From eb5d156a6f8f9c60670a2ede8628b9d5a96d840a Mon Sep 17 00:00:00 2001 From: hypdeb Date: Wed, 11 Sep 2024 13:25:45 +0200 Subject: [PATCH] remove changes incompatible with older versions of Bazel --- cuda/private/rules/cuda_library.bzl | 6 +++--- cuda/private/rules/cuda_objects.bzl | 6 +++--- cuda/private/toolchain_configs/clang.bzl | 5 +++-- cuda/private/toolchain_configs/nvcc.bzl | 5 +++-- cuda/private/toolchain_configs/nvcc_msvc.bzl | 5 +++-- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/cuda/private/rules/cuda_library.bzl b/cuda/private/rules/cuda_library.bzl index a1af1f9..bc5945a 100644 --- a/cuda/private/rules/cuda_library.bzl +++ b/cuda/private/rules/cuda_library.bzl @@ -1,10 +1,10 @@ -load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain") +load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") load("//cuda/private:actions/compile.bzl", "compile") load("//cuda/private:actions/dlink.bzl", "device_link") load("//cuda/private:cuda_helper.bzl", "cuda_helper") load("//cuda/private:providers.bzl", "CudaInfo") load("//cuda/private:rules/common.bzl", "ALLOW_CUDA_HDRS", "ALLOW_CUDA_SRCS") -load("//cuda/private:toolchain.bzl", "find_cuda_toolchain", "use_cuda_toolchain") +load("//cuda/private:toolchain.bzl", "find_cuda_toolchain", "use_cpp_toolchain", "use_cuda_toolchain") def _cuda_library_impl(ctx): """cuda_library is a rule that perform device link. @@ -175,6 +175,6 @@ cuda_library = rule( "_default_cuda_archs": attr.label(default = "//cuda:archs"), }, fragments = ["cpp"], - toolchains = use_cpp_toolchain(mandatory = True) + use_cuda_toolchain(), + toolchains = use_cpp_toolchain() + use_cuda_toolchain(), provides = [DefaultInfo, OutputGroupInfo, CcInfo, CudaInfo], ) diff --git a/cuda/private/rules/cuda_objects.bzl b/cuda/private/rules/cuda_objects.bzl index bdfb31b..c7bcb71 100644 --- a/cuda/private/rules/cuda_objects.bzl +++ b/cuda/private/rules/cuda_objects.bzl @@ -1,9 +1,9 @@ -load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain") +load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") load("//cuda/private:actions/compile.bzl", "compile") load("//cuda/private:cuda_helper.bzl", "cuda_helper") load("//cuda/private:providers.bzl", "CudaInfo") load("//cuda/private:rules/common.bzl", "ALLOW_CUDA_HDRS", "ALLOW_CUDA_SRCS") -load("//cuda/private:toolchain.bzl", "find_cuda_toolchain", "use_cuda_toolchain") +load("//cuda/private:toolchain.bzl", "find_cuda_toolchain", "use_cpp_toolchain", "use_cuda_toolchain") def _cuda_objects_impl(ctx): attr = ctx.attr @@ -110,6 +110,6 @@ code and device link time optimization source files.""", "_default_cuda_archs": attr.label(default = "//cuda:archs"), }, fragments = ["cpp"], - toolchains = use_cpp_toolchain(mandatory = True) + use_cuda_toolchain(), + toolchains = use_cpp_toolchain() + use_cuda_toolchain(), provides = [DefaultInfo, OutputGroupInfo, CcInfo, CudaInfo], ) diff --git a/cuda/private/toolchain_configs/clang.bzl b/cuda/private/toolchain_configs/clang.bzl index 93d14a3..844677c 100644 --- a/cuda/private/toolchain_configs/clang.bzl +++ b/cuda/private/toolchain_configs/clang.bzl @@ -1,9 +1,10 @@ load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_tools//tools/build_defs/cc:action_names.bzl", CC_ACTION_NAMES = "ACTION_NAMES") -load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain") +load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") load("//cuda/private:action_names.bzl", "ACTION_NAMES") load("//cuda/private:artifact_categories.bzl", "ARTIFACT_CATEGORIES") load("//cuda/private:providers.bzl", "CudaToolchainConfigInfo", "CudaToolkitInfo") +load("//cuda/private:toolchain.bzl", "use_cpp_toolchain") load( "//cuda/private:toolchain_config_lib.bzl", "action_config", @@ -515,6 +516,6 @@ cuda_toolchain_config = rule( "_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"), # legacy behaviour }, provides = [CudaToolchainConfigInfo], - toolchains = use_cpp_toolchain(mandatory = True), + toolchains = use_cpp_toolchain(), fragments = ["cpp"], ) diff --git a/cuda/private/toolchain_configs/nvcc.bzl b/cuda/private/toolchain_configs/nvcc.bzl index 7f80887..d2f0c50 100644 --- a/cuda/private/toolchain_configs/nvcc.bzl +++ b/cuda/private/toolchain_configs/nvcc.bzl @@ -1,9 +1,10 @@ load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_tools//tools/build_defs/cc:action_names.bzl", CC_ACTION_NAMES = "ACTION_NAMES") -load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain") +load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") load("//cuda/private:action_names.bzl", "ACTION_NAMES") load("//cuda/private:artifact_categories.bzl", "ARTIFACT_CATEGORIES") load("//cuda/private:providers.bzl", "CudaToolchainConfigInfo", "CudaToolkitInfo") +load("//cuda/private:toolchain.bzl", "use_cpp_toolchain") load( "//cuda/private:toolchain_config_lib.bzl", "action_config", @@ -525,6 +526,6 @@ cuda_toolchain_config = rule( "_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"), # legacy behaviour }, provides = [CudaToolchainConfigInfo], - toolchains = use_cpp_toolchain(mandatory = True), + toolchains = use_cpp_toolchain(), fragments = ["cpp"], ) diff --git a/cuda/private/toolchain_configs/nvcc_msvc.bzl b/cuda/private/toolchain_configs/nvcc_msvc.bzl index 5f2fb06..af4f30e 100644 --- a/cuda/private/toolchain_configs/nvcc_msvc.bzl +++ b/cuda/private/toolchain_configs/nvcc_msvc.bzl @@ -1,9 +1,10 @@ load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_tools//tools/build_defs/cc:action_names.bzl", CC_ACTION_NAMES = "ACTION_NAMES") -load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain") +load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") load("//cuda/private:action_names.bzl", "ACTION_NAMES") load("//cuda/private:artifact_categories.bzl", "ARTIFACT_CATEGORIES") load("//cuda/private:providers.bzl", "CudaToolchainConfigInfo", "CudaToolkitInfo") +load("//cuda/private:toolchain.bzl", "use_cpp_toolchain") load( "//cuda/private:toolchain_config_lib.bzl", "action_config", @@ -613,6 +614,6 @@ cuda_toolchain_config = rule( "_cc_toolchain": attr.label(default = "@bazel_tools//tools/cpp:current_cc_toolchain"), # legacy behaviour }, provides = [CudaToolchainConfigInfo], - toolchains = use_cpp_toolchain(mandatory = True), + toolchains = use_cpp_toolchain(), fragments = ["cpp"], )