From c96417b9890664b660268b23746e3801e1d5a0c3 Mon Sep 17 00:00:00 2001 From: Ludovic Henry Date: Sat, 26 Sep 2026 03:40:29 +0000 Subject: [PATCH] stim: Add version 1.16.0 Build stim's riscv64 wheels from the v1.16.0 checkout with cibuildwheel, mirroring upstream's ci.yml build_dist job (same test-requires and test-command), narrowed to cp312/cp313/cp314 manylinux_riscv64. stim's SIMD code is compile-time gated (__AVX2__/__SSE2__) with a portable 64-bit bitword polyfill, and setup.py already builds only _stim_polyfill on non-x86. The one blocker is march.pybind.cc including x86-only on any non-Windows target it doesn't recognise; the patch adds __riscv to the existing dummied-out branch (aarch64/PPC) so detection returns "polyfill". --- .github/workflows/build-stim.yml | 108 ++++++++++++++++++ docs/packages/stim.yaml | 6 + .../0001-march-dummy-cpuid-on-riscv.patch | 23 ++++ 3 files changed, 137 insertions(+) create mode 100644 .github/workflows/build-stim.yml create mode 100644 docs/packages/stim.yaml create mode 100644 patches/stim/1.16.0/0001-march-dummy-cpuid-on-riscv.patch diff --git a/.github/workflows/build-stim.yml b/.github/workflows/build-stim.yml new file mode 100644 index 0000000000..4d826ff47c --- /dev/null +++ b/.github/workflows/build-stim.yml @@ -0,0 +1,108 @@ +# SPDX-FileCopyrightText: 2026 The RISE Project +# SPDX-License-Identifier: MIT +--- +name: Build stim wheels (riscv64) + +on: + workflow_dispatch: + inputs: + version: + description: 'Version glob to (re)build; empty builds every version of docs/packages/stim.yaml not released yet' + required: false + default: '' + pull_request: + branches: [main] + paths: + - '.github/workflows/build-stim.yml' + - 'docs/packages/stim.yaml' + - 'patches/stim/**' + push: + branches: [main] + paths: + - '.github/workflows/build-stim.yml' + - 'docs/packages/stim.yaml' + - 'patches/stim/**' + +concurrency: + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true + +permissions: + contents: read # to fetch code (actions/checkout) + +env: + MANYLINUX_RISCV64_IMAGE: quay.io/pypa/manylinux_2_39_riscv64 + +jobs: + setup: + uses: $/.github/workflows/_setup.yml + with: + package: stim + version: ${{ inputs.version }} + + build_wheels: + needs: [setup] + if: needs.setup.outputs.versions != '[]' + name: Build stim ${{ matrix.version }} ${{ matrix.python }}-manylinux_riscv64 + runs-on: ubuntu-24.04-riscv + timeout-minutes: 360 + strategy: + fail-fast: false + matrix: + version: ${{ fromJSON(needs.setup.outputs.versions) }} + python: [cp312, cp313, cp314] + + env: + STIM_VERSION: ${{ matrix.version }} + + steps: + - name: Checkout stim ${{ env.STIM_VERSION }} + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + repository: quantumlib/stim + ref: v${{ env.STIM_VERSION }} + persist-credentials: false + + - name: Checkout python-wheels + uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + path: python-wheels + persist-credentials: false + + - name: Patch stim source + run: git apply python-wheels/patches/stim/${{ env.STIM_VERSION }}/*.patch + + - uses: pypa/cibuildwheel@1828c10ab37f080699c7b81cea34097c684a7074 # v4.2.0 + with: + output-dir: wheelhouse/ + only: ${{ matrix.python }}-manylinux_riscv64 + env: + CIBW_MANYLINUX_RISCV64_IMAGE: ${{ env.MANYLINUX_RISCV64_IMAGE }} + CIBW_ENVIRONMENT: >- + PIP_EXTRA_INDEX_URL=https://pypi.riseproject.dev/simple/ + PIP_ONLY_BINARY=:all: + CIBW_TEST_REQUIRES: cirq-core pytest + CIBW_TEST_COMMAND: pytest {project}/src {project}/glue/cirq && stim help + + - uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 + with: + name: stim-${{ env.STIM_VERSION }}-${{ matrix.python }}-manylinux_riscv64 + path: wheelhouse/*.whl + if-no-files-found: error + + publish: + name: Publish stim ${{ matrix.version }} + needs: [setup, build_wheels] + if: needs.setup.outputs.versions != '[]' + strategy: + fail-fast: false + matrix: + version: ${{ fromJSON(needs.setup.outputs.versions) }} + permissions: + contents: write + pull-requests: write + uses: $/.github/workflows/_publish-wheel.yml + secrets: + app-private-key: ${{ secrets.RISEPROJECT_APP_PRIVATE_KEY }} + with: + artifact-pattern: stim-${{ matrix.version }}-*-manylinux_riscv64 diff --git a/docs/packages/stim.yaml b/docs/packages/stim.yaml new file mode 100644 index 0000000000..8eb3032dd4 --- /dev/null +++ b/docs/packages/stim.yaml @@ -0,0 +1,6 @@ +package-name: stim +source-code: https://github.com/quantumlib/stim +license: Apache-2.0 +versions: +- version: 1.16.0 + patched: true diff --git a/patches/stim/1.16.0/0001-march-dummy-cpuid-on-riscv.patch b/patches/stim/1.16.0/0001-march-dummy-cpuid-on-riscv.patch new file mode 100644 index 0000000000..22dc421d59 --- /dev/null +++ b/patches/stim/1.16.0/0001-march-dummy-cpuid-on-riscv.patch @@ -0,0 +1,23 @@ +Upstream-Status: To upstream [not yet submitted; this port may only touch riseproject-dev/python-wheels] + +The _detect_machine_architecture extension (march.pybind.cc) only dummies out +cpuid() for macOS arm64, aarch64 and PowerPC; every other non-Windows target +falls into the GCC branch, which includes the x86-only and calls +__cpuid_count. On riscv64 that header does not exist, so the extension (and +therefore the whole stim wheel) fails to compile. Add __riscv to the dummied-out +list: detect_march() then returns "polyfill" and stim/__init__.py imports the +portable _stim_polyfill module, exactly as it already does on arm64. setup.py +only builds _stim_polyfill (not _stim_sse2) on non-x86, so nothing else changes. +--- a/src/stim/py/march.pybind.cc ++++ b/src/stim/py/march.pybind.cc +@@ -6,8 +6,8 @@ + // Windows + #include + #define cpuid(info, x) __cpuidex(info, x, 0) +-#elif (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__) || defined(_ARCH_PPC) +-// macOS ARM64 and IBM PowerPC (dummied out) ++#elif (defined(__arm64__) && defined(__APPLE__)) || defined(__aarch64__) || defined(_ARCH_PPC) || defined(__riscv) ++// macOS ARM64, IBM PowerPC and RISC-V (dummied out) + void cpuid(int info[4], int infoType) { + info[0] = 0; + info[1] = 0;