Move additional_deps to deps.

PiperOrigin-RevId: 285469994
Change-Id: I4fc2308752d000859a5ebb486917a96967e43d65
This commit is contained in:
Brian Atkinson 2019-12-13 14:17:15 -08:00 committed by TensorFlower Gardener
parent 913e50445b
commit b1bc83537f
8 changed files with 79 additions and 79 deletions

View File

@ -33,7 +33,7 @@ def distribute_py_test(
srcs = srcs, srcs = srcs,
data = data, data = data,
main = main, main = main,
additional_deps = deps, deps = deps,
shard_count = shard_count, shard_count = shard_count,
tags = tags, tags = tags,
args = args, args = args,

View File

@ -134,11 +134,6 @@ cuda_py_tests(
"test/vgg_block_nchw_test.py", "test/vgg_block_nchw_test.py",
"test/vgg_block_test.py", "test/vgg_block_test.py",
], ],
additional_deps = [
":tf_trt_integration_test_base",
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework_test_lib",
],
python_version = "PY3", python_version = "PY3",
tags = [ tags = [
"no_cuda_on_cpu_tap", "no_cuda_on_cpu_tap",
@ -146,6 +141,11 @@ cuda_py_tests(
"no_windows", "no_windows",
"nomac", "nomac",
], ],
deps = [
":tf_trt_integration_test_base",
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework_test_lib",
],
) )
cuda_py_tests( cuda_py_tests(
@ -154,11 +154,6 @@ cuda_py_tests(
"test/biasadd_matmul_test.py", "test/biasadd_matmul_test.py",
"test/concatenation_test.py", "test/concatenation_test.py",
], ],
additional_deps = [
":tf_trt_integration_test_base",
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework_test_lib",
],
python_version = "PY3", python_version = "PY3",
tags = [ tags = [
"no_rocm", "no_rocm",
@ -166,6 +161,11 @@ cuda_py_tests(
"nomac", "nomac",
"notap", # b/140261407 "notap", # b/140261407
], ],
deps = [
":tf_trt_integration_test_base",
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework_test_lib",
],
) )
cuda_py_test( cuda_py_test(

View File

@ -1532,11 +1532,11 @@ tf_py_test(
name = "compile_utils_test", name = "compile_utils_test",
size = "medium", size = "medium",
srcs = ["engine/compile_utils_test.py"], srcs = ["engine/compile_utils_test.py"],
additional_deps = [ deps = [
":keras", ":keras",
"@absl_py//absl/testing:parameterized",
"//third_party/py/numpy",
"//tensorflow/python:client_testlib", "//tensorflow/python:client_testlib",
"//third_party/py/numpy",
"@absl_py//absl/testing:parameterized",
], ],
) )

View File

@ -53,10 +53,10 @@ tf_py_test(
name = "imagenet_utils_test", name = "imagenet_utils_test",
size = "medium", size = "medium",
srcs = ["imagenet_utils_test.py"], srcs = ["imagenet_utils_test.py"],
additional_deps = [
":applications",
"@absl_py//absl/testing:parameterized",
"//tensorflow/python:client_testlib",
],
shard_count = 2, shard_count = 2,
deps = [
":applications",
"//tensorflow/python:client_testlib",
"@absl_py//absl/testing:parameterized",
],
) )

View File

@ -3539,13 +3539,13 @@ sycl_py_test(
name = "basic_gpu_test", name = "basic_gpu_test",
size = "small", size = "small",
srcs = ["basic_gpu_test.py"], srcs = ["basic_gpu_test.py"],
additional_deps = [ deps = [
"//third_party/py/numpy",
"//tensorflow/python:array_ops_gen", "//tensorflow/python:array_ops_gen",
"//tensorflow/python:client_testlib", "//tensorflow/python:client_testlib",
"//tensorflow/python:framework_for_generated_wrappers", "//tensorflow/python:framework_for_generated_wrappers",
"//tensorflow/python:math_ops", "//tensorflow/python:math_ops",
"//tensorflow/python:math_ops_gen", "//tensorflow/python:math_ops_gen",
"//third_party/py/numpy",
], ],
) )

View File

