Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 60 additions & 11 deletions .github/workflows/release-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@ jobs:
- { os: ubuntu-24.04, arch: i686, build: 'cp*-manylinux*', build_id: cp-manylinux }
- { os: ubuntu-24.04, arch: i686, build: 'cp*-musllinux*', build_id: cp-musllinux }
- { os: ubuntu-24.04, arch: i686, build: 'pp*', build_id: pp }
- { os: windows-2022, arch: x86, build: 'cp*', build_id: cp }
- { os: windows-2022, arch: AMD64, build: 'cp*', build_id: cp }
- { os: windows-2022, arch: AMD64, build: 'pp*', build_id: pp }
- { os: windows-2022, arch: ARM64, build: 'cp*', build_id: cp }
- { os: macos-15-intel, arch: x86_64, build: 'cp*', build_id: cp }
- { os: macos-15-intel, arch: x86_64, build: 'pp*', build_id: pp }
- { os: macos-15-intel, arch: arm64, build: 'cp*', build_id: cp }
- { os: windows-2025, arch: x86, build: 'cp*', build_id: cp }
- { os: windows-2025, arch: AMD64, build: 'cp*', build_id: cp }
- { os: windows-2025, arch: AMD64, build: 'pp*', build_id: pp }
- { os: windows-11-arm, arch: ARM64, build: 'cp*', build_id: cp }
- { os: macos-15-intel, arch: x86_64, build: 'cp*', build_id: cp }
- { os: macos-15-intel, arch: x86_64, build: 'pp*', build_id: pp }
- { os: macos-15-intel, arch: arm64, build: 'cp*', build_id: cp }
- { os: ubuntu-24.04-arm, arch: armv7l, build: 'cp*-manylinux*', build_id: cp-manylinux }
- { os: ubuntu-24.04-arm, arch: armv7l, build: 'cp*-musllinux*', build_id: cp-musllinux }
- { os: ubuntu-24.04-arm, arch: aarch64, build: 'cp*-manylinux*', build_id: cp-manylinux }
Expand Down Expand Up @@ -130,9 +130,9 @@ jobs:
with:
output-dir: wheelhouse

# build wheels for windows-2022
# build wheels for windows
- name: Build wheels for windows
if: matrix.os == 'windows-2022' && (matrix.arch == 'AMD64' || matrix.arch == 'x86')
if: matrix.os == 'windows-2025' && (matrix.arch == 'AMD64' || matrix.arch == 'x86')
uses: pypa/cibuildwheel@v3.3.1
env:
CIBW_ARCHS_WINDOWS: ${{ matrix.arch }}
Expand All @@ -146,7 +146,7 @@ jobs:
output-dir: wheelhouse

- name: Build wheels for windows ARM64
if: matrix.os == 'windows-2022' && matrix.arch == 'ARM64'
if: matrix.os == 'windows-11-arm' && matrix.arch == 'ARM64'
uses: pypa/cibuildwheel@v3.3.1
env:
CIBW_ARCHS_WINDOWS: ${{ matrix.arch }}
Expand Down Expand Up @@ -276,11 +276,60 @@ jobs:
name: wheels-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.build_id }}
path: wheelhouse/*.whl

build_wheels_qemu_cp:
name: ${{ matrix.arch }} ${{ matrix.build_cp }} ${{ matrix.build_sub }}
runs-on: ubuntu-24.04

strategy:
fail-fast: false
matrix:
arch: [riscv64]
build_cp: [cp38, cp39, cp310, cp311, cp312, cp313]
build_sub: [manylinux, musllinux]

steps:
- uses: actions/checkout@v6
with:
submodules: true

- uses: actions/setup-python@v6
with:
python-version: '3.x'

- name: Set up QEMU
uses: docker/setup-qemu-action@v3
with:
platforms: all

- name: Build wheels with qemu
uses: pypa/cibuildwheel@v3.3.1
env:
CIBW_ARCHS_LINUX: ${{ matrix.arch }}
CIBW_BUILD: ${{ matrix.build_cp }}-${{ matrix.build_sub }}*
CIBW_BUILD_VERBOSITY: 1
CIBW_ENVIRONMENT: CMAKE_BUILD_PARALLEL_LEVEL=4 EXTRA_CMAKE_ARGS="-DNCNN_XTHEADVECTOR=OFF"
with:
output-dir: wheelhouse

- name: Show files
run: ls -lh wheelhouse
shell: bash

- name: Verify clean directory
run: git diff --exit-code
shell: bash

- name: Upload wheels
uses: actions/upload-artifact@v6
with:
name: wheels_qemu_cp-${{ matrix.arch }}-${{ matrix.build_cp }}-${{ matrix.build_sub }}
path: wheelhouse/*.whl

upload_all:
permissions:
contents: none
name: Upload
needs: [build_wheels, build_sdist]
needs: [build_wheels, build_wheels_qemu_cp, build_sdist]
runs-on: ubuntu-latest

steps:
Expand Down
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ def find_version():
ENABLE_BITCODE = os.environ.get("ENABLE_BITCODE", "")
ENABLE_ARC = os.environ.get("ENABLE_ARC", "")
ENABLE_VISIBILITY = os.environ.get("ENABLE_VISIBILITY", "")
EXTRA_CMAKE_ARGS = os.getenv("EXTRA_CMAKE_ARGS", "").split()

# Parse variables from command line with setup.py install
class InstallCommand(install):
Expand Down Expand Up @@ -129,6 +130,8 @@ def build_extension(self, ext):
if ENABLE_VISIBILITY != "":
cmake_args.append("-DENABLE_VISIBILITY=" + ENABLE_VISIBILITY)

cmake_args += EXTRA_CMAKE_ARGS

build_args = []

if self.compiler.compiler_type == "msvc":
Expand Down
Loading