Move the large-tensor concat op test to another test file that can be marked

nomsan and notsan, and concat_op_test passes in msan and tsan.
Change: 136664499

tensorflow/python/kernel_tests/BUILD

@@ -1264,7 +1264,19 @@ cuda_py_test(
     additional_deps = [
         "//tensorflow:tensorflow_py",
     ],
-    tags = ["notsan"],  # http://b/30445083
+)
+
+cuda_py_test(
+    name = "large_concat_op_test",
+    size = "small",
+    srcs = ["large_concat_op_test.py"],
+    additional_deps = [
+        "//tensorflow:tensorflow_py",
+    ],
+    tags = [
+        "nomsan",
+        "notsan",
+    ],
 )
 
 cuda_py_test(

tensorflow/python/kernel_tests/concat_op_test.py

@@ -418,17 +418,6 @@ class ConcatOpTest(tf.test.TestCase):
       self.assertEqual(2 * n + 2, after - before)
       print("graph = ", [x.name for x in g.get_operations()])
 
-  def testConcatLargeTensors(self):
-    # CPU-only test, because it fails on GPUs with <= 4GB memory.
-    with tf.device("/cpu:0"):
-      a = tf.ones([2**31 + 6], dtype=tf.int8)
-      b = tf.zeros([1024], dtype=tf.int8)
-      onezeros = tf.concat(0, [a, b])
-    with self.test_session(use_gpu=False):
-      # TODO(dga):  Add more depth to this test to validate correctness,
-      # not just non-crashingness, once other large tensor fixes have gone in.
-      _ = onezeros.eval()
-
   # important as gpu implementation could fail if
   # shared memory is not large for all the inputs
   def testConcatLargeNumberOfTensors(self):

tensorflow/python/kernel_tests/large_concat_op_test.py

+# Copyright 2016 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.
+# ==============================================================================
+"""Functional tests for Concat Op."""
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+import tensorflow as tf
+
+
+class LargeConcatOpTest(tf.test.TestCase):
+  """Tests that belong in concat_op_test.py, but run over large tensors."""
+
+  def testConcatLargeTensors(self):
+    # CPU-only test, because it fails on GPUs with <= 4GB memory.
+    with tf.device("/cpu:0"):
+      a = tf.ones([2**31 + 6], dtype=tf.int8)
+      b = tf.zeros([1024], dtype=tf.int8)
+      onezeros = tf.concat(0, [a, b])
+    with self.test_session(use_gpu=False):
+      # TODO(dga):  Add more depth to this test to validate correctness,
+      # not just non-crashingness, once other large tensor fixes have gone in.
+      _ = onezeros.eval()
+
+
+if __name__ == "__main__":
+  tf.test.main()