Test CUDA 13.0 on Windows CI.

Author: nnethercote

.github/workflows/ci_windows.yml

@@ -23,10 +23,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        cuda: ["12.8.1", "13.0.2"]
         include:
           - os: windows-latest
             target: x86_64-pc-windows-msvc
-            cuda: "12.8.1"
             linux-local-args: []
             sub-packages:
               [
@@ -39,14 +39,15 @@ jobs:
                 "cublas_dev",
                 "curand",
                 "curand_dev",
+                "nvvm",
               ]
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
       - name: Install CUDA
-        uses: Jimver/[email protected].22
+        uses: Jimver/[email protected].29
         id: cuda-toolkit
         with:
           cuda: ${{ matrix.cuda }}
@@ -57,7 +58,6 @@ jobs:
           log-file-suffix: "${{matrix.os}}-${{matrix.cuda}}"
 
       - name: List CUDA_PATH files
-        shell: pwsh
         run: Get-ChildItem -Path $env:CUDA_PATH -Recurse | ForEach-Object { $_.FullName }
 
       # random command that forces rustup to install stuff in rust-toolchain
@@ -68,9 +68,12 @@ jobs:
         run: rustup component add rustfmt clippy
 
       - name: Update PATH to expose CUDA codegen backend
-        shell: pwsh
         run: |
-          echo "$env:CUDA_PATH\nvvm\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          # njn: explain
+          echo "$env:CUDA_PATH\nvvm\bin" | `
+            Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          echo "$env:CUDA_PATH\nvvm\bin\x64" | `
+            Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
       - name: Verify CUDA, Rust installation
         run: |
@@ -103,15 +106,21 @@ jobs:
       # Exclude crates with tests that require an NVIDIA GPU: blastoff, cudnn, cust.
       # Exclude crates that require cuDNN, not available on Windows CI: cudnn, cudnn-sys.
       - name: Test
-        run: cargo test --workspace --exclude blastoff --exclude cudnn --exclude cudnn-sys --exclude cust
+        run: |
+          cargo test --workspace `
+            --exclude blastoff --exclude cudnn --exclude cudnn-sys --exclude cust
 
       # Exclude crates that require cuDNN, not available on Windows CI: cudnn, cudnn-sys.
       # Exclude cust_raw because it triggers hundreds of warnings.
       - name: Check documentation
         env:
           RUSTDOCFLAGS: -Dwarnings
-        run: cargo doc --workspace --all-features --document-private-items --no-deps --exclude cudnn --exclude cudnn-sys --exclude cust_raw
+        run: |
+          cargo doc --workspace --all-features --document-private-items --no-deps `
+            --exclude cudnn --exclude cudnn-sys --exclude cust_raw
 
       # Disabled due to dll issues, someone with Windows knowledge needed
       # - name: Compiletest
-      #  run: cargo run -p compiletests --release --no-default-features -- --target-arch compute_61,compute_75,compute_90
+      #  run: |
+      #    cargo run -p compiletests --release --no-default-features -- `
+      #      --target-arch compute_61,compute_75,compute_90

Cargo.lock

@@ -14,6 +14,7 @@ bindgen = "0.71.1"
 bimap = "0.6.3"
 cc = "1.2.17"
 doxygen-bindgen = "0.1"
+walkdir = "2.5"
 
 [package.metadata.docs.rs]
 features = [

crates/cust_raw/Cargo.toml

@@ -45,6 +45,68 @@ impl CudaSdk {
         // Retrieve the NVVM related paths.
         let nvvm_include_paths = Self::find_nvvm_include_dirs(cuda_root.as_path())?;
         let nvvm_library_paths = Self::find_nvvm_library_dirs(cuda_root.as_path())?;
+
+        // use std::fs;
+
+        // fn main2(root_path: std::path::PathBuf) {
+        //     use std::ffi::OsStr;
+        //     use walkdir::WalkDir;
+
+        //     for entry in WalkDir::new(root_path).into_iter().filter_map(|e| e.ok()) {
+        //         let path = entry.path();
+        //         let depth = entry.depth();
+
+        //         // Indent based on depth
+        //         let indent = "    ".repeat(depth);
+
+        //         if path.is_dir() {
+        //             eprintln!(
+        //                 "{}├── {}",
+        //                 indent,
+        //                 path.file_name()
+        //                     .unwrap_or(OsStr::new("???"))
+        //                     .to_string_lossy()
+        //             );
+        //         } else {
+        //             eprintln!(
+        //                 "{}└── {}",
+        //                 indent,
+        //                 path.file_name()
+        //                     .unwrap_or(OsStr::new("???"))
+        //                     .to_string_lossy()
+        //             );
+        //         }
+        //     }
+        // }
+        // main2(cuda_root.clone());
+
+        // eprintln!("1---");
+        // let path = &cuda_root;
+        // if let Ok(paths) = fs::read_dir(path) {
+        //     for path in paths {
+        //         eprintln!("Name: {}", path.unwrap().path().display())
+        //     }
+        // }
+        // eprintln!("1---");
+
+        // eprintln!("2---");
+        // let path = cuda_root.join("nvvm");
+        // if let Ok(paths) = fs::read_dir(path) {
+        //     for path in paths {
+        //         eprintln!("Name: {}", path.unwrap().path().display())
+        //     }
+        // }
+        // eprintln!("2---");
+
+        // eprintln!("3---");
+        // let path = cuda_root.join("nvvm").join("libdevice");
+        // if let Ok(paths) = fs::read_dir(&path) {
+        //     for path in paths {
+        //         eprintln!("Name: {}", path.unwrap().path().display())
+        //     }
+        // }
+        // eprintln!("3---");
+
         let libdevice_bitcode_path = cuda_root
             .join("nvvm")
             .join("libdevice")