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

Revert renaming of tools to exec_tools

Browse Source 
Reverts part of f827c02390 as that causes
trouble due to action_env variables not passed through to any dependent
build which breaks builds using TF_SYSTEM_LIBS
This commit is contained in:
Alexander Grund 2020-09-11 18:38:42 +02:00
parent 457066c8c6
commit 80eb881222
No known key found for this signature in database
GPG Key ID: E92C451FC21EF13F
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tensorflow/tensorflow.bzl
View File

@ -779,7 +779,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),
@ -981,7 +981,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 + ") > $@"),
) )
@ -990,7 +990,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") + " > $@"),
@ -2491,7 +2491,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"),
], ],
) )