fix windows paths again

PREDICT-EPFL · Nov 2, 2024 · 69b4b8c · 69b4b8c
1 parent bc22caf
commit 69b4b8c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -61,7 +61,9 @@ jobs:
       - name: Build wheels
         uses: pypa/cibuildwheel@v2.21.3
         env:
-          CIBW_ENVIRONMENT: ${{ (matrix.target.arch == 'x86_64' || matrix.target.arch == 'amd64') && 'CMAKE_ARGS="-DBLASFEO_X64_DIR=/opt/blasfeo_x64 -DBLASFEO_X64_AVX2_DIR=/opt/blasfeo_x64_avx2 -DBLASFEO_X64_AVX512_DIR=/opt/blasfeo_x64_avx512"' || ((matrix.target.arch == 'arm64' || matrix.target.arch == 'aarch64') && 'CMAKE_ARGS="-DBLASFEO_ARM64_DIR=/opt/blasfeo_arm64"' || '') }}
+          CIBW_ENVIRONMENT_LINUX: ${{ (matrix.target.arch == 'x86_64' || matrix.target.arch == 'amd64') && 'CMAKE_ARGS="-DBLASFEO_X64_DIR=/opt/blasfeo_x64 -DBLASFEO_X64_AVX2_DIR=/opt/blasfeo_x64_avx2 -DBLASFEO_X64_AVX512_DIR=/opt/blasfeo_x64_avx512"' || ((matrix.target.arch == 'arm64' || matrix.target.arch == 'aarch64') && 'CMAKE_ARGS="-DBLASFEO_ARM64_DIR=/opt/blasfeo_arm64"' || '') }}
+          CIBW_ENVIRONMENT_MACOS: ${{ (matrix.target.arch == 'x86_64' || matrix.target.arch == 'amd64') && 'CMAKE_ARGS="-DBLASFEO_X64_DIR=/opt/blasfeo_x64 -DBLASFEO_X64_AVX2_DIR=/opt/blasfeo_x64_avx2 -DBLASFEO_X64_AVX512_DIR=/opt/blasfeo_x64_avx512"' || ((matrix.target.arch == 'arm64' || matrix.target.arch == 'aarch64') && 'CMAKE_ARGS="-DBLASFEO_ARM64_DIR=/opt/blasfeo_arm64"' || '') }}
+          CIBW_ENVIRONMENT_WINDOWS: CMAKE_ARGS="-DBLASFEO_X64_DIR=c:/opt/blasfeo_x64 -DBLASFEO_X64_AVX2_DIR=c:/opt/blasfeo_x64_avx2 -DBLASFEO_X64_AVX512_DIR=c:/opt/blasfeo_x64_avx512"
           CIBW_ARCHS_LINUX: ${{ matrix.target.arch }}
           CIBW_BEFORE_ALL_LINUX: bash ci/cibw_before_all_linux.sh
           CIBW_BEFORE_ALL_WINDOWS: bash ci/cibw_before_all_windows.sh

diff --git a/ci/cibw_before_all_windows.sh b/ci/cibw_before_all_windows.sh
@@ -13,9 +13,9 @@ cd build_external
 bash ../ci/install_eigen.sh
 
 bash ../ci/download_blasfeo.sh
-bash ../ci/build_install_blasfeo.sh GENERIC generic c:/opt/blasfeo
+bash ../ci/build_install_blasfeo.sh GENERIC generic
 bash ../ci/build_install_blasfeo.sh X64_INTEL_CORE x64 c:/opt/blasfeo_x64
 bash ../ci/build_install_blasfeo.sh X64_INTEL_HASWELL x64_avx2 c:/opt/blasfeo_x64_avx2
 bash ../ci/build_install_blasfeo.sh X64_INTEL_SKYLAKE_X arm64 c:/opt/blasfeo_x64_avx512
 
-export CMAKE_ARGS="-DBLASFEO_X64_DIR=/opt/blasfeo_x64 -DBLASFEO_X64_AVX2_DIR=/opt/blasfeo_x64_avx2 -DBLASFEO_X64_AVX512_DIR=/opt/blasfeo_x64_avx512"
+export CMAKE_ARGS="-DBLASFEO_X64_DIR=c:/opt/blasfeo_x64 -DBLASFEO_X64_AVX2_DIR=c:/opt/blasfeo_x64_avx2 -DBLASFEO_X64_AVX512_DIR=c:/opt/blasfeo_x64_avx512"