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

Fixes for PR comments and build failures

Browse Source
This commit is contained in:
Sami Kama 2018-02-02 14:36:07 -08:00
parent af4782345c
commit 45fcb8f2d3
6 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tensorflow/contrib/BUILD
View File

@ -105,8 +105,9 @@ py_library(
"//tensorflow/contrib/training:training_py", "//tensorflow/contrib/training:training_py",
"//tensorflow/contrib/util:util_py", "//tensorflow/contrib/util:util_py",
"//tensorflow/python:util", "//tensorflow/python:util",
] + if_mpi(["//tensorflow/contrib/mpi_collectives:mpi_collectives_py"]) ] + if_mpi(["//tensorflow/contrib/mpi_collectives:mpi_collectives_py"]) + if_tensorrt([
+ if_tensorrt(["//tensorflow/contrib/tensorrt:init_py"]), "//tensorflow/contrib/tensorrt:init_py",
]),
) )

2
tensorflow/contrib/cmake/python_modules.txt
View File

@ -405,6 +405,8 @@ tensorflow/contrib/summary
tensorflow/contrib/tensorboard tensorflow/contrib/tensorboard
tensorflow/contrib/tensorboard/plugins tensorflow/contrib/tensorboard/plugins
tensorflow/contrib/tensorboard/plugins/projector tensorflow/contrib/tensorboard/plugins/projector
# TODO(sami): Add cmake implementations
# tensorflow/contrib/tensorrt/python
tensorflow/contrib/tensor_forest tensorflow/contrib/tensor_forest
tensorflow/contrib/tensor_forest/client tensorflow/contrib/tensor_forest/client
tensorflow/contrib/tensor_forest/hybrid tensorflow/contrib/tensor_forest/hybrid

13
tensorflow/tensorflow.bzl
View File

@ -1303,14 +1303,13 @@ def tf_extension_copts():
# This function attempts to append init_module_name to list of # This function attempts to append init_module_name to list of
# exported functions in version script # exported functions in version script
def _append_init_to_versionscript_impl(ctx): def _append_init_to_versionscript_impl(ctx):
modName=ctx.attr.module_name mod_name = ctx.attr.module_name
isVS=ctx.attr.is_version_script if ctx.attr.is_version_script:
if isVS:
ctx.actions.expand_template( ctx.actions.expand_template(
template=ctx.file.template_file, template=ctx.file.template_file,
output=ctx.outputs.versionscript, output=ctx.outputs.versionscript,
substitutions={ substitutions={
"global:":"global:\n init_%s;\n PyInit_*;"%(modName), "global:":"global:\n init_%s;\n PyInit_*;"%(mod_name),
}, },
is_executable=False, is_executable=False,
) )
@ -1319,7 +1318,7 @@ def _append_init_to_versionscript_impl(ctx):
template=ctx.file.template_file, template=ctx.file.template_file,
output=ctx.outputs.versionscript, output=ctx.outputs.versionscript,
substitutions={ substitutions={
"*tensorflow*":"*tensorflow*\ninit_%s\nPyInit_*\n"%(modName), "*tensorflow*":"*tensorflow*\ninit_%s\nPyInit_*\n"%(mod_name),
}, },
is_executable=False, is_executable=False,
) )
@ -1330,7 +1329,9 @@ _append_init_to_versionscript= rule(
attrs={ attrs={
"module_name":attr.string(mandatory=True), "module_name":attr.string(mandatory=True),
"template_file":attr.label(allow_files=True,single_file=True,mandatory=True), "template_file":attr.label(allow_files=True,single_file=True,mandatory=True),
"is_version_script":attr.bool(default=True,doc='whether target is a ld version script or exported symbol list',mandatory=False), "is_version_script":attr.bool(default=True,
doc='whether target is a ld version script or exported symbol list',
mandatory=False),
}, },
outputs={"versionscript":"%{name}.lds"}, outputs={"versionscript":"%{name}.lds"},
) )

2
third_party/tensorrt/BUILD.tpl vendored
View File

@ -5,8 +5,6 @@ licenses(["notice"])
exports_files(["LICENSE"]) exports_files(["LICENSE"])
load("@local_config_cuda//cuda:build_defs.bzl", "cuda_default_copts", "if_cuda")
package(default_visibility = ["//visibility:public"]) package(default_visibility = ["//visibility:public"])
cc_library( cc_library(