Skip to content

Commit 3fc4b71

Browse files
authored
Merge pull request numpy#19483 from charris/update-blas64_ci
MAINT: Update for using openblas64_.
2 parents 93a9ed2 + 6ec6519 commit 3fc4b71

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ stages:
273273
TEST_MODE: full
274274
BITS: 64
275275
NPY_USE_BLAS_ILP64: '1'
276-
OPENBLAS_SUFFIX: '64_'
276+
277277
steps:
278278
- template: azure-steps-windows.yml
279279

azure-steps-windows.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,12 @@ steps:
2929
- script: python -m pip install -r test_requirements.txt
3030
displayName: 'Install dependencies; some are optional to avoid test skips'
3131

32+
- powershell: |
33+
choco install -y mingw --forcex86 --force --version=7.3.0
34+
refreshenv
35+
displayName: 'Install 32-bit mingw for 32-bit builds'
36+
condition: eq(variables['BITS'], 32)
37+
3238
- powershell: |
3339
$ErrorActionPreference = "Stop"
3440
# Download and get the path to "openblas.a". We cannot copy it
@@ -37,29 +43,25 @@ steps:
3743
# since OPENBLAS will be picked up by the openblas discovery
3844
$target = $(python tools/openblas_support.py)
3945
mkdir openblas
40-
echo "Copying $target to openblas/openblas$env:OPENBLAS_SUFFIX.a"
41-
cp $target openblas/openblas$env:OPENBLAS_SUFFIX.a
42-
If ( Test-Path env:NPY_USE_BLAS_ILP64 ){
43-
echo "##vso[task.setvariable variable=OPENBLAS64_]$pwd\openblas"
44-
} else {
45-
echo "##vso[task.setvariable variable=OPENBLAS]$pwd\openblas"
46-
}
46+
echo "Copying $target to openblas/"
47+
cp $target openblas/
4748
displayName: 'Download / Install OpenBLAS'
4849

49-
- powershell: |
50-
choco install -y mingw --forcex86 --force --version=7.3.0
51-
refreshenv
52-
displayName: 'Install 32-bit mingw for 32-bit builds'
53-
condition: eq(variables['BITS'], 32)
5450
# NOTE: for Windows builds it seems much more tractable to use runtests.py
5551
# vs. manual setup.py and then runtests.py for testing only
5652

5753
- powershell: |
54+
ls openblas
5855
If ($(BITS) -eq 32) {
5956
$env:CFLAGS = "-m32"
6057
$env:LDFLAGS = "-m32"
6158
$env:PATH = "C:\\ProgramData\\chocolatey\\lib\\mingw\\tools\\install\\mingw$(BITS)\\bin;" + $env:PATH
6259
}
60+
If ( Test-Path env:NPY_USE_BLAS_ILP64 ) {
61+
$env:OPENBLAS64_ = "openblas"
62+
} else {
63+
$env:OPENBLAS = "openblas"
64+
}
6365
python -c "from tools import openblas_support; openblas_support.make_init('numpy')"
6466
python -m pip wheel -v -v -v --no-build-isolation --no-use-pep517 --wheel-dir=dist .
6567

0 commit comments

Comments
 (0)