[tf.data] Rename `GetInputPlaceholder` -> `GetInputNames` in C++ dataset tests.
PiperOrigin-RevId: 271449647
diff --git a/tensorflow/core/kernels/data/cache_dataset_ops_test.cc b/tensorflow/core/kernels/data/cache_dataset_ops_test.cc
index 28698ca..7f2b43a 100644
--- a/tensorflow/core/kernels/data/cache_dataset_ops_test.cc
+++ b/tensorflow/core/kernels/data/cache_dataset_ops_test.cc
@@ -42,10 +42,8 @@
return {filename_tensor};
}
- Status GetInputPlaceholder(
- std::vector<string>* input_placeholder) const override {
- *input_placeholder = {CacheDatasetOp::kInputDataset,
- CacheDatasetOp::kFileName};
+ Status GetInputNames(std::vector<string>* input_names) const override {
+ *input_names = {CacheDatasetOp::kInputDataset, CacheDatasetOp::kFileName};
return Status::OK();
}
diff --git a/tensorflow/core/kernels/data/concatenate_dataset_op_test.cc b/tensorflow/core/kernels/data/concatenate_dataset_op_test.cc
index 47b5e70..42bd95a 100644
--- a/tensorflow/core/kernels/data/concatenate_dataset_op_test.cc
+++ b/tensorflow/core/kernels/data/concatenate_dataset_op_test.cc
@@ -42,11 +42,10 @@
std::vector<Tensor> GetInputTensors() const override { return {}; }
- Status GetInputPlaceholder(
- std::vector<string>* input_placeholder) const override {
- input_placeholder->reserve(2);
- input_placeholder->emplace_back(ConcatenateDatasetOp::kInputDataset);
- input_placeholder->emplace_back(ConcatenateDatasetOp::kAnotherDataset);
+ Status GetInputNames(std::vector<string>* input_names) const override {
+ input_names->reserve(2);
+ input_names->emplace_back(ConcatenateDatasetOp::kInputDataset);
+ input_names->emplace_back(ConcatenateDatasetOp::kAnotherDataset);
return Status::OK();
}
diff --git a/tensorflow/core/kernels/data/dataset_test_base.cc b/tensorflow/core/kernels/data/dataset_test_base.cc
index 6657776..8dee5d1 100644
--- a/tensorflow/core/kernels/data/dataset_test_base.cc
+++ b/tensorflow/core/kernels/data/dataset_test_base.cc
@@ -809,14 +809,14 @@
std::unique_ptr<OpKernel>* dataset_kernel) {
name_utils::OpNameParams params;
params.op_version = dataset_params.op_version();
- std::vector<string> input_placeholder;
- TF_RETURN_IF_ERROR(dataset_params.GetInputPlaceholder(&input_placeholder));
+ std::vector<string> input_names;
+ TF_RETURN_IF_ERROR(dataset_params.GetInputNames(&input_names));
AttributeVector attributes;
TF_RETURN_IF_ERROR(dataset_params.GetAttributes(&attributes));
NodeDef node_def =
test::function::NDef(dataset_params.node_name(),
name_utils::OpName(dataset_params.op_name(), params),
- input_placeholder, attributes);
+ input_names, attributes);
TF_RETURN_IF_ERROR(CreateOpKernel(node_def, dataset_kernel));
return Status::OK();
}
@@ -896,10 +896,10 @@
return {start_tensor, stop_tensor, step_tensor};
}
-Status RangeDatasetParams::GetInputPlaceholder(
- std::vector<string>* input_placeholder) const {
- *input_placeholder = {RangeDatasetOp::kStart, RangeDatasetOp::kStop,
- RangeDatasetOp::kStep};
+Status RangeDatasetParams::GetInputNames(
+ std::vector<string>* input_names) const {
+ *input_names = {RangeDatasetOp::kStart, RangeDatasetOp::kStop,
+ RangeDatasetOp::kStep};
return Status::OK();
}
@@ -925,11 +925,10 @@
return {batch_size, drop_remainder};
}
-Status BatchDatasetParams::GetInputPlaceholder(
- std::vector<string>* input_placeholder) const {
- *input_placeholder = {BatchDatasetOp::kInputDataset,
- BatchDatasetOp::kBatchSize,
- BatchDatasetOp::kDropRemainder};
+Status BatchDatasetParams::GetInputNames(
+ std::vector<string>* input_names) const {
+ *input_names = {BatchDatasetOp::kInputDataset, BatchDatasetOp::kBatchSize,
+ BatchDatasetOp::kDropRemainder};
return Status::OK();
}
@@ -955,11 +954,10 @@
return other_arguments_;
}
-Status MapDatasetParams::GetInputPlaceholder(
- std::vector<string>* input_placeholder) const {
- input_placeholder->emplace_back(MapDatasetOp::kInputDataset);
+Status MapDatasetParams::GetInputNames(std::vector<string>* input_names) const {
+ input_names->emplace_back(MapDatasetOp::kInputDataset);
for (int i = 0; i < other_arguments_.size(); ++i) {
- input_placeholder->emplace_back(
+ input_names->emplace_back(
absl::StrCat(MapDatasetOp::kOtherArguments, "_", i));
}
return Status::OK();
@@ -977,9 +975,9 @@
}
Status MapDatasetParams::CreateFactory(FunctionDef* fdef) const {
- std::vector<string> input_placeholder;
- TF_RETURN_IF_ERROR(GetInputPlaceholder(&input_placeholder));
- bool has_other_args = input_placeholder.size() > 1;
+ std::vector<string> input_names;
+ TF_RETURN_IF_ERROR(GetInputNames(&input_names));
+ bool has_other_args = input_names.size() > 1;
*fdef = test::function::MakeMapDataset(has_other_args);
return Status::OK();
}
@@ -1000,11 +998,11 @@
return components_;
}
-Status TensorSliceDatasetParams::GetInputPlaceholder(
- std::vector<string>* input_placeholder) const {
- input_placeholder->reserve(components_.size());
+Status TensorSliceDatasetParams::GetInputNames(
+ std::vector<string>* input_names) const {
+ input_names->reserve(components_.size());
for (int i = 0; i < components_.size(); ++i) {
- input_placeholder->emplace_back(
+ input_names->emplace_back(
absl::StrCat(TensorSliceDatasetOp::kComponents, "_", i));
}
return Status::OK();
@@ -1052,11 +1050,11 @@
return {CreateTensor<int64>(TensorShape({}), {count_})};
}
-Status TakeDatasetParams::GetInputPlaceholder(
- std::vector<string>* input_placeholder) const {
- input_placeholder->reserve(input_dataset_params_.size() + 1);
- input_placeholder->emplace_back(TakeDatasetOp::kInputDataset);
- input_placeholder->emplace_back(TakeDatasetOp::kCount);
+Status TakeDatasetParams::GetInputNames(
+ std::vector<string>* input_names) const {
+ input_names->reserve(input_dataset_params_.size() + 1);
+ input_names->emplace_back(TakeDatasetOp::kInputDataset);
+ input_names->emplace_back(TakeDatasetOp::kCount);
return Status::OK();
}
diff --git a/tensorflow/core/kernels/data/dataset_test_base.h b/tensorflow/core/kernels/data/dataset_test_base.h
index d18e33a..8ca43ee 100644
--- a/tensorflow/core/kernels/data/dataset_test_base.h
+++ b/tensorflow/core/kernels/data/dataset_test_base.h
@@ -120,8 +120,7 @@
virtual std::vector<Tensor> GetInputTensors() const = 0;
// Returns the dataset input names as a string vector.
- virtual Status GetInputPlaceholder(
- std::vector<string>* input_placeholder) const = 0;
+ virtual Status GetInputNames(std::vector<string>* input_names) const = 0;
// Returns the dataset attributes as a vector.
virtual Status GetAttributes(AttributeVector* attributes) const = 0;
@@ -183,8 +182,7 @@
std::vector<Tensor> GetInputTensors() const override;
- Status GetInputPlaceholder(
- std::vector<string>* input_placeholder) const override;
+ Status GetInputNames(std::vector<string>* input_names) const override;
Status GetAttributes(AttributeVector* attr_vector) const override;
@@ -221,8 +219,7 @@
std::vector<Tensor> GetInputTensors() const override;
- Status GetInputPlaceholder(
- std::vector<string>* input_placeholder) const override;
+ Status GetInputNames(std::vector<string>* input_names) const override;
Status GetAttributes(AttributeVector* attr_vector) const override;
@@ -265,8 +262,7 @@
std::vector<Tensor> GetInputTensors() const override;
- Status GetInputPlaceholder(
- std::vector<string>* input_placeholder) const override;
+ Status GetInputNames(std::vector<string>* input_names) const override;
Status GetAttributes(AttributeVector* attr_vector) const override;
@@ -293,8 +289,7 @@
std::vector<Tensor> GetInputTensors() const override;
- Status GetInputPlaceholder(
- std::vector<string>* input_placeholder) const override;
+ Status GetInputNames(std::vector<string>* input_names) const override;
Status GetAttributes(AttributeVector* attr_vector) const override;
@@ -335,8 +330,7 @@
std::vector<Tensor> GetInputTensors() const override;
- Status GetInputPlaceholder(
- std::vector<string>* input_placeholder) const override;
+ Status GetInputNames(std::vector<string>* input_names) const override;
Status GetAttributes(AttributeVector* attr_vector) const override;
diff --git a/tensorflow/core/kernels/data/experimental/assert_next_dataset_op_test.cc b/tensorflow/core/kernels/data/experimental/assert_next_dataset_op_test.cc
index 3d9e3c3..9b35734 100644
--- a/tensorflow/core/kernels/data/experimental/assert_next_dataset_op_test.cc
+++ b/tensorflow/core/kernels/data/experimental/assert_next_dataset_op_test.cc
@@ -43,11 +43,10 @@
transformations_)};
}
- Status GetInputPlaceholder(
- std::vector<string>* input_placeholder) const override {
- input_placeholder->reserve(input_dataset_params_.size() + 1);
- input_placeholder->emplace_back(AssertNextDatasetOp::kInputDataset);
- input_placeholder->emplace_back(AssertNextDatasetOp::kTransformations);
+ Status GetInputNames(std::vector<string>* input_names) const override {
+ input_names->reserve(input_dataset_params_.size() + 1);
+ input_names->emplace_back(AssertNextDatasetOp::kInputDataset);
+ input_names->emplace_back(AssertNextDatasetOp::kTransformations);
return Status::OK();
}
diff --git a/tensorflow/core/kernels/data/experimental/map_and_batch_dataset_op_test.cc b/tensorflow/core/kernels/data/experimental/map_and_batch_dataset_op_test.cc
index 4ec2c62..4797650 100644
--- a/tensorflow/core/kernels/data/experimental/map_and_batch_dataset_op_test.cc
+++ b/tensorflow/core/kernels/data/experimental/map_and_batch_dataset_op_test.cc
@@ -54,18 +54,17 @@
return inputs;
}
- Status GetInputPlaceholder(
- std::vector<string>* input_placeholder) const override {
- input_placeholder->reserve(input_dataset_params_.size() +
- other_arguments_.size() + 3);
- input_placeholder->emplace_back(MapAndBatchDatasetOp::kInputDataset);
+ Status GetInputNames(std::vector<string>* input_names) const override {
+ input_names->reserve(input_dataset_params_.size() +
+ other_arguments_.size() + 3);
+ input_names->emplace_back(MapAndBatchDatasetOp::kInputDataset);
for (int i = 0; i < other_arguments_.size(); ++i) {
- input_placeholder->emplace_back(
+ input_names->emplace_back(
absl::StrCat(MapAndBatchDatasetOp::kOtherArguments, "_", i));
}
- input_placeholder->emplace_back(MapAndBatchDatasetOp::kBatchSize);
- input_placeholder->emplace_back(MapAndBatchDatasetOp::kNumParallelCalls);
- input_placeholder->emplace_back(MapAndBatchDatasetOp::kDropRemainder);
+ input_names->emplace_back(MapAndBatchDatasetOp::kBatchSize);
+ input_names->emplace_back(MapAndBatchDatasetOp::kNumParallelCalls);
+ input_names->emplace_back(MapAndBatchDatasetOp::kDropRemainder);
return Status::OK();
}
diff --git a/tensorflow/core/kernels/data/experimental/sampling_dataset_op_test.cc b/tensorflow/core/kernels/data/experimental/sampling_dataset_op_test.cc
index 996a59b..be4fb11 100644
--- a/tensorflow/core/kernels/data/experimental/sampling_dataset_op_test.cc
+++ b/tensorflow/core/kernels/data/experimental/sampling_dataset_op_test.cc
@@ -44,11 +44,9 @@
return {rate, seed_tensor, seed2_tensor};
}
- Status GetInputPlaceholder(
- std::vector<string>* input_placeholder) const override {
- *input_placeholder = {SamplingDatasetOp::kInputDataset,
- SamplingDatasetOp::kRate, SamplingDatasetOp::kSeed,
- SamplingDatasetOp::kSeed2};
+ Status GetInputNames(std::vector<string>* input_names) const override {
+ *input_names = {SamplingDatasetOp::kInputDataset, SamplingDatasetOp::kRate,
+ SamplingDatasetOp::kSeed, SamplingDatasetOp::kSeed2};
return Status::OK();
}
diff --git a/tensorflow/core/kernels/data/tensor_dataset_op_test.cc b/tensorflow/core/kernels/data/tensor_dataset_op_test.cc
index 731ccdd..b64e9b9 100644
--- a/tensorflow/core/kernels/data/tensor_dataset_op_test.cc
+++ b/tensorflow/core/kernels/data/tensor_dataset_op_test.cc
@@ -31,11 +31,10 @@
std::vector<Tensor> GetInputTensors() const override { return components_; }
- Status GetInputPlaceholder(
- std::vector<string>* input_placeholder) const override {
- input_placeholder->reserve(components_.size());
+ Status GetInputNames(std::vector<string>* input_names) const override {
+ input_names->reserve(components_.size());
for (int i = 0; i < components_.size(); ++i) {
- input_placeholder->emplace_back(
+ input_names->emplace_back(
absl::StrCat(TensorDatasetOp::kComponents, "_", i));
}
return Status::OK();
diff --git a/tensorflow/core/kernels/data/tensor_slice_dataset_op_test.cc b/tensorflow/core/kernels/data/tensor_slice_dataset_op_test.cc
index f8a5d8b..aea8598 100644
--- a/tensorflow/core/kernels/data/tensor_slice_dataset_op_test.cc
+++ b/tensorflow/core/kernels/data/tensor_slice_dataset_op_test.cc
@@ -99,10 +99,9 @@
auto test_case = GetParam();
TF_ASSERT_OK(Initialize(test_case.dataset_params));
- std::vector<string> input_placeholder;
- TF_ASSERT_OK(
- test_case.dataset_params.GetInputPlaceholder(&input_placeholder));
- size_t num_tensors_per_slice = input_placeholder.size();
+ std::vector<string> input_names;
+ TF_ASSERT_OK(test_case.dataset_params.GetInputNames(&input_names));
+ size_t num_tensors_per_slice = input_names.size();
bool end_of_sequence = false;
std::vector<Tensor> out_tensors;
int cur_slice = 0;
