aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/python/profiler
diff options
context:
space:
mode:
authorGravatar A. Unique TensorFlower <gardener@tensorflow.org>2018-07-16 14:52:24 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-07-16 14:56:06 -0700
commita968fd3993f0cc0a54431a3f897a1a8ff4e717e3 (patch)
treee2ac1da622ada613b9a77e30b0c2546c5393d3a0 /tensorflow/python/profiler
parent4e652775bb5bd315d709394316112f3ac06b4ab1 (diff)
Fix model_analyzer_test_gpu
PiperOrigin-RevId: 204811714
Diffstat (limited to 'tensorflow/python/profiler')
-rw-r--r--tensorflow/python/profiler/BUILD1
-rw-r--r--tensorflow/python/profiler/model_analyzer_test.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/tensorflow/python/profiler/BUILD b/tensorflow/python/profiler/BUILD
index 52f6f248a3..0654104a34 100644
--- a/tensorflow/python/profiler/BUILD
+++ b/tensorflow/python/profiler/BUILD
@@ -58,7 +58,6 @@ cuda_py_test(
"//tensorflow/python:variables",
],
tags = [
- "no_gpu",
"no_pip",
"oss_serial",
],
diff --git a/tensorflow/python/profiler/model_analyzer_test.py b/tensorflow/python/profiler/model_analyzer_test.py
index f9891f3b1e..c0e16ca536 100644
--- a/tensorflow/python/profiler/model_analyzer_test.py
+++ b/tensorflow/python/profiler/model_analyzer_test.py
@@ -106,7 +106,7 @@ class PrintModelAnalysisTest(test.TestCase):
# Make sure time is profiled.
gap = 1 if test.is_gpu_available() else 2
for i in range(3, 6, gap):
- mat = re.search('(.*)[um]s/(.*)[um]s', metrics[i])
+ mat = re.search('(.*)(?:us|ms|sec)/(.*)(?:us|ms|sec)', metrics[i])
self.assertGreater(float(mat.group(1)), 0.0)
self.assertGreater(float(mat.group(2)), 0.0)
# Make sure device is profiled.