Rename exec_tools to tools

Follow up to 
Based on
https://github.com/bazelbuild/bazel/issues/12059#issuecomment-725641997
exec_tools might no longer be needed and hence can be replaced by tools.
This fixes various build failures caused by missing environment
variables in environments where they are required, e.g. using custom
compilers.
This commit is contained in:
Alexander Grund 2020-11-16 11:18:05 +01:00 committed by Geeta Chavan
parent ab2c927a09
commit 956025aa53
9 changed files with 15 additions and 16 deletions
tensorflow
compiler
lite
build_def.bzl
delegates/flex
experimental/acceleration/compatibility
python/tools
BUILD
api/generator
tools/compatibility

View File

@ -115,7 +115,7 @@ genrule(
# have control of the full GPU. # have control of the full GPU.
cmd = "CUDA_VISIBLE_DEVICES='' " + cmd = "CUDA_VISIBLE_DEVICES='' " +
"$(location :make_test_graphs) --out_dir $(@D)", "$(location :make_test_graphs) --out_dir $(@D)",
exec_tools = [":make_test_graphs"], tools = [":make_test_graphs"],
tags = ["manual"], tags = ["manual"],
) )

View File

@ -127,7 +127,7 @@ def tf_library(
"$(location " + tfcompile_tool + ")" + "$(location " + tfcompile_tool + ")" +
" --config=$(location " + config + ")" + " --config=$(location " + config + ")" +
" --dump_fetch_nodes > $@"), " --dump_fetch_nodes > $@"),
exec_tools = [tfcompile_tool], tools = [tfcompile_tool],
# Run tfcompile on the build host, rather than forge, since it's # Run tfcompile on the build host, rather than forge, since it's
# typically way faster on the local machine. # typically way faster on the local machine.
local = 1, local = 1,
@ -162,7 +162,7 @@ def tf_library(
"//tensorflow/python/tools:freeze_graph)" + "//tensorflow/python/tools:freeze_graph)" +
freeze_args freeze_args
), ),
exec_tools = ["//tensorflow/python/tools:freeze_graph"], tools = ["//tensorflow/python/tools:freeze_graph"],
tags = tags, tags = tags,
) )
tfcompile_graph = freeze_file tfcompile_graph = freeze_file
@ -242,7 +242,7 @@ def tf_library(
" --out_function_object=$(@D)/" + function_object_file + " --out_function_object=$(@D)/" + function_object_file +
" " + flags + " " + profiling_flag + " " + mlir_flag + " " + traceme_flag " " + flags + " " + profiling_flag + " " + mlir_flag + " " + traceme_flag
), ),
exec_tools = [tfcompile_tool], tools = [tfcompile_tool],
visibility = visibility, visibility = visibility,
testonly = testonly, testonly = testonly,
# Run tfcompile on the build host since it's typically faster on the # Run tfcompile on the build host since it's typically faster on the
@ -281,7 +281,7 @@ def tf_library(
" --out_session_module=$(@D)/" + session_module_pb + " --out_session_module=$(@D)/" + session_module_pb +
" " + flags " " + flags
), ),
exec_tools = [tfcompile_tool], tools = [tfcompile_tool],
visibility = visibility, visibility = visibility,
testonly = testonly, testonly = testonly,
local = 1, local = 1,

View File

@ -40,7 +40,7 @@ def gen_op_libraries(
srcs = [], srcs = [],
outs = [name + ".inc.cc"], outs = [name + ".inc.cc"],
cmd = "$(location %s) --output=$@ --gen_register_op=true" % gen_op_lib_exec, cmd = "$(location %s) --output=$@ --gen_register_op=true" % gen_op_lib_exec,
exec_tools = [":" + gen_op_lib_exec], tools = [":" + gen_op_lib_exec],
tags = tags, tags = tags,
) )
@ -100,7 +100,7 @@ def gen_op_libraries(
srcs = [], srcs = [],
outs = [name + ".mlir"], outs = [name + ".mlir"],
cmd = "$(location %s) --output=$@ --gen_register_op=false" % gen_tfr_lib_exec, cmd = "$(location %s) --output=$@ --gen_register_op=false" % gen_tfr_lib_exec,
exec_tools = [":" + gen_tfr_lib_exec], tools = [":" + gen_tfr_lib_exec],
tags = tags, tags = tags,
) )

