Change creation of symlinks (via skylark method) in cuda_configure.bzl.tpl for creation of genrules (via _tpl) that do the equivalent symlinks, but during build (not during Skylark execution).

Change: 154535355

1 files changed, 19 insertions, 16 deletions

diff --git a/third_party/gpus/cuda/BUILD.tpl b/third_party/gpus/cuda/BUILD.tpl
index 4b996db7a6..279c441255 100644
--- a/third_party/gpus/cuda/BUILD.tpl
+++ b/third_party/gpus/cuda/BUILD.tpl
@@ -41,10 +41,10 @@ config_setting(
 
 cc_library(
     name = "cuda_headers",
-    hdrs = glob([
-        "**/*.h",
-        "**/*.hpp",
-    ]),
+    hdrs = [
+        "cuda_config.h",
+        %{cuda_headers}
+    ],
     includes = [
         ".",
         "include",
@@ -55,7 +55,7 @@ cc_library(
 cc_library(
     name = "cudart_static",
     srcs = ["lib/%{cudart_static_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkopts = select({
         ":freebsd": [],
         "//conditions:default": ["-ldl"],
@@ -69,7 +69,7 @@ cc_library(
 cc_library(
     name = "cuda_driver",
     srcs = ["lib/%{cuda_driver_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     visibility = ["//visibility:public"],
 )
 
@@ -77,7 +77,7 @@ cc_library(
     name = "cudart",
     srcs = ["lib/%{cudart_lib}"],
     data = ["lib/%{cudart_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkstatic = 1,
     visibility = ["//visibility:public"],
 )
@@ -86,7 +86,7 @@ cc_library(
     name = "cublas",
     srcs = ["lib/%{cublas_lib}"],
     data = ["lib/%{cublas_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkstatic = 1,
     visibility = ["//visibility:public"],
 )
@@ -95,7 +95,7 @@ cc_library(
     name = "cusolver",
     srcs = ["lib/%{cusolver_lib}"],
     data = ["lib/%{cusolver_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkstatic = 1,
     linkopts = ["-lgomp"],
     visibility = ["//visibility:public"],
@@ -105,7 +105,7 @@ cc_library(
     name = "cudnn",
     srcs = ["lib/%{cudnn_lib}"],
     data = ["lib/%{cudnn_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkstatic = 1,
     visibility = ["//visibility:public"],
 )
@@ -114,7 +114,7 @@ cc_library(
     name = "cufft",
     srcs = ["lib/%{cufft_lib}"],
     data = ["lib/%{cufft_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkstatic = 1,
     visibility = ["//visibility:public"],
 )
@@ -123,7 +123,7 @@ cc_library(
     name = "curand",
     srcs = ["lib/%{curand_lib}"],
     data = ["lib/%{curand_lib}"],
-    includes = ["include/"],
+    includes = ["include"],
     linkstatic = 1,
     visibility = ["//visibility:public"],
 )
@@ -143,9 +143,10 @@ cc_library(
 
 cc_library(
     name = "cupti_headers",
-    hdrs = glob([
-        "**/*.h",
-    ]),
+    hdrs = [
+        "cuda_config.h",
+        ":cuda-extras",
+    ],
     includes = [
         ".",
         "extras/CUPTI/include/",
@@ -161,6 +162,8 @@ cc_library(
 
 cc_library(
     name = "libdevice_root",
-    data = glob(["nvvm/libdevice/*.bc"]),
+    data = [":cuda-nvvm"],
     visibility = ["//visibility:public"],
 )
+
+%{cuda_include_genrules}