Splitting scalar strict test into an internal and external version.

Change: 152064895

4 files changed, 5 insertions, 39 deletions

diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 333c6b8f2b..f21402652f 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -1578,9 +1578,9 @@ cuda_py_test(
 )
 
 cuda_py_test(
-    name = "scalar_strict_test",
+    name = "scalar_test",
     size = "small",
-    srcs = ["scalar_strict_test.py"],
+    srcs = ["scalar_test.py"],
     additional_deps = [
         "//third_party/py/numpy",
         "//tensorflow/python:array_ops",
diff --git a/tensorflow/python/kernel_tests/scalar_strict_test.py b/tensorflow/python/kernel_tests/scalar_test.py
index e208217637..b34426cc21 100644
--- a/tensorflow/python/kernel_tests/scalar_strict_test.py
+++ b/tensorflow/python/kernel_tests/scalar_test.py
@@ -27,20 +27,15 @@ from tensorflow.python.ops import math_ops
 from tensorflow.python.ops import random_ops
 from tensorflow.python.ops import sparse_ops
 import tensorflow.python.ops.nn_grad  # pylint: disable=unused-import
-from tensorflow.python.platform import control_imports
 from tensorflow.python.platform import test
 
 
-class ScalarStrictTest(test.TestCase):
+class ScalarTest(test.TestCase):
 
   def check(self, op, args, error, correct=None):
     # Within Google, the switch to scalar strict occurred at version 6.
-    if control_imports.USE_OSS:
-      lenient = []
-      strict = [5, 6]
-    else:
-      lenient = [5]
-      strict = [6]
+    lenient = []
+    strict = [5, 6]
 
     # Use placeholders to bypass shape inference, since only the C++
     # GraphDef level is ever scalar lenient.
diff --git a/tensorflow/python/platform/control_imports.py b/tensorflow/python/platform/control_imports.py
deleted file mode 100644
index 61b29ca4e5..0000000000
--- a/tensorflow/python/platform/control_imports.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2015 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.
-# ==============================================================================
-
-"""Switch between Google or open source dependencies."""
-# Switch between Google and OSS dependencies
-USE_OSS = True
-
-# Per-dependency switches determining whether each dependency is ready
-# to be replaced by its OSS equivalence.
-# TODO(danmane,mrry,opensource): Flip these switches, then remove them
-OSS_APP = True
-OSS_FLAGS = True
-OSS_GFILE = True
-OSS_GOOGLETEST = True
-OSS_LOGGING = True
-OSS_PARAMETERIZED = True
diff --git a/tensorflow/tools/test/check_futures_test.py b/tensorflow/tools/test/check_futures_test.py
index 36a61c0ecc..32d65adb1f 100644
--- a/tensorflow/tools/test/check_futures_test.py
+++ b/tensorflow/tools/test/check_futures_test.py
@@ -40,7 +40,6 @@ FUTURES_PATTERN_2 = re.compile(
 REQUIRED_FUTURES = frozenset(['absolute_import', 'division', 'print_function'])
 
 WHITELIST = [
-    'python/platform/control_imports.py',
     'tools/docker/jupyter_notebook_config.py',
 ]