Improve hermeticity for clang (#159)

bazel-contrib · Sep 6, 2023 · a7bce91 · a7bce91
1 parent e772553
commit a7bce91
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/build-tests.yaml b/.github/workflows/build-tests.yaml
@@ -55,7 +55,6 @@ jobs:
         run: |
           echo "build --config=clang" > $HOME/.bazelrc
           echo "build:clang --@rules_cuda//cuda:archs=sm_80" >> $HOME/.bazelrc
-          echo "build:clang --spawn_strategy=local" >> $HOME/.bazelrc
 
       - run: bazelisk build @rules_cuda_examples//basic:all
       - run: bazelisk build @rules_cuda_examples//rdc:all

diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml
@@ -53,7 +53,7 @@ jobs:
           echo "build --config=clang" > $HOME/.bazelrc
           echo "build:clang --cxxopt=--cuda-gpu-arch=sm_80 >> $HOME/.bazelrc"
 
-      - run: cd examples && bazelisk build --verbose_failures --spawn_strategy=local --cuda_archs='compute_80,sm_80' @rules_cuda_examples//nccl:perf_binaries
+      - run: cd examples && bazelisk build --verbose_failures --cuda_archs='compute_80,sm_80' @rules_cuda_examples//nccl:perf_binaries
 
       - run: bazelisk shutdown
 
@@ -126,7 +126,7 @@ jobs:
           echo "build --config=clang" > $HOME/.bazelrc
           echo "build:clang --cxxopt=--cuda-gpu-arch=sm_80 >> $HOME/.bazelrc"
 
-      - run: cd examples && bazelisk build --verbose_failures --spawn_strategy=local --cuda_archs='compute_80,sm_80' @rules_cuda_examples//nccl:perf_binaries
+      - run: cd examples && bazelisk build --verbose_failures --cuda_archs='compute_80,sm_80' @rules_cuda_examples//nccl:perf_binaries
 
       - run: bazelisk shutdown
 

diff --git a/cuda/private/actions/dlink.bzl b/cuda/private/actions/dlink.bzl
@@ -188,16 +188,15 @@ def _wrapper_device_link(
     compile_common = cuda_helper.create_common_info(
         # this is useless
         cuda_archs_info = common.cuda_archs_info,
-        headers = [fatbin_h],
+        headers = [fatbin_h, register_h],
         defines = [
             # Silence warning about including internal header.
             "__CUDA_INCLUDE_COMPILER_INTERNAL_HEADERS__",
             # Macros that need to be defined starting with CUDA 10.
             "__NV_EXTRA_INITIALIZATION=",
             "__NV_EXTRA_FINALIZATION=",
         ],
-        # TODO: avoid the hardcode path
-        includes = common.includes + ["external/local_cuda/cuda/include"],
+        includes = common.includes,
         system_includes = common.system_includes,
         quote_includes = common.quote_includes,
         # suppress cuda mode as c++ mode

diff --git a/cuda/runtime/BUILD.local_cuda b/cuda/runtime/BUILD.local_cuda
@@ -7,9 +7,10 @@ package(
 filegroup(
     name = "compiler_deps",
     srcs = [
-        "cuda/version.txt",
         ":_cuda_header_files",
     ] + glob([
+        "cuda/version.txt",
+        "cuda/version.json",
         "cuda/bin/**",
         "cuda/lib64/**",
         "cuda/nvvm/**",

diff --git a/cuda/templates/BUILD.local_toolchain_clang b/cuda/templates/BUILD.local_toolchain_clang
@@ -26,6 +26,7 @@ cuda_toolchain_config(
 cuda_toolchain(
     name = "clang-local",
     compiler_executable = "%{clang_path}",
+    compiler_files = "@local_cuda//:compiler_deps",
     toolchain_config = ":clang-local-config",
 )