From 68b706da27f4e72f42af5028535c8f106b6e2feb Mon Sep 17 00:00:00 2001
From: Kibeom Kim <kkb@google.com>
Date: Thu, 30 Jul 2020 14:29:25 -0700
Subject: [PATCH] Remove @test_util.run_deprecated_v1 in identity_op_py_test.py
PiperOrigin-RevId: 324083565
Change-Id: I2b7b4f8b5691206b8bcd5f2c332703c81f7bda07
---
tensorflow/python/BUILD | 1 +
.../kernel_tests/identity_op_py_test.py | 28 ++-----------
.../python/kernel_tests/v1_compat_tests/BUILD | 17 ++++++++
.../v1_compat_tests/identity_op_py_test.py | 42 +++++++++++++++++++
4 files changed, 64 insertions(+), 24 deletions(-)
create mode 100644 tensorflow/python/kernel_tests/v1_compat_tests/BUILD
create mode 100644 tensorflow/python/kernel_tests/v1_compat_tests/identity_op_py_test.py
diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD
index 98e7cd368ee..810c7866aad 100644
--- a/tensorflow/python/BUILD
+++ b/tensorflow/python/BUILD
@@ -2758,6 +2758,7 @@ tf_gen_op_wrapper_private_py(
"//learning/brain/python/ops:__pkg__",
"//tensorflow/compiler/tests:__pkg__",
"//tensorflow/python/kernel_tests:__pkg__",
+ "//tensorflow/python/kernel_tests/v1_compat_tests:__pkg__",
],
deps = [
"//tensorflow/c/kernels:bitcast_op_lib",
diff --git a/tensorflow/python/kernel_tests/identity_op_py_test.py b/tensorflow/python/kernel_tests/identity_op_py_test.py
index 013502dfe09..9e8b0eb6938 100644
--- a/tensorflow/python/kernel_tests/identity_op_py_test.py
+++ b/tensorflow/python/kernel_tests/identity_op_py_test.py
@@ -21,35 +21,25 @@ from __future__ import print_function
import numpy as np
from tensorflow.python.framework import constant_op
-from tensorflow.python.framework import dtypes
from tensorflow.python.framework import sparse_tensor
-from tensorflow.python.framework import test_util
from tensorflow.python.ops import array_ops
-from tensorflow.python.ops import gen_array_ops
-from tensorflow.python.ops import variables
from tensorflow.python.platform import test
class IdentityOpTest(test.TestCase):
- @test_util.run_deprecated_v1
def testInt32_6(self):
- with self.cached_session():
- value = array_ops.identity([1, 2, 3, 4, 5, 6]).eval()
+ value = self.evaluate(array_ops.identity([1, 2, 3, 4, 5, 6]))
self.assertAllEqual(np.array([1, 2, 3, 4, 5, 6]), value)
- @test_util.run_deprecated_v1
def testInt32_2_3(self):
- with self.cached_session():
- inp = constant_op.constant([10, 20, 30, 40, 50, 60], shape=[2, 3])
- value = array_ops.identity(inp).eval()
+ inp = constant_op.constant([10, 20, 30, 40, 50, 60], shape=[2, 3])
+ value = self.evaluate(array_ops.identity(inp))
self.assertAllEqual(np.array([[10, 20, 30], [40, 50, 60]]), value)
- @test_util.run_deprecated_v1
def testString(self):
source = [b"A", b"b", b"C", b"d", b"E", b"f"]
- with self.cached_session():
- value = array_ops.identity(source).eval()
+ value = self.evaluate(array_ops.identity(source))
self.assertAllEqual(source, value)
def testIdentityShape(self):
@@ -63,16 +53,6 @@ class IdentityOpTest(test.TestCase):
self.assertEqual(shape,
array_ops.identity(np.array(array_2x3)).get_shape())
- @test_util.run_v1_only("b/120545219")
- def testRefIdentityShape(self):
- with self.cached_session():
- shape = [2, 3]
- tensor = variables.VariableV1(
- constant_op.constant(
- [[1, 2, 3], [6, 5, 4]], dtype=dtypes.int32))
- self.assertEqual(shape, tensor.get_shape())
- self.assertEqual(shape, gen_array_ops.ref_identity(tensor).get_shape())
-
def testCompositeTensor(self):
original = sparse_tensor.SparseTensor([[3]], [1.0], [100])
copied = array_ops.identity(original)
diff --git a/tensorflow/python/kernel_tests/v1_compat_tests/BUILD b/tensorflow/python/kernel_tests/v1_compat_tests/BUILD
new file mode 100644
index 00000000000..4529dd19645
--- /dev/null
+++ b/tensorflow/python/kernel_tests/v1_compat_tests/BUILD
@@ -0,0 +1,17 @@
+load("//tensorflow:tensorflow.bzl", "tf_py_test")
+
+package(
+ default_visibility = ["//tensorflow:internal"],
+ licenses = ["notice"], # Apache 2.0
+)
+
+tf_py_test(
+ name = "identity_op_py_test",
+ size = "small",
+ srcs = ["identity_op_py_test.py"],
+ deps = [
+ "//tensorflow/python:array_ops",
+ "//tensorflow/python:array_ops_gen",
+ "//tensorflow/python:variables",
+ ],
+)
diff --git a/tensorflow/python/kernel_tests/v1_compat_tests/identity_op_py_test.py b/tensorflow/python/kernel_tests/v1_compat_tests/identity_op_py_test.py
new file mode 100644
index 00000000000..3c53d021f49
--- /dev/null
+++ b/tensorflow/python/kernel_tests/v1_compat_tests/identity_op_py_test.py
@@ -0,0 +1,42 @@
+# Copyright 2020 The TensorFlow Authors. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ==============================================================================
+"""Tests for IdentityOp."""
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from tensorflow.python.framework import constant_op
+from tensorflow.python.framework import dtypes
+from tensorflow.python.framework import test_util
+from tensorflow.python.ops import gen_array_ops
+from tensorflow.python.ops import variables
+from tensorflow.python.platform import test
+
+
+class IdentityOpTest(test.TestCase):
+
+ @test_util.run_v1_only("Don't need to test VariableV1 in TF2.")
+ def testRefIdentityShape(self):
+ shape = [2, 3]
+ tensor = variables.VariableV1(
+ constant_op.constant(
+ [[1, 2, 3], [6, 5, 4]], dtype=dtypes.int32))
+ self.assertEqual(shape, tensor.get_shape())
+ self.assertEqual(shape, gen_array_ops.ref_identity(tensor).get_shape())
+
+
+if __name__ == "__main__":
+ test.main()