experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[tf.data] Move cardinality op out of experimental

Browse Source 
PiperOrigin-RevId: 314574956
Change-Id: I9f724070c3c348b048ebb29e6619eaf88da4f5f4
This commit is contained in:
Andrew Audibert 2020-06-03 11:54:11 -07:00 committed by TensorFlower Gardener
parent a4799e5246
commit 2686074524
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tensorflow/core/ops/dataset_ops.cc
View File

@ -415,6 +415,11 @@ REGISTER_OP("AnonymousSeedGenerator")
return Status::OK(); return Status::OK();
}); });
REGISTER_OP("DatasetCardinality")
.Input("input_dataset: variant")
.Output("cardinality: int64")
.SetShapeFn(shape_inference::ScalarShape);
REGISTER_OP("DeleteSeedGenerator") REGISTER_OP("DeleteSeedGenerator")
.Input("handle: resource") .Input("handle: resource")
.Input("deleter: variant") .Input("deleter: variant")

5
tensorflow/core/ops/experimental_dataset_ops.cc
View File

@ -229,11 +229,6 @@ REGISTER_OP("ExperimentalCSVDataset")
return shape_inference::ScalarShape(c); return shape_inference::ScalarShape(c);
}); });
REGISTER_OP("DatasetCardinality")
.Input("input_dataset: variant")
.Output("cardinality: int64")
.SetShapeFn(shape_inference::ScalarShape);
REGISTER_OP("ExperimentalDatasetCardinality") REGISTER_OP("ExperimentalDatasetCardinality")
.Input("input_dataset: variant") .Input("input_dataset: variant")
.Output("cardinality: int64") .Output("cardinality: int64")

3
tensorflow/python/data/experimental/ops/cardinality.py
View File

@ -20,6 +20,7 @@ from __future__ import print_function
from tensorflow.python.data.ops import dataset_ops from tensorflow.python.data.ops import dataset_ops
from tensorflow.python.framework import dtypes from tensorflow.python.framework import dtypes
from tensorflow.python.framework import ops from tensorflow.python.framework import ops
from tensorflow.python.ops import gen_dataset_ops
from tensorflow.python.ops import gen_experimental_dataset_ops as ged_ops from tensorflow.python.ops import gen_experimental_dataset_ops as ged_ops
from tensorflow.python.util.tf_export import tf_export from tensorflow.python.util.tf_export import tf_export
@ -64,7 +65,7 @@ def cardinality(dataset):
constant `INFINITE_CARDINALITY` and `UNKNOWN_CARDINALITY` respectively. constant `INFINITE_CARDINALITY` and `UNKNOWN_CARDINALITY` respectively.
""" """
return ged_ops.dataset_cardinality(dataset._variant_tensor) # pylint: disable=protected-access return gen_dataset_ops.dataset_cardinality(dataset._variant_tensor) # pylint: disable=protected-access
@tf_export("data.experimental.assert_cardinality") @tf_export("data.experimental.assert_cardinality")

2
tensorflow/python/data/ops/dataset_ops.py
View File

@ -2157,7 +2157,7 @@ name=None))
named constants `tf.data.INFINITE_CARDINALITY` and named constants `tf.data.INFINITE_CARDINALITY` and
`tf.data.UNKNOWN_CARDINALITY` respectively. `tf.data.UNKNOWN_CARDINALITY` respectively.
""" """
return ged_ops.dataset_cardinality(self._variant_tensor) return gen_dataset_ops.dataset_cardinality(self._variant_tensor)
@tf_export(v1=["data.Dataset"]) @tf_export(v1=["data.Dataset"])