stab at macos

GraphBLAS · Aug 15, 2024 · 3a1ce93 · 3a1ce93
1 parent 10d4de0
commit 3a1ce93
Showing 1 changed file with 44 additions and 48 deletions.
diff --git a/.github/workflows/new_build.yml b/.github/workflows/new_build.yml
@@ -36,51 +36,47 @@ jobs:
         cmake .. -DCOVERAGE=1 -DGRAPHBLAS_INCLUDE_DIR=${GRAPHBLAS_INCLUDE_DIR} -DGRAPHBLAS_LIBRARY=${GRAPHBLAS_LIBRARY}
         JOBS=2 make
         make test_coverage
-    # - name: Deploy
-    #   uses: JamesIves/[email protected]
-    #   if: matrix.config.grb_version == '9.1.0' && github.event_name == 'push' && github.ref == 'refs/heads/stable'
-    #   with:
-    #     branch: gh-pages
-    #     folder: build/test_coverage/
-    #     single-commit: true
-    # - name: Save output
-    #   uses: actions/[email protected]
-    #   with:
-    #     name: test_coverage
-    #     path: build/test_coverage/
-  # macos:
-  #   runs-on: macos-12
-  #   strategy:
-  #     matrix:
-  #       config:
-  #        - {grb_version: 9.1.0, conda_grb_package_hash: heb48c95, conda_extension: conda}
-  #   steps:
-  #   - name: Checkout
-  #     uses: actions/[email protected]
-  #   - name: Install dependencies
-  #     run: |
-  #       brew tap-new libomp/cask
-  #       brew extract --version=14.0.6 libomp libomp/cask
-  #       brew install [email protected]
-  #   - name: Get GraphBLAS binaries
-  #     run: |
-  #       mkdir graphblas-binaries
-  #       cd graphblas-binaries
-  #       wget --quiet https://anaconda.org/conda-forge/graphblas/${{ matrix.config.grb_version }}/download/osx-64/graphblas-${{ matrix.config.grb_version }}-${{ matrix.config.conda_grb_package_hash }}_0.${{ matrix.config.conda_extension }}
-  #       if [ ${{ matrix.config.conda_extension }} == "tar.bz2" ]; then
-  #         tar xf graphblas-${{ matrix.config.grb_version }}-${{ matrix.config.conda_grb_package_hash }}_0.${{ matrix.config.conda_extension }}
-  #       else
-  #         unzip graphblas-${{ matrix.config.grb_version }}-${{ matrix.config.conda_grb_package_hash }}_0.${{ matrix.config.conda_extension }}
-  #         tar xf pkg-graphblas-${{ matrix.config.grb_version }}-${{ matrix.config.conda_grb_package_hash }}_0.tar.zst
-  #       fi
-  #       cd ..
-  #   - name: Build project
-  #     run: |
-  #       export GRAPHBLAS_INCLUDE_DIR=`pwd`/graphblas-binaries/include/suitesparse
-  #       export GRAPHBLAS_LIBRARY=`pwd`/graphblas-binaries/lib/libgraphblas.dylib
-  #       # adding an extra line to the CMakeLists.txt file to locate the libomp instance installed by brew
-  #       echo 'include_directories("/usr/local/opt/libomp/include")' | cat - CMakeLists.txt
-  #       cd build
-  #       CC=gcc cmake .. -DGRAPHBLAS_INCLUDE_DIR=${GRAPHBLAS_INCLUDE_DIR} -DGRAPHBLAS_LIBRARY=${GRAPHBLAS_LIBRARY}
-  #       JOBS=2 make
-  #       make test
+    - name: Deploy
+      uses: JamesIves/[email protected]
+      if: matrix.config.grb_version == '9.1.0' && github.event_name == 'push' && github.ref == 'refs/heads/stable'
+      with:
+        branch: gh-pages
+        folder: build/test_coverage/
+        single-commit: true
+    - name: Save output
+      uses: actions/[email protected]
+      with:
+        name: test_coverage
+        path: build/test_coverage/
+  macos:
+    runs-on: macos-12
+    strategy:
+      matrix:
+        config:
+         - {grb_version: 9.3.1}
+    steps:
+    - name: Checkout
+      uses: actions/[email protected]
+    - name: Install dependencies
+      run: |
+        brew tap-new libomp/cask
+        brew extract --version=14.0.6 libomp libomp/cask
+        brew install [email protected]
+    - name: Get GraphBLAS binaries
+      run: |
+        git clone https://github.com/DrTimothyAldenDavis/GraphBLAS.git
+        cd GraphBLAS
+        git checkout tags/v${{ matrix.config.grb_version }}
+        make compact
+        sudo make install
+        cd ..
+    - name: Build project
+      run: |
+        export GRAPHBLAS_INCLUDE_DIR=`pwd`/GraphBLAS/include/suitesparse
+        export GRAPHBLAS_LIBRARY=`pwd`/GraphBLAS/lib/libgraphblas.dylib
+        # adding an extra line to the CMakeLists.txt file to locate the libomp instance installed by brew
+        echo 'include_directories("/usr/local/opt/libomp/include")' | cat - CMakeLists.txt
+        cd build
+        CC=gcc cmake .. -DGRAPHBLAS_INCLUDE_DIR=${GRAPHBLAS_INCLUDE_DIR} -DGRAPHBLAS_LIBRARY=${GRAPHBLAS_LIBRARY}
+        JOBS=2 make
+        make test