From 90d58ce333d009ea2a896e80d04c9cb383e74133 Mon Sep 17 00:00:00 2001 From: Yanhua Sun Date: Fri, 21 Aug 2020 15:55:18 -0700 Subject: [PATCH] clean up expired compat check PiperOrigin-RevId: 327888730 Change-Id: Ib16049bc731638dd2ce6ceff396fac2e2ca500a1 --- tensorflow/python/kernel_tests/cond_v2_test.py | 4 +--- tensorflow/python/ops/cond_v2.py | 6 +----- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/tensorflow/python/kernel_tests/cond_v2_test.py b/tensorflow/python/kernel_tests/cond_v2_test.py index 4c9fbd59a8e..30b20c67fda 100644 --- a/tensorflow/python/kernel_tests/cond_v2_test.py +++ b/tensorflow/python/kernel_tests/cond_v2_test.py @@ -20,7 +20,6 @@ from __future__ import division from __future__ import print_function from tensorflow.core.protobuf import config_pb2 -from tensorflow.python.compat.compat import forward_compatibility_horizon from tensorflow.python.eager import backprop from tensorflow.python.eager import context from tensorflow.python.eager import def_function @@ -1607,5 +1606,4 @@ def _has_node_with_op(run_metadata, op_type): if __name__ == "__main__": - with forward_compatibility_horizon(2020, 8, 21): - test.main() + test.main() diff --git a/tensorflow/python/ops/cond_v2.py b/tensorflow/python/ops/cond_v2.py index 17a5d5e97fa..163f0fb7077 100644 --- a/tensorflow/python/ops/cond_v2.py +++ b/tensorflow/python/ops/cond_v2.py @@ -25,7 +25,6 @@ from __future__ import print_function import collections -from tensorflow.python.compat import compat from tensorflow.python.eager import backprop_util from tensorflow.python.framework import auto_control_deps from tensorflow.python.framework import auto_control_deps_utils as acd @@ -1120,10 +1119,7 @@ def _build_case(branch_index, op for op in bg.get_operations() if auto_control_deps.op_is_stateful(op) ]) - # TODO(b/161915509): Remove this after 08/20/2020. This is required to abide - # by 3-week forward compat window of new TF python op generating code with - # stale runtime binaries. - if (stateful_ops or not compat.forward_compatible(2020, 8, 20)): + if stateful_ops: op_fn = gen_functional_ops.case else: op_fn = gen_functional_ops.stateless_case