Switch cond_v2 to using tfe.defun instead of function.Defun.

This requires a few changes:
- Make func_graph_from_py_func public (not part of the official public API though)
- Make function_def_to_graph return the new FuncGraph implementation.
- Disables some cond_v2 tests until we get them working with the new FuncGraph implementation.
- Add outer_graph field to FuncGraph.
- Add external_captures and internal_captures properties to FuncGraph for readability.
- Remove extra_inputs/extra_args terminology from cond_v2_impl for readability.
- Use compat.as_str() around Graph._functions keys. In Python 3, we were somehow getting a mix of str and bytes objects.

PiperOrigin-RevId: 210015940

1 files changed, 1 insertions, 0 deletions

diff --git a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
index 5e0447e4ff..4a3e767f4d 100644
--- a/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
+++ b/tensorflow/python/kernel_tests/control_flow_ops_py_test.py
@@ -32,6 +32,7 @@ from tensorflow.core.protobuf import config_pb2
 from tensorflow.python.client import device_lib
 from tensorflow.python.client import session
 from tensorflow.python.eager import context
+from tensorflow.python.eager import function as _  # pylint: disable=unused-import
 from tensorflow.python.framework import constant_op
 from tensorflow.python.framework import dtypes
 from tensorflow.python.framework import errors_impl