Merge pull request #7957 from kmaehashi/fix-windows-test

Fix Windows test scripts
cupy · Oct 23, 2023 · 7391198 · 7391198
2 parents 2b86893 + 298d8a0
commit 7391198
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.pfnci/windows/_flexci.ps1 b/.pfnci/windows/_flexci.ps1
@@ -93,6 +93,10 @@ function ActivateNVTX1() {
     $Env:PATH = "$base\bin\x64;" + $Env:PATH
 }
 
+function InstallZLIB() {
+    Copy-Item -Path "C:\Development\ZLIB\zlibwapi.dll" -Destination "C:\Windows\System32"
+}
+
 function IsPullRequestTest() {
     return ${Env:FLEXCI_BRANCH} -ne $null -and ${Env:FLEXCI_BRANCH}.StartsWith("refs/pull/")
 }

diff --git a/.pfnci/windows/test.ps1 b/.pfnci/windows/test.ps1
@@ -86,7 +86,7 @@ function Main {
     echo "Building..."
     $build_retval = 0
     RunOrDie python -m pip install -U "numpy" "scipy"
-    python -m pip install ".[all,test]" -vvv > cupy_build_log.txt
+    python -m pip install ".[all,test]" -v > cupy_build_log.txt
     if (-not $?) {
         $build_retval = $LastExitCode
     }
@@ -128,9 +128,7 @@ function Main {
 
     # Install dependency for cuDNN 8.3+
     echo ">> Installing zlib"
-    RunOrDie curl.exe -LO http://www.winimage.com/zLibDll/zlib123dllx64.zip
-    RunOrDie 7z x "zlib123dllx64.zip"
-    Copy-Item -Path "dll_x64\zlibwapi.dll" -Destination "C:\Windows\System32"
+    InstallZLIB
 
     pushd tests
     echo "CuPy Configuration:"