Perform full test

pierotofy · Feb 26, 2024 · 8a9b8b5 · 8a9b8b5
1 parent 490d084
commit 8a9b8b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 45 deletions.
diff --git a/.github/workflows/cuda/Windows.ps1 b/.github/workflows/cuda/Windows.ps1
@@ -5,26 +5,6 @@ $CUDA_VER = "$($CUDA_VER_ARR[0]).$($CUDA_VER_ARR[1])"
 $CUDA_VER_ID = "$($CUDA_VER_ARR[0])_$($CUDA_VER_ARR[1])"
 $CUDA_VER_SHORT = "cu$($CUDA_VER_ARR[0])$($CUDA_VER_ARR[1])"
 
-# Free up disk space
-# Docker Cache
-# docker rmi $(docker images -q -a)
-# Android SDK
-# if ($Env:ANDROID_HOME) {
-# Remove-Item -Recurse -Force $Env:ANDROID_HOME -ErrorAction Ignore
-# }
-# if ($Env:ANDROID_NDK_HOME) {
-# Remove-Item -Recurse -Force $Env:ANDROID_NDK_HOME -ErrorAction Ignore
-# }
-# # JVM
-# if ($Env:JAVA_HOME_11_X64) {
-# Remove-Item -Recurse -Force $Env:JAVA_HOME_11_X64 -ErrorAction Ignore
-# }
-# if ($Env:JAVA_HOME_8_X64) {
-# Remove-Item -Recurse -Force $Env:JAVA_HOME_8_X64 -ErrorAction Ignore
-# }
-#Remove-Item -Force -Recurse -LiteralPath "C:\msys64\"
-#Remove-Item -Force -Recurse -LiteralPath  "C:\mingw64\"
-
 # Network installer url
 if ( $CUDA_VER_ARR[0] -ge 11 ) {
 $CUDA_URL = "https://developer.download.nvidia.com/compute/cuda/$CUDA_VER_FULL/network_installers/cuda_$($CUDA_VER_FULL)_windows_network.exe"
@@ -44,22 +24,8 @@ echo "Downloading CUDA installer from $CUDA_URL"
 Invoke-WebRequest $CUDA_URL -OutFile cuda.exe
 echo "Installing CUDA..."
 Start-Process -Wait -FilePath .\cuda.exe -ArgumentList "$CUDA_INSTALL_ARGS"
-
-if ( !$? ) {
-  exit 1
-}
-
 Remove-Item .\cuda.exe -Force
 
-# Add CUDA environment variables.
-# $CUDA_PATH = "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v$CUDA_VER"
-# echo "CUDA_PATH=$CUDA_PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-# echo "CUDA_PATH_V$CUDA_VER_ID=$CUDA_PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-# echo "CUDA_VER_SHORT=$CUDA_VER_SHORT" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-# echo "$CUDA_PATH\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
-# $TORCH_CUDA_ARCH_LIST = "7.0;7.5"
-# echo "TORCH_CUDA_ARCH_LIST=$TORCH_CUDA_ARCH_LIST" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
 # Install NvToolsExt
 $NVTOOLSEXT_PATH  = "C:\Program Files\NVIDIA Corporation\NvToolsExt"
 if (Test-Path -Path "$NVTOOLSEXT_PATH " -PathType Container) {
@@ -79,9 +45,4 @@ Write-Output "Copying NvTools, '$tmpExtractedNvTools' -> '$NVTOOLSEXT_PATH'"
 New-Item -Path "$NVTOOLSEXT_PATH "-ItemType "directory" -Force
 Copy-Item -Recurse -Path "$tmpExtractedNvTools\*" -Destination "$NVTOOLSEXT_PATH"
 Remove-Item "$tmpExtractedNvTools" -Recurse -Force
-Remove-Item "$tmpToolsDl" -Recurse -Force
-
-# $NVTOOLSEXT_PATH = "C:\Program Files\NVIDIA Corporation\NvToolsExt"
-# echo "NVTOOLSEXT_PATH=$NVTOOLSEXT_PATH" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-
-Get-PSDrive
+Remove-Item "$tmpToolsDl" -Recurse -Force
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -16,15 +16,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022] # [windows-2019, windows-2022]
+        os: [windows-2019, windows-2022] # [windows-2019, windows-2022]
         arch: [x64] # [x64, x86]
-        torch-version: [2.2.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1]
-        cuda-version: [12.1.1] # [12.3.1, 12.1.1, 11.8.0, 11.7.1, 11.6.2, 11.5.2,11.4.4, 11.3.1, 11.2.2, 11.1.1, 11.0.3, cpu]
+        torch-version: [2.1.2, 2.2.1] # [1.12.0, 1.13.0, 2.0.0, 2.1.0, 2.1.1, 2.1.2, 2.2.0, 2.2.1]
+        cuda-version: [11.8.0, 12.1.1] # [12.3.1, 12.1.1, 11.8.0, 11.7.1, 11.6.2, 11.5.2,11.4.4, 11.3.1, 11.2.2, 11.1.1, 11.0.3, cpu]
         opencv-version: [4.9.0] # [4.7.0, 4.8.1, 4.9.0]
         cmake-build-type: [ Release ] # [Debug, ClangTidy]
         include:
-#          - os: windows-2019
-#            generator: 'Visual Studio 16 2019'
+          - os: windows-2019
+            generator: 'Visual Studio 16 2019'
           - os: windows-2022
             generator: 'Visual Studio 17 2022'
     env: