From 27a9d6fa9cff7ce12a48aca22bef57e8e057b21c Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Fri, 13 Oct 2023 16:37:01 +0300 Subject: [PATCH 01/18] Fix building wheels --- .github/workflows/test_build.yml | 5 +++-- pyproject.toml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index b8472ab8..6d092c1f 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -9,7 +9,7 @@ jobs: build_wheels: strategy: matrix: - os: [ windows-2019, macOS-11 ] + os: [ubuntu-20.04 windows-2019, macOS-11 ] name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} @@ -32,4 +32,5 @@ jobs: env: CIBW_ENVIRONMENT_MACOS: > PATH="/usr/local/opt/llvm/bin:$PATH" LDFLAGS="-L/usr/local/opt/llvm/lib" CPPFLAGS="-I/usr/local/opt/llvm/include" - CIBW_BUILD: cp310-* + CIBW_BUILD: cp39-* + CIBW_SKIP: "*musllinux*" "*manylinux_x86_64" diff --git a/pyproject.toml b/pyproject.toml index ede7a018..d0c6ea5f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ['setuptools', 'numpy', 'Cython<3.0.0'] +requires = ['setuptools', 'numpy<1.26.0', 'Cython<3.0.0'] build-backend = 'setuptools.build_meta' [project] From a3f87c5d068956c5ad27e4b60b284c19bf2f4a23 Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Fri, 13 Oct 2023 16:38:59 +0300 Subject: [PATCH 02/18] Fix --- .github/workflows/test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 6d092c1f..0b934d61 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -33,4 +33,4 @@ jobs: CIBW_ENVIRONMENT_MACOS: > PATH="/usr/local/opt/llvm/bin:$PATH" LDFLAGS="-L/usr/local/opt/llvm/lib" CPPFLAGS="-I/usr/local/opt/llvm/include" CIBW_BUILD: cp39-* - CIBW_SKIP: "*musllinux*" "*manylinux_x86_64" + CIBW_SKIP: "*musllinux* *manylinux_x86_64" From 4cb3954653a19b9f1c5af212afadc939a40a11a7 Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Fri, 13 Oct 2023 16:40:14 +0300 Subject: [PATCH 03/18] Fix --- .github/workflows/test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 0b934d61..642a8b69 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -9,7 +9,7 @@ jobs: build_wheels: strategy: matrix: - os: [ubuntu-20.04 windows-2019, macOS-11 ] + os: [ubuntu-20.04, windows-2019, macOS-11 ] name: Build wheels on ${{ matrix.os }} runs-on: ${{ matrix.os }} From cee4d8f2c1c3aca3a5a9b8768831a2621f0171c6 Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Sat, 14 Oct 2023 01:49:43 +0300 Subject: [PATCH 04/18] Try install blas --- .github/workflows/test_build.yml | 3 +++ pyproject.toml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 642a8b69..279a79ba 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -27,6 +27,9 @@ jobs: ln -sf /usr/local/bin/gcc-12 /usr/local/bin/gcc ls /usr/local/bin/gcc* gcc --version + - name: Install blas for i686 + if: matrix.os == 'ubuntu-20.04' + run: sudo apt-get install libopenblas-dev - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse env: diff --git a/pyproject.toml b/pyproject.toml index d0c6ea5f..ede7a018 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ['setuptools', 'numpy<1.26.0', 'Cython<3.0.0'] +requires = ['setuptools', 'numpy', 'Cython<3.0.0'] build-backend = 'setuptools.build_meta' [project] From 8ac41fb29488a79a68257332fca91ce1248f11af Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Sat, 14 Oct 2023 02:29:01 +0300 Subject: [PATCH 05/18] Maybe Fix --- .github/workflows/test_build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 279a79ba..7296d946 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -29,7 +29,9 @@ jobs: gcc --version - name: Install blas for i686 if: matrix.os == 'ubuntu-20.04' - run: sudo apt-get install libopenblas-dev + run: | + sudo apt-get install libopenblas-dev + export PKG_CONFIG_PATH="/usr/lib/x86_64-linux-gnu/openblas-pthread/pkgconfig" - name: Build wheels run: python -m cibuildwheel --output-dir wheelhouse env: From d622494c0fb734f974c7f9813d962a95198f44cf Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Sat, 14 Oct 2023 02:37:36 +0300 Subject: [PATCH 06/18] wtf --- .github/workflows/test_build.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 7296d946..f08fe21e 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -30,10 +30,12 @@ jobs: - name: Install blas for i686 if: matrix.os == 'ubuntu-20.04' run: | - sudo apt-get install libopenblas-dev + sudo apt-get install libopenblas-dev pkg-config export PKG_CONFIG_PATH="/usr/lib/x86_64-linux-gnu/openblas-pthread/pkgconfig" - name: Build wheels - run: python -m cibuildwheel --output-dir wheelhouse + run: | + echo $PKG_CONFIG_PATH + python -m cibuildwheel --output-dir wheelhouse env: CIBW_ENVIRONMENT_MACOS: > PATH="/usr/local/opt/llvm/bin:$PATH" LDFLAGS="-L/usr/local/opt/llvm/lib" CPPFLAGS="-I/usr/local/opt/llvm/include" From a0911781175be215b57ea8dce87ba8e2cff449e8 Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Sat, 14 Oct 2023 02:43:02 +0300 Subject: [PATCH 07/18] Fix? --- .github/workflows/test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index f08fe21e..897d53f0 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -31,7 +31,6 @@ jobs: if: matrix.os == 'ubuntu-20.04' run: | sudo apt-get install libopenblas-dev pkg-config - export PKG_CONFIG_PATH="/usr/lib/x86_64-linux-gnu/openblas-pthread/pkgconfig" - name: Build wheels run: | echo $PKG_CONFIG_PATH @@ -41,3 +40,4 @@ jobs: PATH="/usr/local/opt/llvm/bin:$PATH" LDFLAGS="-L/usr/local/opt/llvm/lib" CPPFLAGS="-I/usr/local/opt/llvm/include" CIBW_BUILD: cp39-* CIBW_SKIP: "*musllinux* *manylinux_x86_64" + PKG_CONFIG_PATH: "/usr/lib/x86_64-linux-gnu/openblas-pthread/pkgconfig" From 582f5bd2d4d27967cd49d7286ede6dab6eb3757b Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Sat, 14 Oct 2023 02:48:36 +0300 Subject: [PATCH 08/18] ls --- .github/workflows/test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 897d53f0..1382e24f 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -33,7 +33,7 @@ jobs: sudo apt-get install libopenblas-dev pkg-config - name: Build wheels run: | - echo $PKG_CONFIG_PATH + ls $PKG_CONFIG_PATH python -m cibuildwheel --output-dir wheelhouse env: CIBW_ENVIRONMENT_MACOS: > From ce6f5a740064972da99cbff13647ace07319d863 Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Sat, 14 Oct 2023 02:56:53 +0300 Subject: [PATCH 09/18] Fix? --- .github/workflows/test_build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 1382e24f..7d71f9c6 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -33,11 +33,10 @@ jobs: sudo apt-get install libopenblas-dev pkg-config - name: Build wheels run: | - ls $PKG_CONFIG_PATH python -m cibuildwheel --output-dir wheelhouse env: CIBW_ENVIRONMENT_MACOS: > PATH="/usr/local/opt/llvm/bin:$PATH" LDFLAGS="-L/usr/local/opt/llvm/lib" CPPFLAGS="-I/usr/local/opt/llvm/include" CIBW_BUILD: cp39-* CIBW_SKIP: "*musllinux* *manylinux_x86_64" - PKG_CONFIG_PATH: "/usr/lib/x86_64-linux-gnu/openblas-pthread/pkgconfig" + PKG_CONFIG_PATH: "/usr/lib/x86_64-linux-gnu/openblas-pthread/pkgconfig/openblas.pc" From fb4806824f84b2ceb82f622838bba7e1e7ddac22 Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Sat, 14 Oct 2023 02:59:39 +0300 Subject: [PATCH 10/18] Fix? --- .github/workflows/test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 7d71f9c6..252bc634 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -39,4 +39,4 @@ jobs: PATH="/usr/local/opt/llvm/bin:$PATH" LDFLAGS="-L/usr/local/opt/llvm/lib" CPPFLAGS="-I/usr/local/opt/llvm/include" CIBW_BUILD: cp39-* CIBW_SKIP: "*musllinux* *manylinux_x86_64" - PKG_CONFIG_PATH: "/usr/lib/x86_64-linux-gnu/openblas-pthread/pkgconfig/openblas.pc" + PKG_CONFIG_PATH: "/usr/lib/x86_64-linux-gnu/openblas-pthread/pkgconfig/blas-openblas.pc" From 516cfdba3eab6f4e690665018122fc77d0e74a64 Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Mon, 16 Oct 2023 14:46:07 +0300 Subject: [PATCH 11/18] `numpy<2.0.0` for build --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index ede7a018..03753a93 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ['setuptools', 'numpy', 'Cython<3.0.0'] +requires = ['setuptools', 'numpy<2.0.0', 'Cython<3.0.0'] build-backend = 'setuptools.build_meta' [project] From 50891951d99fad51e6609216efa84deb7d7d2422 Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Mon, 16 Oct 2023 15:46:30 +0300 Subject: [PATCH 12/18] Manually install numpy w/o blas for build --- .github/workflows/test_build.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 252bc634..7766eafb 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -27,12 +27,10 @@ jobs: ln -sf /usr/local/bin/gcc-12 /usr/local/bin/gcc ls /usr/local/bin/gcc* gcc --version - - name: Install blas for i686 - if: matrix.os == 'ubuntu-20.04' - run: | - sudo apt-get install libopenblas-dev pkg-config - name: Build wheels run: | + python -m pip install --upgrade pip + pip install "numpy<2.0.0" -C-Dallow-noblas=true python -m cibuildwheel --output-dir wheelhouse env: CIBW_ENVIRONMENT_MACOS: > From 0822654517d82ccff85a0de65d758fb44916efcb Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Mon, 16 Oct 2023 15:59:41 +0300 Subject: [PATCH 13/18] Maybe this --- .github/workflows/test_build.yml | 1 - pyproject.toml | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 7766eafb..fb6616ce 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -30,7 +30,6 @@ jobs: - name: Build wheels run: | python -m pip install --upgrade pip - pip install "numpy<2.0.0" -C-Dallow-noblas=true python -m cibuildwheel --output-dir wheelhouse env: CIBW_ENVIRONMENT_MACOS: > diff --git a/pyproject.toml b/pyproject.toml index 03753a93..727f063b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ['setuptools', 'numpy<2.0.0', 'Cython<3.0.0'] +requires = ['setuptools', '"numpy<2.0.0" -C-Dallow-noblas=true', 'Cython<3.0.0'] build-backend = 'setuptools.build_meta' [project] From ff43f903d029e0c22a783f5f1e25b9b246ffc065 Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Mon, 16 Oct 2023 16:09:21 +0300 Subject: [PATCH 14/18] Maybe this --- pyproject.toml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 727f063b..064d8ac1 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,5 +1,5 @@ [build-system] -requires = ['setuptools', '"numpy<2.0.0" -C-Dallow-noblas=true', 'Cython<3.0.0'] +requires = ['setuptools', 'numpy<2.0.0', 'Cython<3.0.0'] build-backend = 'setuptools.build_meta' [project] @@ -70,3 +70,6 @@ imops = ['py.typed'] [tool.setuptools.dynamic] version = {attr = 'imops.__version__.__version__'} dependencies = { file = ['requirements.txt'] } + +[tool.cibuildwheel.config-settings] +--build-option = "-Dallow-noblas=true" From f040d99d58a0b959f9f4b6300d54832eb6f8c392 Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Mon, 16 Oct 2023 16:11:33 +0300 Subject: [PATCH 15/18] Update cibuildwheel --- .github/workflows/test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index fb6616ce..5d8aa22c 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v3 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.9.0 + run: python -m pip install cibuildwheel==2.10.0 - name: Install gcc for mac if: matrix.os == 'macOS-11' run: | From ce67e25d59173c541599416297fae1a5487a8a79 Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Mon, 16 Oct 2023 16:36:27 +0300 Subject: [PATCH 16/18] Maybe that --- .github/workflows/test_build.yml | 1 + pyproject.toml | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 5d8aa22c..b15af858 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -36,4 +36,5 @@ jobs: PATH="/usr/local/opt/llvm/bin:$PATH" LDFLAGS="-L/usr/local/opt/llvm/lib" CPPFLAGS="-I/usr/local/opt/llvm/include" CIBW_BUILD: cp39-* CIBW_SKIP: "*musllinux* *manylinux_x86_64" + CIBW_BEFORE_BUILD: "pip install numpy -C-Dallow-noblas=true" PKG_CONFIG_PATH: "/usr/lib/x86_64-linux-gnu/openblas-pthread/pkgconfig/blas-openblas.pc" diff --git a/pyproject.toml b/pyproject.toml index 064d8ac1..03753a93 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -70,6 +70,3 @@ imops = ['py.typed'] [tool.setuptools.dynamic] version = {attr = 'imops.__version__.__version__'} dependencies = { file = ['requirements.txt'] } - -[tool.cibuildwheel.config-settings] ---build-option = "-Dallow-noblas=true" From 188f744c750642f1844dead0898a818fd9276eed Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Mon, 16 Oct 2023 16:41:14 +0300 Subject: [PATCH 17/18] Fix --- .github/workflows/test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index b15af858..f0a9e910 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -36,5 +36,5 @@ jobs: PATH="/usr/local/opt/llvm/bin:$PATH" LDFLAGS="-L/usr/local/opt/llvm/lib" CPPFLAGS="-I/usr/local/opt/llvm/include" CIBW_BUILD: cp39-* CIBW_SKIP: "*musllinux* *manylinux_x86_64" - CIBW_BEFORE_BUILD: "pip install numpy -C-Dallow-noblas=true" + CIBW_BEFORE_BUILD: 'python -m pip install numpy --config-settings=setup-args="-Dallow-noblas=true"' PKG_CONFIG_PATH: "/usr/lib/x86_64-linux-gnu/openblas-pthread/pkgconfig/blas-openblas.pc" From 600379b869d7e538c00c356710350a02c4826c4a Mon Sep 17 00:00:00 2001 From: Philipenko Vladimir Date: Mon, 16 Oct 2023 17:16:20 +0300 Subject: [PATCH 18/18] Update builds --- .github/workflows/release.yml | 7 +++++-- .github/workflows/test_build.yml | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 669b8d7d..bf73825d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -44,7 +44,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-python@v3 - name: Install cibuildwheel - run: python -m pip install cibuildwheel==2.9.0 + run: python -m pip install cibuildwheel==2.10.0 - name: Install gcc for mac if: matrix.os == 'macOS-11' run: | @@ -54,11 +54,14 @@ jobs: ls /usr/local/bin/gcc* gcc --version - name: Build wheels - run: python -m cibuildwheel --output-dir wheelhouse + run: | + python -m pip install --upgrade pip + python -m cibuildwheel --output-dir wheelhouse env: CIBW_ENVIRONMENT_MACOS: > PATH="/usr/local/opt/llvm/bin:$PATH" LDFLAGS="-L/usr/local/opt/llvm/lib" CPPFLAGS="-I/usr/local/opt/llvm/include" CIBW_BUILD: cp36-* cp37-* cp38-* cp39-* cp310-* cp311-* + CIBW_BEFORE_BUILD: 'python -m pip install "numpy<2.0.0" --config-settings=setup-args="-Dallow-noblas=true"' - uses: actions/upload-artifact@v3 with: path: ./wheelhouse/*.whl diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index f0a9e910..2675486b 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -36,5 +36,4 @@ jobs: PATH="/usr/local/opt/llvm/bin:$PATH" LDFLAGS="-L/usr/local/opt/llvm/lib" CPPFLAGS="-I/usr/local/opt/llvm/include" CIBW_BUILD: cp39-* CIBW_SKIP: "*musllinux* *manylinux_x86_64" - CIBW_BEFORE_BUILD: 'python -m pip install numpy --config-settings=setup-args="-Dallow-noblas=true"' - PKG_CONFIG_PATH: "/usr/lib/x86_64-linux-gnu/openblas-pthread/pkgconfig/blas-openblas.pc" + CIBW_BEFORE_BUILD: 'python -m pip install "numpy<2.0.0" --config-settings=setup-args="-Dallow-noblas=true"'