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

Merge pull request #34168 from lamarrr:patch-5

Browse Source 
PiperOrigin-RevId: 282381036
Change-Id: I9870a352cf7a664ec4f7dfab13c6bb9bff41ec72
This commit is contained in:
TensorFlower Gardener 2019-11-25 11:24:46 -08:00
commit f46e758677
32 changed files with 51 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tensorflow/c/eager/BUILD
View File

@ -12,7 +12,7 @@ load(
"tf_kernel_tests_linkstatic",
)
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)

2
tensorflow/cc/saved_model/BUILD
View File

@ -10,7 +10,7 @@ load(
"tf_cc_test",
)
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"if_static",
"if_static_and_not_mobile",
)

2
tensorflow/compiler/tests/BUILD
View File

@ -4,7 +4,7 @@ load("//tensorflow/compiler/aot:tfcompile.bzl", "tf_library")
load("//tensorflow/compiler/tests:build_defs.bzl", "tf_xla_py_test")
load("//tensorflow/compiler/tests:build_defs.bzl", "generate_backend_suites")
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)

2
tensorflow/compiler/tests/build_defs.bzl
View File

@ -3,7 +3,7 @@
load("@local_config_cuda//cuda:build_defs.bzl", "cuda_is_configured")
load("//tensorflow/compiler/tests:plugin.bzl", "plugins")
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
"tf_exec_compatible_with",
)

2
tensorflow/compiler/xla/service/gpu/BUILD
View File

@ -6,7 +6,7 @@ load(
"tf_proto_library_cc",
)
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)
load(

2
tensorflow/compiler/xla/service/gpu/tests/BUILD
View File

@ -7,7 +7,7 @@
load("//tensorflow/compiler/xla/tests:build_defs.bzl", "xla_test")
load("//tensorflow:tensorflow.bzl", "tf_cc_test")
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)

2
tensorflow/compiler/xla/service/interpreter/BUILD
View File

@ -1,5 +1,5 @@
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"if_static",
)

2
tensorflow/compiler/xla/service/mlir_gpu/tests/BUILD
View File

@ -2,7 +2,7 @@
load("//tensorflow:tensorflow.bzl", "tf_cc_test")
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)

2
tensorflow/compiler/xla/tests/BUILD
View File

@ -3,7 +3,7 @@
load("//tensorflow/compiler/xla/tests:build_defs.bzl", "generate_backend_suites", "generate_backend_test_macros", "xla_test", "xla_test_library")
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)
load("//tensorflow:tensorflow.bzl", "tf_cc_binary", "tf_cc_test")

2
tensorflow/compiler/xla/tests/build_defs.bzl
View File

@ -5,7 +5,7 @@ load("@local_config_rocm//rocm:build_defs.bzl", "rocm_is_configured")
load("//tensorflow/compiler/xla/tests:plugin.bzl", "plugins")
load("//tensorflow:tensorflow.bzl", "tf_cc_test")
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)

2
tensorflow/compiler/xrt/tests/BUILD
View File

@ -1,6 +1,6 @@
load("//tensorflow:tensorflow.bzl", "tf_cc_test", "tf_cuda_cc_test")
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)

2
tensorflow/core/BUILD
View File

@ -121,7 +121,7 @@ load(
"tf_pyclif_proto_library",
)
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"if_dynamic_kernels",
"if_static",
"tf_cuda_tests_tags",

2
tensorflow/core/distributed_runtime/BUILD
View File

@ -12,7 +12,7 @@ load(
"tf_kernel_tests_linkstatic",
)
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)

2
tensorflow/core/distributed_runtime/rpc/BUILD
View File

@ -16,7 +16,7 @@ load(
"tf_kernel_tests_linkstatic",
)
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)

2
tensorflow/core/grappler/clusters/BUILD
View File

@ -2,7 +2,7 @@ load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda")
load("//tensorflow:tensorflow.bzl", "tf_cc_test")
load("//tensorflow:tensorflow.bzl", "tf_cuda_library")
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)

2
tensorflow/core/grappler/optimizers/BUILD
View File

@ -3,7 +3,7 @@ load("//tensorflow:tensorflow.bzl", "tf_cuda_cc_test")
# Platform specific build config
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"if_static",
)

2
tensorflow/core/kernels/BUILD
View File

@ -29,7 +29,7 @@ load(
"tf_kernel_tests_linkstatic",
)
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)
load(

2
tensorflow/core/nccl/BUILD
View File

@ -8,7 +8,7 @@ load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda")
load("@local_config_rocm//rocm:build_defs.bzl", "if_rocm")
load("//tensorflow:tensorflow.bzl", "if_cuda_or_rocm")
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)

