diff --git a/tensorflow/core/kernels/data/dataset_test_base.cc b/tensorflow/core/kernels/data/dataset_test_base.cc index 2a7061aa5efe598a87f14e02efd4aeab55978fec..09846291ea9359dbbb4d6d99ab0858c83df330b0 100644 --- a/tensorflow/core/kernels/data/dataset_test_base.cc +++ b/tensorflow/core/kernels/data/dataset_test_base.cc @@ -823,6 +823,14 @@ RangeDatasetParams::RangeDatasetParams(int64 start, int64 stop, int64 step) stop_(stop), step_(step) {} +RangeDatasetParams::RangeDatasetParams(int64 start, int64 stop, int64 step, + DataTypeVector output_dtypes) + : DatasetParams(std::move(output_dtypes), {PartialTensorShape({})}, + "range_dataset"), + start_(start), + stop_(stop), + step_(step) {} + std::vector RangeDatasetParams::GetInputTensors() const { Tensor start_tensor = CreateTensor(TensorShape({}), {start_}); Tensor stop_tensor = CreateTensor(TensorShape({}), {stop_}); diff --git a/tensorflow/core/kernels/data/dataset_test_base.h b/tensorflow/core/kernels/data/dataset_test_base.h index 35114c648f8f213ca2f1c40b43ff0927f19906c6..d8afcdf84d8c367c6764b2f1a79053d24afa5966 100644 --- a/tensorflow/core/kernels/data/dataset_test_base.h +++ b/tensorflow/core/kernels/data/dataset_test_base.h @@ -172,6 +172,9 @@ class RangeDatasetParams : public DatasetParams { RangeDatasetParams(int64 start, int64 stop, int64 step); + RangeDatasetParams(int64 start, int64 stop, int64 step, + DataTypeVector output_dtypes); + std::vector GetInputTensors() const override; Status GetInputNames(std::vector* input_names) const override; diff --git a/tensorflow/core/kernels/data/range_dataset_op.cc b/tensorflow/core/kernels/data/range_dataset_op.cc index 8e870859913d6ae6b7e9c747f27fc387f9aa87d9..447bdf9a6775eed563c207bd83d739ee00607824 100644 --- a/tensorflow/core/kernels/data/range_dataset_op.cc +++ b/tensorflow/core/kernels/data/range_dataset_op.cc @@ -36,11 +36,13 @@ constexpr char kNext[] = "next"; class RangeDatasetOp::Dataset : public DatasetBase { public: - Dataset(OpKernelContext* ctx, int64 start, int64 stop, int64 step) + Dataset(OpKernelContext* ctx, int64 start, int64 stop, int64 step, + DataTypeVector output_dtypes) : DatasetBase(DatasetContext(ctx)), start_(start), stop_(stop), - step_(step) {} + step_(step), + output_dtypes_(output_dtypes) {} std::unique_ptr MakeIteratorInternal( const string& prefix) const override { @@ -49,8 +51,7 @@ class RangeDatasetOp::Dataset : public DatasetBase { } const DataTypeVector& output_dtypes() const override { - static DataTypeVector* dtypes = new DataTypeVector({DT_INT64}); - return *dtypes; + return output_dtypes_; } const std::vector& output_shapes() const override { @@ -106,7 +107,20 @@ class RangeDatasetOp::Dataset : public DatasetBase { return Status::OK(); } out_tensors->reserve(1); - out_tensors->emplace_back(next_); + Tensor result(dataset()->output_dtypes()[0]); + switch (dataset()->output_dtypes()[0]) { +#define HANDLE_TYPE(type) \ + case DataTypeToEnum::value: { \ + out_tensors->emplace_back(static_cast(next_)); \ + break; \ + } + TF_CALL_NUMBER_TYPES(HANDLE_TYPE); +#undef HANDLE_TYPE + default: + return errors::InvalidArgument( + "Unsupported data type: ", + DataTypeString(dataset()->output_dtypes()[0])); + } *end_of_sequence = false; next_ += dataset()->step_; @@ -140,10 +154,13 @@ class RangeDatasetOp::Dataset : public DatasetBase { const int64 start_; const int64 stop_; const int64 step_; + const DataTypeVector output_dtypes_; }; RangeDatasetOp::RangeDatasetOp(OpKernelConstruction* ctx) - : DatasetOpKernel(ctx) {} + : DatasetOpKernel(ctx) { + OP_REQUIRES_OK(ctx, ctx->GetAttr(kOutputTypes, &output_types_)); +} void RangeDatasetOp::MakeDataset(OpKernelContext* ctx, DatasetBase** output) { int64 start; @@ -157,7 +174,7 @@ void RangeDatasetOp::MakeDataset(OpKernelContext* ctx, DatasetBase** output) { OP_REQUIRES(ctx, step != 0, errors::InvalidArgument("step must be a non-zero integer.")); - *output = new Dataset(ctx, start, stop, step); + *output = new Dataset(ctx, start, stop, step, output_types_); } namespace { diff --git a/tensorflow/core/kernels/data/range_dataset_op.h b/tensorflow/core/kernels/data/range_dataset_op.h index c560a7babd33faf8072c10bd50598bd82f734a8a..077987b72e10fd3ccee80581f31ef13d8141eafd 100644 --- a/tensorflow/core/kernels/data/range_dataset_op.h +++ b/tensorflow/core/kernels/data/range_dataset_op.h @@ -36,6 +36,7 @@ class RangeDatasetOp : public DatasetOpKernel { private: class Dataset; + DataTypeVector output_types_; }; } // namespace data diff --git a/tensorflow/core/kernels/data/range_dataset_op_test.cc b/tensorflow/core/kernels/data/range_dataset_op_test.cc index bd620f38930a41a7b079d525eba574df0841ceb1..13a027ecdc6e41ec9cb822b482a3d662e18df548 100644 --- a/tensorflow/core/kernels/data/range_dataset_op_test.cc +++ b/tensorflow/core/kernels/data/range_dataset_op_test.cc @@ -34,6 +34,16 @@ RangeDatasetParams ZeroStepRangeDatasetParams() { return RangeDatasetParams(/*start=*/10, /*stop=*/0, /*step=*/0); } +RangeDatasetParams RangeDatasetParams1() { + return RangeDatasetParams(/*start=*/0, /*stop=*/10, /*step=*/3, + /*output_dtypes=*/{DT_INT32}); +} + +RangeDatasetParams RangeDatasetParams2() { + return RangeDatasetParams(/*start=*/0, /*stop=*/10, /*step=*/3, + /*output_dtypes=*/{DT_INT64}); +} + std::vector> GetNextTestCases() { return {{/*dataset_params=*/PositiveStepRangeDatasetParams(), /*expected_outputs=*/ @@ -59,12 +69,17 @@ TEST_F(RangeDatasetOpTest, DatasetTypeString) { CheckDatasetTypeString(name_utils::OpName(RangeDatasetOp::kDatasetType))); } -TEST_F(RangeDatasetOpTest, DatasetOutputDtypes) { - auto range_dataset_params = PositiveStepRangeDatasetParams(); - TF_ASSERT_OK(Initialize(range_dataset_params)); - TF_ASSERT_OK(CheckDatasetOutputDtypes({DT_INT64})); +std::vector> +DatasetOutputDtypesTestCases() { + return {{/*dataset_params=*/RangeDatasetParams1(), + /*expected_output_dtypes=*/{DT_INT32}}, + {/*dataset_params=*/RangeDatasetParams2(), + /*expected_output_dtypes=*/{DT_INT64}}}; } +DATASET_OUTPUT_DTYPES_TEST_P(RangeDatasetOpTest, RangeDatasetParams, + DatasetOutputDtypesTestCases()) + TEST_F(RangeDatasetOpTest, DatasetOutputShapes) { auto range_dataset_params = PositiveStepRangeDatasetParams(); TF_ASSERT_OK(Initialize(range_dataset_params)); @@ -81,12 +96,17 @@ std::vector> CardinalityTestCases() { DATASET_CARDINALITY_TEST_P(RangeDatasetOpTest, RangeDatasetParams, CardinalityTestCases()) -TEST_F(RangeDatasetOpTest, IteratorOutputDtypes) { - auto range_dataset_params = PositiveStepRangeDatasetParams(); - TF_ASSERT_OK(Initialize(range_dataset_params)); - TF_ASSERT_OK(CheckIteratorOutputDtypes({DT_INT64})); +std::vector> +IteratorOutputDtypesTestCases() { + return {{/*dataset_params=*/RangeDatasetParams1(), + /*expected_output_dtypes=*/{DT_INT32}}, + {/*dataset_params=*/RangeDatasetParams2(), + /*expected_output_dtypes=*/{DT_INT64}}}; } +ITERATOR_OUTPUT_DTYPES_TEST_P(RangeDatasetOpTest, RangeDatasetParams, + IteratorOutputDtypesTestCases()) + TEST_F(RangeDatasetOpTest, IteratorOutputShapes) { auto range_dataset_params = PositiveStepRangeDatasetParams(); TF_ASSERT_OK(Initialize(range_dataset_params)); diff --git a/tensorflow/python/data/kernel_tests/range_test.py b/tensorflow/python/data/kernel_tests/range_test.py index d136565ce42c80c9e8ea4e2a02848a4d49221982..4139b4dab3ce540ec71b9f43823cda4e6c923d07 100644 --- a/tensorflow/python/data/kernel_tests/range_test.py +++ b/tensorflow/python/data/kernel_tests/range_test.py @@ -18,63 +18,129 @@ from __future__ import division from __future__ import print_function from absl.testing import parameterized +import numpy as np from tensorflow.python.data.kernel_tests import test_base from tensorflow.python.data.ops import dataset_ops from tensorflow.python.framework import combinations +from tensorflow.python.framework import dtypes from tensorflow.python.framework import errors from tensorflow.python.platform import test class RangeTest(test_base.DatasetTestBase, parameterized.TestCase): - @combinations.generate(test_base.default_test_combinations()) - def testStop(self): - dataset = dataset_ops.Dataset.range(5) - self.assertDatasetProduces(dataset, expected_output=range(5)) + @combinations.generate( + combinations.times( + test_base.default_test_combinations(), + combinations.combine(output_type=[ + dtypes.int32, dtypes.int64, dtypes.float32, dtypes.float64 + ]))) + def testStop(self, output_type): + stop = 5 + dataset = dataset_ops.Dataset.range(stop, output_type=output_type) + expected_output = np.arange(stop, dtype=output_type.as_numpy_dtype) + self.assertDatasetProduces(dataset, expected_output=expected_output) + self.assertEqual(output_type, dataset_ops.get_legacy_output_types(dataset)) - @combinations.generate(test_base.default_test_combinations()) - def testStartStop(self): + @combinations.generate( + combinations.times( + test_base.default_test_combinations(), + combinations.combine(output_type=[ + dtypes.int32, dtypes.int64, dtypes.float32, dtypes.float64 + ]))) + def testStartStop(self, output_type): start, stop = 2, 5 - dataset = dataset_ops.Dataset.range(start, stop) - self.assertDatasetProduces(dataset, expected_output=range(2, 5)) + dataset = dataset_ops.Dataset.range(start, stop, output_type=output_type) + expected_output = np.arange(start, stop, dtype=output_type.as_numpy_dtype) + self.assertDatasetProduces(dataset, expected_output=expected_output) + self.assertEqual(output_type, dataset_ops.get_legacy_output_types(dataset)) - @combinations.generate(test_base.default_test_combinations()) - def testStartStopStep(self): + @combinations.generate( + combinations.times( + test_base.default_test_combinations(), + combinations.combine(output_type=[ + dtypes.int32, dtypes.int64, dtypes.float32, dtypes.float64 + ]))) + def testStartStopStep(self, output_type): start, stop, step = 2, 10, 2 - dataset = dataset_ops.Dataset.range(start, stop, step) - self.assertDatasetProduces(dataset, expected_output=range(2, 10, 2)) + dataset = dataset_ops.Dataset.range( + start, stop, step, output_type=output_type) + expected_output = np.arange( + start, stop, step, dtype=output_type.as_numpy_dtype) + self.assertDatasetProduces(dataset, expected_output=expected_output) + self.assertEqual(output_type, dataset_ops.get_legacy_output_types(dataset)) - @combinations.generate(test_base.default_test_combinations()) - def testZeroStep(self): + @combinations.generate( + combinations.times( + test_base.default_test_combinations(), + combinations.combine(output_type=[ + dtypes.int32, dtypes.int64, dtypes.float32, dtypes.float64 + ]))) + def testZeroStep(self, output_type): start, stop, step = 2, 10, 0 with self.assertRaises(errors.InvalidArgumentError): - dataset = dataset_ops.Dataset.range(start, stop, step) + dataset = dataset_ops.Dataset.range( + start, stop, step, output_type=output_type) self.evaluate(dataset._variant_tensor) - @combinations.generate(test_base.default_test_combinations()) - def testNegativeStep(self): + @combinations.generate( + combinations.times( + test_base.default_test_combinations(), + combinations.combine(output_type=[ + dtypes.int32, dtypes.int64, dtypes.float32, dtypes.float64 + ]))) + def testNegativeStep(self, output_type): start, stop, step = 2, 10, -1 - dataset = dataset_ops.Dataset.range(start, stop, step) - self.assertDatasetProduces(dataset, expected_output=range(2, 10, -1)) + dataset = dataset_ops.Dataset.range( + start, stop, step, output_type=output_type) + expected_output = np.arange( + start, stop, step, dtype=output_type.as_numpy_dtype) + self.assertDatasetProduces(dataset, expected_output=expected_output) + self.assertEqual(output_type, dataset_ops.get_legacy_output_types(dataset)) - @combinations.generate(test_base.default_test_combinations()) - def testStopLessThanStart(self): + @combinations.generate( + combinations.times( + test_base.default_test_combinations(), + combinations.combine(output_type=[ + dtypes.int32, dtypes.int64, dtypes.float32, dtypes.float64 + ]))) + def testStopLessThanStart(self, output_type): start, stop = 10, 2 - dataset = dataset_ops.Dataset.range(start, stop) - self.assertDatasetProduces(dataset, expected_output=range(10, 2)) + dataset = dataset_ops.Dataset.range(start, stop, output_type=output_type) + expected_output = np.arange(start, stop, dtype=output_type.as_numpy_dtype) + self.assertDatasetProduces(dataset, expected_output=expected_output) + self.assertEqual(output_type, dataset_ops.get_legacy_output_types(dataset)) - @combinations.generate(test_base.default_test_combinations()) - def testStopLessThanStartWithPositiveStep(self): + @combinations.generate( + combinations.times( + test_base.default_test_combinations(), + combinations.combine(output_type=[ + dtypes.int32, dtypes.int64, dtypes.float32, dtypes.float64 + ]))) + def testStopLessThanStartWithPositiveStep(self, output_type): start, stop, step = 10, 2, 2 - dataset = dataset_ops.Dataset.range(start, stop, step) - self.assertDatasetProduces(dataset, expected_output=range(10, 2, 2)) + dataset = dataset_ops.Dataset.range( + start, stop, step, output_type=output_type) + expected_output = np.arange( + start, stop, step, dtype=output_type.as_numpy_dtype) + self.assertDatasetProduces(dataset, expected_output=expected_output) + self.assertEqual(output_type, dataset_ops.get_legacy_output_types(dataset)) - @combinations.generate(test_base.default_test_combinations()) - def testStopLessThanStartWithNegativeStep(self): + @combinations.generate( + combinations.times( + test_base.default_test_combinations(), + combinations.combine(output_type=[ + dtypes.int32, dtypes.int64, dtypes.float32, dtypes.float64 + ]))) + def testStopLessThanStartWithNegativeStep(self, output_type): start, stop, step = 10, 2, -1 - dataset = dataset_ops.Dataset.range(start, stop, step) - self.assertDatasetProduces(dataset, expected_output=range(10, 2, -1)) + dataset = dataset_ops.Dataset.range( + start, stop, step, output_type=output_type) + expected_output = np.arange( + start, stop, step, dtype=output_type.as_numpy_dtype) + self.assertDatasetProduces(dataset, expected_output=expected_output) + self.assertEqual(output_type, dataset_ops.get_legacy_output_types(dataset)) if __name__ == "__main__": diff --git a/tensorflow/python/data/ops/dataset_ops.py b/tensorflow/python/data/ops/dataset_ops.py index a983799001120ccf82dbc2b56b6948113ce445cd..6f9d201c85d7508e9130b981d54fef469c9e37c6 100644 --- a/tensorflow/python/data/ops/dataset_ops.py +++ b/tensorflow/python/data/ops/dataset_ops.py @@ -870,7 +870,7 @@ class DatasetV2(tracking_base.Trackable, composite_tensor.CompositeTensor): return id_dataset.flat_map(flat_map_fn) @staticmethod - def range(*args): + def range(*args, **kwargs): """Creates a `Dataset` of a step-separated range of values. >>> list(Dataset.range(5).as_numpy_iterator()) @@ -885,12 +885,18 @@ class DatasetV2(tracking_base.Trackable, composite_tensor.CompositeTensor): [] >>> list(Dataset.range(5, 1, -2).as_numpy_iterator()) [5, 3] + >>> list(Dataset.range(2, 5, output_type=tf.int32).as_numpy_iterator()) + [2, 3, 4] + >>> list(Dataset.range(1, 5, 2, output_type=tf.float32).as_numpy_iterator()) + [1.0, 3.0] Args: *args: follows the same semantics as python's xrange. len(args) == 1 -> start = 0, stop = args[0], step = 1 len(args) == 2 -> start = args[0], stop = args[1], step = 1 len(args) == 3 -> start = args[0], stop = args[1, stop = args[2] + **kwargs: + - output_type: Its expected dtype. (Optional, default: `tf.int64`). Returns: Dataset: A `RangeDataset`. @@ -898,7 +904,7 @@ class DatasetV2(tracking_base.Trackable, composite_tensor.CompositeTensor): Raises: ValueError: if len(args) == 0. """ - return RangeDataset(*args) + return RangeDataset(*args, **kwargs) @staticmethod def zip(datasets): @@ -2228,8 +2234,8 @@ class DatasetV1(DatasetV2): @staticmethod @functools.wraps(DatasetV2.range) - def range(*args): - return DatasetV1Adapter(DatasetV2.range(*args)) + def range(*args, **kwargs): + return DatasetV1Adapter(DatasetV2.range(*args, **kwargs)) @staticmethod @functools.wraps(DatasetV2.zip) @@ -3344,10 +3350,10 @@ class RepeatDataset(UnaryUnchangedStructureDataset): class RangeDataset(DatasetSource): """A `Dataset` of a step separated range of values.""" - def __init__(self, *args): + def __init__(self, *args, **kwargs): """See `Dataset.range()` for details.""" - self._parse_args(*args) - self._structure = tensor_spec.TensorSpec([], dtypes.int64) + self._parse_args(*args, **kwargs) + self._structure = tensor_spec.TensorSpec([], self._output_type) variant_tensor = gen_dataset_ops.range_dataset( start=self._start, stop=self._stop, @@ -3355,7 +3361,7 @@ class RangeDataset(DatasetSource): **self._flat_structure) super(RangeDataset, self).__init__(variant_tensor) - def _parse_args(self, *args): + def _parse_args(self, *args, **kwargs): """Parse arguments according to the same rules as the `range()` builtin.""" if len(args) == 1: self._start = self._build_tensor(0, "start") @@ -3371,6 +3377,10 @@ class RangeDataset(DatasetSource): self._step = self._build_tensor(args[2], "step") else: raise ValueError("Invalid arguments to RangeDataset: %s" % str(args)) + if "output_type" in kwargs: + self._output_type = kwargs["output_type"] + else: + self._output_type = dtypes.int64 def _build_tensor(self, int64_value, name): return ops.convert_to_tensor(int64_value, dtype=dtypes.int64, name=name) diff --git a/tensorflow/tools/api/golden/v1/tensorflow.data.-dataset.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.data.-dataset.pbtxt index fe1d7653f1699ee3e2a20d0474d38abf418b70a8..bbdedf6e9605c1d14b9b613679d10d4f3afa83ec 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.data.-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.data.-dataset.pbtxt @@ -115,7 +115,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce" diff --git a/tensorflow/tools/api/golden/v1/tensorflow.data.-fixed-length-record-dataset.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.data.-fixed-length-record-dataset.pbtxt index 252638a7c6c4381e303fd0651bbb7f396852f869..a4746be7b945408e750711dcee0c9c50f642654f 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.data.-fixed-length-record-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.data.-fixed-length-record-dataset.pbtxt @@ -117,7 +117,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce" diff --git a/tensorflow/tools/api/golden/v1/tensorflow.data.-t-f-record-dataset.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.data.-t-f-record-dataset.pbtxt index 579199e36d309c908038b490717d237e7639689c..f7468c7425d0d3bcf7773ce973e10716fc39f7e3 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.data.-t-f-record-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.data.-t-f-record-dataset.pbtxt @@ -117,7 +117,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce" diff --git a/tensorflow/tools/api/golden/v1/tensorflow.data.-text-line-dataset.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.data.-text-line-dataset.pbtxt index b8c9b22d349da8c0a7768eaee7de2092d9ee5a1c..660125eea13763a115a737d593f5dca3d6e6f6d5 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.data.-text-line-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.data.-text-line-dataset.pbtxt @@ -117,7 +117,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce" diff --git a/tensorflow/tools/api/golden/v1/tensorflow.data.experimental.-csv-dataset.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.data.experimental.-csv-dataset.pbtxt index 79b160ded4e107ed1ae037ad073a849c5922533d..1fe3f13b8ecfae5fd287a47e0590cbc1eeff73c5 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.data.experimental.-csv-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.data.experimental.-csv-dataset.pbtxt @@ -117,7 +117,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce" diff --git a/tensorflow/tools/api/golden/v1/tensorflow.data.experimental.-random-dataset.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.data.experimental.-random-dataset.pbtxt index 1fc8d37321369d6dbda976b2316cd81c225b0a97..f886bd287b5a4b00463e63baf4d34edd84d70200 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.data.experimental.-random-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.data.experimental.-random-dataset.pbtxt @@ -117,7 +117,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce" diff --git a/tensorflow/tools/api/golden/v1/tensorflow.data.experimental.-sql-dataset.pbtxt b/tensorflow/tools/api/golden/v1/tensorflow.data.experimental.-sql-dataset.pbtxt index 029d112aaf7910353b58309d97c8d30f69525b2a..a39d54b18ba780aceddc60df1d93263af9ab0f1f 100644 --- a/tensorflow/tools/api/golden/v1/tensorflow.data.experimental.-sql-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v1/tensorflow.data.experimental.-sql-dataset.pbtxt @@ -117,7 +117,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.data.-dataset.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.data.-dataset.pbtxt index 878b114cf179d0d2c5fcb21f6d5180a7cbb75345..6d188da77f0c53a4f4d6e254183acaafbfa63c5c 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.data.-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.data.-dataset.pbtxt @@ -82,7 +82,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.data.-fixed-length-record-dataset.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.data.-fixed-length-record-dataset.pbtxt index 1c2668196c1e0737e188ca830289f50bacc97e55..4c13d908d8aecb369cf8ce3b8bf02d48f85c4a8f 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.data.-fixed-length-record-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.data.-fixed-length-record-dataset.pbtxt @@ -84,7 +84,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.data.-t-f-record-dataset.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.data.-t-f-record-dataset.pbtxt index 793350df44f0e71e2ba4c44fcb7cca4b78788672..c17f4af70e87e3b6b21b7be886fe05b916d84983 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.data.-t-f-record-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.data.-t-f-record-dataset.pbtxt @@ -83,7 +83,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.data.-text-line-dataset.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.data.-text-line-dataset.pbtxt index b023d10327893eb23d9af00cd4d72c8245eea2b1..b641ef7388cb780ce0a507ef15c99e962e334166 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.data.-text-line-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.data.-text-line-dataset.pbtxt @@ -84,7 +84,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.data.experimental.-csv-dataset.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.data.experimental.-csv-dataset.pbtxt index b6047938a93c4ef0584e4034e450f25c5caaa3c4..f0e7383ea3468461e66f65275e5aaed2300ce1bc 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.data.experimental.-csv-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.data.experimental.-csv-dataset.pbtxt @@ -84,7 +84,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.data.experimental.-random-dataset.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.data.experimental.-random-dataset.pbtxt index 10babb92993faaaa9d51c57b4e647a9bb7b0fdf4..a5f86e6fb84ab5f85513feb4bc422fe333eade2d 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.data.experimental.-random-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.data.experimental.-random-dataset.pbtxt @@ -84,7 +84,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce" diff --git a/tensorflow/tools/api/golden/v2/tensorflow.data.experimental.-sql-dataset.pbtxt b/tensorflow/tools/api/golden/v2/tensorflow.data.experimental.-sql-dataset.pbtxt index 7a210097eb1d42ddafd3a1aa98f97c3df206c84e..961a70935ea2e8010e2d5f7f3045207aa20465f4 100644 --- a/tensorflow/tools/api/golden/v2/tensorflow.data.experimental.-sql-dataset.pbtxt +++ b/tensorflow/tools/api/golden/v2/tensorflow.data.experimental.-sql-dataset.pbtxt @@ -84,7 +84,7 @@ tf_class { } member_method { name: "range" - argspec: "args=[], varargs=args, keywords=None, defaults=None" + argspec: "args=[], varargs=args, keywords=kwargs, defaults=None" } member_method { name: "reduce"