fix ci error

fangq · Aug 4, 2023 · 688d183 · 688d183
1 parent 97fff3e
commit 688d183
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml
@@ -143,7 +143,7 @@ jobs:
           cd src
           make clean
           if [[ "$RUNNER_OS" == "Linux" ]]; then
-            make AR=g++ BACKEND=cudastatic USERLINKOPT='libzmat.a -Wl,-Bstatic -lgomp -Wl,-Bdynamic'
+            make AR=g++ BACKEND=cudastatic USERLINKOPT='lib/libzmat.a -Wl,-Bstatic -lgomp -Wl,-Bdynamic'
             ldd ../bin/mcx
           elif [[ "$RUNNER_OS" == "macOS" ]]; then
             make BACKEND=cudastatic CC=gcc-10 CXX=g++-10

diff --git a/.github/workflows/build_windows_wheel.yml b/.github/workflows/build_windows_wheel.yml
@@ -41,11 +41,18 @@ jobs:
           cuda: '10.2.89'
           method: 'network'
           sub-packages: '["nvcc"]'
-      - name: Install CUDA
+      - name: Setup CUDA
         run: |
           $CUDA_PATH=Get-ChildItem "C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA" -filter "v*.*" -Directory | % { $_.fullname }
           echo "CUDA_PATH=$CUDA_PATH" >> $env:GITHUB_ENV
           echo "CUDA_TOOLKIT_ROOT_DIR=$CUDA_PATH" >> $env:GITHUB_ENV
+      - name: Install Zlib Dev
+        run: |
+          curl.exe --retry 3 -kL https://cytranet.dl.sourceforge.net/project/gnuwin32/zlib/1.2.3/zlib-1.2.3-lib.zip --output zlib.zip
+          Expand-Archive .\zlib.zip -DestinationPath zlib\
+          echo "CMAKE_INCLUDE_PATH=$PWD\zlib\include" >> $env:GITHUB_ENV
+          echo "CMAKE_LIBRARY_PATH=$PWD\zlib\lib" >> $env:GITHUB_ENV
+          rm zlib.zip
       - name: Build Wheels
         run: |
           cd pmcx/