2
tensorflow/core/platform/BUILD
View File

@ -7,7 +7,7 @@
#
# The libraries in this package are not allowed to have ANY dependencies
# to any TensorFlow code outside this package.
load("//tensorflow/core/platform:default/build_config_root.bzl", "if_static")
load("//tensorflow/core/platform:google/build_config_root.bzl", "if_static")
load(
"//tensorflow/core/platform:default/build_config.bzl",
"tf_additional_lib_hdrs",

2
tensorflow/core/platform/default/build_config.bzl
View File

@ -2,7 +2,7 @@
load("@com_google_protobuf//:protobuf.bzl", "proto_gen")
load("//tensorflow:tensorflow.bzl", "clean_dep", "if_not_windows")
load("//tensorflow/core/platform:default/build_config_root.bzl", "if_static")
load("//tensorflow/core/platform:google/build_config_root.bzl", "if_static")
load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda")
load("@local_config_rocm//rocm:build_defs.bzl", "if_rocm")
load(

2
tensorflow/core/platform/default/build_config/BUILD
View File

@ -12,7 +12,7 @@ load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda")
load("@local_config_rocm//rocm:build_defs.bzl", "if_rocm")
load("//tensorflow:tensorflow.bzl", "tf_copts")
load("//tensorflow:tensorflow.bzl", "tf_cuda_library")
load("//tensorflow/core/platform:default/build_config_root.bzl", "if_static")
load("//tensorflow/core/platform:google/build_config_root.bzl", "if_static")
load("@local_config_sycl//sycl:platform.bzl", "sycl_library_path")
load("@local_config_sycl//sycl:build_defs.bzl", "if_ccpp")

2
tensorflow/core/profiler/internal/gpu/BUILD
View File

@ -12,7 +12,7 @@ load(
"tf_kernel_tests_linkstatic",
)
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)

2
tensorflow/examples/adding_an_op/BUILD
View File

@ -2,7 +2,7 @@
# Code examples referenced by adding_an_op
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
"tf_exec_compatible_with",
)

22
tensorflow/lite/experimental/micro/kernels/cmsis-nn/fully_connected.cc
View File

@ -89,6 +89,7 @@ TfLiteStatus EvalQuantizedInt8(TfLiteContext* context, TfLiteNode* node,
const TfLiteTensor* input,
const TfLiteTensor* filter,
const TfLiteTensor* bias, TfLiteTensor* output) {
#if defined(ARM_MATH_DSP) && defined(ARM_MATH_LOOPUNROLL)
RuntimeShape output_shape = GetTensorShape(output);
const int batches = output_shape.Dims(0);
const int output_depth = output_shape.Dims(1);
@ -96,7 +97,6 @@ TfLiteStatus EvalQuantizedInt8(TfLiteContext* context, TfLiteNode* node,
const int filter_dim_count = filter_shape.DimensionsCount();
const int accum_depth = filter_shape.Dims(filter_dim_count - 1);
#if defined(ARM_MATH_DSP) && defined(ARM_MATH_LOOPUNROLL)
const int32_t buf_size = arm_fully_connected_s8_get_buffer_size(accum_depth);
int16_t* buf = nullptr;
TF_LITE_ENSURE_OK(context, get_cmsis_scratch_buffer(context, &buf, buf_size));
@ -111,7 +111,25 @@ TfLiteStatus EvalQuantizedInt8(TfLiteContext* context, TfLiteNode* node,
data->output_activation_min, data->output_activation_max, buf),
ARM_MATH_SUCCESS);
#else
#error ARM_MATH_DSP and ARM_MATH_LOOPUNROLL must be set
#pragma message( \
"CMSIS-NN optimization for fully_connected not available for this target. Using reference kernel.")
FullyConnectedParams op_params;
op_params.input_offset = -input->params.zero_point;
op_params.weights_offset = -filter->params.zero_point;
op_params.output_offset = output->params.zero_point;
op_params.output_multiplier = data->output_multiplier;
// TODO(b/138810107): Figure out whether output shift should be inverted
op_params.output_shift = -data->output_shift;
op_params.quantized_activation_min = data->output_activation_min;
op_params.quantized_activation_max = data->output_activation_max;
reference_integer_ops::FullyConnected(
op_params, GetTensorShape(input), GetTensorData<int8_t>(input),
GetTensorShape(filter), GetTensorData<int8_t>(filter),
GetTensorShape(bias), GetTensorData<int32_t>(bias),
GetTensorShape(output), GetTensorData<int8_t>(output));
#endif
return kTfLiteOk;
}

