experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ROCm] Unit-test updates for the ROCm platform.

Browse Source 
This commit mostly either enables or disables unittests on the ROCM platform, details listed below
* adding/removing no_rocm tag for tests in the //tensorflow/compiler/mlir dir
* enabling / disabling subtests within //tensorflow/core/grappler/optimizers:constant_folding_test for the ROCm platform
* disabling a subtest within //tensorflow/core/distributed_runtime:collective_param_resolver_distributed_test fir the ROCm platform
* adding no_rocm tag to tests that are failing on the ROCm platform
* minor bug fix to ensure that the //tensorflow/compiler/mlir/tensorflow:error_util_test passes on a consistent basis
This commit is contained in:
Deven Desai 2019-12-31 17:01:07 +00:00
parent 6072451f8b
commit 32b7183acd
19 changed files with 57 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tensorflow/compiler/mlir/glob_lit_test.bzl
View File

@ -12,7 +12,7 @@ load("@bazel_skylib//lib:paths.bzl", "paths")
_default_test_file_exts = ["mlir", ".pbtxt", ".td"] _default_test_file_exts = ["mlir", ".pbtxt", ".td"]
_default_driver = "@llvm-project//mlir:run_lit.sh" _default_driver = "@llvm-project//mlir:run_lit.sh"
_default_size = "small" _default_size = "small"
_default_tags = ["no_rocm"] _default_tags = []
# These are patterns which we should never match, for tests, subdirectories, or # These are patterns which we should never match, for tests, subdirectories, or
# test input data files. # test input data files.

5
tensorflow/compiler/mlir/lite/tests/BUILD
View File

@ -5,6 +5,11 @@ package(licenses = ["notice"])
glob_lit_tests( glob_lit_tests(
data = [":test_utilities"], data = [":test_utilities"],
driver = "@llvm-project//mlir:run_lit.sh", driver = "@llvm-project//mlir:run_lit.sh",
tags_override = {
"legalize-tf.mlir": ["no_rocm"],
"optimize.mlir": ["no_rocm"],
"prepare-tf.mlir": ["no_rocm"],
},
test_file_exts = ["mlir"], test_file_exts = ["mlir"],
) )

6
tensorflow/compiler/mlir/lite/tests/end2end/BUILD
View File

@ -8,6 +8,12 @@ glob_lit_tests(
":test_utilities", ":test_utilities",
], ],
driver = "@llvm-project//mlir:run_lit.sh", driver = "@llvm-project//mlir:run_lit.sh",
tags_override = {
"add.pbtxt": ["no_rocm"],
"conv_2d.pbtxt": ["no_rocm"],
"fake_quant_per_channel.pbtxt": ["no_rocm"],
"ophint_lstm.pbtxt": ["no_rocm"],
},
test_file_exts = [ test_file_exts = [
"pbtxt", "pbtxt",
], ],

1
tensorflow/compiler/mlir/tensorflow/BUILD
View File

