Merge pull request #45264 from Flamefire/rename_exec_tools_to_tools

[CherryPick:r2.4] Revert renaming of tools to exec_tools
This commit is contained in:
Goldie Gadde 2020-12-02 10:56:54 -08:00 committed by GitHub
commit 0194673634
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -778,7 +778,7 @@ def tf_gen_op_wrapper_cc(
out_ops_file + "_internal.cc", out_ops_file + "_internal.cc",
], ],
srcs = srcs, srcs = srcs,
exec_tools = [":" + tool] + tf_binary_additional_srcs(), tools = [":" + tool] + tf_binary_additional_srcs(),
cmd = ("$(location :" + tool + ") $(location :" + out_ops_file + ".h) " + cmd = ("$(location :" + tool + ") $(location :" + out_ops_file + ".h) " +
"$(location :" + out_ops_file + ".cc) " + "$(location :" + out_ops_file + ".cc) " +
str(include_internal_ops) + " " + api_def_args_str), str(include_internal_ops) + " " + api_def_args_str),
@ -986,7 +986,7 @@ def tf_gen_op_wrapper_py(
name = name + "_pygenrule", name = name + "_pygenrule",
outs = [out], outs = [out],
srcs = api_def_srcs + [hidden_file], srcs = api_def_srcs + [hidden_file],
exec_tools = [tool_name] + tf_binary_additional_srcs(), tools = [tool_name] + tf_binary_additional_srcs(),
cmd = ("$(location " + tool_name + ") " + api_def_args_str + cmd = ("$(location " + tool_name + ") " + api_def_args_str +
" @$(location " + hidden_file + ") > $@"), " @$(location " + hidden_file + ") > $@"),
compatible_with = compatible_with, compatible_with = compatible_with,
@ -996,7 +996,7 @@ def tf_gen_op_wrapper_py(
name = name + "_pygenrule", name = name + "_pygenrule",
outs = [out], outs = [out],
srcs = api_def_srcs, srcs = api_def_srcs,
exec_tools = [tool_name] + tf_binary_additional_srcs(), tools = [tool_name] + tf_binary_additional_srcs(),
cmd = ("$(location " + tool_name + ") " + api_def_args_str + " " + cmd = ("$(location " + tool_name + ") " + api_def_args_str + " " +
op_list_arg + " " + op_list_arg + " " +
("1" if op_list_is_whitelist else "0") + " > $@"), ("1" if op_list_is_whitelist else "0") + " > $@"),
@ -2379,7 +2379,7 @@ def tf_generate_proto_text_sources(name, srcs_relative_dir, srcs, protodeps = []
cmd = cmd =
"$(location //tensorflow/tools/proto_text:gen_proto_text_functions) " + "$(location //tensorflow/tools/proto_text:gen_proto_text_functions) " +
"$(@D) " + srcs_relative_dir + " $(SRCS)", "$(@D) " + srcs_relative_dir + " $(SRCS)",
exec_tools = [ tools = [
clean_dep("//tensorflow/tools/proto_text:gen_proto_text_functions"), clean_dep("//tensorflow/tools/proto_text:gen_proto_text_functions"),
], ],
compatible_with = compatible_with, compatible_with = compatible_with,