View File

@ -674,8 +674,7 @@ def gen_zipped_test_file(name, file, toco, flags):
cmd = (("$(locations :generate_examples) --toco $(locations {0}) " + cmd = (("$(locations :generate_examples) --toco $(locations {0}) " +
" --zip_to_output {1} {2} $(@D)").format(toco, file, flags)), " --zip_to_output {1} {2} $(@D)").format(toco, file, flags)),
outs = [file], outs = [file],
# `exec_tools` is required for PY3 compatibility in place of `tools`. tools = [
exec_tools = [
":generate_examples", ":generate_examples",
toco, toco,
], ],

View File

@ -73,7 +73,7 @@ def generate_flex_kernel_header(
name = "%s_kernel_registration" % name, name = "%s_kernel_registration" % name,
srcs = [list_ops_output], srcs = [list_ops_output],
outs = [header], outs = [header],
exec_tools = [tool], tools = [tool],
message = "Processing %s..." % list_ops_output, message = "Processing %s..." % list_ops_output,
cmd = ("$(location " + tool + ")" + cmd = ("$(location " + tool + ")" +
" --default_ops=\"\"" + " --default_ops=\"\"" +

View File

@ -99,7 +99,7 @@ genrule(
--output_source_file $(location :devicedb-sample.cc) \ --output_source_file $(location :devicedb-sample.cc) \
--array_variable_name g_tflite_acceleration_devicedb_sample_binary --array_variable_name g_tflite_acceleration_devicedb_sample_binary
""", """,
exec_tools = [":convert_binary_to_cc_source"], tools = [":convert_binary_to_cc_source"],
) )
cc_library( cc_library(
@ -142,7 +142,7 @@ genrule(
--output_source_file $(location :gpu_compatibility_binary.cc) \ --output_source_file $(location :gpu_compatibility_binary.cc) \
--array_variable_name g_tflite_acceleration_gpu_compatibility_binary --array_variable_name g_tflite_acceleration_gpu_compatibility_binary
""", """,
exec_tools = [":convert_binary_to_cc_source"], tools = [":convert_binary_to_cc_source"],
) )
cc_library( cc_library(

View File

@ -399,7 +399,7 @@ genrule(
cmd = ( cmd = (
"$(location :make_aot_compile_models) --out_dir $(@D)" "$(location :make_aot_compile_models) --out_dir $(@D)"
), ),
exec_tools = [":make_aot_compile_models"], tools = [":make_aot_compile_models"],
tags = ["no_rocm"], tags = ["no_rocm"],
) )

View File

@ -139,7 +139,7 @@ def gen_api_init_files(
" --use_relative_imports=True $(OUTS)" " --use_relative_imports=True $(OUTS)"
), ),
srcs = srcs, srcs = srcs,
exec_tools = [":" + api_gen_binary_target], tools = [":" + api_gen_binary_target],
visibility = [ visibility = [
"//tensorflow:__pkg__", "//tensorflow:__pkg__",
"//tensorflow/tools/api/tests:__pkg__", "//tensorflow/tools/api/tests:__pkg__",

View File

@ -219,7 +219,7 @@ genrule(
" --infile $(location testdata/test_file_v0_11.py)" + " --infile $(location testdata/test_file_v0_11.py)" +
" --outfile $(location test_file_v1_0.py)" + " --outfile $(location test_file_v1_0.py)" +
" --reportfile $(location report.txt)"), " --reportfile $(location report.txt)"),
exec_tools = [":tf_upgrade"], tools = [":tf_upgrade"],
) )
py_test( py_test(
@ -246,7 +246,7 @@ genrule(
" --outfile $(location test_file_v2_0.py)" + " --outfile $(location test_file_v2_0.py)" +
" --reportfile $(location report_v2.txt) && " + " --reportfile $(location report_v2.txt) && " +
"sed -i'.original' 's/_TEST_VERSION = 1/_TEST_VERSION = 2/g' $(location test_file_v2_0.py)"), "sed -i'.original' 's/_TEST_VERSION = 1/_TEST_VERSION = 2/g' $(location test_file_v2_0.py)"),
exec_tools = [":tf_upgrade_v2"], tools = [":tf_upgrade_v2"],
) )
py_test( py_test(