diff options
| author |  Derek Murray <mrry@google.com> | 2018-10-01 16:45:11 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-10-01 16:50:05 -0700 |
| commit | b72265dc002e712fc3d0f33434f13c7a36a484b2 (patch) | |
| tree | f92d1f23c329654772f95d93f5cf4458741b72df /tensorflow/contrib/stateless | |
| parent | bb1f9e1a57c8bc18325b3c86298be96e6647a0a3 (diff) | |
[tf.data] Deprecate `tf.contrib.data` and introduce `tf.data.experimental` to replace it.
This change prepares `tf.data` for TensorFlow 2.0, where `tf.contrib` will no longer exist. It retains the pre-existing endpoints in `tf.contrib.data` with deprecation warnings.
Note there are some exceptions to the move:
* Deprecated symbols in `tf.contrib.data` have not been moved to `tf.data.experimental`, because replacements already exist.
* `tf.contrib.data.LMDBDataset` has not been moved, because we plan to move it to a SIG-maintained repository.
* `tf.contrib.data.assert_element_shape()` has not yet been moved, because it depends on functionality in `tf.contrib`, and it will move in a later change.
* `tf.contrib.data.AUTOTUNE` has not yet been moved, because we have not yet determined how to `tf_export()` a Python integer.
* The stats-related API endpoints have not yet appeared in a released version of TensorFlow, so these are moved to `tf.data.experimental` without retaining an endpoint in `tf.contrib.data`.
In addition, this change includes some build rule and ApiDef refactoring:
* Some of the "//third_party/tensorflow/python:training" dependencies had to be split in order to avoid a circular dependency.
* The `tf.contrib.stateless` ops now have a private core library for the generated wrappers (and accordingly are hidden in their ApiDef) so that `tf.data.experimental.sample_from_datasets()` can depend on them.
PiperOrigin-RevId: 215304249
Diffstat (limited to 'tensorflow/contrib/stateless')
| -rw-r--r-- | tensorflow/contrib/stateless/BUILD | 8 | ||||
| -rw-r--r-- | tensorflow/contrib/stateless/__init__.py | 5 |
2 files changed, 4 insertions, 9 deletions
diff --git a/tensorflow/contrib/stateless/BUILD b/tensorflow/contrib/stateless/BUILD index dcbef2881d..a217397c1a 100644 --- a/tensorflow/contrib/stateless/BUILD +++ b/tensorflow/contrib/stateless/BUILD @@ -9,19 +9,13 @@ exports_files(["LICENSE"]) load("//tensorflow:tensorflow.bzl", "cuda_py_test") load("//tensorflow:tensorflow.bzl", "tf_gen_op_wrapper_py") -tf_gen_op_wrapper_py( - name = "stateless_random_ops", - out = "gen_stateless_random_ops.py", # cmake chokes without this - deps = ["//tensorflow/core:stateless_random_ops_op_lib"], -) - py_library( name = "stateless", srcs = ["__init__.py"], srcs_version = "PY2AND3", deps = [ - ":stateless_random_ops", "//tensorflow/python:framework_ops", + "//tensorflow/python:stateless_random_ops_gen", "//tensorflow/python:util", ], ) diff --git a/tensorflow/contrib/stateless/__init__.py b/tensorflow/contrib/stateless/__init__.py index 0cca40f071..fe23fe0dd8 100644 --- a/tensorflow/contrib/stateless/__init__.py +++ b/tensorflow/contrib/stateless/__init__.py @@ -32,10 +32,11 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function +from tensorflow.python.framework import ops + # pylint: disable=wildcard-import -from tensorflow.contrib.stateless.gen_stateless_random_ops import * +from tensorflow.python.ops.gen_stateless_random_ops import * -from tensorflow.python.framework import ops from tensorflow.python.util.all_util import remove_undocumented ops.NotDifferentiable("StatelessMultinomial") |