diff options
| author |  Skye Wanderman-Milne <skyewm@google.com> | 2018-02-26 11:43:14 -0800 |
|---|---|---|
| committer |  TensorFlower Gardener <gardener@tensorflow.org> | 2018-02-26 11:50:25 -0800 |
| commit | 0f8ee19ef830fc7d28ae611194bcd66f4383b038 (patch) | |
| tree | 9ec24a53e29ccc8b9d4be225a73323112f2f1c83 /tensorflow/python/layers | |
| parent | e5b73fc9a8df0d87cb964ed49e946d2477c73e19 (diff) | |
Actually expose smart_cond and smart_constant_value in tf.contrib.framework
Also moves these methods into their own file in python/framework. This avoids further bloating control_flow_ops.py and makes the BUILD deps easier for a future change I'm working on.
PiperOrigin-RevId: 187055501
Diffstat (limited to 'tensorflow/python/layers')
| -rw-r--r-- | tensorflow/python/layers/utils.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tensorflow/python/layers/utils.py b/tensorflow/python/layers/utils.py index 484c6fc466..3b156c36a2 100644 --- a/tensorflow/python/layers/utils.py +++ b/tensorflow/python/layers/utils.py @@ -24,6 +24,7 @@ from tensorflow.python.eager import context from tensorflow.python.ops import variables from tensorflow.python.ops import control_flow_ops from tensorflow.python.framework import ops +from tensorflow.python.framework import smart_cond as smart_module from tensorflow.python.framework import tensor_util from tensorflow.python.util import nest @@ -201,7 +202,7 @@ def smart_cond(pred, true_fn=None, false_fn=None, name=None): if isinstance(pred, variables.Variable): return control_flow_ops.cond( pred, true_fn=true_fn, false_fn=false_fn, name=name) - return control_flow_ops.smart_cond( + return smart_module.smart_cond( pred, true_fn=true_fn, false_fn=false_fn, name=name) @@ -228,7 +229,7 @@ def constant_value(pred): if isinstance(pred, variables.Variable): return None - return control_flow_ops.smart_constant_value(pred) + return smart_module.smart_constant_value(pred) def object_list_uid(object_list): |