From f8e341a3cd8e47d8487b34f426a24eb8067e4e45 Mon Sep 17 00:00:00 2001 From: xla authors Date: Thu, 26 Sep 2024 15:49:23 -0700 Subject: [PATCH] Renamed `nvcc_clang` to `cuda_nvcc` according to the changes in JAX PiperOrigin-RevId: 679322660 --- .bazelrc | 11 ++++++----- build_tools/configure/configure.py | 2 +- build_tools/configure/testdata/nvcc_clang.bazelrc | 2 +- third_party/tsl/.bazelrc | 11 ++++++----- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.bazelrc b/.bazelrc index bee4dc3e784a99..314ebf7ff49e15 100644 --- a/.bazelrc +++ b/.bazelrc @@ -256,10 +256,11 @@ build:cuda_clang_official --action_env=CLANG_CUDA_COMPILER_PATH="/usr/lib/llvm-1 build:cuda_clang_official --crosstool_top="@local_config_cuda//crosstool:toolchain" # Build with nvcc for CUDA and clang for host -build:nvcc_clang --config=cuda -build:nvcc_clang --action_env=TF_NVCC_CLANG="1" -build:nvcc_clang --@local_config_cuda//:cuda_compiler=nvcc - +build:cuda_nvcc --config=cuda +build:cuda_nvcc --action_env=TF_NVCC_CLANG="1" +build:cuda_nvcc --@local_config_cuda//:cuda_compiler=nvcc +# Old config for backward compatibility +build:nvcc_clang --config=cuda_nvcc # Debug config build:dbg -c dbg @@ -550,7 +551,7 @@ build:rbe_linux_cuda --config=rbe_linux_cpu build:rbe_linux_cuda --repo_env=REMOTE_GPU_TESTING=1 build:rbe_linux_cuda_nvcc --config=rbe_linux_cuda -build:rbe_linux_cuda_nvcc --config=nvcc_clang +build:rbe_linux_cuda_nvcc --config=cuda_nvcc build:rbe_linux_cuda_nvcc --repo_env TF_NCCL_USE_STUB=1 build:rbe_win_base --config=rbe_base diff --git a/build_tools/configure/configure.py b/build_tools/configure/configure.py index 508307bb899953..007f6f586000b8 100755 --- a/build_tools/configure/configure.py +++ b/build_tools/configure/configure.py @@ -310,7 +310,7 @@ def to_bazelrc_lines( f"build --action_env CLANG_CUDA_COMPILER_PATH={dpav.clang_path}" ) elif compiler_pair == (CudaCompiler.NVCC, HostCompiler.CLANG): - rc.append("build --config nvcc_clang") + rc.append("build --config cuda_nvcc") # This is demanded by cuda_configure.bzl rc.append( f"build --action_env CLANG_CUDA_COMPILER_PATH={dpav.clang_path}" diff --git a/build_tools/configure/testdata/nvcc_clang.bazelrc b/build_tools/configure/testdata/nvcc_clang.bazelrc index b56236998fe166..59d8d15c220843 100644 --- a/build_tools/configure/testdata/nvcc_clang.bazelrc +++ b/build_tools/configure/testdata/nvcc_clang.bazelrc @@ -1,7 +1,7 @@ build --action_env CLANG_COMPILER_PATH=/usr/lib/llvm-18/bin/clang build --repo_env CC=/usr/lib/llvm-18/bin/clang build --repo_env BAZEL_COMPILER=/usr/lib/llvm-18/bin/clang -build --config nvcc_clang +build --config cuda_nvcc build --action_env CLANG_CUDA_COMPILER_PATH=/usr/lib/llvm-18/bin/clang build:cuda --repo_env HERMETIC_CUDA_VERSION="12.1.1" build:cuda --repo_env HERMETIC_CUDA_COMPUTE_CAPABILITIES=7.5 diff --git a/third_party/tsl/.bazelrc b/third_party/tsl/.bazelrc index bee4dc3e784a99..314ebf7ff49e15 100644 --- a/third_party/tsl/.bazelrc +++ b/third_party/tsl/.bazelrc @@ -256,10 +256,11 @@ build:cuda_clang_official --action_env=CLANG_CUDA_COMPILER_PATH="/usr/lib/llvm-1 build:cuda_clang_official --crosstool_top="@local_config_cuda//crosstool:toolchain" # Build with nvcc for CUDA and clang for host -build:nvcc_clang --config=cuda -build:nvcc_clang --action_env=TF_NVCC_CLANG="1" -build:nvcc_clang --@local_config_cuda//:cuda_compiler=nvcc - +build:cuda_nvcc --config=cuda +build:cuda_nvcc --action_env=TF_NVCC_CLANG="1" +build:cuda_nvcc --@local_config_cuda//:cuda_compiler=nvcc +# Old config for backward compatibility +build:nvcc_clang --config=cuda_nvcc # Debug config build:dbg -c dbg @@ -550,7 +551,7 @@ build:rbe_linux_cuda --config=rbe_linux_cpu build:rbe_linux_cuda --repo_env=REMOTE_GPU_TESTING=1 build:rbe_linux_cuda_nvcc --config=rbe_linux_cuda -build:rbe_linux_cuda_nvcc --config=nvcc_clang +build:rbe_linux_cuda_nvcc --config=cuda_nvcc build:rbe_linux_cuda_nvcc --repo_env TF_NCCL_USE_STUB=1 build:rbe_win_base --config=rbe_base