2
tensorflow/python/BUILD
View File

@ -26,7 +26,7 @@ load("//tensorflow:tensorflow.bzl", "tf_py_wrap_cc")
load("//tensorflow:tensorflow.bzl", "cuda_py_test")
load("//tensorflow:tensorflow.bzl", "cuda_py_tests")
load("//tensorflow/core/platform:default/build_config.bzl", "pyx_library", "tf_additional_all_protos", "tf_additional_cupti_test_flags", "tf_additional_lib_deps", "tf_proto_library", "tf_proto_library_py", "tf_protos_grappler") # @unused
load("//tensorflow/core/platform:default/build_config_root.bzl", "if_static", "tf_additional_plugin_deps")
load("//tensorflow/core/platform:google/build_config_root.bzl", "if_static", "tf_additional_plugin_deps")
load("//tensorflow/python:build_defs.bzl", "tf_gen_op_wrapper_private_py")
load(
"//third_party/ngraph:build_defs.bzl",

2
tensorflow/python/kernel_tests/proto/BUILD
View File

@ -2,7 +2,7 @@
load("//tensorflow:tensorflow.bzl", "tf_py_test")
load("//tensorflow:tensorflow.bzl", "tf_cc_shared_object")
load("//tensorflow/core/platform:default/build_config_root.bzl", "if_static")
load("//tensorflow/core/platform:google/build_config_root.bzl", "if_static")
load("//tensorflow/core/platform:default/build_config.bzl", "tf_additional_all_protos", "tf_proto_library")
package(

2
tensorflow/stream_executor/BUILD
View File

@ -6,7 +6,7 @@
load("//tensorflow:tensorflow.bzl", "tf_cc_test")
load("//tensorflow/core/platform:default/build_config.bzl", "tf_proto_library")
load("//tensorflow/core/platform:default/build_config_root.bzl", "if_static")
load("//tensorflow/core/platform:google/build_config_root.bzl", "if_static")
load("//tensorflow/stream_executor:build_defs.bzl", "stream_executor_friends")
package(

2
tensorflow/stream_executor/cuda/BUILD
View File

@ -15,7 +15,7 @@ load(
"if_cuda_is_configured",
)
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"tf_cuda_tests_tags",
)

2
tensorflow/stream_executor/rocm/BUILD
View File

@ -8,7 +8,7 @@ load(
)
load("//tensorflow:tensorflow.bzl", "tf_copts")
load("@local_config_rocm//rocm:build_defs.bzl", "if_rocm_is_configured")
load("//tensorflow/core/platform:default/build_config_root.bzl", "if_static")
load("//tensorflow/core/platform:google/build_config_root.bzl", "if_static")
package(
default_visibility = [":friends"],

2
tensorflow/tensorflow.bzl
View File

@ -1,7 +1,7 @@
# Return the options to use for a C++ library or binary build.
# Uses the ":optmode" config_setting to pick the options.
load(
"//tensorflow/core/platform:default/build_config_root.bzl",
"//tensorflow/core/platform:google/build_config_root.bzl",
"if_dynamic_kernels",
"if_static",
"tf_additional_grpc_deps_py",

2
tensorflow/tools/lib_package/BUILD
View File

@ -8,7 +8,7 @@ load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda")
load("@local_config_rocm//rocm:build_defs.bzl", "if_rocm")
load("@local_config_syslibs//:build_defs.bzl", "if_not_system_lib")
load("//tensorflow:tensorflow.bzl", "VERSION", "VERSION_MAJOR", "if_macos")
load("//tensorflow/core/platform:default/build_config_root.bzl", "tf_additional_license_deps")
load("//tensorflow/core/platform:google/build_config_root.bzl", "tf_additional_license_deps")
load("//third_party/mkl:build_defs.bzl", "if_mkl")
genrule(

2
tensorflow/tools/pip_package/BUILD
View File

@ -5,7 +5,7 @@ load("//tensorflow:tensorflow.bzl", "if_windows", "transitive_hdrs")
load("//third_party/mkl:build_defs.bzl", "if_mkl", "if_mkl_ml")
load("@local_config_cuda//cuda:build_defs.bzl", "if_cuda")
load("@local_config_syslibs//:build_defs.bzl", "if_not_system_lib")
load("//tensorflow/core/platform:default/build_config_root.bzl", "tf_additional_license_deps")
load("//tensorflow/core/platform:google/build_config_root.bzl", "tf_additional_license_deps")
load("//third_party/ngraph:build_defs.bzl", "if_ngraph")
package(default_visibility = ["//visibility:private"])