diff --git a/tensorflow/compiler/tests/BUILD b/tensorflow/compiler/tests/BUILD
index f0941d3621b..a0a04c710a7 100644
--- a/tensorflow/compiler/tests/BUILD
+++ b/tensorflow/compiler/tests/BUILD
@@ -477,7 +477,6 @@ tf_xla_py_test(
python_version = "PY3",
tags = [
"no_pip", # TODO(b/149738646): fix pip install so these tests run on kokoro pip
- "no_rocm",
],
deps = [
":xla_test",
@@ -1627,7 +1626,6 @@ cuda_py_test(
shard_count = 5,
tags = [
"no_pip", # TODO(b/149738646): fix pip install so these tests run on kokoro pip
- "no_rocm",
],
xla_enable_strict_auto_jit = False,
xla_enabled = True,
@@ -1652,7 +1650,6 @@ cuda_py_test(
srcs = ["dense_layer_test.py"],
tags = [
"no_pip", # TODO(b/149738646): fix pip install so these tests run on kokoro pip
- "no_rocm",
],
xla_enable_strict_auto_jit = False,
xla_enabled = True,
@@ -1747,7 +1744,6 @@ cuda_py_test(
srcs = ["lstm_test.py"],
tags = [
"no_pip", # TODO(b/149738646): fix pip install so these tests run on kokoro pip
- "no_rocm",
],
xla_enable_strict_auto_jit = False,
xla_enabled = True,
@@ -1871,7 +1867,6 @@ tf_xla_py_test(
tags = [
"no_oss", # TODO(b/148108508): Re-enable this test in OSS.
"no_pip", # TODO(b/149738646): fix pip install so these tests run on kokoro pip
- "no_rocm",
],
deps = [
":xla_test",
diff --git a/tensorflow/compiler/xla/service/gpu/tests/BUILD b/tensorflow/compiler/xla/service/gpu/tests/BUILD
index 681e025ba1f..1615d27ec11 100644
--- a/tensorflow/compiler/xla/service/gpu/tests/BUILD
+++ b/tensorflow/compiler/xla/service/gpu/tests/BUILD
@@ -172,7 +172,7 @@ tf_cc_test(
srcs = [
"reduction_vectorization_test.cc",
],
- tags = tf_cuda_tests_tags() + ["no_rocm"],
+ tags = tf_cuda_tests_tags(),
deps = [
":gpu_codegen_test",
"//tensorflow/compiler/xla:debug_options_flags",
diff --git a/tensorflow/compiler/xla/service/mlir_gpu/experimental/conv_emitter/BUILD b/tensorflow/compiler/xla/service/mlir_gpu/experimental/conv_emitter/BUILD
index 74eef71870e..f0197c720d8 100644
--- a/tensorflow/compiler/xla/service/mlir_gpu/experimental/conv_emitter/BUILD
+++ b/tensorflow/compiler/xla/service/mlir_gpu/experimental/conv_emitter/BUILD
@@ -63,7 +63,6 @@ tf_cc_test(
srcs = ["conv_emitter_test.cc"],
tags = [
"no_oss", # TODO(b/148143101): Test should pass in OSS.
- "no_rocm",
],
deps = [
":conv_emitter",
diff --git a/tensorflow/compiler/xla/tests/BUILD b/tensorflow/compiler/xla/tests/BUILD
index 55a31b7f650..18324c05797 100644
--- a/tensorflow/compiler/xla/tests/BUILD
+++ b/tensorflow/compiler/xla/tests/BUILD
@@ -626,7 +626,6 @@ xla_test(
name = "conditional_test",
srcs = ["conditional_test.cc"],
shard_count = 2,
- tags = ["no_rocm"],
deps = [
":test_macros_header",
"//tensorflow/compiler/xla:xla_data_proto_cc",
@@ -665,7 +664,6 @@ xla_test(
name = "scalar_computations_test",
srcs = ["scalar_computations_test.cc"],
shard_count = 32,
- tags = ["no_rocm"],
deps = [
":test_macros_header",
"//tensorflow/compiler/xla:literal",
@@ -1514,7 +1512,6 @@ xla_test(
srcs = ["reduce_test.cc"],
shard_count = 31,
tags = [
- "no_rocm",
"optonly",
],
deps = [
@@ -1594,7 +1591,6 @@ xla_test(
timeout = "long",
srcs = ["select_and_scatter_test.cc"],
tags = [
- "no_rocm",
"nozapfhahn",
"optonly",
],
diff --git a/tensorflow/core/common_runtime/BUILD b/tensorflow/core/common_runtime/BUILD
index aec0e169584..3d73cf332bc 100644
--- a/tensorflow/core/common_runtime/BUILD
+++ b/tensorflow/core/common_runtime/BUILD
@@ -2127,7 +2127,6 @@ tf_cuda_cc_test(
size = "small",
srcs = ["process_function_library_runtime_test.cc"],
linkstatic = tf_kernel_tests_linkstatic(),
- tags = ["no_rocm"],
deps = [
":core_cpu",
":core_cpu_internal",
diff --git a/tensorflow/core/nccl/BUILD b/tensorflow/core/nccl/BUILD
index 9b1447f53c1..70fcce9ab77 100644
--- a/tensorflow/core/nccl/BUILD
+++ b/tensorflow/core/nccl/BUILD
@@ -64,8 +64,6 @@ tf_cuda_cc_test(
"manual",
"multi_gpu",
"no_oss",
- # TODO(b/147451637): Replace 'no_rocm' with 'rocm_multi_gpu'.
- "no_rocm",
"notap",
],
deps = [
diff --git a/tensorflow/python/compiler/tensorrt/BUILD b/tensorflow/python/compiler/tensorrt/BUILD
index 6b3f32cadc4..9237ad1392e 100644
--- a/tensorflow/python/compiler/tensorrt/BUILD
+++ b/tensorflow/python/compiler/tensorrt/BUILD
@@ -97,7 +97,6 @@ cuda_py_test(
tags = [
"no_cuda_on_cpu_tap",
"no_pip",
- "no_rocm",
"no_windows",
"nomac",
],
diff --git a/tensorflow/python/debug/BUILD b/tensorflow/python/debug/BUILD
index 36fdb20aeae..ac5f1ca060c 100644
--- a/tensorflow/python/debug/BUILD
+++ b/tensorflow/python/debug/BUILD
@@ -1116,7 +1116,6 @@ py_test(
srcs = ["cli/debugger_cli_common_test.py"],
python_version = "PY3",
srcs_version = "PY2AND3",
- tags = ["no_rocm"],
deps = [
":debugger_cli_common",
"//tensorflow/python:framework_test_lib",
diff --git a/tensorflow/python/distribute/BUILD b/tensorflow/python/distribute/BUILD
index 0553917edec..2e71f9195d3 100644
--- a/tensorflow/python/distribute/BUILD
+++ b/tensorflow/python/distribute/BUILD
@@ -162,7 +162,6 @@ py_test(
srcs = ["distribute_lib_test.py"],
python_version = "PY3",
srcs_version = "PY2AND3",
- tags = ["no_rocm"],
deps = [
":combinations",
":distribute_lib",
diff --git a/tensorflow/python/keras/BUILD b/tensorflow/python/keras/BUILD
index 177258b0ce5..097c52368dd 100755
--- a/tensorflow/python/keras/BUILD
+++ b/tensorflow/python/keras/BUILD
@@ -581,7 +581,6 @@ tf_py_test(
python_version = "PY3",
shard_count = 8,
tags = [
- "no_rocm",
"notsan", # b/67509773
],
deps = [
diff --git a/tensorflow/python/keras/distribute/BUILD b/tensorflow/python/keras/distribute/BUILD
index 34c0fc202db..874d34855a8 100644
--- a/tensorflow/python/keras/distribute/BUILD
+++ b/tensorflow/python/keras/distribute/BUILD
@@ -809,7 +809,6 @@ distribute_py_test(
tags = [
"multi_and_single_gpu",
"no_cuda_asan", # times out
- "no_rocm",
],
xla_tags = [
"no_cuda_asan", # times out
@@ -829,7 +828,6 @@ distribute_py_test(
shard_count = 7,
tags = [
"multi_and_single_gpu",
- "no_rocm",
],
xla_tags = [
"no_cuda_asan", # times out
diff --git a/tensorflow/python/keras/engine/BUILD b/tensorflow/python/keras/engine/BUILD
index ef26a14632a..99e736df645 100644
--- a/tensorflow/python/keras/engine/BUILD
+++ b/tensorflow/python/keras/engine/BUILD
@@ -389,7 +389,6 @@ tf_py_test(
shard_count = 20,
tags = [
"manual",
- "no_rocm",
"nomac", # TODO(mihaimaruseac): b/127695564
"notsan",
],
@@ -514,7 +513,6 @@ tf_py_test(
python_version = "PY3",
shard_count = 30,
tags = [
- "no_rocm",
"nomac", # TODO(mihaimaruseac): b/127695564
],
deps = [
@@ -658,7 +656,6 @@ tf_py_test(
python_version = "PY3",
shard_count = 8,
tags = [
- "no_rocm",
"nomac", # TODO(mihaimaruseac): b/127695564
],
deps = [
diff --git a/tensorflow/python/keras/layers/BUILD b/tensorflow/python/keras/layers/BUILD
index 54e815dc60a..1caff66c651 100644
--- a/tensorflow/python/keras/layers/BUILD
+++ b/tensorflow/python/keras/layers/BUILD
@@ -750,7 +750,6 @@ tf_py_test(
python_version = "PY3",
shard_count = 4,
tags = [
- "no_rocm",
"notsan", # http://b/62136390
],
deps = [
@@ -769,7 +768,6 @@ tf_py_test(
python_version = "PY3",
shard_count = 4,
tags = [
- "no_rocm",
"noasan", # times out b/63678675
"notsan", # http://b/62189182
],
diff --git a/tensorflow/python/keras/tests/BUILD b/tensorflow/python/keras/tests/BUILD
index e7db6c45e04..37e1a064368 100644
--- a/tensorflow/python/keras/tests/BUILD
+++ b/tensorflow/python/keras/tests/BUILD
@@ -147,7 +147,6 @@ tf_py_test(
python_version = "PY3",
shard_count = 16,
tags = [
- "no_rocm",
"notsan",
],
deps = [
diff --git a/tensorflow/python/kernel_tests/BUILD b/tensorflow/python/kernel_tests/BUILD
index 3dac22c413a..bc65c78819e 100644
--- a/tensorflow/python/kernel_tests/BUILD
+++ b/tensorflow/python/kernel_tests/BUILD
@@ -241,7 +241,6 @@ cuda_py_test(
srcs = ["cholesky_op_test.py"],
shard_count = 5,
tags = [
- "no_rocm", # TODO(rocm): feature not supported on ROCm platform
"nomsan", # TODO(b/131773093): Re-enable.
],
deps = [
@@ -3847,7 +3846,6 @@ cuda_py_test(
size = "medium",
srcs = ["tridiagonal_matmul_op_test.py"],
shard_count = 10,
- tags = ["no_rocm"],
deps = [
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework_for_generated_wrappers",
diff --git a/tensorflow/python/kernel_tests/linalg/BUILD b/tensorflow/python/kernel_tests/linalg/BUILD
index 097183d1025..0da8a0e6880 100644
--- a/tensorflow/python/kernel_tests/linalg/BUILD
+++ b/tensorflow/python/kernel_tests/linalg/BUILD
@@ -149,7 +149,6 @@ cuda_py_test(
srcs = ["linear_operator_circulant_test.py"],
shard_count = 10,
tags = [
- "no_rocm", # calls BLAS ops for complex types
"noasan", # times out, b/63678675
"optonly", # times out, b/79171797
],
diff --git a/tensorflow/python/ops/ragged/BUILD b/tensorflow/python/ops/ragged/BUILD
index 2934491e69a..d726c3b832d 100644
--- a/tensorflow/python/ops/ragged/BUILD
+++ b/tensorflow/python/ops/ragged/BUILD
@@ -1104,7 +1104,6 @@ py_test(
srcs = ["ragged_map_fn_op_test.py"],
python_version = "PY3",
srcs_version = "PY2AND3",
- tags = ["no_rocm"],
deps = [
":ragged", # fixdeps: keep
":ragged_factory_ops",
diff --git a/tensorflow/python/saved_model/BUILD b/tensorflow/python/saved_model/BUILD
index 3e4fb285faa..808e5c98211 100644
--- a/tensorflow/python/saved_model/BUILD
+++ b/tensorflow/python/saved_model/BUILD
@@ -367,7 +367,6 @@ py_strict_library(
tf_py_test(
name = "save_test",
srcs = ["save_test.py"],
- tags = ["no_rocm"],
deps = [
":loader",
":save",
diff --git a/tensorflow/python/tools/BUILD b/tensorflow/python/tools/BUILD
index 8e40d51a221..32a6f965277 100644
--- a/tensorflow/python/tools/BUILD
+++ b/tensorflow/python/tools/BUILD
@@ -444,7 +444,6 @@ saved_model_compile_aot(
"//tensorflow/cc/saved_model:saved_model_half_plus_two",
],
force_without_xla_support_flag = False,
- tags = ["no_rocm"],
)
saved_model_compile_aot(
@@ -455,7 +454,6 @@ saved_model_compile_aot(
"//tensorflow/cc/saved_model:saved_model_half_plus_two",
],
force_without_xla_support_flag = False,
- tags = ["no_rocm"],
)
saved_model_compile_aot(
@@ -466,7 +464,6 @@ saved_model_compile_aot(
"//tensorflow/cc/saved_model:saved_model_half_plus_two",
],
force_without_xla_support_flag = False,
- tags = ["no_rocm"],
variables_to_feed = "variable_x",
)
@@ -503,7 +500,6 @@ tf_cc_test(
srcs = if_xla_available([
"aot_compiled_test.cc",
]),
- tags = ["no_rocm"],
deps = [
"//tensorflow/core:test_main",
] + if_xla_available([
diff --git a/tensorflow/python/tpu/BUILD b/tensorflow/python/tpu/BUILD
index 234ca520e0d..2f4d6e34974 100644
--- a/tensorflow/python/tpu/BUILD
+++ b/tensorflow/python/tpu/BUILD
@@ -34,7 +34,6 @@ py_test(
"no_oss_py2",
"no_oss_py35",
"no_pip",
- "no_rocm",
],
deps = [
"//tensorflow/python:client_testlib",
diff --git a/tensorflow/tools/compatibility/BUILD b/tensorflow/tools/compatibility/BUILD
index 1aa76fb5a9b..238b6909324 100644
--- a/tensorflow/tools/compatibility/BUILD
+++ b/tensorflow/tools/compatibility/BUILD
@@ -270,7 +270,6 @@ py_test(
srcs = ["test_file_v2_0.py"],
python_version = "PY3",
srcs_version = "PY2AND3",
- tags = ["no_rocm"],
deps = [
"//tensorflow:tensorflow_py",
],