Fix issues with the tests and add mistakenly taken out macro back

tensorflow/contrib/BUILD

@@ -106,7 +106,7 @@ py_library(
         "//tensorflow/contrib/util:util_py",
         "//tensorflow/python:util",
     ] + if_mpi(["//tensorflow/contrib/mpi_collectives:mpi_collectives_py"]) + if_tensorrt([
-      "//tensorflow/contrib/tensorrt:init_py",
+        "//tensorflow/contrib/tensorrt:init_py",
     ]),
 
 )

tensorflow/contrib/cmake/python_modules.txt

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

tensorflow/contrib/tensorrt/BUILD

@@ -78,10 +78,10 @@ cc_library(
     copts = tf_copts(),
     deps = [
         ":trt_logging",
-        "//tensorflow/core:stream_executor_headers_lib",
         "//tensorflow/core:framework_headers_lib",
         "//tensorflow/core:gpu_headers_lib",
         "//tensorflow/core:lib_proto_parsing",
+        "//tensorflow/core:stream_executor_headers_lib",
         "//third_party/eigen3",
         "@local_config_tensorrt//:nv_infer",
         "@nsync//:nsync_headers",
@@ -186,9 +186,9 @@ tf_cuda_library(
     deps = [
         ":segment",
         ":trt_logging",
-        "//tensorflow/core:graph",
         "//tensorflow/core:framework_headers_lib",
         "//tensorflow/core:framework_lite",
+        "//tensorflow/core:graph",
         "//tensorflow/core:protos_all_cc",
         "//tensorflow/core/grappler:devices",
         "//tensorflow/core/grappler/clusters:virtual_cluster",

tensorflow/tools/pip_package/BUILD

@@ -182,8 +182,9 @@ sh_binary(
             "//tensorflow/python:test_ops",
             "//tensorflow/tools/dist_test/server:grpc_tensorflow_server",
         ],
-    }) + if_mkl(["//third_party/mkl:intel_binary_blob"])
-    + if_tensorrt(["//tensorflow/contrib/tensorrt:init_py"]),
+    }) + if_mkl(["//third_party/mkl:intel_binary_blob"]) + if_tensorrt([
+      "//tensorflow/contrib/tensorrt:init_py",
+    ]),
 )
 
 # A genrule for generating a marker file for the pip package on Windows

third_party/tensorrt/BUILD.tpl

@@ -1,6 +1,7 @@
 # NVIDIA TensorRT
 # A high-performance deep learning inference optimizer and runtime.
 
+load("@local_config_cuda//cuda:build_defs.bzl", "cuda_default_copts")
 licenses(["notice"])
 
 exports_files(["LICENSE"])