Change for internal compatibility.

This commit is contained in:
A. Unique TensorFlower 2016-11-04 05:49:28 -08:00 committed by TensorFlower Gardener
parent d05336271c
commit d150ca80da
7 changed files with 58 additions and 58 deletions
tensorflow
contrib
layers
slim
tfprof/python/tools/tfprof
core
BUILD
kernels
BUILD
hexagon
python

View File

@ -30,7 +30,7 @@ tf_gen_op_libs(
tf_gen_op_wrapper_py(
name = "bucketization_op",
deps = ["//tensorflow/contrib/layers:bucketization_op_op_lib"],
deps = [":bucketization_op_op_lib"],
)
tf_kernel_library(
@ -59,7 +59,7 @@ tf_gen_op_libs(
tf_gen_op_wrapper_py(
name = "sparse_feature_cross_op",
deps = ["//tensorflow/contrib/layers:sparse_feature_cross_op_op_lib"],
deps = [":sparse_feature_cross_op_op_lib"],
)
tf_kernel_library(

View File

@ -48,8 +48,8 @@ py_test(
srcs_version = "PY2AND3",
tags = ["manual"],
deps = [
":slim",
"//tensorflow:tensorflow_py",
"//tensorflow/contrib/slim",
"//tensorflow/python:framework_test_lib",
"//tensorflow/python:platform_test",
],

View File

@ -10,8 +10,8 @@ py_library(
srcs = ["model_analyzer.py"],
srcs_version = "PY2AND3",
deps = [
"//tensorflow/contrib/tfprof/python/tools/tfprof:pywrap_tensorflow_print_model_analysis_lib",
"//tensorflow/contrib/tfprof/python/tools/tfprof:tfprof_logger",
":pywrap_tensorflow_print_model_analysis_lib",
":tfprof_logger",
"//tensorflow/tools/tfprof:protos_all_py",
],
)

View File

@ -838,15 +838,15 @@ filegroup(
# TODO(andrewharp/nhua):
# make more test-related sources portable e.g. "platform/test.cc",
srcs = [
"//tensorflow/core:framework/fake_input.cc",
"//tensorflow/core:framework/fake_input.h",
"//tensorflow/core:framework/shape_inference_testutil.cc",
"//tensorflow/core:framework/shape_inference_testutil.h",
"//tensorflow/core:framework/tensor_testutil.cc",
"//tensorflow/core:framework/tensor_testutil.h",
"//tensorflow/core:platform/test.h",
"//tensorflow/core:util/reporter.cc",
"//tensorflow/core:util/reporter.h",
":framework/fake_input.cc",
":framework/fake_input.h",
":framework/shape_inference_testutil.cc",
":framework/shape_inference_testutil.h",
":framework/tensor_testutil.cc",
":framework/tensor_testutil.h",
":platform/test.h",
":util/reporter.cc",
":util/reporter.h",
],
visibility = ["//visibility:public"],
)
@ -855,13 +855,13 @@ filegroup(
filegroup(
name = "android_test_srcs_no_core",
srcs = [
"//tensorflow/core:framework/shape_inference_testutil.cc",
"//tensorflow/core:framework/shape_inference_testutil.h",
"//tensorflow/core:framework/tensor_testutil.cc",
"//tensorflow/core:framework/tensor_testutil.h",
"//tensorflow/core:platform/test.h",
"//tensorflow/core:util/reporter.cc",
"//tensorflow/core:util/reporter.h",
":framework/shape_inference_testutil.cc",
":framework/shape_inference_testutil.h",
":framework/tensor_testutil.cc",
":framework/tensor_testutil.h",
":platform/test.h",
":util/reporter.cc",
":util/reporter.h",
],
visibility = ["//visibility:public"],
)
@ -1869,6 +1869,7 @@ tf_cc_test(
srcs = ["common_runtime/graph_runner_test.cc"],
linkstatic = tf_kernel_tests_linkstatic(),
deps = [
":array_ops_op_lib",
":core",
":core_cpu",
":core_cpu_internal",
@ -1884,7 +1885,6 @@ tf_cc_test(
":testlib",
"//tensorflow/cc:cc_ops",
"//tensorflow/cc:scope",
"//tensorflow/core:array_ops_op_lib",
"//tensorflow/core/kernels:cwise_op",
"//third_party/eigen3",
],

View File

@ -1051,8 +1051,8 @@ cc_library(
"conditional_accumulator_base_op.h",
],
deps = [
":fill_functor",
":typed_conditional_accumulator_base",
"//tensorflow/core/kernels:fill_functor",
],
)
@ -2069,6 +2069,7 @@ tf_cc_test(
srcs = ["sdca_ops_test.cc"],
linkstatic = tf_kernel_tests_linkstatic(), # Required for benchmarking
deps = [
":ops_util",
"//tensorflow/core:all_kernels",
"//tensorflow/core:core_cpu",
"//tensorflow/core:framework",
@ -2076,7 +2077,6 @@ tf_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:ops_util",
],
)
@ -2654,17 +2654,17 @@ tf_kernel_library(
"reference_gemm.h",
],
deps = [
":concat_lib_hdrs",
":conv_ops",
":eigen_helpers",
":ops_util",
":pooling_ops",
"//tensorflow/core",
"//tensorflow/core:array_ops_op_lib",
"//tensorflow/core:framework",
"//tensorflow/core:lib",
"//tensorflow/core:math_ops_op_lib",
"//tensorflow/core:nn_ops_op_lib",
"//tensorflow/core/kernels:concat_lib_hdrs",
"//tensorflow/core/kernels:conv_ops",
"//tensorflow/core/kernels:eigen_helpers",
"//tensorflow/core/kernels:ops_util",
"//tensorflow/core/kernels:pooling_ops",
"//third_party/eigen3",
"@gemmlowp//:gemmlowp",
],
@ -2675,14 +2675,14 @@ tf_cc_test(
size = "small",
srcs = ["requantization_range_op_test.cc"],
deps = [
":ops_testutil",
":ops_util",
":quantized_ops",
"//tensorflow/core:framework",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:ops_testutil",
"//tensorflow/core/kernels:ops_util",
],
)
@ -2691,14 +2691,14 @@ tf_cc_test(
size = "small",
srcs = ["quantize_down_and_shrink_range_op_test.cc"],
deps = [
":ops_testutil",
":ops_util",
":quantized_ops",
"//tensorflow/core:framework",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:ops_testutil",
"//tensorflow/core/kernels:ops_util",
],
)
@ -2707,14 +2707,14 @@ tf_cc_test(
size = "small",
srcs = ["requantize_op_test.cc"],
deps = [
":ops_testutil",
":ops_util",
":quantized_ops",
"//tensorflow/core:framework",
"//tensorflow/core:protos_all_cc",
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:ops_testutil",
"//tensorflow/core/kernels:ops_util",
],
)
@ -2742,6 +2742,8 @@ tf_cc_test(
name = "quantized_activation_ops_test",
srcs = ["quantized_activation_ops_test.cc"],
deps = [
":ops_testutil",
":ops_util",
":quantized_ops",
"//tensorflow/core:array_ops_op_lib",
"//tensorflow/core:framework",
@ -2751,8 +2753,6 @@ tf_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:ops_testutil",
"//tensorflow/core/kernels:ops_util",
],
)
@ -2761,6 +2761,8 @@ tf_cc_test(
size = "small",
srcs = ["quantized_bias_add_op_test.cc"],
deps = [
":ops_testutil",
":ops_util",
":quantized_ops",
"//tensorflow/core:array_ops_op_lib",
"//tensorflow/core:framework",
@ -2770,8 +2772,6 @@ tf_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:ops_testutil",
"//tensorflow/core/kernels:ops_util",
],
)
@ -2781,6 +2781,8 @@ tf_cc_test(
srcs = ["quantized_conv_ops_test.cc"],
tags = ["nomsan"], # http://b/32242946
deps = [
":ops_testutil",
":ops_util",
":quantized_ops",
"//tensorflow/core:array_ops_op_lib",
"//tensorflow/core:framework",
@ -2790,8 +2792,6 @@ tf_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:ops_testutil",
"//tensorflow/core/kernels:ops_util",
],
)
@ -2800,6 +2800,8 @@ tf_cc_test(
size = "small",
srcs = ["quantize_op_test.cc"],
deps = [
":ops_testutil",
":ops_util",
":quantized_ops",
"//tensorflow/core:array_ops_op_lib",
"//tensorflow/core:framework",
@ -2809,8 +2811,6 @@ tf_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:ops_testutil",
"//tensorflow/core/kernels:ops_util",
],
)
@ -2820,6 +2820,8 @@ tf_cc_test(
srcs = ["quantized_matmul_op_test.cc"],
tags = ["nomsan"], # http://b/32242946
deps = [
":ops_testutil",
":ops_util",
":quantized_ops",
"//tensorflow/core:array_ops_op_lib",
"//tensorflow/core:framework",
@ -2829,8 +2831,6 @@ tf_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:ops_testutil",
"//tensorflow/core/kernels:ops_util",
],
)
@ -2839,6 +2839,8 @@ tf_cc_test(
size = "small",
srcs = ["quantized_pooling_ops_test.cc"],
deps = [
":ops_testutil",
":ops_util",
":quantized_ops",
"//tensorflow/core:array_ops_op_lib",
"//tensorflow/core:framework",
@ -2848,8 +2850,6 @@ tf_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:ops_testutil",
"//tensorflow/core/kernels:ops_util",
],
)
@ -2858,6 +2858,8 @@ tf_cc_test(
size = "small",
srcs = ["quantized_reshape_op_test.cc"],
deps = [
":ops_testutil",
":ops_util",
":quantized_ops",
"//tensorflow/core:framework",
"//tensorflow/core:lib",
@ -2865,8 +2867,6 @@ tf_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:ops_testutil",
"//tensorflow/core/kernels:ops_util",
],
)
@ -2875,6 +2875,8 @@ tf_cc_test(
size = "small",
srcs = ["quantized_concat_op_test.cc"],
deps = [
":ops_testutil",
":ops_util",
":quantized_ops",
"//tensorflow/core:array_ops_op_lib",
"//tensorflow/core:core_cpu",
@ -2886,8 +2888,6 @@ tf_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:ops_testutil",
"//tensorflow/core/kernels:ops_util",
],
)
@ -2896,6 +2896,8 @@ tf_cc_test(
size = "small",
srcs = ["quantized_batch_norm_op_test.cc"],
deps = [
":batch_norm_op",
":ops_testutil",
":quantized_ops",
"//tensorflow/core:array_ops_op_lib",
"//tensorflow/core:core_cpu_internal",
@ -2907,8 +2909,6 @@ tf_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels:batch_norm_op",
"//tensorflow/core/kernels:ops_testutil",
"//third_party/eigen3",
],
)

View File

@ -48,6 +48,7 @@ tf_cc_test(
size = "small",
srcs = ["graph_transferer_test.cc"],
deps = [
":graph_transferer",
"//tensorflow/cc:cc_ops",
"//tensorflow/core:core_cpu",
"//tensorflow/core:direct_session",
@ -57,7 +58,6 @@ tf_cc_test(
"//tensorflow/core:test",
"//tensorflow/core:test_main",
"//tensorflow/core:testlib",
"//tensorflow/core/kernels/hexagon:graph_transferer",
],
)

View File

@ -1731,9 +1731,9 @@ py_library(
srcs_version = "PY2AND3",
visibility = ["//visibility:public"],
deps = [
":platform",
"//tensorflow:tensorflow_py",
"//tensorflow/core:protos_all_py",
"//tensorflow/python:platform",
],
)
@ -1783,10 +1783,10 @@ py_test(
srcs_version = "PY2AND3",
deps = [
":framework_test_lib",
":platform",
":platform_test",
":util_example_parser_configuration",
"//tensorflow:tensorflow_py",
"//tensorflow/python:platform",
],
)
@ -2274,9 +2274,9 @@ py_test(
srcs = ["ops/dequantize_op_test.py"],
srcs_version = "PY2AND3",
deps = [
":framework_test_lib",
":ops",
"//tensorflow:tensorflow_py",
"//tensorflow/python:framework_test_lib",
],
)
@ -2286,9 +2286,9 @@ py_test(
srcs = ["ops/quantized_conv_ops_test.py"],
srcs_version = "PY2AND3",
deps = [
":framework_test_lib",
":ops",
"//tensorflow:tensorflow_py",
"//tensorflow/python:framework_test_lib",
],
)