Merge pull request #249 from ffgan/rv64_cross_build

feat: build riscv64+glibc wheel

Author: mattip

.github/workflows/posix.yml

@@ -47,6 +47,9 @@ jobs:
           - { os: ubuntu-24.04-arm, PLAT: s390x, INTERFACE64: '0', MB_ML_VER: '2014', MB_ML_LIBC: manylinux}
           - { os: ubuntu-24.04-arm, PLAT: s390x, INTERFACE64: '1', MB_ML_VER: '2014', MB_ML_LIBC: manylinux}
 
+          - { os: ubuntu-24.04-arm, PLAT: riscv64, INTERFACE64: '0', MB_ML_VER: '_2_39', MB_ML_LIBC: manylinux}
+          - { os: ubuntu-24.04-arm, PLAT: riscv64, INTERFACE64: '1', MB_ML_VER: '_2_39', MB_ML_LIBC: manylinux}
+
     env:
       NIGHTLY: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
       MB_ML_LIBC: ${{ matrix.MB_ML_LIBC }}
@@ -57,7 +60,7 @@ jobs:
       OS-NAME: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v6.0.1
       with:
         submodules: recursive
         fetch-depth: 0
@@ -73,8 +76,8 @@ jobs:
         xcode-version: '15.4'
 
     - name: Set up QEMU
-      if: matrix.PLAT == 'ppc64le' || matrix.PLAT == 's390x'
-      uses: docker/setup-qemu-action@v3
+      if: matrix.PLAT == 'ppc64le' || matrix.PLAT == 's390x' || matrix.PLAT == 'riscv64'
+      uses: docker/setup-qemu-action@v3.7.0
       with:
         platforms: all
 
@@ -89,7 +92,7 @@ jobs:
     #     limit-access-to-actor: true
 
     - name: Build and Test wheels
-      uses: pypa/cibuildwheel@v3.3.0
+      uses: pypa/cibuildwheel@v3.3.1
       timeout-minutes: 60
       with:
         output-dir: dist
@@ -107,15 +110,16 @@ jobs:
         CIBW_MUSLLINUX_PPC64LE_IMAGE: ${{ matrix.MB_ML_LIBC }}${{matrix.MB_ML_VER}}
         CIBW_MANYLINUX_S390X_IMAGE: ${{ matrix.MB_ML_LIBC }}${{matrix.MB_ML_VER}}
         CIBW_MUSLLINUX_S390X_IMAGE: ${{ matrix.MB_ML_LIBC }}${{matrix.MB_ML_VER}}
+        CIBW_MANYLINUX_RISCV64_IMAGE: ${{ matrix.MB_ML_LIBC }}${{matrix.MB_ML_VER}}
 
     - name: Upload wheels to artifacts
-      uses: actions/upload-artifact@v4.3.0
+      uses: actions/upload-artifact@v6.0.0
       with:
         name: wheels-${{ matrix.os }}-${{ matrix.PLAT }}-${{ matrix.INTERFACE64 }}-${{ matrix.MB_ML_LIBC }}-${{ matrix.MB_ML_VER }}
         path: dist/scipy_openblas*.whl
 
 
-    - uses: conda-incubator/setup-miniconda@v3.2.0
+    - uses: conda-incubator/setup-miniconda@v3.3.0
       with:
         channels: conda-forge
         channel-priority: true

.github/workflows/windows-arm.yml

@@ -30,10 +30,10 @@ jobs:
 
     steps:
 
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v6.0.1
 
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6.2.0
       with:
         python-version: 3.12
         architecture: arm64
@@ -74,7 +74,7 @@ jobs:
         python -m scipy_openblas${env:INTERFACE_BITS}
         python -c "import scipy_openblas${env:INTERFACE_BITS}; print(scipy_openblas${env:INTERFACE_BITS}.get_pkg_config())"
 
-    - uses: actions/upload-artifact@v4.3.0
+    - uses: actions/upload-artifact@v6.0.0
       with:
         name: wheels-${{ env.PLAT }}-${{ env.INTERFACE64 }}
         path: dist/scipy_openblas*.whl
@@ -85,6 +85,8 @@ jobs:
         Invoke-WebRequest https://static.rust-lang.org/rustup/dist/aarch64-pc-windows-msvc/rustup-init.exe -UseBasicParsing -Outfile rustup-init.exe
         .\rustup-init.exe -y
         $env:PATH="$env:PATH;$env:USERPROFILE\.cargo\bin"
+        # cryptography dropped win-arm64 for 46.0.4, make sure we don't try to compile from source
+        pip install --only-binary :all: cryptography
         pip install anaconda-client
 
     - name: Upload

.github/workflows/windows.yml

@@ -31,7 +31,7 @@ jobs:
 
     timeout-minutes: 90
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v6.0.1
     - name: install-rtools
       run: |
         # rtools 42+ does not support 32 bits builds.
@@ -85,7 +85,7 @@ jobs:
         cp for_test\test*.exe builds
 
     - name: Set up Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6.2.0
       with:
         python-version: 3.9
         architecture: ${{ matrix.plat }}
@@ -141,12 +141,12 @@ jobs:
         fi
 
     - name: Set up different Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6.2.0
       with:
         python-version: 3.11
         architecture: ${{ matrix.plat }}
 
-    - uses: actions/upload-artifact@v4.3.0
+    - uses: actions/upload-artifact@v6.0.0
       with:
         name: wheels-${{matrix.plat }}-${{ matrix.INTERFACE64 }}
         path: dist/scipy_openblas*.whl

pyproject.toml

@@ -9,7 +9,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "scipy-openblas64"
 # v0.3.31-22-g5ffbf38b
-version = "0.3.31.22.0"
+version = "0.3.31.22.1"
 requires-python = ">=3.7"
 description = "Provides OpenBLAS for python packaging"
 readme = "README.md"

tools/build_steps.sh

@@ -68,7 +68,7 @@ function get_plat_tag {
     local mb_ml_ver=${MB_ML_VER:-1}
     local mb_ml_libc=${MB_ML_LIBC:-manylinux}
     case $plat in
-        i686|x86_64|arm64|universal2|intel|aarch64|s390x|ppc64le|loongarch64) ;;
+        i686|x86_64|arm64|universal2|intel|aarch64|s390x|ppc64le|loongarch64|riscv64) ;;
         *) echo Did not recognize plat $plat; return 1 ;;
     esac
     local uname=${2:-$(uname)}
@@ -153,6 +153,9 @@ function build_lib {
         Linux-loongarch64)
             local target="GENERIC"
             ;;
+        Linux-riscv64)
+            local target="GENERIC"
+            ;;
         *) echo "Strange plat value $plat"; exit 1 ;;
     esac
     case $interface64 in
@@ -185,7 +188,7 @@ function build_lib {
         echo "the utest samin/damin have been temporarily disabled."
         echo "QEMU does not support the 'lper' /'lpdr' instructions used"
     fi
-    if [ "$plat" == "loongarch64" ] || [ "$plat" == "ppc64le" ] || [ "$plat" == "s390x" ]; then
+    if [ "$plat" == "loongarch64" ] || [ "$plat" == "ppc64le" ] || [ "$plat" == "s390x" ] || [ "$plat" == "riscv64" ]; then
         sed -i 's/CTEST(fork, safety)/CTEST_SKIP(fork, safety)/g' ./utest/test_fork.c
         sed -i 's/CTEST(fork, safety_after_fork_in_parent)/CTEST_SKIP(fork, safety_after_fork_in_parent)/g' ./utest/test_post_fork.c
         echo "QEMU has a race condition preventing fork tests to work as expected"