From e1654c78feae0663e6cbf1b13d8a54832deb3129 Mon Sep 17 00:00:00 2001
From: Dan Moldovan <mdan@google.com>
Date: Mon, 10 Aug 2020 10:18:01 -0700
Subject: [PATCH] Retire temporary release toggle.

PiperOrigin-RevId: 325831070
Change-Id: If723c0bd89255522c8cbfd02156c30db23ea53b8
---
 tensorflow/python/autograph/core/converter_testing.py | 2 --
 tensorflow/python/autograph/operators/control_flow.py | 6 ------
 tensorflow/python/autograph/utils/testing.py          | 2 --
 3 files changed, 10 deletions(-)

diff --git a/tensorflow/python/autograph/core/converter_testing.py b/tensorflow/python/autograph/core/converter_testing.py
index 2909cf3f8bc..9f2604dec94 100644
--- a/tensorflow/python/autograph/core/converter_testing.py
+++ b/tensorflow/python/autograph/core/converter_testing.py
@@ -21,7 +21,6 @@ from __future__ import print_function
 import contextlib
 import imp
 import inspect
-import os
 import sys
 
 import six
@@ -101,7 +100,6 @@ class TestCase(test.TestCase):
 
   def setUp(self):
     # AutoGraph tests must run in graph mode to properly test control flow.
-    os.environ['AUTOGRAPH_CREATE_SYMBOLS_IN_LOOPS'] = '1'
     self.graph = ops.Graph().as_default()
     self.graph.__enter__()
 
diff --git a/tensorflow/python/autograph/operators/control_flow.py b/tensorflow/python/autograph/operators/control_flow.py
index 0106efda5dd..7b307ed5020 100644
--- a/tensorflow/python/autograph/operators/control_flow.py
+++ b/tensorflow/python/autograph/operators/control_flow.py
@@ -60,7 +60,6 @@ from __future__ import division
 from __future__ import print_function
 
 import functools
-import os
 import traceback
 
 import numpy as np
@@ -973,11 +972,6 @@ def _try_handling_undefineds(
   """
   state_modified = False
 
-  # TODO(mdan): Remove once the default option is stable.
-  if os.getenv('AUTOGRAPH_CREATE_SYMBOLS_IN_LOOPS', '1') == '0':
-    _verify_loop_init_vars(init_vars, symbol_names)
-    return False, init_vars
-
   try:
     # Stage an iteration of the loop body in a temporary graph.
     with func_graph.FuncGraph('tmp').as_default():
diff --git a/tensorflow/python/autograph/utils/testing.py b/tensorflow/python/autograph/utils/testing.py
index 1da82db66c8..df60583bf85 100644
--- a/tensorflow/python/autograph/utils/testing.py
+++ b/tensorflow/python/autograph/utils/testing.py
@@ -18,7 +18,6 @@ from __future__ import absolute_import
 from __future__ import division
 from __future__ import print_function
 
-import os
 import re
 import types
 import unittest
@@ -108,7 +107,6 @@ class AutoGraphTestCase(test.TestCase):
 
   def setUp(self):
     super().setUp()
-    os.environ['AUTOGRAPH_CREATE_SYMBOLS_IN_LOOPS'] = '1'
     self.variables = {}
     self.trace_log = []
     op_callbacks.add_op_callback(self._op_callback)