From 2f9ba0aae7363850f58b8c9dc9c31cbdd81ddb88 Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Tue, 6 Oct 2020 13:37:02 -0700 Subject: [PATCH] Change TFLite python:interpreter target environment constraints to non_prod. PiperOrigin-RevId: 335710234 Change-Id: I4c8ab9249590b5577d262bdd306e3c83dd9dac40 --- tensorflow/core/kernels/BUILD | 5 +++++ tensorflow/core/platform/BUILD | 1 + tensorflow/lite/BUILD | 1 + .../lite/experimental/tflite_api_dispatcher/BUILD | 3 +++ tensorflow/lite/kernels/BUILD | 2 ++ tensorflow/lite/kernels/internal/BUILD | 1 + tensorflow/lite/python/BUILD | 2 ++ tensorflow/lite/python/interpreter_wrapper/BUILD | 8 ++++++++ tensorflow/python/BUILD | 11 +++++++++++ tensorflow/tensorflow.bzl | 4 +++- tensorflow/tools/compatibility/BUILD | 3 +++ 11 files changed, 40 insertions(+), 1 deletion(-) diff --git a/tensorflow/core/kernels/BUILD b/tensorflow/core/kernels/BUILD index cad1e4b44bb..c336dd24800 100644 --- a/tensorflow/core/kernels/BUILD +++ b/tensorflow/core/kernels/BUILD @@ -19,6 +19,9 @@ load("//tensorflow/core/kernels/mlir_generated:build_defs.bzl", "if_mlir_generat # buildifier: disable=same-origin-load load("//tensorflow:tensorflow.bzl", "cc_header_only_library") +# buildifier: disable=same-origin-load +load("//tensorflow:tensorflow.bzl", "get_compatible_with_portable") + # buildifier: disable=same-origin-load load("//tensorflow:tensorflow.bzl", "tf_kernel_library") @@ -890,6 +893,7 @@ cc_library( hdrs = [ "eigen_spatial_convolutions-inl.h", ], + compatible_with = get_compatible_with_portable(), deps = [ ":eigen_convolution_helpers", ], @@ -900,6 +904,7 @@ cc_library( hdrs = [ "eigen_convolution_helpers.h", ], + compatible_with = get_compatible_with_portable(), ) # OpKernel libraries ---------------------------------------------------------- diff --git a/tensorflow/core/platform/BUILD b/tensorflow/core/platform/BUILD index d13bb6ce43a..41b0b2ac275 100644 --- a/tensorflow/core/platform/BUILD +++ b/tensorflow/core/platform/BUILD @@ -1013,6 +1013,7 @@ cc_library( filegroup( name = "tensor_float_32_hdr", srcs = ["tensor_float_32_utils.h"], + compatible_with = get_compatible_with_portable(), ) tf_cc_tests( diff --git a/tensorflow/lite/BUILD b/tensorflow/lite/BUILD index 222e18ce155..6fccce0f792 100644 --- a/tensorflow/lite/BUILD +++ b/tensorflow/lite/BUILD @@ -673,6 +673,7 @@ cc_library( cc_library( name = "stateful_error_reporter", hdrs = ["stateful_error_reporter.h"], + compatible_with = get_compatible_with_portable(), deps = ["//tensorflow/lite/core/api"], ) diff --git a/tensorflow/lite/experimental/tflite_api_dispatcher/BUILD b/tensorflow/lite/experimental/tflite_api_dispatcher/BUILD index fff0a47c323..bb64be61599 100644 --- a/tensorflow/lite/experimental/tflite_api_dispatcher/BUILD +++ b/tensorflow/lite/experimental/tflite_api_dispatcher/BUILD @@ -1,3 +1,5 @@ +load("//tensorflow:tensorflow.bzl", "get_compatible_with_portable") + package( default_visibility = ["//tensorflow:internal"], licenses = ["notice"], # Apache 2.0 @@ -6,6 +8,7 @@ package( cc_library( name = "tflite_api_dispatcher", hdrs = ["tflite_api_dispatcher.h"], + compatible_with = get_compatible_with_portable(), deps = [ "//tensorflow/lite:framework_lib", ], diff --git a/tensorflow/lite/kernels/BUILD b/tensorflow/lite/kernels/BUILD index e44b2197bf8..f7aa91dc24d 100644 --- a/tensorflow/lite/kernels/BUILD +++ b/tensorflow/lite/kernels/BUILD @@ -263,6 +263,7 @@ cc_library( hdrs = [ "eigen_support.h", ], + compatible_with = get_compatible_with_portable(), copts = tflite_copts() + EXTRA_EIGEN_COPTS, visibility = ["//visibility:private"], deps = [ @@ -300,6 +301,7 @@ cc_library( cc_library( name = "tflite_with_ruy_default", + compatible_with = get_compatible_with_portable(), visibility = ["//visibility:private"], deps = select({ ":chromiumos_arm64": [":tflite_with_ruy_enabled"], diff --git a/tensorflow/lite/kernels/internal/BUILD b/tensorflow/lite/kernels/internal/BUILD index 4d4ea84685e..94135c6adbe 100644 --- a/tensorflow/lite/kernels/internal/BUILD +++ b/tensorflow/lite/kernels/internal/BUILD @@ -347,6 +347,7 @@ cc_library( "optimized/eigen_tensor_reduced_instantiations_oss.h", "optimized/multithreaded_conv.h", ], + compatible_with = get_compatible_with_portable(), copts = tflite_copts(), deps = [ ":common", diff --git a/tensorflow/lite/python/BUILD b/tensorflow/lite/python/BUILD index c48220ef7d8..9ddc01baefd 100644 --- a/tensorflow/lite/python/BUILD +++ b/tensorflow/lite/python/BUILD @@ -1,4 +1,5 @@ load("@flatbuffers//:build_defs.bzl", "flatbuffer_py_library") +load("//tensorflow:tensorflow.bzl", "get_compatible_with_portable") package( default_visibility = ["//tensorflow:internal"], @@ -17,6 +18,7 @@ py_library( srcs = [ "interpreter.py", ], + compatible_with = get_compatible_with_portable(), srcs_version = "PY2AND3", visibility = ["//visibility:public"], deps = [ diff --git a/tensorflow/lite/python/interpreter_wrapper/BUILD b/tensorflow/lite/python/interpreter_wrapper/BUILD index 1427a64f82f..3055d37fa07 100644 --- a/tensorflow/lite/python/interpreter_wrapper/BUILD +++ b/tensorflow/lite/python/interpreter_wrapper/BUILD @@ -1,5 +1,8 @@ load("//tensorflow:tensorflow.bzl", "pybind_extension") +# buildifier: disable=same-origin-load +load("//tensorflow:tensorflow.bzl", "get_compatible_with_portable") + package( default_visibility = ["//visibility:public"], licenses = ["notice"], # Apache 2.0 @@ -9,6 +12,7 @@ cc_library( name = "numpy", srcs = ["numpy.cc"], hdrs = ["numpy.h"], + compatible_with = get_compatible_with_portable(), deps = [ "//tensorflow/lite:string_util", "//tensorflow/lite/c:common", @@ -23,6 +27,7 @@ cc_library( hdrs = [ "interpreter_wrapper.h", ], + compatible_with = get_compatible_with_portable(), deps = [ ":numpy", ":python_error_reporter", @@ -45,6 +50,7 @@ cc_library( name = "python_error_reporter", srcs = ["python_error_reporter.cc"], hdrs = ["python_error_reporter.h"], + compatible_with = get_compatible_with_portable(), deps = [ "//tensorflow/lite:stateful_error_reporter", "//third_party/python_runtime:headers", # buildcleaner: keep @@ -55,6 +61,7 @@ cc_library( name = "python_utils", srcs = ["python_utils.cc"], hdrs = ["python_utils.h"], + compatible_with = get_compatible_with_portable(), deps = [ "//tensorflow/lite:framework", "//tensorflow/lite:string_util", @@ -75,6 +82,7 @@ pybind_extension( "interpreter_wrapper_pybind11.cc", ], hdrs = ["interpreter_wrapper.h"], + compatible_with = get_compatible_with_portable(), link_in_framework = True, module_name = "_pywrap_tensorflow_interpreter_wrapper", deps = [ diff --git a/tensorflow/python/BUILD b/tensorflow/python/BUILD index f1dbeac86b3..9e2e481df27 100644 --- a/tensorflow/python/BUILD +++ b/tensorflow/python/BUILD @@ -8,6 +8,9 @@ load("//tensorflow:tensorflow.bzl", "cc_header_only_library", "if_mlir", "if_not # buildifier: disable=same-origin-load load("//tensorflow:tensorflow.bzl", "get_compatible_with_cloud") +# buildifier: disable=same-origin-load +load("//tensorflow:tensorflow.bzl", "get_compatible_with_portable") + # buildifier: disable=same-origin-load load("//tensorflow:tensorflow.bzl", "tf_monitoring_python_deps") @@ -602,6 +605,7 @@ cc_library( cc_library( name = "pybind11_lib", hdrs = ["lib/core/pybind11_lib.h"], + compatible_with = get_compatible_with_portable(), features = ["-parse_headers"], visibility = tf_external_workspace_visible(visibility), deps = [ @@ -806,6 +810,7 @@ tf_python_pybind_extension( name = "_pywrap_tensor_float_32_execution", srcs = ["util/tensor_float_32.cc"], hdrs = ["//tensorflow/core/platform:tensor_float_32_hdr"], + compatible_with = get_compatible_with_portable(), module_name = "_pywrap_tensor_float_32_execution", deps = [ "@pybind11", @@ -5469,6 +5474,7 @@ py_library( py_strict_library( name = "tf_export", srcs = ["util/tf_export.py"], + compatible_with = get_compatible_with_portable(), srcs_version = "PY2AND3", visibility = ["//tensorflow:__subpackages__"], deps = [ @@ -5497,6 +5503,7 @@ py_strict_library( "util/tf_decorator.py", "util/tf_inspect.py", ], + compatible_with = get_compatible_with_portable(), srcs_version = "PY2AND3", visibility = [ "//tensorflow:__subpackages__", @@ -5514,6 +5521,7 @@ py_strict_library( py_strict_library( name = "tf_stack", srcs = ["util/tf_stack.py"], + compatible_with = get_compatible_with_portable(), srcs_version = "PY2AND3", # TODO(mdan): Remove public visibility. visibility = ["//visibility:public"], @@ -5526,6 +5534,7 @@ py_strict_library( pybind_extension( name = "_tf_stack", srcs = ["util/tf_stack.cc"], + compatible_with = get_compatible_with_portable(), # TODO(b/138203821): change to "util._tf_stack" once the bug is fixed. module_name = "_tf_stack", deps = [ @@ -5610,6 +5619,7 @@ tf_py_test( py_library( name = "global_test_configuration", + compatible_with = get_compatible_with_portable(), deps = if_mlir(["//tensorflow/compiler/mlir/tensorflow:mlir_roundtrip_pass_registration"]) + tf_enable_mlir_bridge(), ) @@ -5628,6 +5638,7 @@ py_library( "util/**/*_test.py", ], ), + compatible_with = get_compatible_with_portable(), srcs_version = "PY2AND3", visibility = visibility + [ "//tensorflow:__pkg__", diff --git a/tensorflow/tensorflow.bzl b/tensorflow/tensorflow.bzl index 990130e1702..332fd8ab3c7 100644 --- a/tensorflow/tensorflow.bzl +++ b/tensorflow/tensorflow.bzl @@ -2767,7 +2767,8 @@ def tf_python_pybind_extension( deps = [], defines = [], visibility = None, - testonly = None): + testonly = None, + compatible_with = None): """A wrapper macro for pybind_extension that is used in tensorflow/python/BUILD. Please do not use it anywhere else as it may behave unexpectedly. b/146445820 @@ -2787,6 +2788,7 @@ def tf_python_pybind_extension( visibility = visibility, link_in_framework = True, testonly = testonly, + compatible_with = compatible_with, ) def tf_pybind_cc_library_wrapper(name, deps, visibility = None, **kwargs): diff --git a/tensorflow/tools/compatibility/BUILD b/tensorflow/tools/compatibility/BUILD index 18a8d72a0b0..a15014f447b 100644 --- a/tensorflow/tools/compatibility/BUILD +++ b/tensorflow/tools/compatibility/BUILD @@ -4,6 +4,7 @@ load( "tf_cc_test", # @unused "tf_copts", # @unused ) +load("//tensorflow:tensorflow.bzl", "get_compatible_with_portable") package( default_visibility = ["//tensorflow:internal"], @@ -80,6 +81,7 @@ py_test( py_library( name = "renames_v2", srcs = ["renames_v2.py"], + compatible_with = get_compatible_with_portable(), srcs_version = "PY2AND3", ) @@ -92,6 +94,7 @@ py_library( py_library( name = "all_renames_v2", srcs = ["all_renames_v2.py"], + compatible_with = get_compatible_with_portable(), srcs_version = "PY2AND3", visibility = [ "//tensorflow:__pkg__",