diff options
| author |  Skye Wanderman-Milne <skyewm@google.com> | 2018-06-15 14:54:00 -0700 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-06-15 14:57:08 -0700 |
| commit | 94b3db68ee2edb568b6b12d3063b72074910f878 (patch) | |
| tree | c9ef7668e327580e7063111335e7a2495d4d4e8c /tensorflow/contrib/__init__.py | |
| parent | 33f8f7e1843c750186c8fbcfbf94f286bb7ca505 (diff) | |
Move cond_v2 to core (non-public) and add toggle to use cond_v2 by default.
This change:
* Creates a new global variable, control_flow_ops._ENABLE_COND_V2, to use
cond_v2 by default when calling tf.cond. This variable can also be
controlled via the environment variable TF_ENABLE_COND_V2.
* Moves cond_v2 out of contrib so it's accessible from control_flow_ops.py.
* Lazily "imports" some modules in cond_v2 to avoid circular dependencies.
Note that these lazy "imports" must be imported by the cond_v2 caller (or
recursively by one of the caller's imports) in order for cond_v2 to have
access to them.
* Renames the cond_v2 module to cond_v2_impl, and creates a new cond_v2 module
that imports the cond_v2 method and the necessary extra imports. This is
useful for explicitly calling cond_v2 outside of control_flow_ops.cond.
PiperOrigin-RevId: 200778208
Diffstat (limited to 'tensorflow/contrib/__init__.py')
| -rw-r--r-- | tensorflow/contrib/__init__.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tensorflow/contrib/__init__.py b/tensorflow/contrib/__init__.py index ad8c40395c..9aad772f0a 100644 --- a/tensorflow/contrib/__init__.py +++ b/tensorflow/contrib/__init__.py @@ -30,7 +30,6 @@ from tensorflow.contrib import cluster_resolver from tensorflow.contrib import coder from tensorflow.contrib import compiler from tensorflow.contrib import constrained_optimization -from tensorflow.contrib import control_flow from tensorflow.contrib import copy_graph from tensorflow.contrib import crf from tensorflow.contrib import cudnn_rnn |