diff --git a/tensorflow/python/client/timeline_test.py b/tensorflow/python/client/timeline_test.py index 90ed4d18771..e7d60de6905 100644 --- a/tensorflow/python/client/timeline_test.py +++ b/tensorflow/python/client/timeline_test.py @@ -104,10 +104,7 @@ class TimelineTest(test.TestCase): step_stats = run_metadata.step_stats devices = [d.device for d in step_stats.dev_stats] self.assertTrue('/job:localhost/replica:0/task:0/device:GPU:0' in devices) - if not test.is_built_with_rocm(): - # skip this check for the ROCm platform - # stream level tracing is not yet supported on the ROCm platform - self.assertTrue('/device:GPU:0/stream:all' in devices) + self.assertTrue('/device:GPU:0/stream:all' in devices) tl = timeline.Timeline(step_stats) ctf = tl.generate_chrome_trace_format() self._validateTrace(ctf) diff --git a/tensorflow/python/eager/profiler_test.py b/tensorflow/python/eager/profiler_test.py index 33a46bc0127..96533d8e80f 100644 --- a/tensorflow/python/eager/profiler_test.py +++ b/tensorflow/python/eager/profiler_test.py @@ -47,8 +47,7 @@ class ProfilerTest(test_util.TensorFlowTestCase): profile_pb.ParseFromString(profile_result) devices = frozenset(device.name for device in profile_pb.devices.values()) self.assertIn('/host:CPU', devices) - if not test_util.IsBuiltWithROCm() and config.list_physical_devices('GPU'): - # device tracing is not yet supported on the ROCm platform + if config.list_physical_devices('GPU'): self.assertIn('/device:GPU:0', devices) events = frozenset(event.name for event in profile_pb.trace_events) self.assertIn('three_times_five', events) diff --git a/tensorflow/python/profiler/BUILD b/tensorflow/python/profiler/BUILD index 728e1016915..91d6ad34786 100644 --- a/tensorflow/python/profiler/BUILD +++ b/tensorflow/python/profiler/BUILD @@ -61,7 +61,6 @@ cuda_py_test( python_version = "PY3", tags = [ "no_pip", - "no_rocm", ], deps = [ ":profiler_v2", diff --git a/tensorflow/python/profiler/internal/run_metadata_test.py b/tensorflow/python/profiler/internal/run_metadata_test.py index 6345e15ede6..deb49bd91f2 100644 --- a/tensorflow/python/profiler/internal/run_metadata_test.py +++ b/tensorflow/python/profiler/internal/run_metadata_test.py @@ -136,10 +136,6 @@ class RunMetadataTest(test.TestCase): ret = _extract_node(run_meta, 'MatMul') self.assertEqual(len(ret['gpu:0']), 1) - if not test.is_built_with_rocm(): - # skip this check for the ROCm platform - # stream level tracing is not yet supported on the ROCm platform - self.assertEqual(len(ret['gpu:0/stream:all']), 1, '%s' % run_meta) @test_util.run_deprecated_v1 def testAllocationHistory(self): @@ -251,9 +247,6 @@ class RunMetadataTest(test.TestCase): for node in ret['gpu:0']: total_cpu_execs += node.op_end_rel_micros - if not test.is_built_with_rocm(): - # skip this check for the ROCm platform - # stream level tracing is not yet supported on the ROCm platform self.assertGreaterEqual( len(ret['gpu:0/stream:all']), 4, '%s' % run_meta) diff --git a/tensorflow/python/profiler/profile_context_test.py b/tensorflow/python/profiler/profile_context_test.py index f4051ed7b7d..885f08ca4b9 100644 --- a/tensorflow/python/profiler/profile_context_test.py +++ b/tensorflow/python/profiler/profile_context_test.py @@ -69,13 +69,6 @@ class ProfilerContextTest(test.TestCase): os.path.join(test.get_temp_dir(), "profile_100")) as profiler: profiler.profile_operations(options=opts) with gfile.Open(outfile, "r") as f: - - if test.is_built_with_rocm(): - # The profiler output for ROCm mode, includes an extra warning - # related to the lack of stream tracing in ROCm mode. - # Need to skip this warning when doing the diff - profile_str = "\n".join(profile_str.split("\n")[7:]) - self.assertEqual(profile_str, f.read()) @test_util.run_deprecated_v1