From bd3b7979d28153723aa118dcb5bcfc84694319e1 Mon Sep 17 00:00:00 2001
From: Peng Wang <wangpeng@google.com>
Date: Thu, 16 Jul 2020 11:33:54 -0700
Subject: [PATCH] Adds `string_` and `unicode_` to the do-not-descend map of
 `tf.experimental.numpy`.

PiperOrigin-RevId: 321609879
Change-Id: I175fa2cec731de275a8810b94bb19d93fc3edacc
---
 .../tools/api/tests/api_compatibility_test.py |   5 +-
 ...ensorflow.experimental.numpy.string_.pbtxt | 339 -----------------
 ...nsorflow.experimental.numpy.unicode_.pbtxt | 354 ------------------
 3 files changed, 3 insertions(+), 695 deletions(-)
 delete mode 100644 third_party/py/numpy/tf_numpy_api/tensorflow.experimental.numpy.string_.pbtxt
 delete mode 100644 third_party/py/numpy/tf_numpy_api/tensorflow.experimental.numpy.unicode_.pbtxt

diff --git a/tensorflow/tools/api/tests/api_compatibility_test.py b/tensorflow/tools/api/tests/api_compatibility_test.py
index aeae307be35..f6d1ba4d8c2 100644
--- a/tensorflow/tools/api/tests/api_compatibility_test.py
+++ b/tensorflow/tools/api/tests/api_compatibility_test.py
@@ -362,9 +362,10 @@ class ApiCompatibilityTest(test.TestCase):
       public_api_visitor.private_map['tf'].append('enable_v2_behavior')
 
     public_api_visitor.do_not_descend_map['tf.GPUOptions'] = ['Experimental']
-    # Do not descend into `iinfo` because np.iinfo's signature is different
+    # Do not descend into these classes because their signatures are different
     # between internal and OSS.
-    public_api_visitor.do_not_descend_map['tf.experimental.numpy'] = ['iinfo']
+    public_api_visitor.do_not_descend_map['tf.experimental.numpy'] = [
+        'iinfo', 'string_', 'unicode_']
     if FLAGS.only_test_core_api:
       public_api_visitor.do_not_descend_map['tf'].extend(_NON_CORE_PACKAGES)
     if additional_private_map:
