pypy 4

ameli · Dec 21, 2023 · ffbc836 · ffbc836
1 parent 77d7bdb
commit ffbc836
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -57,6 +57,7 @@ jobs:
               if: (contains(matrix.python-version, 'pypy'))
               run: |
                   brew install openblas
+                  brew install gfortran
                   
             # - name: Install CUDA
             #   uses: Jimver/[email protected]

diff --git a/tools/ci/cirrus_deploy_pypi_macosx_arm64.yml b/tools/ci/cirrus_deploy_pypi_macosx_arm64.yml
@@ -40,11 +40,11 @@ pypi_build_wheels_macosx_arm64_task:
     - env:
         CIBW_BUILD: "cp312-macosx_arm64"
     - env:
-        CIBW_BUILD: "pp38-manylinux_aarch64"
+        CIBW_BUILD: "pp38-macosx_arm64"
     - env:
-        CIBW_BUILD: "pp39-manylinux_aarch64"
+        CIBW_BUILD: "pp39-macosx_arm64"
     - env:
-        CIBW_BUILD: "pp310-manylinux_aarch64"
+        CIBW_BUILD: "pp310-macosx_arm64"
   env:
     PATH: /opt/homebrew/opt/[email protected]/bin:/usr/local/lib:/usr/local/include:$PATH
     # Specifying CIBW_ENVIRONMENT_MACOS overrides pyproject.toml, so include

diff --git a/tools/wheels/install_openblas.sh b/tools/wheels/install_openblas.sh
@@ -47,13 +47,28 @@ then
 
     echo "PyPy detected. Install OpenBLAS."
 
-    UNAME_STR=$(uname)
+    PLATFORM=$(uname)
 
-    if [[ ${UNAME_STR} == "Linux" ]];
+    if [[ ${PLATFORM} == "Linux" ]];
     then
 
-        # Install OpenBLAS
+        # Update yum
         yum update
+
+        # On AARCH64, openblas is not in yum, unless EPEL repos are enabled
+        ARCH=`uname -m`
+        if [[ ${ARCH} == "aarch64" ]];
+        then
+            yum install -y epel-release
+
+            # Lib directory on AARCH64
+            LIB_DIR="lib"
+        else
+            # Lib directory on X86_64
+            LIB_DIR="lib64"
+        fi
+
+        # Install OpenBLAS and PkgConfig
         yum install -y openblas-devel
         yum install -y pkgconfig
 
@@ -63,7 +78,7 @@ then
         # Make pkgconfig to be aware of OpenBLAS
         CONTENT="prefix=/usr
         exec_prefix=\${prefix}
-        libdir=\${exec_prefix}/lib64
+        libdir=\${exec_prefix}/${LIB_DIR}
         includedir=\${prefix}/include/openblas
 
         Name: OpenBLAS
@@ -75,7 +90,7 @@ then
 
         echo "$CONTENT" | tee /usr/lib64/pkgconfig/openblas.pc
 
-    elif [[ ${UNAME_STR} == "Darwin" ]];
+    elif [[ ${PLATFORM} == "Darwin" ]];
     then
 
         brew install openblas