add windows support

Author: finn-ball

cuda/extensions.bzl

@@ -185,13 +185,15 @@ def _impl(module_ctx):
     for component_name in redist_components_mapping.keys():
         # Build dictionaries mapping versions to repo names for each platform.
         x86_64_repos = {ver: versioned_repos[component_name]["linux-x86_64"][ver] for ver in redist_versions if "linux-x86_64" in versioned_repos[component_name] and ver in versioned_repos[component_name]["linux-x86_64"]}
+        windows_x86_64_repos = {ver: versioned_repos[component_name]["windows-x86_64"][ver] for ver in redist_versions if "windows-x86_64" in versioned_repos[component_name] and ver in versioned_repos[component_name]["windows-x86_64"]}
         aarch64_repos = {ver: versioned_repos[component_name]["linux-aarch64"][ver] for ver in redist_versions if "linux-aarch64" in versioned_repos[component_name] and ver in versioned_repos[component_name]["linux-aarch64"]}
         sbsa_repos = {ver: versioned_repos[component_name]["linux-sbsa"][ver] for ver in redist_versions if "linux-sbsa" in versioned_repos[component_name] and ver in versioned_repos[component_name]["linux-sbsa"]}
 
         platform_alias_repo(
             name = redist_components_mapping[component_name],
             component_name = component_name,
             linux_x86_64_repos = x86_64_repos,
+            windows_x86_64_repos = windows_x86_64_repos,
             linux_aarch64_repos = aarch64_repos,
             linux_sbsa_repos = sbsa_repos,
             versions = redist_versions,

cuda/platform_alias_extension.bzl

@@ -50,6 +50,8 @@ def _platform_alias_repo_impl(ctx):
     platforms_available = []
     if len(ctx.attr.linux_x86_64_repos) > 0:
         platforms_available.append("linux-x86_64")
+    if len(ctx.attr.windows_x86_64_repos) > 0:
+        platforms_available.append("windows-x86_64")
     if len(ctx.attr.linux_sbsa_repos) > 0:
         platforms_available.append("linux-sbsa")
     if len(ctx.attr.linux_aarch64_repos) > 0:
@@ -113,6 +115,7 @@ def _platform_alias_repo_impl(ctx):
 
         platform_repos_map = {
             "linux-x86_64": ctx.attr.linux_x86_64_repos,
+            "windows-x86_64": ctx.attr.windows_x86_64_repos,
             "linux-sbsa": ctx.attr.linux_sbsa_repos,
             "linux-aarch64": ctx.attr.linux_aarch64_repos,
         }
@@ -177,6 +180,10 @@ platform_alias_repo = repository_rule(
             default = {},
             doc = "Dictionary mapping versions to ARM64/Jetpack repository names",
         ),
+        "windows_x86_64_repos": attr.string_dict(
+            default = {},
+            doc = "Dictionary mapping versions to Windows x86_64 repository names",
+        ),
         "linux_sbsa_repos": attr.string_dict(
             default = {},
             doc = "Dictionary mapping versions to SBSA repository names",

cuda/private/platforms.bzl

@@ -4,6 +4,7 @@
 # These are the platforms for which we generate component aliases.
 SUPPORTED_PLATFORMS = [
     "linux-x86_64",
+    "windows-x86_64",
     "linux-sbsa",
     "linux-aarch64",
 ]

cuda/private/templates/BUILD.nvcc

@@ -1,37 +1,58 @@
-# Export individual executables as simple target names
-exports_files([
+nvcc_bin = any_or_first(
     "%{component_name}/bin/nvcc",
+    "%{component_name}/bin/nvcc.exe",
+)
+nvlink_bin = any_or_first(
     "%{component_name}/bin/nvlink",
+    "%{component_name}/bin/nvlink.exe",
+)
+ptxas_bin = any_or_first(
     "%{component_name}/bin/ptxas",
+    "%{component_name}/bin/ptxas.exe",
+)
+bin2c_bin = any_or_first(
     "%{component_name}/bin/bin2c",
+    "%{component_name}/bin/bin2c.exe",
+)
+fatbinary_bin = any_or_first(
     "%{component_name}/bin/fatbinary",
+    "%{component_name}/bin/fatbinary.exe",
+)
+
+# Export individual executables as simple target names
+exports_files([
+    nvcc_bin,
+    nvlink_bin,
+    ptxas_bin,
+    bin2c_bin,
+    fatbinary_bin,
     "%{component_name}/bin/crt/link.stub",
 ], visibility = ["//visibility:public"])
 
 # Create aliases with simple names for toolchain compatibility
 alias(
     name = "nvcc",
-    actual = "%{component_name}/bin/nvcc",
+    actual = nvcc_bin,
 )
 
 alias(
     name = "nvlink",
-    actual = "%{component_name}/bin/nvlink",
+    actual = nvlink_bin,
 )
 
 alias(
     name = "ptxas",
-    actual = "%{component_name}/bin/ptxas",
+    actual = ptxas_bin,
 )
 
 alias(
     name = "bin2c",
-    actual = "%{component_name}/bin/bin2c",
+    actual = bin2c_bin,
 )
 
 alias(
     name = "fatbinary",
-    actual = "%{component_name}/bin/fatbinary",
+    actual = fatbinary_bin,
 )
 
 alias(

cuda/private/templates/BUILD.nvvm

@@ -1,13 +1,18 @@
+cicc_bin = any_or_first(
+    "%{component_name}/nvvm/bin/cicc",
+    "%{component_name}/nvvm/bin/cicc.exe",
+)
+
 # Export individual files as simple target names
 exports_files([
-    "%{component_name}/nvvm/bin/cicc",
+    cicc_bin,
     "%{component_name}/nvvm/libdevice/libdevice.10.bc",
 ], visibility = ["//visibility:public"])
 
 # Create aliases with simple names for toolchain compatibility
 alias(
     name = "cicc",
-    actual = "%{component_name}/nvvm/bin/cicc",
+    actual = cicc_bin,
 )
 
 alias(

tests/integration/test_all.sh

@@ -11,7 +11,6 @@ skip_components_bzlmod=false
 skip_redist_json=false
 skip_redist_json_multi=false
 skip_redist_json_collision=false
-redist_windows_limited=false
 
 while [[ $# -gt 0 ]]; do
     case $1 in
@@ -40,11 +39,12 @@ done
 
 set -ex
 
-# The CUDA redist archives used here are linux-only; skip on Windows CI.
+redist_platform_args=()
 if [[ "$RUNNER_OS" == "Windows" ]] || [[ "$(uname -s 2>/dev/null)" =~ MINGW|MSYS|CYGWIN ]]; then
-    # Multi-version redist tests currently generate linux repos only.
-    # On Windows, run a reduced analysis-only subset for coverage.
-    redist_windows_limited=true
+    redist_platform_args=(
+        --@rules_cuda//cuda:exec_platform=windows-x86_64
+        --@rules_cuda//cuda:target_platform=windows-x86_64
+    )
 fi
 
 # toolchain configured by the root module of the user
@@ -178,14 +178,12 @@ cat <<- EOF
 ============================================================
 EOF
 pushd "$this_dir/toolchain_redist_json"
-    bazel build --enable_workspace //... --@rules_cuda//cuda:enable=False
-    bazel build --enable_workspace //:optionally_use_rule --@rules_cuda//cuda:enable=False
-    if [ "$redist_windows_limited" = false ]; then
-        bazel build --enable_workspace //... --@rules_cuda//cuda:enable=True
-        bazel build --enable_workspace //:optionally_use_rule --@rules_cuda//cuda:enable=True
-        bazel build --enable_workspace //:use_library
-        bazel build --enable_workspace //:use_rule
-    fi
+    bazel build --enable_workspace //... --@rules_cuda//cuda:enable=False "${redist_platform_args[@]}"
+    bazel build --enable_workspace //... --@rules_cuda//cuda:enable=True "${redist_platform_args[@]}"
+    bazel build --enable_workspace //:optionally_use_rule --@rules_cuda//cuda:enable=False "${redist_platform_args[@]}"
+    bazel build --enable_workspace //:optionally_use_rule --@rules_cuda//cuda:enable=True "${redist_platform_args[@]}"
+    bazel build --enable_workspace //:use_library "${redist_platform_args[@]}"
+    bazel build --enable_workspace //:use_rule "${redist_platform_args[@]}"
     bazel clean && bazel shutdown
 popd
 fi
@@ -199,20 +197,18 @@ cat <<- EOF
 ============================================================
 EOF
 pushd "$this_dir/toolchain_redist_json_multi"
-    bazel build --enable_bzlmod //... --@rules_cuda//cuda:enable=False
-    bazel build --enable_bzlmod //:optionally_use_rule --@rules_cuda//cuda:enable=False
-    if [ "$redist_windows_limited" = false ]; then
-        bazel build --enable_bzlmod //... --@rules_cuda//cuda:enable=True
-        bazel build --enable_bzlmod //:optionally_use_rule --@rules_cuda//cuda:enable=True --@rules_cuda//cuda:version=12.6.3
-        bazel build --enable_bzlmod //:optionally_use_rule --@rules_cuda//cuda:enable=True --@rules_cuda//cuda:version=11.7.0
-        bazel build --enable_bzlmod //:use_library
-        bazel build --enable_bzlmod //:use_rule --@rules_cuda//cuda:version=12.6.3
-        bazel build --enable_bzlmod //:use_rule --@rules_cuda//cuda:version=11.7.0
-    fi
+    bazel build --enable_bzlmod //... --@rules_cuda//cuda:enable=False "${redist_platform_args[@]}"
+    bazel build --enable_bzlmod //... --@rules_cuda//cuda:enable=True "${redist_platform_args[@]}"
+    bazel build --enable_bzlmod //:optionally_use_rule --@rules_cuda//cuda:enable=False "${redist_platform_args[@]}"
+    bazel build --enable_bzlmod //:optionally_use_rule --@rules_cuda//cuda:enable=True --@rules_cuda//cuda:version=12.6.3 "${redist_platform_args[@]}"
+    bazel build --enable_bzlmod //:optionally_use_rule --@rules_cuda//cuda:enable=True --@rules_cuda//cuda:version=11.7.0 "${redist_platform_args[@]}"
+    bazel build --enable_bzlmod //:use_library "${redist_platform_args[@]}"
+    bazel build --enable_bzlmod //:use_rule --@rules_cuda//cuda:version=12.6.3 "${redist_platform_args[@]}"
+    bazel build --enable_bzlmod //:use_rule --@rules_cuda//cuda:version=11.7.0 "${redist_platform_args[@]}"
 
     # Keep the override-only dedupe probe isolated so it cannot pollute later versioned builds.
     bazel clean && bazel shutdown
-    CUDA_REDIST_VERSION_OVERRIDE=11.7.0 bazel build --enable_bzlmod //:optionally_use_rule --@rules_cuda//cuda:enable=False
+    CUDA_REDIST_VERSION_OVERRIDE=11.7.0 bazel build --enable_bzlmod //:optionally_use_rule --@rules_cuda//cuda:enable=False "${redist_platform_args[@]}"
     bazel clean && bazel shutdown
 popd
 fi

tests/integration/toolchain_redist_json/MODULE.bazel

@@ -12,6 +12,7 @@ cuda.redist_json(
     name = "rules_cuda_redist_json",
     platforms = [
         "linux-x86_64",
+        "windows-x86_64",
     ],
     version = "12.6.3",
 )

tests/integration/toolchain_redist_json_multi/MODULE.bazel

@@ -12,13 +12,15 @@ cuda.redist_json(
     name = "cuda_12_6_3",
     platforms = [
         "linux-x86_64",
+        "windows-x86_64",
     ],
     version = "12.6.3",
 )
 cuda.redist_json(
     name = "cuda_11_7_0",
     platforms = [
         "linux-x86_64",
+        "windows-x86_64",
     ],
     version = "11.7.0",
 )