Remove the estimator_export decorator.

All uses of `estimator_export` in `tensorflow_estimator` have
been updated to use an alternative decorator defined inside the
estimator package.

As the estimator is a deprecated API, no new endpoints should
be registered using the `estimator_export` decorator. This change
removes the decorator from `tf_export`.

`estimator_export` was also the last remaining usage of the `deprecated_inst`
argument in the overall `api_export` decorator. This optional argument
created a circular dependency between the `deprecation` module and
`tf_export`. This argument and its functionality have also been removed.

PiperOrigin-RevId: 503514596

Author: tensorflower-gardener

tensorflow/python/util/tf_export.py

@@ -291,7 +291,6 @@ def __init__(self, *args, **kwargs):  # pylint: disable=g-doc-args
     self._api_name = kwargs.get('api_name', TENSORFLOW_API_NAME)
     self._overrides = kwargs.get('overrides', [])
     self._allow_multiple_exports = kwargs.get('allow_multiple_exports', False)
-    self._deprecation_inst = kwargs.get('deprecation_inst', None)
 
     self._validate_symbol_names()
 
@@ -349,15 +348,6 @@ def __call__(self, func):
     self.set_attr(undecorated_func, api_names_attr, self._names)
     self.set_attr(undecorated_func, api_names_attr_v1, self._names_v1)
 
-    # TODO(b/263286841): Remove functionality
-    if self._deprecation_inst is not None:
-      # Inline import to avoid dependency cycle between deprecation
-      # utility and tf_export
-      from tensorflow.python.util import deprecation  # pylint: disable=g-import-not-at-top
-      deprecation_wrapper = deprecation.deprecated(
-          None, self._deprecation_inst, warn_once=True)
-      func = deprecation_wrapper(func)
-
     for name in self._names:
       _NAME_TO_SYMBOL_MAPPING[name] = func
     for name_v1 in self._names_v1:
@@ -427,11 +417,4 @@ def wrapper(*args, **kwargs):
 
 
 tf_export = functools.partial(api_export, api_name=TENSORFLOW_API_NAME)
-# TODO(b/263286841): Remove in favor of
-# `tensorflow_estimator.python.estimator.estimator_export`.
-estimator_export = functools.partial(
-    api_export,
-    api_name=ESTIMATOR_API_NAME,
-    is_deprecated=True,
-    deprecation_inst='Use tf.keras instead.')
 keras_export = functools.partial(api_export, api_name=KERAS_API_NAME)

tensorflow/python/util/tf_export_test.py

@@ -141,38 +141,6 @@ def testExportClasses(self):
     self.assertEqual(['TestClassA1'], tf_export.get_v1_names(TestClassA))
     self.assertEqual(['TestClassB1'], tf_export.get_v1_names(TestClassB))
 
-  def testExportClassInEstimator(self):
-    export_decorator_a = tf_export.tf_export('TestClassA1')
-    export_decorator_a(TestClassA)
-    self.assertEqual(('TestClassA1',), TestClassA._tf_api_names)
-
-    export_decorator_b = tf_export.estimator_export('estimator.TestClassB1')
-    export_decorator_b(TestClassB)
-    self.assertTrue('_tf_api_names' not in TestClassB.__dict__)
-    self.assertEqual(('TestClassA1',), TestClassA._tf_api_names)
-    self.assertEqual(['TestClassA1'], tf_export.get_v1_names(TestClassA))
-    self.assertEqual(['estimator.TestClassB1'],
-                     tf_export.get_v1_names(TestClassB))
-
-  @test.mock.patch.object(logging, 'warning', autospec=True)
-  def testExportDeprecated(self, mock_warning):
-    export_decorator = tf_export.estimator_export(
-        'estimator.TestClassA', is_deprecated=True)
-    export_decorator(TestClassA)
-
-    export_decorator2 = tf_export.tf_export('TestClassB1')
-    export_decorator2(TestClassB)
-
-    # Deprecation should trigger a runtime warning
-    TestClassA()
-    self.assertEqual(1, mock_warning.call_count)
-    # Deprecation should only warn once, upon first call
-    TestClassA()
-    self.assertEqual(1, mock_warning.call_count)
-    # No warning should be triggered when inherting from a deprecated class
-    TestClassB()
-    self.assertEqual(1, mock_warning.call_count)
-
   def testExportSingleConstant(self):
     module1 = self._CreateMockModule('module1')
 
@@ -215,19 +183,9 @@ def testRaisesExceptionIfInvalidSymbolName(self):
     with self.assertRaises(tf_export.InvalidSymbolNameError):
       tf_export.tf_export('estimator.invalid')
 
-    # All symbols exported by Estimator must be under tf.estimator package.
-    with self.assertRaises(tf_export.InvalidSymbolNameError):
-      tf_export.estimator_export('invalid')
-    with self.assertRaises(tf_export.InvalidSymbolNameError):
-      tf_export.estimator_export('Estimator.invalid')
-    with self.assertRaises(tf_export.InvalidSymbolNameError):
-      tf_export.estimator_export('invalid.estimator')
-
   def testRaisesExceptionIfInvalidV1SymbolName(self):
     with self.assertRaises(tf_export.InvalidSymbolNameError):
       tf_export.tf_export('valid', v1=['estimator.invalid'])
-    with self.assertRaises(tf_export.InvalidSymbolNameError):
-      tf_export.estimator_export('estimator.valid', v1=['invalid'])
 
   def testOverridesFunction(self):
     _test_function2._tf_api_names = ['abc']