From 09c55baec483600f125238fa8c5c826a4b8410ec Mon Sep 17 00:00:00 2001 From: atksh <31435204+atksh@users.noreply.github.com> Date: Sat, 13 Apr 2024 09:19:32 +0900 Subject: [PATCH 1/8] chore: Update python versions in cibuildwheel.yml --- .github/workflows/cibuildwheel.yml | 78 +++++++++++++++++++++++++++--- 1 file changed, 72 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index ec0e963..a282a28 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -43,6 +43,14 @@ jobs: python: 310 platform_id: win_amd64 arch: AMD64 + - os: windows-latest + python: 311 + platform_id: win_amd64 + arch: AMD64 + - os: windows-latest + python: 312 + platform_id: win_amd64 + arch: AMD64 # Linux 64 bit manylinux2014 - os: ubuntu-latest @@ -70,6 +78,16 @@ jobs: platform_id: manylinux_x86_64 manylinux_image: manylinux2014 arch: x86_64 + - os: ubuntu-latest + python: 311 + platform_id: manylinux_x86_64 + manylinux_image: manylinux2014 + arch: x86_64 + - os: ubuntu-latest + python: 312 + platform_id: manylinux_x86_64 + manylinux_image: manylinux2014 + arch: x86_64 # Linux 64 bit aarch64 - os: ubuntu-latest @@ -97,33 +115,81 @@ jobs: platform_id: manylinux_aarch64 manylinux_image: manylinux2014 arch: aarch64 + - os: ubuntu-latest + python: 311 + platform_id: manylinux_aarch64 + manylinux_image: manylinux2014 + arch: aarch64 + - os: ubuntu-latest + python: 312 + platform_id: manylinux_aarch64 + manylinux_image: manylinux2014 + arch: aarch64 # MacOS x86_64 - - os: macos-latest + - os: macos-13 python: 36 platform_id: macosx_x86_64 macosx_deployment_target: 10.14 arch: x86_64 - - os: macos-latest + - os: macos-13 python: 37 platform_id: macosx_x86_64 macosx_deployment_target: 10.14 arch: x86_64 - - os: macos-latest + - os: macos-13 python: 38 platform_id: macosx_x86_64 macosx_deployment_target: 10.14 arch: x86_64 - - os: macos-latest + - os: macos-13 python: 39 platform_id: macosx_x86_64 macosx_deployment_target: 10.14 arch: x86_64 - - os: macos-latest + - os: macos-13 python: 310 platform_id: macosx_x86_64 macosx_deployment_target: 10.14 arch: x86_64 + - os: macos-13 + python: 311 + platform_id: macosx_x86_64 + macosx_deployment_target: 10.14 + arch: x86_64 + - os: macos-13 + python: 312 + platform_id: macosx_x86_64 + macosx_deployment_target: 10.14 + arch: x86_64 + + # MacOS arm + - os: macos-14 + python: 38 + platform_id: macosx_arm + macosx_deployment_target: 11.7 + arch: arm + - os: macos-14 + python: 39 + platform_id: macosx_arm + macosx_deployment_target: 11.7 + arch: arm + - os: macos-14 + python: 310 + platform_id: macosx_arm + macosx_deployment_target: 11.7 + arch: arm + - os: macos-14 + python: 311 + platform_id: macosx_arm + macosx_deployment_target: 11.7 + arch: arm + - os: macos-14 + python: 312 + platform_id: macosx_arm + macosx_deployment_target: 11.7 + arch: arm + steps: - uses: actions/checkout@v2 @@ -143,7 +209,7 @@ jobs: env: CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }} CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }} - CIBW_TEST_SKIP: "*-macosx_universal2" + CIBW_TEST_SKIP: "*-macosx_arm" CIBW_BEFORE_BUILD: pip install pybind11 CIBW_TEST_COMMAND: pytest {project}/tests -vv CIBW_TEST_REQUIRES: pytest numpy From cb1a77d523abe193fa75aa99b5a4e13ef48670d9 Mon Sep 17 00:00:00 2001 From: atksh <31435204+atksh@users.noreply.github.com> Date: Sat, 13 Apr 2024 09:23:59 +0900 Subject: [PATCH 2/8] fix --- .github/workflows/cibuildwheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index a282a28..c66ce8d 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -205,7 +205,7 @@ jobs: with: platforms: all - name: Build wheels - uses: pypa/cibuildwheel@v2.4.0 + uses: pypa/cibuildwheel@v2.17.0 env: CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }} CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }} From 14bbd0077dca250a5a99eb948127d4a54bee893e Mon Sep 17 00:00:00 2001 From: atksh <31435204+atksh@users.noreply.github.com> Date: Sat, 13 Apr 2024 09:27:30 +0900 Subject: [PATCH 3/8] mod --- .github/workflows/cibuildwheel.yml | 2 +- third/mimalloc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 160000 third/mimalloc diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index c66ce8d..d5e46ec 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -195,7 +195,7 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 name: Install Python with: python-version: 3.9 diff --git a/third/mimalloc b/third/mimalloc new file mode 160000 index 0000000..f2712f4 --- /dev/null +++ b/third/mimalloc @@ -0,0 +1 @@ +Subproject commit f2712f4a8f038a7fb4df2790f4c3b7e3ed9e219b From 8a16c10121fd007e3e645ae8c82a37747da60123 Mon Sep 17 00:00:00 2001 From: atksh <31435204+atksh@users.noreply.github.com> Date: Sat, 13 Apr 2024 09:27:38 +0900 Subject: [PATCH 4/8] mod --- third/mimalloc | 1 - 1 file changed, 1 deletion(-) delete mode 160000 third/mimalloc diff --git a/third/mimalloc b/third/mimalloc deleted file mode 160000 index f2712f4..0000000 --- a/third/mimalloc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f2712f4a8f038a7fb4df2790f4c3b7e3ed9e219b From d22520f37b6295645e2dcbd10ff50d9c1ae16d3c Mon Sep 17 00:00:00 2001 From: atksh <31435204+atksh@users.noreply.github.com> Date: Sat, 13 Apr 2024 09:31:09 +0900 Subject: [PATCH 5/8] mod --- .github/workflows/cibuildwheel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index d5e46ec..b0c94cf 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -230,7 +230,7 @@ jobs: - uses: actions/setup-python@v2 name: Install Python with: - python-version: 3.9 + python-version: 3.10 - name: Build sdist run: python setup.py sdist - uses: actions/upload-artifact@v2 From 6fffc351c1cc182b03cc16a81569c76e34e4162f Mon Sep 17 00:00:00 2001 From: atksh <31435204+atksh@users.noreply.github.com> Date: Sat, 13 Apr 2024 09:33:23 +0900 Subject: [PATCH 6/8] mod --- .github/workflows/cibuildwheel.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index b0c94cf..b844edb 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -198,7 +198,7 @@ jobs: - uses: actions/setup-python@v5 name: Install Python with: - python-version: 3.9 + python-version: '3.10' - name: Set up QEMU if: runner.os == 'Linux' uses: docker/setup-qemu-action@v1 @@ -227,10 +227,10 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 name: Install Python with: - python-version: 3.10 + python-version: '3.10' - name: Build sdist run: python setup.py sdist - uses: actions/upload-artifact@v2 From a1bd218cffab3981a7523b6f9ae72c9c54a96ab1 Mon Sep 17 00:00:00 2001 From: atksh <31435204+atksh@users.noreply.github.com> Date: Sat, 13 Apr 2024 09:35:54 +0900 Subject: [PATCH 7/8] mod --- .github/workflows/cibuildwheel.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index b844edb..41e36b0 100644 --- a/.github/workflows/cibuildwheel.yml +++ b/.github/workflows/cibuildwheel.yml @@ -163,32 +163,32 @@ jobs: macosx_deployment_target: 10.14 arch: x86_64 - # MacOS arm + # MacOS arm64 - os: macos-14 python: 38 - platform_id: macosx_arm + platform_id: macosx_arm64 macosx_deployment_target: 11.7 - arch: arm + arch: arm64 - os: macos-14 python: 39 - platform_id: macosx_arm + platform_id: macosx_arm64 macosx_deployment_target: 11.7 - arch: arm + arch: arm64 - os: macos-14 python: 310 - platform_id: macosx_arm + platform_id: macosx_arm64 macosx_deployment_target: 11.7 - arch: arm + arch: arm64 - os: macos-14 python: 311 - platform_id: macosx_arm + platform_id: macosx_arm64 macosx_deployment_target: 11.7 - arch: arm + arch: arm64 - os: macos-14 python: 312 - platform_id: macosx_arm + platform_id: macosx_arm64 macosx_deployment_target: 11.7 - arch: arm + arch: arm64 steps: @@ -209,7 +209,6 @@ jobs: env: CIBW_MANYLINUX_X86_64_IMAGE: ${{ matrix.manylinux_image }} CIBW_BUILD: cp${{ matrix.python }}-${{ matrix.platform_id }} - CIBW_TEST_SKIP: "*-macosx_arm" CIBW_BEFORE_BUILD: pip install pybind11 CIBW_TEST_COMMAND: pytest {project}/tests -vv CIBW_TEST_REQUIRES: pytest numpy From 4021bd50c676a13396f1cba59c8a9a3778ffa8b3 Mon Sep 17 00:00:00 2001 From: atksh <31435204+atksh@users.noreply.github.com> Date: Sat, 13 Apr 2024 09:37:54 +0900 Subject: [PATCH 8/8] mod --- requirements.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index a617c57..d291914 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1 @@ -numpy>=1.16,<2.0 -pybind11; platform_machine != "x86_64" and platform_machine != "amd64" and platform_machine != "AMD64" and sys_platform == 'darwin' # for m1 mac -cmake; platform_machine != "x86_64" and platform_machine != "amd64" and platform_machine != "AMD64" and sys_platform == 'darwin' # for m1 mac +numpy>=1.16,<2.0 \ No newline at end of file