From ddc227f01710b1931e7705bfe0a95bb6124b01cd Mon Sep 17 00:00:00 2001 From: XB500 Date: Thu, 6 Jun 2024 21:05:19 +0000 Subject: [PATCH 1/5] Opteryx Version 0.15.4-alpha.562 --- opteryx/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opteryx/__version__.py b/opteryx/__version__.py index 60f0c4beb..f35668406 100644 --- a/opteryx/__version__.py +++ b/opteryx/__version__.py @@ -1,4 +1,4 @@ -__build__ = 561 +__build__ = 562 # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From f3086e6411589a362ad32ba156cf6a7415e1f4a3 Mon Sep 17 00:00:00 2001 From: joocer Date: Thu, 6 Jun 2024 22:09:21 +0100 Subject: [PATCH 2/5] 1700 --- .github/workflows/release.yaml | 39 ++++++++++++++++++++++------------ Cargo.toml | 2 +- 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 18c93f250..f18c89775 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -132,6 +132,11 @@ jobs: name: dist-linux-3.12 path: dist +name: Build and Release + +on: [push, pull_request] + +jobs: build-macos: runs-on: macos-latest strategy: @@ -165,13 +170,13 @@ jobs: DEVELOPER_DIR: /Applications/Xcode.app/Contents/Developer MACOSX_DEPLOYMENT_TARGET: '10.15' ARCHFLAGS: -arch x86_64 -arch arm64 - PYO3_CROSS_LIB_DIR: /Applications/Xcode.app/Contents/Developer/Library/Frameworks/Python3.framework/Versions/${{ matrix.python-version }}/lib PYO3_CROSS: 1 PYO3_CROSS_PYTHON_VERSION: ${{ matrix.python-version }} PYO3_CROSS_PYTHON_IMPLEMENTATION: CPython PYO3_NO_PYTHON: 1 RUST_BACKTRACE: 1 - run: python setup.py bdist_wheel + CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG: true + run: cargo build --release --target aarch64-apple-darwin - name: Archive dist artifacts uses: actions/upload-artifact@v1 @@ -182,30 +187,37 @@ jobs: build-windows: runs-on: windows-latest strategy: - max-parallel: 3 + max-parallel: 4 matrix: python-version: ['3.9', '3.10', '3.11', '3.12'] steps: - - uses: actions/checkout@master - - - name: Download Build Tools for Visual Studio 2019 - run: Invoke-WebRequest -Uri https://aka.ms/vs/16/release/vs_buildtools.exe -OutFile vs_buildtools.exe + - uses: actions/checkout@v3.5.3 - - name: Run vs_buildtools.exe install - run: ./vs_buildtools.exe --quiet --wait --norestart --nocache --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 --add Microsoft.VisualStudio.Component.VC.140 --includeRecommended + - name: Install rust toolchain + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true - - name: Set up Python ${{ matrix.python-version }} x64 + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - architecture: x64 - name: Install Python package dependencies run: python -m pip install --upgrade cython wheel numpy setuptools_rust - - name: Build binary wheel - run: python setup.py bdist_wheel + - name: Build on Windows + shell: bash + env: + PYO3_CROSS: 1 + PYO3_CROSS_PYTHON_VERSION: ${{ matrix.python-version }} + PYO3_CROSS_PYTHON_IMPLEMENTATION: CPython + PYO3_NO_PYTHON: 1 + RUST_BACKTRACE: 1 + CARGO_PROFILE_RELEASE_BUILD_OVERRIDE_DEBUG: true + run: cargo build --release - name: Archive dist artifacts uses: actions/upload-artifact@v1 @@ -213,6 +225,7 @@ jobs: name: dist-windows-${{ matrix.python-version }} path: dist + # build-macos, upload: needs: [build-linux-cp39, build-linux-cp310, build-linux-cp311, build-linux-cp312, build-windows] diff --git a/Cargo.toml b/Cargo.toml index 4b74709b1..3886151ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ name = "compute" crate-type = ["cdylib"] [dependencies] -pyo3 = { version = "0.20.3", features = ["extension-module", "abi3-py310"] } +pyo3 = { version = "0.20.3", features = ["extension-module", "abi3-py39"] } numpy = "0.20" ndarray = "0.15.3" pythonize = "0.20" From 8f6e13de96fbeb7ef26115e8316e57189fe1eae1 Mon Sep 17 00:00:00 2001 From: XB500 Date: Thu, 6 Jun 2024 21:09:56 +0000 Subject: [PATCH 3/5] Opteryx Version 0.15.4-alpha.563 --- opteryx/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opteryx/__version__.py b/opteryx/__version__.py index f35668406..098e743b8 100644 --- a/opteryx/__version__.py +++ b/opteryx/__version__.py @@ -1,4 +1,4 @@ -__build__ = 562 +__build__ = 563 # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From fc42aa301948fc3441c04b530ddef5b61878c24c Mon Sep 17 00:00:00 2001 From: joocer Date: Thu, 6 Jun 2024 22:13:30 +0100 Subject: [PATCH 4/5] 1700 --- .github/workflows/release.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f18c89775..3d77c8fde 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -132,11 +132,6 @@ jobs: name: dist-linux-3.12 path: dist -name: Build and Release - -on: [push, pull_request] - -jobs: build-macos: runs-on: macos-latest strategy: From 7fd3ccb7baf0aed9a02eca7f7aa052b9073d9e90 Mon Sep 17 00:00:00 2001 From: XB500 Date: Thu, 6 Jun 2024 21:14:00 +0000 Subject: [PATCH 5/5] Opteryx Version 0.15.4-alpha.564 --- opteryx/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opteryx/__version__.py b/opteryx/__version__.py index 098e743b8..2cfb544c0 100644 --- a/opteryx/__version__.py +++ b/opteryx/__version__.py @@ -1,4 +1,4 @@ -__build__ = 563 +__build__ = 564 # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License.