Implement wheel PR comments

Author: alugowski

.github/workflows/wheels.yml

@@ -17,6 +17,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
       - name: Build SDist
         run: pipx run build --sdist
@@ -58,6 +60,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
 
       - uses: actions/setup-python@v4
         with:
@@ -79,8 +83,8 @@ jobs:
           # Build SuiteSparse
           CIBW_BEFORE_ALL: bash suitesparse.sh ${{ github.ref }}
 
-          # Ask suitesparse.sh to build libraries in MSVC style on Windows.
-          CIBW_ENVIRONMENT_WINDOWS: CMAKE_GNUtoMS=ON
+          # CMAKE_GNUtoMS=ON asks suitesparse.sh to build libraries in MSVC style on Windows.
+          CIBW_ENVIRONMENT_WINDOWS: CMAKE_GNUtoMS=ON GRAPHBLAS_PREFIX="C:/GraphBLAS"
 
           # macOS libomp requires special configs. BREW_LIBOMP=1 asks suitesparse.sh to include them.
           CIBW_ENVIRONMENT_MACOS: BREW_LIBOMP="1"
@@ -101,7 +105,7 @@ jobs:
           # Note: Currently using a workaround: --no-mangle instead of stripping graphblas.dll
           # see https://github.com/adang1345/delvewheel/issues/33
           CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel"
-          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path \"C:\\Program Files (x86)\\bin\" --no-mangle \"libgomp-1.dll;libgcc_s_seh-1.dll\" -w {dest_dir} {wheel}"
+          CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair --add-path \"C:\\GraphBLAS\\bin\" --no-mangle \"libgomp-1.dll;libgcc_s_seh-1.dll\" -w {dest_dir} {wheel}"
 
           # make cibuildwheel install test dependencies from pyproject.toml
           CIBW_TEST_EXTRAS: "test"
@@ -118,9 +122,21 @@ jobs:
         shell: bash
 
       - uses: actions/upload-artifact@v3
+        id: uploadAttempt1
+        continue-on-error: true
         with:
           path: wheelhouse/*.whl
+          if-no-files-found: error
 
+      # Retry upload if first attempt failed. This happens somewhat randomly and for irregular reasons.
+      # Logic is a duplicate of previous step.
+      - uses: actions/upload-artifact@v3
+        id: uploadAttempt2
+        if: steps.uploadAttempt1.outcome == 'failure'
+        continue-on-error: false
+        with:
+          path: wheelhouse/*.whl
+          if-no-files-found: error
 
   upload_all:
     name: Upload to PyPI

build_graphblas_cffi.py

@@ -16,12 +16,11 @@
     include_dirs.append(os.path.join(sys.prefix, "Library", "include"))
     library_dirs.append(os.path.join(sys.prefix, "Library", "lib"))
 
-    # suitesparse.sh installs GraphBLAS.h here
-    include_dirs.append(os.path.join("C:\\", "Program Files (x86)", "include"))
-    # graphblas.lib and graphblas.dll.a
-    library_dirs.append(os.path.join("C:\\", "Program Files (x86)", "lib"))
-    # graphblas.dll
-    library_dirs.append(os.path.join("C:\\", "Program Files (x86)", "bin"))
+    # wheels.yml configures suitesparse.sh to install GraphBLAS here.
+    prefix = "C:\\GraphBLAS"
+    include_dirs.append(os.path.join(prefix, "include"))
+    library_dirs.append(os.path.join(prefix, "lib"))
+    library_dirs.append(os.path.join(prefix, "bin"))
 
 ffibuilder.set_source(
     "suitesparse_graphblas._graphblas",

pyproject.toml

@@ -4,7 +4,7 @@ requires = [
     "setuptools >=64",
     "setuptools-git-versioning",
     "wheel",
-    "cffi",
+    "cffi>=1.11",
     "cython",
     "oldest-supported-numpy",
 ]

suitesparse.sh

@@ -34,6 +34,11 @@ if [ -n "${CMAKE_GNUtoMS}" ]; then
     cmake_params+=(-DCMAKE_STATIC_LIBRARY_PREFIX=)
 fi
 
+if [ -n "${GRAPHBLAS_PREFIX}" ]; then
+    echo "GRAPHBLAS_PREFIX=${GRAPHBLAS_PREFIX}"
+    cmake_params+=(-DCMAKE_INSTALL_PREFIX="${GRAPHBLAS_PREFIX}")
+fi
+
 curl -L https://github.com/DrTimothyAldenDavis/GraphBLAS/archive/refs/tags/v${VERSION}.tar.gz | tar xzf -
 cd GraphBLAS-${VERSION}/build
 
@@ -62,12 +67,17 @@ make -j$NPROC
 make install
 
 if [ -n "${CMAKE_GNUtoMS}" ]; then
+    if [ -z "${GRAPHBLAS_PREFIX}" ]; then
+        # Windows default
+        GRAPHBLAS_PREFIX="C:/Program Files (x86)"
+    fi
+
     # Windows:
     # CMAKE_STATIC_LIBRARY_PREFIX is sometimes ignored, possibly when the MinGW toolchain is selected.
     # Drop the 'lib' prefix manually.
     echo "manually removing lib prefix"
-    mv "C:/Program Files (x86)/lib/libgraphblas.lib" "C:/Program Files (x86)/lib/graphblas.lib"
-    mv "C:/Program Files (x86)/lib/libgraphblas.dll.a" "C:/Program Files (x86)/lib/graphblas.dll.a"
+    mv "${GRAPHBLAS_PREFIX}/lib/libgraphblas.lib" "${GRAPHBLAS_PREFIX}/lib/graphblas.lib"
+    mv "${GRAPHBLAS_PREFIX}/lib/libgraphblas.dll.a" "${GRAPHBLAS_PREFIX}/lib/graphblas.dll.a"
     # cp instead of mv because the GNU tools expect libgraphblas.dll and the MS tools expect graphblas.dll.
-    cp "C:/Program Files (x86)/bin/libgraphblas.dll" "C:/Program Files (x86)/bin/graphblas.dll"
+    cp "${GRAPHBLAS_PREFIX}/bin/libgraphblas.dll" "${GRAPHBLAS_PREFIX}/bin/graphblas.dll"
 fi