@ -934,7 +934,6 @@ cc_library(
tf_cc_test( tf_cc_test(
name = "error_util_test", name = "error_util_test",
srcs = ["utils/error_util_test.cc"], srcs = ["utils/error_util_test.cc"],
tags = ["no_rocm"],
deps = [ deps = [
":error_util", ":error_util",
"//tensorflow/compiler/xla:test", "//tensorflow/compiler/xla:test",

4
tensorflow/compiler/mlir/tensorflow/tests/BUILD
View File

@ -5,6 +5,10 @@ package(licenses = ["notice"])
glob_lit_tests( glob_lit_tests(
data = [":test_utilities"], data = [":test_utilities"],
driver = "@llvm-project//mlir:run_lit.sh", driver = "@llvm-project//mlir:run_lit.sh",
tags_override = {
"optimize.mlir": ["no_rocm"],
"tf_optimize.mlir": ["no_rocm"],
},
test_file_exts = ["mlir"], test_file_exts = ["mlir"],
) )

2
tensorflow/core/distributed_runtime/collective_param_resolver_distributed_test.cc
View File

@ -315,7 +315,7 @@ TEST_F(DeviceResDistTest, Workers2Devices2) {
ValidateCollectiveParams(num_workers, num_devices); ValidateCollectiveParams(num_workers, num_devices);
} }
#ifndef GOOGLE_CUDA #if !GOOGLE_CUDA && !TENSORFLOW_USE_ROCM
namespace { namespace {
// A mock NcclReducer for testing group runtime details initialization with CPU // A mock NcclReducer for testing group runtime details initialization with CPU
// builds. The only meaningful function in this class is // builds. The only meaningful function in this class is

28
tensorflow/core/grappler/optimizers/constant_folding_test.cc
View File

@ -551,9 +551,9 @@ TEST_F(ConstantFoldingTest, ConstantPushDownBiasAdd) {
TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_ScalarConst) { TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_ScalarConst) {
for (string data_format : { for (string data_format : {
"NHWC", "NHWC",
#if GOOGLE_CUDA #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
"NCHW" "NCHW"
#endif // GOOGLE_CUDA #endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
}) { }) {
MulConvPushDownTest( MulConvPushDownTest(
/*input_shape=*/data_format == "NHWC" ? TensorShape{4, 10, 10, 3} /*input_shape=*/data_format == "NHWC" ? TensorShape{4, 10, 10, 3}
@ -569,9 +569,9 @@ TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_ScalarConst) {
TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_SingletonConst) { TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_SingletonConst) {
for (string data_format : { for (string data_format : {
"NHWC", "NHWC",
#if GOOGLE_CUDA #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
"NCHW" "NCHW"
#endif // GOOGLE_CUDA #endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
}) { }) {
for (auto mul_const_input_shape : for (auto mul_const_input_shape :
{TensorShape{1}, TensorShape{1, 1, 1, 1}}) { {TensorShape{1}, TensorShape{1, 1, 1, 1}}) {
@ -590,9 +590,9 @@ TEST_F(ConstantFoldingTest,
MulConvPushDownTest_Conv2D_SingletonConst_ShapeMismatch) { MulConvPushDownTest_Conv2D_SingletonConst_ShapeMismatch) {
for (string data_format : { for (string data_format : {
"NHWC", "NHWC",
#if GOOGLE_CUDA #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
"NCHW" "NCHW"
#endif // GOOGLE_CUDA #endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
}) { }) {
MulConvPushDownTest( MulConvPushDownTest(
/*input_shape=*/data_format == "NHWC" ? TensorShape{4, 10, 10, 3} /*input_shape=*/data_format == "NHWC" ? TensorShape{4, 10, 10, 3}
@ -608,9 +608,9 @@ TEST_F(ConstantFoldingTest,
TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_3x1x3Const) { TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_3x1x3Const) {
for (auto data_format : { for (auto data_format : {
"NHWC", "NHWC",
#if GOOGLE_CUDA #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
"NCHW" "NCHW"
#endif // GOOGLE_CUDA #endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
}) { }) {
MulConvPushDownTest( MulConvPushDownTest(
/*input_shape=*/{3, 3, 3, 3}, /*input_shape=*/{3, 3, 3, 3},
@ -635,7 +635,7 @@ TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_NHWC_VectorLikeConst) {
} }
} }
#if GOOGLE_CUDA #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_NCHW_VectorLikeConst) { TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_NCHW_VectorLikeConst) {
for (auto mul_const_input_shape : for (auto mul_const_input_shape :
{TensorShape{3}, TensorShape{3, 1, 1}, TensorShape{1, 3, 1, 1}}) { {TensorShape{3}, TensorShape{3, 1, 1}, TensorShape{1, 3, 1, 1}}) {
@ -649,14 +649,14 @@ TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_NCHW_VectorLikeConst) {
/*expect_folded=*/false); /*expect_folded=*/false);
} }
} }
#endif // GOOGLE_CUDA #endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_3x1Const) { TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_3x1Const) {
for (auto data_format : { for (auto data_format : {
"NHWC", "NHWC",
#if GOOGLE_CUDA #if GOOGLE_CUDA || TENSORFLOW_USE_ROCM
"NCHW" "NCHW"
#endif // GOOGLE_CUDA #endif // GOOGLE_CUDA || TENSORFLOW_USE_ROCM
}) { }) {
MulConvPushDownTest( MulConvPushDownTest(
/*input_shape=*/{3, 3, 3, 3}, /*input_shape=*/{3, 3, 3, 3},
@ -668,6 +668,9 @@ TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv2D_3x1Const) {
} }
} }
// This test fails on ROCm platform with two vaue miscompare
// TODO(rocm) : analysze and fix the cause of the failure and re-enable test
#ifndef TENSORFLOW_USE_ROCM
TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv3D_NDHWC_1x1x3Const) { TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv3D_NDHWC_1x1x3Const) {
MulConvPushDownTest( MulConvPushDownTest(
/*input_shape=*/{3, 3, 3, 3, 3}, /*input_shape=*/{3, 3, 3, 3, 3},
@ -678,6 +681,7 @@ TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv3D_NDHWC_1x1x3Const) {
/*data_format=*/"NDHWC", /*data_format=*/"NDHWC",
/*expect_folded=*/true); /*expect_folded=*/true);
} }
#endif
TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv3D_NCDHW_3x1x1x1Const) { TEST_F(ConstantFoldingTest, MulConvPushDownTest_Conv3D_NCDHW_3x1x1x1Const) {
MulConvPushDownTest( MulConvPushDownTest(

2
tensorflow/lite/python/BUILD
View File

@ -143,6 +143,7 @@ py_test(
shard_count = 4, shard_count = 4,
srcs_version = "PY2AND3", srcs_version = "PY2AND3",
tags = [ tags = [
"no_rocm",
"no_windows", "no_windows",
], ],
deps = [ deps = [
@ -159,6 +160,7 @@ py_test(
python_version = "PY3", python_version = "PY3",
srcs_version = "PY2AND3", srcs_version = "PY2AND3",
tags = [ tags = [
"no_rocm",
"no_windows", "no_windows",
], ],
deps = [ deps = [

7
tensorflow/python/BUILD
View File

@ -3197,6 +3197,7 @@ tf_py_test(
size = "small", size = "small",
srcs = ["ops/collective_ops_test.py"], srcs = ["ops/collective_ops_test.py"],
python_version = "PY3", python_version = "PY3",
tags = ["no_rocm"],
deps = [ deps = [
":client_testlib", ":client_testlib",
":collective_ops", ":collective_ops",
@ -6425,6 +6426,7 @@ tf_py_test(
size = "small", size = "small",
srcs = ["framework/convert_to_constants_test.py"], srcs = ["framework/convert_to_constants_test.py"],
python_version = "PY3", python_version = "PY3",
tags = ["no_rocm"],
deps = [ deps = [
"client_testlib", "client_testlib",
"framework_test_lib", "framework_test_lib",
@ -6449,7 +6451,10 @@ tf_py_test(
size = "small", size = "small",
srcs = ["lib/io/file_io_test.py"], srcs = ["lib/io/file_io_test.py"],
python_version = "PY3", python_version = "PY3",
tags = ["no_windows"], tags = [
"no_rocm",
"no_windows",
],
deps = [ deps = [
":client_testlib", ":client_testlib",
":errors", ":errors",

2
tensorflow/python/debug/BUILD
View File

@ -926,6 +926,7 @@ py_test(
srcs = ["wrappers/framework_test.py"], srcs = ["wrappers/framework_test.py"],
python_version = "PY3", python_version = "PY3",
srcs_version = "PY2AND3", srcs_version = "PY2AND3",
tags = ["no_rocm"],
deps = [ deps = [
":debug_data", ":debug_data",
":framework", ":framework",
@ -1146,6 +1147,7 @@ py_test(
srcs = ["cli/debugger_cli_common_test.py"], srcs = ["cli/debugger_cli_common_test.py"],
python_version = "PY3", python_version = "PY3",
srcs_version = "PY2AND3", srcs_version = "PY2AND3",
tags = ["no_rocm"],
deps = [ deps = [
":debugger_cli_common", ":debugger_cli_common",
"//tensorflow/python:framework_test_lib", "//tensorflow/python:framework_test_lib",

1
tensorflow/python/distribute/BUILD
View File

@ -177,6 +177,7 @@ py_test(
srcs = ["distribute_lib_test.py"], srcs = ["distribute_lib_test.py"],
python_version = "PY3", python_version = "PY3",
srcs_version = "PY2AND3", srcs_version = "PY2AND3",
tags = ["no_rocm"],
deps = [ deps = [
":combinations", ":combinations",
":distribute_lib", ":distribute_lib",

2
tensorflow/python/feature_column/BUILD
View File

@ -113,6 +113,7 @@ tf_py_test(
tags = [ tags = [
"no_cuda_on_cpu_tap", "no_cuda_on_cpu_tap",
"no_pip", "no_pip",
"no_rocm",
"no_windows", "no_windows",
], ],
deps = [ deps = [
@ -165,6 +166,7 @@ tf_py_test(
tags = [ tags = [
"no_cuda_on_cpu_tap", "no_cuda_on_cpu_tap",
"no_pip", "no_pip",
"no_rocm",
"no_windows", "no_windows",
], ],
deps = [":feature_column_v2_test_main_lib"], deps = [":feature_column_v2_test_main_lib"],

1
tensorflow/python/keras/applications/BUILD
View File

@ -43,6 +43,7 @@ tf_py_test(
size = "medium", size = "medium",
srcs = ["applications_test.py"], srcs = ["applications_test.py"],
shard_count = 36, shard_count = 36,
tags = ["no_rocm"],
deps = [ deps = [
":applications", ":applications",
"//tensorflow/python:client_testlib", "//tensorflow/python:client_testlib",

6
tensorflow/python/keras/layers/BUILD
View File

@ -650,7 +650,10 @@ tf_py_test(
srcs = ["gru_test.py"], srcs = ["gru_test.py"],
python_version = "PY3", python_version = "PY3",
shard_count = 4, shard_count = 4,
tags = ["notsan"], # http://b/62136390 tags = [
"no_rocm",
"notsan", # http://b/62136390
],
deps = [ deps = [
"//tensorflow/python:client_testlib", "//tensorflow/python:client_testlib",
"//tensorflow/python/keras", "//tensorflow/python/keras",
@ -666,6 +669,7 @@ tf_py_test(
python_version = "PY3", python_version = "PY3",
shard_count = 4, shard_count = 4,
tags = [ tags = [
"no_rocm",
"noasan", # times out b/63678675 "noasan", # times out b/63678675
"notsan", # http://b/62189182 "notsan", # http://b/62189182
], ],

1
tensorflow/python/keras/legacy_tf_layers/BUILD
View File

@ -157,6 +157,7 @@ tf_py_test(
srcs = ["pooling_test.py"], srcs = ["pooling_test.py"],
main = "pooling_test.py", main = "pooling_test.py",
python_version = "PY3", python_version = "PY3",
tags = ["no_rocm"],
deps = [ deps = [
":pooling", ":pooling",
"//tensorflow/python:array_ops", "//tensorflow/python:array_ops",

1
tensorflow/python/keras/saving/BUILD
View File

@ -136,6 +136,7 @@ tf_py_test(
python_version = "PY3", python_version = "PY3",
shard_count = 4, shard_count = 4,
tags = [ tags = [
"no_rocm",
"no_windows", "no_windows",
], ],
deps = [ deps = [

1
tensorflow/python/ops/ragged/BUILD
View File

@ -1093,6 +1093,7 @@ py_test(
srcs = ["ragged_map_fn_op_test.py"], srcs = ["ragged_map_fn_op_test.py"],
python_version = "PY3", python_version = "PY3",
srcs_version = "PY2AND3", srcs_version = "PY2AND3",
tags = ["no_rocm"],
deps = [ deps = [
":ragged", # fixdeps: keep ":ragged", # fixdeps: keep
":ragged_factory_ops", ":ragged_factory_ops",

1
tensorflow/python/tpu/BUILD
View File

@ -32,6 +32,7 @@ py_test(
"no_oss_py2", "no_oss_py2",
"no_oss_py35", "no_oss_py35",
"no_pip", "no_pip",
"no_rocm",
], ],
deps = [ deps = [
"//tensorflow/python:client_testlib", "//tensorflow/python:client_testlib",

1
tensorflow/tools/docs/BUILD
View File

@ -26,6 +26,7 @@ py_test(
tags = [ tags = [
"no_oss_py2", "no_oss_py2",
"no_pip", "no_pip",
"no_rocm",
"no_windows", # numpy prints differently on windows. "no_windows", # numpy prints differently on windows.
"noasan", "noasan",
"nomsan", "nomsan",