diff --git a/third_party/py/numpy/tf_numpy_api/tensorflow.experimental.numpy.string_.pbtxt b/third_party/py/numpy/tf_numpy_api/tensorflow.experimental.numpy.string_.pbtxt
deleted file mode 100644
index 3297a0bd2a0..00000000000
--- a/third_party/py/numpy/tf_numpy_api/tensorflow.experimental.numpy.string_.pbtxt
+++ /dev/null
@@ -1,339 +0,0 @@
-path: "tensorflow.experimental.numpy.string_"
-tf_class {
-  is_instance: "<class \'numpy.bytes_\'>"
-  member {
-    name: "T"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "base"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "data"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "dtype"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "flags"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "flat"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "imag"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "itemsize"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "nbytes"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "ndim"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "real"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "shape"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "size"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "strides"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "all"
-  }
-  member_method {
-    name: "any"
-  }
-  member_method {
-    name: "argmax"
-  }
-  member_method {
-    name: "argmin"
-  }
-  member_method {
-    name: "argsort"
-  }
-  member_method {
-    name: "astype"
-  }
-  member_method {
-    name: "byteswap"
-  }
-  member_method {
-    name: "capitalize"
-  }
-  member_method {
-    name: "center"
-  }
-  member_method {
-    name: "choose"
-  }
-  member_method {
-    name: "clip"
-  }
-  member_method {
-    name: "compress"
-  }
-  member_method {
-    name: "conj"
-  }
-  member_method {
-    name: "conjugate"
-  }
-  member_method {
-    name: "copy"
-  }
-  member_method {
-    name: "count"
-  }
-  member_method {
-    name: "cumprod"
-  }
-  member_method {
-    name: "cumsum"
-  }
-  member_method {
-    name: "decode"
-  }
-  member_method {
-    name: "diagonal"
-  }
-  member_method {
-    name: "dump"
-  }
-  member_method {
-    name: "dumps"
-  }
-  member_method {
-    name: "endswith"
-  }
-  member_method {
-    name: "expandtabs"
-  }
-  member_method {
-    name: "fill"
-  }
-  member_method {
-    name: "find"
-  }
-  member_method {
-    name: "flatten"
-  }
-  member_method {
-    name: "fromhex"
-  }
-  member_method {
-    name: "getfield"
-  }
-  member_method {
-    name: "hex"
-  }
-  member_method {
-    name: "index"
-  }
-  member_method {
-    name: "isalnum"
-  }
-  member_method {
-    name: "isalpha"
-  }
-  member_method {
-    name: "isdigit"
-  }
-  member_method {
-    name: "islower"
-  }
-  member_method {
-    name: "isspace"
-  }
-  member_method {
-    name: "istitle"
-  }
-  member_method {
-    name: "isupper"
-  }
-  member_method {
-    name: "item"
-  }
-  member_method {
-    name: "itemset"
-  }
-  member_method {
-    name: "join"
-  }
-  member_method {
-    name: "ljust"
-  }
-  member_method {
-    name: "lower"
-  }
-  member_method {
-    name: "lstrip"
-  }
-  member_method {
-    name: "maketrans"
-  }
-  member_method {
-    name: "max"
-  }
-  member_method {
-    name: "mean"
-  }
-  member_method {
-    name: "min"
-  }
-  member_method {
-    name: "newbyteorder"
-  }
-  member_method {
-    name: "nonzero"
-  }
-  member_method {
-    name: "partition"
-  }
-  member_method {
-    name: "prod"
-  }
-  member_method {
-    name: "ptp"
-  }
-  member_method {
-    name: "put"
-  }
-  member_method {
-    name: "ravel"
-  }
-  member_method {
-    name: "repeat"
-  }
-  member_method {
-    name: "replace"
-  }
-  member_method {
-    name: "reshape"
-  }
-  member_method {
-    name: "resize"
-  }
-  member_method {
-    name: "rfind"
-  }
-  member_method {
-    name: "rindex"
-  }
-  member_method {
-    name: "rjust"
-  }
-  member_method {
-    name: "round"
-  }
-  member_method {
-    name: "rpartition"
-  }
-  member_method {
-    name: "rsplit"
-  }
-  member_method {
-    name: "rstrip"
-  }
-  member_method {
-    name: "searchsorted"
-  }
-  member_method {
-    name: "setfield"
-  }
-  member_method {
-    name: "setflags"
-  }
-  member_method {
-    name: "sort"
-  }
-  member_method {
-    name: "split"
-  }
-  member_method {
-    name: "splitlines"
-  }
-  member_method {
-    name: "squeeze"
-  }
-  member_method {
-    name: "startswith"
-  }
-  member_method {
-    name: "std"
-  }
-  member_method {
-    name: "strip"
-  }
-  member_method {
-    name: "sum"
-  }
-  member_method {
-    name: "swapaxes"
-  }
-  member_method {
-    name: "swapcase"
-  }
-  member_method {
-    name: "take"
-  }
-  member_method {
-    name: "title"
-  }
-  member_method {
-    name: "tobytes"
-  }
-  member_method {
-    name: "tofile"
-  }
-  member_method {
-    name: "tolist"
-  }
-  member_method {
-    name: "tostring"
-  }
-  member_method {
-    name: "trace"
-  }
-  member_method {
-    name: "translate"
-  }
-  member_method {
-    name: "transpose"
-  }
-  member_method {
-    name: "upper"
-  }
-  member_method {
-    name: "var"
-  }
-  member_method {
-    name: "view"
-  }
-  member_method {
-    name: "zfill"
-  }
-}
diff --git a/third_party/py/numpy/tf_numpy_api/tensorflow.experimental.numpy.unicode_.pbtxt b/third_party/py/numpy/tf_numpy_api/tensorflow.experimental.numpy.unicode_.pbtxt
deleted file mode 100644
index 7cfc7fb56cd..00000000000
--- a/third_party/py/numpy/tf_numpy_api/tensorflow.experimental.numpy.unicode_.pbtxt
+++ /dev/null
@@ -1,354 +0,0 @@
-path: "tensorflow.experimental.numpy.unicode_"
-tf_class {
-  is_instance: "<class \'numpy.str_\'>"
-  member {
-    name: "T"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "base"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "data"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "dtype"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "flags"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "flat"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "imag"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "itemsize"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "nbytes"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "ndim"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "real"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "shape"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "size"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member {
-    name: "strides"
-    mtype: "<type \'getset_descriptor\'>"
-  }
-  member_method {
-    name: "__init__"
-  }
-  member_method {
-    name: "all"
-  }
-  member_method {
-    name: "any"
-  }
-  member_method {
-    name: "argmax"
-  }
-  member_method {
-    name: "argmin"
-  }
-  member_method {
-    name: "argsort"
-  }
-  member_method {
-    name: "astype"
-  }
-  member_method {
-    name: "byteswap"
-  }
-  member_method {
-    name: "capitalize"
-  }
-  member_method {
-    name: "casefold"
-  }
-  member_method {
-    name: "center"
-  }
-  member_method {
-    name: "choose"
-  }
-  member_method {
-    name: "clip"
-  }
-  member_method {
-    name: "compress"
-  }
-  member_method {
-    name: "conj"
-  }
-  member_method {
-    name: "conjugate"
-  }
-  member_method {
-    name: "copy"
-  }
-  member_method {
-    name: "count"
-  }
-  member_method {
-    name: "cumprod"
-  }
-  member_method {
-    name: "cumsum"
-  }
-  member_method {
-    name: "diagonal"
-  }
-  member_method {
-    name: "dump"
-  }
-  member_method {
-    name: "dumps"
-  }
-  member_method {
-    name: "encode"
-  }
-  member_method {
-    name: "endswith"
-  }
-  member_method {
-    name: "expandtabs"
-  }
-  member_method {
-    name: "fill"
-  }
-  member_method {
-    name: "find"
-  }
-  member_method {
-    name: "flatten"
-  }
-  member_method {
-    name: "format"
-  }
-  member_method {
-    name: "format_map"
-  }
-  member_method {
-    name: "getfield"
-  }
-  member_method {
-    name: "index"
-  }
-  member_method {
-    name: "isalnum"
-  }
-  member_method {
-    name: "isalpha"
-  }
-  member_method {
-    name: "isdecimal"
-  }
-  member_method {
-    name: "isdigit"
-  }
-  member_method {
-    name: "isidentifier"
-  }
-  member_method {
-    name: "islower"
-  }
-  member_method {
-    name: "isnumeric"
-  }
-  member_method {
-    name: "isprintable"
-  }
-  member_method {
-    name: "isspace"
-  }
-  member_method {
-    name: "istitle"
-  }
-  member_method {
-    name: "isupper"
-  }
-  member_method {
-    name: "item"
-  }
-  member_method {
-    name: "itemset"
-  }
-  member_method {
-    name: "join"
-  }
-  member_method {
-    name: "ljust"
-  }
-  member_method {
-    name: "lower"
-  }
-  member_method {
-    name: "lstrip"
-  }
-  member_method {
-    name: "maketrans"
-  }
-  member_method {
-    name: "max"
-  }
-  member_method {
-    name: "mean"
-  }
-  member_method {
-    name: "min"
-  }
-  member_method {
-    name: "newbyteorder"
-  }
-  member_method {
-    name: "nonzero"
-  }
-  member_method {
-    name: "partition"
-  }
-  member_method {
-    name: "prod"
-  }
-  member_method {
-    name: "ptp"
-  }
-  member_method {
-    name: "put"
-  }
-  member_method {
-    name: "ravel"
-  }
-  member_method {
-    name: "repeat"
-  }
-  member_method {
-    name: "replace"
-  }
-  member_method {
-    name: "reshape"
-  }
-  member_method {
-    name: "resize"
-  }
-  member_method {
-    name: "rfind"
-  }
-  member_method {
-    name: "rindex"
-  }
-  member_method {
-    name: "rjust"
-  }
-  member_method {
-    name: "round"
-  }
-  member_method {
-    name: "rpartition"
-  }
-  member_method {
-    name: "rsplit"
-  }
-  member_method {
-    name: "rstrip"
-  }
-  member_method {
-    name: "searchsorted"
-  }
-  member_method {
-    name: "setfield"
-  }
-  member_method {
-    name: "setflags"
-  }
-  member_method {
-    name: "sort"
-  }
-  member_method {
-    name: "split"
-  }
-  member_method {
-    name: "splitlines"
-  }
-  member_method {
-    name: "squeeze"
-  }
-  member_method {
-    name: "startswith"
-  }
-  member_method {
-    name: "std"
-  }
-  member_method {
-    name: "strip"
-  }
-  member_method {
-    name: "sum"
-  }
-  member_method {
-    name: "swapaxes"
-  }
-  member_method {
-    name: "swapcase"
-  }
-  member_method {
-    name: "take"
-  }
-  member_method {
-    name: "title"
-  }
-  member_method {
-    name: "tobytes"
-  }
-  member_method {
-    name: "tofile"
-  }
-  member_method {
-    name: "tolist"
-  }
-  member_method {
-    name: "tostring"
-  }
-  member_method {
-    name: "trace"
-  }
-  member_method {
-    name: "translate"
-  }
-  member_method {
-    name: "transpose"
-  }
-  member_method {
-    name: "upper"
-  }
-  member_method {
-    name: "var"
-  }
-  member_method {
-    name: "view"
-  }
-  member_method {
-    name: "zfill"
-  }
-}