Internal changes only.

PiperOrigin-RevId: 330611992
Change-Id: Iad24ce23401c34e9b239bfbe00aafa26f3003065

tensorflow/python/BUILD

@@ -255,6 +255,7 @@ py_library(
         "//third_party/py/tensorflow_core:__subpackages__",
     ],
     deps = [
+        ":framework_combinations",
         ":no_contrib",
     ],
 )

tensorflow/python/framework/combinations.py

@@ -28,6 +28,7 @@ from tensorflow.python import tf2
 from tensorflow.python.eager import context
 from tensorflow.python.framework import ops
 from tensorflow.python.framework import test_combinations
+from tensorflow.python.util.tf_export import tf_export
 
 
 class EagerGraphCombination(test_combinations.TestCombination):
@@ -81,3 +82,5 @@ generate = functools.partial(
 combine = test_combinations.combine
 times = test_combinations.times
 NamedObject = test_combinations.NamedObject
+
+tf_export("__internal__.test.combinatioins.generate", v1=[])(generate)

tensorflow/python/framework/test_combinations.py

@@ -57,8 +57,10 @@ from absl.testing import parameterized
 import six
 
 from tensorflow.python.util import tf_inspect
+from tensorflow.python.util.tf_export import tf_export
 
 
+@tf_export("__internal__.test.combinatioins.TestCombination", v1=[])
 class TestCombination(object):
   """Customize the behavior of `generate()` and the tests that it executes.
 
@@ -316,6 +318,7 @@ def _augment_with_special_arguments(test_method, test_combinations):
   return decorated
 
 
+@tf_export("__internal__.test.combinatioins.combine", v1=[])
 def combine(**kwargs):
   """Generate combinations based on its keyword arguments.
 
@@ -353,6 +356,7 @@ def combine(**kwargs):
   ]
 
 
+@tf_export("__internal__.test.combinatioins.times", v1=[])
 def times(*combined):
   """Generate a product of N sets of combinations.
 
@@ -386,6 +390,7 @@ def times(*combined):
   return combined_results
 
 
+@tf_export("__internal__.test.combinatioins.NamedObject", v1=[])
 class NamedObject(object):
   """A class that translates an object into a good test name."""
 

tensorflow/python/modules_with_exports.py

@@ -51,6 +51,10 @@ from tensorflow.python.ops.standard_ops import *
 # Namespaces
 from tensorflow.python.ops import initializers_ns as initializers
 
+# _internal APIs
+from tensorflow.python.framework.combinations import *
+from tensorflow.python.framework.test_combinations import *
+
 from tensorflow.python.util.tf_export import tf_export
 
 # Export protos

tensorflow/python/tools/api/generator/BUILD

@@ -85,6 +85,7 @@ py_test(
     ],
     deps = [
         "//tensorflow/python:client_testlib",
+        "//tensorflow/python:framework_combinations",
         "//tensorflow/python:no_contrib",
         "//tensorflow/python/tools/api/generator:create_python_api",
     ],

tensorflow/python/tools/api/generator/api_init_files.bzl

@@ -4,6 +4,9 @@
 TENSORFLOW_API_INIT_FILES = [
     # BEGIN GENERATED FILES
     "__init__.py",
+    "__internal__/__init__.py",
+    "__internal__/test/__init__.py",
+    "__internal__/test/combinatioins/__init__.py",
     "__operators__/__init__.py",
     "audio/__init__.py",
     "autograph/__init__.py",

tensorflow/python/tools/api/generator/output_init_files_test.py

@@ -24,6 +24,8 @@ import sys
 # pylint: disable=unused-import
 from tensorflow import python as _tf_for_api_traversal
 from tensorflow.lite.python import lite as _tflite_for_api_traversal
+from tensorflow.python.framework import combinations
+from tensorflow.python.framework import test_combinations
 # pylint: enable=unused-import
 from tensorflow.python.platform import resource_loader
 from tensorflow.python.platform import test

tensorflow/tools/api/golden/v2/tensorflow.__internal__.pbtxt

@@ -0,0 +1,7 @@
+path: "tensorflow.__internal__"
+tf_module {
+  member {
+    name: "test"
+    mtype: "<type \'module\'>"
+  }
+}

tensorflow/tools/api/golden/v2/tensorflow.__internal__.test.combinatioins.-named-object.pbtxt

@@ -0,0 +1,9 @@
+path: "tensorflow.__internal__.test.combinatioins.NamedObject"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.test_combinations.NamedObject\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+    argspec: "args=[\'self\', \'name\', \'obj\'], varargs=None, keywords=None, defaults=None"
+  }
+}

tensorflow/tools/api/golden/v2/tensorflow.__internal__.test.combinatioins.-test-combination.pbtxt

@@ -0,0 +1,20 @@
+path: "tensorflow.__internal__.test.combinatioins.TestCombination"
+tf_class {
+  is_instance: "<class \'tensorflow.python.framework.test_combinations.TestCombination\'>"
+  is_instance: "<type \'object\'>"
+  member_method {
+    name: "__init__"
+  }
+  member_method {
+    name: "context_managers"
+    argspec: "args=[\'self\', \'kwargs\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "parameter_modifiers"
+    argspec: "args=[\'self\'], varargs=None, keywords=None, defaults=None"
+  }
+  member_method {
+    name: "should_execute_combination"
+    argspec: "args=[\'self\', \'kwargs\'], varargs=None, keywords=None, defaults=None"
+  }
+}

tensorflow/tools/api/golden/v2/tensorflow.__internal__.test.combinatioins.pbtxt

@@ -0,0 +1,23 @@
+path: "tensorflow.__internal__.test.combinatioins"
+tf_module {
+  member {
+    name: "NamedObject"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "TestCombination"
+    mtype: "<type \'type\'>"
+  }
+  member {
+    name: "generate"
+    mtype: "<class \'functools.partial\'>"
+  }
+  member_method {
+    name: "combine"
+    argspec: "args=[], varargs=None, keywords=kwargs, defaults=None"
+  }
+  member_method {
+    name: "times"
+    argspec: "args=[], varargs=combined, keywords=None, defaults=None"
+  }
+}

tensorflow/tools/api/golden/v2/tensorflow.__internal__.test.pbtxt

@@ -0,0 +1,7 @@
+path: "tensorflow.__internal__.test"
+tf_module {
+  member {
+    name: "combinatioins"
+    mtype: "<type \'module\'>"
+  }
+}

tensorflow/tools/docs/generate2.py

@@ -179,6 +179,11 @@ def build_docs(output_dir, code_url_prefix, search_hints, gen_report):
         cls=cls,
         skip=["__init__"])
 
+  try:
+    doc_controls.do_not_generate_docs(tf.__internal__)
+  except AttributeError:
+    pass
+
   try:
     doc_controls.do_not_generate_docs(tf.__operators__)
   except AttributeError: