Fixes for PR comments and build failures

tensorflow/contrib/BUILD

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

tensorflow/contrib/cmake/python_modules.txt

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

tensorflow/tensorflow.bzl

@@ -1303,14 +1303,13 @@ def tf_extension_copts():
 # This function attempts to append init_module_name to list of
 # exported functions in version script
 def _append_init_to_versionscript_impl(ctx):
-    modName=ctx.attr.module_name
-    isVS=ctx.attr.is_version_script
-    if isVS:
+  mod_name = ctx.attr.module_name
+  if ctx.attr.is_version_script:
     ctx.actions.expand_template(
       template=ctx.file.template_file,
       output=ctx.outputs.versionscript,
       substitutions={
-                "global:":"global:\n     init_%s;\n     PyInit_*;"%(modName),
+        "global:":"global:\n     init_%s;\n     PyInit_*;"%(mod_name),
       },
       is_executable=False,
     )
@@ -1319,7 +1318,7 @@ def _append_init_to_versionscript_impl(ctx):
       template=ctx.file.template_file,
       output=ctx.outputs.versionscript,
       substitutions={
-                "*tensorflow*":"*tensorflow*\ninit_%s\nPyInit_*\n"%(modName),
+        "*tensorflow*":"*tensorflow*\ninit_%s\nPyInit_*\n"%(mod_name),
       },
       is_executable=False,
     )
@@ -1330,7 +1329,9 @@ _append_init_to_versionscript= rule(
   attrs={
     "module_name":attr.string(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"},
 )

third_party/tensorrt/BUILD.tpl

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