Skip to content

Commit 1ea9b91

Browse files
Copilotalexlib
andcommitted
Use scipy-openblas64 instead of scipy-openblas
Co-authored-by: alexlib <747110+alexlib@users.noreply.github.com>
1 parent 9b0992a commit 1ea9b91

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

.github/workflows/cibuildwheel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
if: runner.os == 'Windows'
3232
run: |
3333
# Install these on the host so cibuildwheel can resolve the paths
34-
python -m pip install scipy-openblas delvewheel
34+
python -m pip install scipy-openblas64 delvewheel
3535
3636
- name: Build wheels
3737
run: python -m cibuildwheel --output-dir wheelhouse

pyproject.toml

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,12 @@ environment = { EASYSBA_USE_ACCELERATE = "1", EASYSBA_LAPACK_LIBS = "" }
2727
[tool.cibuildwheel.windows]
2828
# We already installed these on the host, but we install them in the
2929
# build venv as well to be safe for the repair step.
30-
before-build = "pip install scipy-openblas delvewheel"
30+
before-build = "pip install scipy-openblas64 delvewheel"
31+
# Use the repair-wheel-command to bundle the DLL
32+
repair-wheel-command = "python -c \"import scipy_openblas64, subprocess, sys; subprocess.check_call(['delvewheel', 'repair', '--add-path', scipy_openblas64.get_lib_dir(), '-w', sys.argv[1], sys.argv[2]])\" {dest_dir} {wheel}"
3133

3234
[tool.cibuildwheel.windows.environment]
3335
EASYSBA_LAPACK_LIBS = "openblas"
34-
# These $(...) commands will now work because scipy-openblas is on the host
35-
INCLUDE = "$(python -c \"import scipy_openblas; print(scipy_openblas.get_include_dir())\");$INCLUDE"
36-
LIB = "$(python -c \"import scipy_openblas; print(scipy_openblas.get_lib_dir())\");$LIB"
37-
38-
[tool.cibuildwheel.windows.repair-wheel-command]
39-
# Use the repair-wheel-command to bundle the DLL
40-
repair-wheel-command = "python -c \"import scipy_openblas, subprocess, sys; subprocess.check_call(['delvewheel', 'repair', '--add-path', scipy_openblas.get_lib_dir(), '-w', sys.argv[1], sys.argv[2]])\" {dest_dir} {wheel}"
36+
# These $(...) commands will now work because scipy-openblas64 is on the host
37+
INCLUDE = "$(python -c \"import scipy_openblas64; print(scipy_openblas64.get_include_dir())\");$INCLUDE"
38+
LIB = "$(python -c \"import scipy_openblas64; print(scipy_openblas64.get_lib_dir())\");$LIB"

0 commit comments

Comments
 (0)