Commit 94b3db68 authored by Skye Wanderman-Milne's avatar Skye Wanderman-Milne Committed by TensorFlower Gardener
Browse files

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
parent 33f8f7e1
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment