Merge pull request #567 from wmaxey/patch-6

Update several components on Windows and fix missing CUDA components on 13.0+

Author: alliepiper

.github/actions/test-windows-image/image-test.ps1

@@ -33,7 +33,7 @@ try {
     TestReturnCode
 
     Write-Output "int main() {return 0;}" > .\test.cu
-    nvcc .\test.cu
+    nvcc -v .\test.cu
     TestReturnCode
 }
 catch {

windows/image/installers/install-cmake.ps1

@@ -1,5 +1,5 @@
 # Fetch CMake
-Invoke-WebRequest -Uri "https://github.com/Kitware/CMake/releases/download/v3.31.6/cmake-3.31.6-windows-x86_64.msi" -OutFile "C:\cmake_installer.msi" -UseBasicParsing
+Invoke-WebRequest -Uri "https://github.com/Kitware/CMake/releases/download/v4.1.0/cmake-4.1.0-windows-x86_64.msi" -OutFile "C:\cmake_installer.msi" -UseBasicParsing
 Start-Process -NoNewWindow -Wait -FilePath msiexec -ArgumentList "/i C:\cmake_installer.msi ADD_CMAKE_TO_PATH=All /qn"
 Remove-Item "C:\cmake_installer.msi"
 

windows/image/installers/install-cuda.ps1

@@ -37,6 +37,11 @@ $cudaComponents =
 
 if ("${major}" -ge "13") {
     $cudaComponents += "crt_$mmVersionTag"
+    $cudaComponents += "cuobjdump_$mmVersionTag"
+    $cudaComponents += "nvfatbin_$mmVersionTag"
+    $cudaComponents += "nvjitlink_$mmVersionTag"
+    $cudaComponents += "nvvm_$mmVersionTag"
+    $cudaComponents += "nvptxcompiler_$mmVersionTag"
 }
 
 Write-Output "Installing CUDA Components: ${cudaComponents}"

windows/image/installers/install-git.ps1

@@ -1,5 +1,5 @@
 # Fetch git
-Invoke-WebRequest -Uri "https://github.com/git-for-windows/git/releases/download/v2.41.0.windows.3/Git-2.41.0.3-64-bit.exe" -OutFile "C:\git_installer.exe" -UseBasicParsing
+Invoke-WebRequest -Uri "https://github.com/git-for-windows/git/releases/download/v2.51.0.windows.1/Git-2.51.0-64-bit.exe" -OutFile "C:\git_installer.exe" -UseBasicParsing
 Start-Process -NoNewWindow -Wait -FilePath "C:\git_installer.exe" -ArgumentList "/S /VERYSILENT /NORESTART /NOCANCEL /SP- /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS"
 Remove-Item "C:\git_installer.exe"
 

windows/image/installers/install-ninja.ps1

@@ -1,4 +1,4 @@
-Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/download/v1.12.1/ninja-win.zip" -OutFile "./ninja.zip" -UseBasicParsing
+Invoke-WebRequest -Uri "https://github.com/ninja-build/ninja/releases/download/v1.13.1/ninja-win.zip" -OutFile "./ninja.zip" -UseBasicParsing
 Expand-Archive .\ninja.zip
 
 . "$PSScriptRoot/envvars.ps1"

windows/windows.Dockerfile

@@ -1,6 +1,6 @@
 ARG ROOT_IMAGE
 
-FROM $ROOT_IMAGE as PreCompilerEnv
+FROM $ROOT_IMAGE
 
 SHELL ["powershell.exe"]
 
@@ -11,8 +11,6 @@ ADD ./ /tools
 
 RUN /tools/install-tools.ps1 -cudaVersion $ENV:CUDA_VER
 
-FROM PreCompilerEnv as BuildEnv
-
 ARG MSVC_VER
 ARG MSVC_COMPILER_VER