Skip to content

Commit fe7146b

Browse files
authored
Update vcpkg setup in cibuildwheel workflow
Refactor Windows environment setup for vcpkg and update LAPACK library configuration.
1 parent 4977fba commit fe7146b

1 file changed

Lines changed: 9 additions & 12 deletions

File tree

.github/workflows/cibuildwheel.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,16 @@ jobs:
4040
- name: Build wheels
4141
env:
4242
CIBW_ENVIRONMENT_MACOS: EASYSBA_USE_ACCELERATE=1 EASYSBA_LAPACK_LIBS=
43+
# Use the pre-installed vcpkg location for speed and reliability
4344
CIBW_BEFORE_ALL_WINDOWS: >-
44-
if not exist C:\vcpkg\vcpkg.exe (
45-
git clone https://github.com/microsoft/vcpkg.git C:\vcpkg &&
46-
C:\vcpkg\bootstrap-vcpkg.bat -disableMetrics
47-
) &&
48-
C:\vcpkg\vcpkg.exe install openblas:x64-windows
49-
CIBW_ENVIRONMENT_WINDOWS: |
50-
EASYSBA_LAPACK_LIBS=openblas
51-
EASYSBA_INCLUDE_DIRS=C:\\vcpkg\\installed\\x64-windows\\include
52-
EASYSBA_LIBRARY_DIRS=C:\\vcpkg\\installed\\x64-windows\\lib
53-
INCLUDE=C:\\vcpkg\\installed\\x64-windows\\include
54-
LIB=C:\\vcpkg\\installed\\x64-windows\\lib
55-
PATH=C:\\vcpkg\\installed\\x64-windows\\bin;{PATH}
45+
vcpkg install openblas:x64-windows
46+
47+
CIBW_ENVIRONMENT_WINDOWS: >-
48+
EASYSBA_LAPACK_LIBS="libopenblas"
49+
EASYSBA_INCLUDE_DIRS="C:/vcpkg/installed/x64-windows/include"
50+
EASYSBA_LIBRARY_DIRS="C:/vcpkg/installed/x64-windows/lib"
51+
INCLUDE="C:/vcpkg/installed/x64-windows/include;$INCLUDE"
52+
LIB="C:/vcpkg/installed/x64-windows/lib;$LIB"
5653
run: python -m cibuildwheel --output-dir wheelhouse
5754

5855
- name: Upload wheels

0 commit comments

Comments
 (0)