@ -24,142 +24,142 @@ py_library(
cuda_py_tests( cuda_py_tests(
name = "dct_ops_test", name = "dct_ops_test",
srcs = ["dct_ops_test.py"], srcs = ["dct_ops_test.py"],
additional_deps = [ python_version = "PY3",
"@absl_py//absl/testing:parameterized", tags = ["no_rocm"],
"//third_party/py/numpy", deps = [
"//tensorflow/python:client_testlib", "//tensorflow/python:client_testlib",
"//tensorflow/python:framework_for_generated_wrappers", "//tensorflow/python:framework_for_generated_wrappers",
"//tensorflow/python/ops/signal", "//tensorflow/python/ops/signal",
"//third_party/py/numpy",
"@absl_py//absl/testing:parameterized",
], ],
python_version = "PY3",
tags = ["no_rocm"],
) )
cuda_py_tests( cuda_py_tests(
name = "fft_ops_test", name = "fft_ops_test",
size = "medium", size = "medium",
srcs = ["fft_ops_test.py"], srcs = ["fft_ops_test.py"],
additional_deps = [
"//third_party/py/numpy",
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework_for_generated_wrappers",
"//tensorflow/python:math_ops",
"//tensorflow/python/ops/signal",
],
python_version = "PY3", python_version = "PY3",
shard_count = 8, shard_count = 8,
tags = [ tags = [
"no_rocm", "no_rocm",
"optonly", "optonly",
], ],
deps = [
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework_for_generated_wrappers",
"//tensorflow/python:math_ops",
"//tensorflow/python/ops/signal",
"//third_party/py/numpy",
],
) )
cuda_py_tests( cuda_py_tests(
name = "mel_ops_test", name = "mel_ops_test",
srcs = ["mel_ops_test.py"], srcs = ["mel_ops_test.py"],
additional_deps = [ python_version = "PY3",
deps = [
":test_util", ":test_util",
"//third_party/py/numpy",
"//tensorflow/python:client_testlib", "//tensorflow/python:client_testlib",
"//tensorflow/python/ops/signal", "//tensorflow/python/ops/signal",
"//third_party/py/numpy",
], ],
python_version = "PY3",
) )
cuda_py_tests( cuda_py_tests(
name = "mfcc_ops_test", name = "mfcc_ops_test",
srcs = ["mfcc_ops_test.py"], srcs = ["mfcc_ops_test.py"],
additional_deps = [ python_version = "PY3",
"@absl_py//absl/testing:parameterized", tags = ["no_rocm"],
"//third_party/py/numpy", deps = [
"//tensorflow/python:client_testlib", "//tensorflow/python:client_testlib",
"//tensorflow/python:framework", "//tensorflow/python:framework",
"//tensorflow/python:framework_for_generated_wrappers", "//tensorflow/python:framework_for_generated_wrappers",
"//tensorflow/python:framework_test_lib", "//tensorflow/python:framework_test_lib",
"//tensorflow/python/ops/signal", "//tensorflow/python/ops/signal",
"//third_party/py/numpy",
"@absl_py//absl/testing:parameterized",
], ],
python_version = "PY3",
tags = ["no_rocm"],
) )
cuda_py_tests( cuda_py_tests(
name = "reconstruction_ops_test", name = "reconstruction_ops_test",
srcs = ["reconstruction_ops_test.py"], srcs = ["reconstruction_ops_test.py"],
additional_deps = [ python_version = "PY3",
"@absl_py//absl/testing:parameterized", deps = [
"//third_party/py/numpy",
"//tensorflow/python:array_ops", "//tensorflow/python:array_ops",
"//tensorflow/python:gradients",
"//tensorflow/python:math_ops",
"//tensorflow/python:client_testlib", "//tensorflow/python:client_testlib",
"//tensorflow/python:framework", "//tensorflow/python:framework",
"//tensorflow/python:framework_for_generated_wrappers", "//tensorflow/python:framework_for_generated_wrappers",
"//tensorflow/python:framework_test_lib", "//tensorflow/python:framework_test_lib",
"//tensorflow/python/ops/signal", "//tensorflow/python:gradients",
"//tensorflow/python:math_ops",
"//tensorflow/python:platform_test", "//tensorflow/python:platform_test",
"//tensorflow/python/ops/signal",
"//third_party/py/numpy",
"@absl_py//absl/testing:parameterized",
], ],
python_version = "PY3",
) )
cuda_py_tests( cuda_py_tests(
name = "shape_ops_test", name = "shape_ops_test",
srcs = ["shape_ops_test.py"], srcs = ["shape_ops_test.py"],
additional_deps = [ python_version = "PY3",
deps = [
":test_util", ":test_util",
"//third_party/py/numpy",
"//tensorflow/python:array_ops", "//tensorflow/python:array_ops",
"//tensorflow/python:math_ops",
"//tensorflow/python:client_testlib", "//tensorflow/python:client_testlib",
"//tensorflow/python:framework", "//tensorflow/python:framework",
"//tensorflow/python:framework_for_generated_wrappers", "//tensorflow/python:framework_for_generated_wrappers",
"//tensorflow/python:framework_test_lib", "//tensorflow/python:framework_test_lib",
"//tensorflow/python/ops/signal", "//tensorflow/python:math_ops",
"//tensorflow/python:platform_test", "//tensorflow/python:platform_test",
"//tensorflow/python/ops/signal",
"//third_party/py/numpy",
], ],
python_version = "PY3",
) )
cuda_py_tests( cuda_py_tests(
name = "spectral_ops_test", name = "spectral_ops_test",
size = "large", size = "large",
srcs = ["spectral_ops_test.py"], srcs = ["spectral_ops_test.py"],
additional_deps = [
"@absl_py//absl/testing:parameterized",
"//third_party/py/numpy",
"//tensorflow/python:array_ops",
"//tensorflow/python:gradients",
"//tensorflow/python:math_ops",
"//tensorflow/python:random_ops",
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework",
"//tensorflow/python:framework_for_generated_wrappers",
"//tensorflow/python:framework_test_lib",
"//tensorflow/python:platform_test",
"//tensorflow/python/ops/signal",
],
python_version = "PY3", python_version = "PY3",
tags = [ tags = [
"no_rocm", "no_rocm",
"nomac", "nomac",
], ],
deps = [
"//tensorflow/python:array_ops",
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework",
"//tensorflow/python:framework_for_generated_wrappers",
"//tensorflow/python:framework_test_lib",
"//tensorflow/python:gradients",
"//tensorflow/python:math_ops",
"//tensorflow/python:platform_test",
"//tensorflow/python:random_ops",
"//tensorflow/python/ops/signal",
"//third_party/py/numpy",
"@absl_py//absl/testing:parameterized",
],
) )
cuda_py_tests( cuda_py_tests(
name = "window_ops_test", name = "window_ops_test",
srcs = ["window_ops_test.py"], srcs = ["window_ops_test.py"],
additional_deps = [
":test_util",
"//third_party/py/numpy",
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework",
"//tensorflow/python:framework_for_generated_wrappers",
"//tensorflow/python:framework_test_lib",
"//tensorflow/python/ops/signal",
"//tensorflow/python:platform_test",
],
python_version = "PY3", python_version = "PY3",
shard_count = 4, shard_count = 4,
tags = [ tags = [
"no_windows_gpu", "no_windows_gpu",
], ],
deps = [
":test_util",
"//tensorflow/python:client_testlib",
"//tensorflow/python:framework",
"//tensorflow/python:framework_for_generated_wrappers",
"//tensorflow/python:framework_test_lib",
"//tensorflow/python:platform_test",
"//tensorflow/python/ops/signal",
"//third_party/py/numpy",
],
) )

View File

@ -87,7 +87,7 @@ py_library(
#cuda_py_test( #cuda_py_test(
# name = "run_and_gather_logs_test", # name = "run_and_gather_logs_test",
# srcs = ["run_and_gather_logs.py"], # srcs = ["run_and_gather_logs.py"],
# additional_deps = [ # deps = [
# ":run_and_gather_logs", # ":run_and_gather_logs",
# ], # ],
# args = [ # args = [

View File

@ -39,7 +39,7 @@ def tf_cc_logged_benchmark(
target, target,
], ],
main = "run_and_gather_logs.py", main = "run_and_gather_logs.py",
additional_deps = [ deps = [
"//tensorflow/tools/test:run_and_gather_logs", "//tensorflow/tools/test:run_and_gather_logs",
], ],
**kwargs **kwargs