danbev commited on
Commit
7e96237
·
unverified ·
1 Parent(s): f6dc2ad

ci : update windows runner to windows-2022 (#3242)

Browse files

* ci : update windows runner to windows-2022

This commit changes the windows-2019 runner to windows-2022.

The motiation for this is that the windows-2019 runner is scheduled for
deprection and will be removed 2025-06-30. There are currently "burnout"
periods that started 2025-06-01 and during these times jobs with
windows-2019 will fail which has happened lately on our CI.

Refs: https://github.com/actions/runner-images/issues/12045

Files changed (1) hide show
  1. .github/workflows/build.yml +25 -17
.github/workflows/build.yml CHANGED
@@ -761,14 +761,15 @@ jobs:
761
  windows-cublas:
762
  if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' ||
763
  github.event.inputs.run_type == 'full-ci' }}
764
- runs-on: windows-2019
765
  strategy:
 
766
  matrix:
767
  build: [Release]
768
  arch: [x64]
769
  cublas: [ON]
770
  sdl2: [ON]
771
- cuda-toolkit: [12.2.0, 11.8.0]
772
  include:
773
  - arch: x64
774
  sdl2: ON
@@ -836,7 +837,7 @@ jobs:
836
  xcopy "$CUDA_TOOLKIT_DIR\visual_studio_integration-windows-x86_64-${VS_VER}-archive\*" "$CUDA_TOOLKIT_DIR" /E /I /H /Y
837
 
838
  # Visual Studio integration
839
- xcopy "$CUDA_TOOLKIT_DIR\visual_studio_integration-windows-x86_64-${VS_VER}-archive\visual_studio_integration\MSBuildExtensions\*" "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Microsoft\VC\v160\BuildCustomizations" /E /I /H /Y
840
 
841
  # Set environment variables
842
  echo "$CUDA_TOOLKIT_DIR\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
@@ -844,23 +845,23 @@ jobs:
844
  echo "CUDA_PATH=$CUDA_TOOLKIT_DIR" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
845
  echo "CUDA_PATH_V11_8=$CUDA_TOOLKIT_DIR" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
846
 
847
- - name: Install Cuda Toolkit 12.2.0
848
- if: ${{ matrix.cuda-toolkit == '12.2.0' }}
849
  run: |
850
  $CUDA_VERSION = ${{ matrix.cuda-toolkit }}
851
  $CUDA_TOOLKIT_DIR = "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v$CUDA_VERSION"
852
  $CUDA_DOWNLOAD = "https://developer.download.nvidia.com/compute/cuda/redist"
853
 
854
  # Components versions
855
- $CUDART_VER = "12.2.140"
856
- $NVCC_VER = "12.2.140"
857
- $NVRTC_VER = "12.2.140"
858
- $CUBLAS_VER = "12.2.5.6"
859
- $NVTX_VER = "12.2.140"
860
- $PROFILER_VER = "12.2.140"
861
- $VS_VER = "12.2.140"
862
- $NVPROF_VER = "12.2.142"
863
- $CCCL_VER = "12.2.140"
864
 
865
  # Create the directory where the CUDA Toolkit will be installed
866
  mkdir -p $CUDA_TOOLKIT_DIR
@@ -894,7 +895,7 @@ jobs:
894
  xcopy "$CUDA_TOOLKIT_DIR\visual_studio_integration-windows-x86_64-${VS_VER}-archive\*" "$CUDA_TOOLKIT_DIR" /E /I /H /Y
895
 
896
  # Visual Studio integration
897
- xcopy "$CUDA_TOOLKIT_DIR\visual_studio_integration-windows-x86_64-${VS_VER}-archive\visual_studio_integration\MSBuildExtensions\*" "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Microsoft\VC\v160\BuildCustomizations" /E /I /H /Y
898
 
899
  # Set environment variables
900
  echo "$CUDA_TOOLKIT_DIR\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
@@ -922,14 +923,21 @@ jobs:
922
  - name: Build Project
923
  shell: cmd
924
  run: |
925
- call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
926
  cmake --version
927
  where cmake
 
 
 
 
 
928
  cmake -S . -B build -G "Ninja Multi-Config" ^
929
  -DCMAKE_BUILD_TYPE=${{ matrix.build }} ^
930
  -DGGML_CUDA=${{ matrix.cublas }} ^
931
  -DWHISPER_SDL2=${{ matrix.sdl2 }} ^
932
- -DSDL2_DIR="%SDL2_DIR%"
 
 
933
  set /A NINJA_JOBS=%NUMBER_OF_PROCESSORS%-1
