From 58d8e0305d261cad08b4a3b4d6a3c65407883ef0 Mon Sep 17 00:00:00 2001 From: mattip Date: Tue, 7 Nov 2023 07:51:06 +0200 Subject: [PATCH 1/3] BLD: limit scipy-openblas32 wheel to 0.3.23.293.2 --- .github/workflows/linux.yml | 4 ++-- .github/workflows/linux_compiler_sanitizers.yml | 2 +- .github/workflows/linux_musl.yml | 2 +- .github/workflows/windows.yml | 4 ++-- azure-pipelines.yml | 2 +- azure-steps-windows.yml | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 7e3f7a52b4da..638554e3ba15 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -75,7 +75,7 @@ jobs: python-version: 'pypy3.9-v7.3.12' - name: Setup using scipy-openblas run: | - python -m pip install scipy-openblas32 spin + python -m pip install "scipy-openblas32<=0.3.23.293.2" spin spin config-openblas --with-scipy-openblas=32 - uses: ./.github/meson_actions @@ -129,7 +129,7 @@ jobs: set -xe sudo apt update sudo apt install gfortran libgfortran5 - pip install scipy-openblas32 + pip install "scipy-openblas32<=0.3.23.293.2" spin config-openblas --with-scipy-openblas=32 - name: Build a wheel env: diff --git a/.github/workflows/linux_compiler_sanitizers.yml b/.github/workflows/linux_compiler_sanitizers.yml index 904ae2a96f18..9822526881a9 100644 --- a/.github/workflows/linux_compiler_sanitizers.yml +++ b/.github/workflows/linux_compiler_sanitizers.yml @@ -35,7 +35,7 @@ jobs: - name: Install dependencies run: | pip install -r build_requirements.txt - pip install scipy-openblas32 spin + pip install "scipy-openblas32<=0.3.23.293.2" spin - name: Build shell: 'script -q -e -c "bash --noprofile --norc -eo pipefail {0}"' env: diff --git a/.github/workflows/linux_musl.yml b/.github/workflows/linux_musl.yml index 5c65a2b2e8b9..89a7e147c395 100644 --- a/.github/workflows/linux_musl.yml +++ b/.github/workflows/linux_musl.yml @@ -55,7 +55,7 @@ jobs: python -m venv test_env source test_env/bin/activate - pip install scipy-openblas64 + pip install "scipy-openblas64<=0.3.23.293.2" pip install -r build_requirements.txt -r test_requirements.txt diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 988a55b761db..eb7126a46a5b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -51,7 +51,7 @@ jobs: env: PKG_CONFIG_PATH: ${{ github.workspace }}/.openblas run: | - python -m pip install scipy-openblas32 + python -m pip install "scipy-openblas32<=0.3.23.293.2" spin build --with-scipy-openblas=32 -j2 -- --vsenv - name: Install NumPy (Clang-cl) @@ -60,7 +60,7 @@ jobs: PKG_CONFIG_PATH: ${{ github.workspace }}/.openblas run: | "[binaries]","c = 'clang-cl'","cpp = 'clang-cl'","ar = 'llvm-lib'","c_ld = 'lld-link'","cpp_ld = 'lld-link'" | Out-File $PWD/clang-cl-build.ini -Encoding ascii - python -m pip install scipy-openblas32 + python -m pip install "scipy-openblas32<=0.3.23.293.2" spin build --with-scipy-openblas=32 -j2 -- --vsenv --native-file=$PWD/clang-cl-build.ini - name: Meson Log diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 433a1fcbf15e..32e2084c2c6a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -73,7 +73,7 @@ stages: cd /numpy && \ /opt/python/cp39-cp39/bin/python -mvenv venv && \ source venv/bin/activate && \ - python3 -m pip install ninja scipy-openblas32 spin && \ + python3 -m pip install ninja "scipy-openblas32<=0.3.23.293.2" spin && \ python3 -m pip install -r test_requirements.txt && \ echo CFLAGS \$CFLAGS && \ spin config-openblas --with-scipy-openblas=32 && \ diff --git a/azure-steps-windows.yml b/azure-steps-windows.yml index 04ec079bd29b..6fb3ef7d04f9 100644 --- a/azure-steps-windows.yml +++ b/azure-steps-windows.yml @@ -30,12 +30,12 @@ steps: python -m pip install . -v -Csetup-args="--vsenv" -Csetup-args="-Dblas=none" -Csetup-args="-Dlapack=none" -Csetup-args="-Dallow-noblas=true" } elseif ( Test-Path env:_USE_BLAS_ILP64 ) { - python -m pip install scipy-openblas64 spin + python -m pip install "scipy-openblas64<=0.3.23.293.2" spin spin config-openblas --with-scipy-openblas=64 $env:PKG_CONFIG_PATH="$pwd/.openblas" python -m pip install . -v -Csetup-args="--vsenv" -Csetup-args="-Duse-ilp64=true" } else { - python -m pip install scipy-openblas32 spin + python -m pip install "scipy-openblas32<=0.3.23.293.2" spin spin config-openblas --with-scipy-openblas=32 $env:PKG_CONFIG_PATH="$pwd/.openblas" python -m pip install . -v -Csetup-args="--vsenv" From 96907132754f6334cf3dc920ee60594ef3091c10 Mon Sep 17 00:00:00 2001 From: mattip Date: Tue, 7 Nov 2023 10:45:32 +0200 Subject: [PATCH 2/3] BLD:escape < in docker bash command --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 32e2084c2c6a..71c196d7c3c4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -73,7 +73,7 @@ stages: cd /numpy && \ /opt/python/cp39-cp39/bin/python -mvenv venv && \ source venv/bin/activate && \ - python3 -m pip install ninja "scipy-openblas32<=0.3.23.293.2" spin && \ + python3 -m pip install ninja "scipy-openblas32\<=0.3.23.293.2" spin && \ python3 -m pip install -r test_requirements.txt && \ echo CFLAGS \$CFLAGS && \ spin config-openblas --with-scipy-openblas=32 && \ From 20a970eb8bb939a45452a0e4e061e4364156f131 Mon Sep 17 00:00:00 2001 From: mattip Date: Tue, 7 Nov 2023 11:41:56 +0200 Subject: [PATCH 3/3] BLD: move unwieldy multi-line CI script into a file --- azure-pipelines.yml | 14 +------------- tools/ci/run_32_bit_linux_docker.sh | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 13 deletions(-) create mode 100644 tools/ci/run_32_bit_linux_docker.sh diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 71c196d7c3c4..1348dfa3a04c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -68,19 +68,7 @@ stages: # yum does not have a ninja package, so use the PyPI one docker run -v $(pwd):/numpy -e CFLAGS="-msse2 -std=c99 -UNDEBUG" \ -e F77=gfortran-5 -e F90=gfortran-5 quay.io/pypa/manylinux2014_i686 \ - /bin/bash -xc " \ - git config --global --add safe.directory /numpy && \ - cd /numpy && \ - /opt/python/cp39-cp39/bin/python -mvenv venv && \ - source venv/bin/activate && \ - python3 -m pip install ninja "scipy-openblas32\<=0.3.23.293.2" spin && \ - python3 -m pip install -r test_requirements.txt && \ - echo CFLAGS \$CFLAGS && \ - spin config-openblas --with-scipy-openblas=32 && \ - export PKG_CONFIG_PATH=/numpy/.openblas && \ - python3 -m pip install . && \ - cd tools && \ - python3 -m pytest --pyargs numpy" + /bin/bash -xc "source /numpy/tools/ci/run_32_bit_linux_docker.sh" displayName: 'Run 32-bit manylinux2014 Docker Build / Tests' - job: Windows diff --git a/tools/ci/run_32_bit_linux_docker.sh b/tools/ci/run_32_bit_linux_docker.sh new file mode 100644 index 000000000000..4d9a1e426e39 --- /dev/null +++ b/tools/ci/run_32_bit_linux_docker.sh @@ -0,0 +1,14 @@ +set -xe + +git config --global --add safe.directory /numpy +cd /numpy +/opt/python/cp39-cp39/bin/python -mvenv venv +source venv/bin/activate +python3 -m pip install ninja "scipy-openblas32<=0.3.23.293.2" spin +python3 -m pip install -r test_requirements.txt +echo CFLAGS \$CFLAGS +spin config-openblas --with-scipy-openblas=32 +export PKG_CONFIG_PATH=/numpy/.openblas +python3 -m pip install . +cd tools +python3 -m pytest --pyargs numpy