diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2021-07-15 09:05:45 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2021-07-15 15:44:15 -0600 |
| commit | 6ec6519fcc2790f6096e15b2625e04f869160eef (patch) | |
| tree | c0e5d06a90926a37cee2be994eeb5a96d745da94 | |
| parent | 89c80ba606f4346f8df2a31cfcc0e967045a68ed (diff) | |
| download | numpy-6ec6519fcc2790f6096e15b2625e04f869160eef.tar.gz | |
MAINT: Update for using openblas64_.
Simplification following similar work on the openblas64_ wheel builds.
| -rw-r--r-- | azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | azure-steps-windows.yml | 26 |
2 files changed, 15 insertions, 13 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index fa527f565..a5b8bd363 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -273,7 +273,7 @@ stages: TEST_MODE: full BITS: 64 NPY_USE_BLAS_ILP64: '1' - OPENBLAS_SUFFIX: '64_' + steps: - template: azure-steps-windows.yml diff --git a/azure-steps-windows.yml b/azure-steps-windows.yml index 6a69db753..9a5f9bb70 100644 --- a/azure-steps-windows.yml +++ b/azure-steps-windows.yml @@ -30,6 +30,12 @@ steps: displayName: 'Install dependencies; some are optional to avoid test skips' - powershell: | + choco install -y mingw --forcex86 --force --version=7.3.0 + refreshenv + displayName: 'Install 32-bit mingw for 32-bit builds' + condition: eq(variables['BITS'], 32) + +- powershell: | $ErrorActionPreference = "Stop" # Download and get the path to "openblas.a". We cannot copy it # to $PYTHON_EXE's directory since that is on a different drive which @@ -37,29 +43,25 @@ steps: # since OPENBLAS will be picked up by the openblas discovery $target = $(python tools/openblas_support.py) mkdir openblas - echo "Copying $target to openblas/openblas$env:OPENBLAS_SUFFIX.a" - cp $target openblas/openblas$env:OPENBLAS_SUFFIX.a - If ( Test-Path env:NPY_USE_BLAS_ILP64 ){ - echo "##vso[task.setvariable variable=OPENBLAS64_]$pwd\openblas" - } else { - echo "##vso[task.setvariable variable=OPENBLAS]$pwd\openblas" - } + echo "Copying $target to openblas/" + cp $target openblas/ displayName: 'Download / Install OpenBLAS' -- powershell: | - choco install -y mingw --forcex86 --force --version=7.3.0 - refreshenv - displayName: 'Install 32-bit mingw for 32-bit builds' - condition: eq(variables['BITS'], 32) # NOTE: for Windows builds it seems much more tractable to use runtests.py # vs. manual setup.py and then runtests.py for testing only - powershell: | + ls openblas If ($(BITS) -eq 32) { $env:CFLAGS = "-m32" $env:LDFLAGS = "-m32" $env:PATH = "C:\\ProgramData\\chocolatey\\lib\\mingw\\tools\\install\\mingw$(BITS)\\bin;" + $env:PATH } + If ( Test-Path env:NPY_USE_BLAS_ILP64 ) { + $env:OPENBLAS64_ = "openblas" + } else { + $env:OPENBLAS = "openblas" + } python -c "from tools import openblas_support; openblas_support.make_init('numpy')" python -m pip wheel -v -v -v --no-build-isolation --no-use-pep517 --wheel-dir=dist . |