934
  cmake --build build --config ${{ matrix.build }} -j %NUMBER_OF_PROCESSORS%
935
 
 
761
  windows-cublas:
762
  if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' ||
763
  github.event.inputs.run_type == 'full-ci' }}
764
+ runs-on: windows-2022
765
  strategy:
766
+ fail-fast: false
767
  matrix:
768
  build: [Release]
769
  arch: [x64]
770
  cublas: [ON]
771
  sdl2: [ON]
772
+ cuda-toolkit: [12.4.0, 11.8.0]
773
  include:
774
  - arch: x64
775
  sdl2: ON
 
837
  xcopy "$CUDA_TOOLKIT_DIR\visual_studio_integration-windows-x86_64-${VS_VER}-archive\*" "$CUDA_TOOLKIT_DIR" /E /I /H /Y
838
 
839
  # Visual Studio integration
840
+ xcopy "$CUDA_TOOLKIT_DIR\visual_studio_integration-windows-x86_64-${VS_VER}-archive\visual_studio_integration\MSBuildExtensions\*" "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\v170\BuildCustomizations" /E /I /H /Y
841
 
842
  # Set environment variables
843
  echo "$CUDA_TOOLKIT_DIR\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
845
  echo "CUDA_PATH=$CUDA_TOOLKIT_DIR" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
846
  echo "CUDA_PATH_V11_8=$CUDA_TOOLKIT_DIR" | Out-File -FilePath $env:GITHUB_ENV -Append -Encoding utf8
847
 
848
+ - name: Install Cuda Toolkit 12.4.0
849
+ if: ${{ matrix.cuda-toolkit == '12.4.0' }}
850
  run: |
851
  $CUDA_VERSION = ${{ matrix.cuda-toolkit }}
852
  $CUDA_TOOLKIT_DIR = "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v$CUDA_VERSION"
853
  $CUDA_DOWNLOAD = "https://developer.download.nvidia.com/compute/cuda/redist"
854
 
855
  # Components versions
856
+ $CUDART_VER = "12.4.127"
857
+ $NVCC_VER = "12.4.131"
858
+ $NVRTC_VER = "12.4.127"
859
+ $CUBLAS_VER = "12.4.5.8"
860
+ $NVTX_VER = "12.4.127"
861
+ $PROFILER_VER = "12.4.127"
862
+ $VS_VER = "12.4.127"
863
+ $NVPROF_VER = "12.4.128"
864
+ $CCCL_VER = "12.4.127"
865
 
866
  # Create the directory where the CUDA Toolkit will be installed
867
  mkdir -p $CUDA_TOOLKIT_DIR
 
895
  xcopy "$CUDA_TOOLKIT_DIR\visual_studio_integration-windows-x86_64-${VS_VER}-archive\*" "$CUDA_TOOLKIT_DIR" /E /I /H /Y
896
 
897
  # Visual Studio integration
898
+ xcopy "$CUDA_TOOLKIT_DIR\visual_studio_integration-windows-x86_64-${VS_VER}-archive\visual_studio_integration\MSBuildExtensions\*" "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Microsoft\VC\v170\BuildCustomizations" /E /I /H /Y
899
 
900
  # Set environment variables
901
  echo "$CUDA_TOOLKIT_DIR\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
923
  - name: Build Project
924
  shell: cmd
925
  run: |
926
+ call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
927
  cmake --version
928
  where cmake
929
+ if "${{ matrix.cuda-toolkit }}" == "11.8.0" (
930
+ set CUDA_FLAGS=-allow-unsupported-compiler -D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH -D_DISABLE_CONSTEXPR_MUTEX_CONSTRUCTOR
931
+ ) else (
932
+ set CUDA_FLAGS=
933
+ )
934
  cmake -S . -B build -G "Ninja Multi-Config" ^
935
  -DCMAKE_BUILD_TYPE=${{ matrix.build }} ^
936
  -DGGML_CUDA=${{ matrix.cublas }} ^
937
  -DWHISPER_SDL2=${{ matrix.sdl2 }} ^
938
+ -DSDL2_DIR="%SDL2_DIR%" ^
939
+ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ^
940
+ -DCMAKE_CUDA_FLAGS="%CUDA_FLAGS%"
941
  set /A NINJA_JOBS=%NUMBER_OF_PROCESSORS%-1
942
  cmake --build build --config ${{ matrix.build }} -j %NUMBER_OF_PROCESSORS%
943