diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b02eb2bfed..3a76340ad9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: LAGraph CI +name: LAGraph CI with Builtin GraphBLAS on: workflow_dispatch: @@ -13,29 +13,25 @@ jobs: strategy: matrix: config: - - {grb_version: 9.1.0, conda_grb_package_hash: hd29ac08, conda_extension: conda} + - {grb_version: 9.3.1} steps: - name: Checkout uses: actions/checkout@v2.0.0 - name: Install tools for build run: | sudo apt install -y lcov - - name: Get GraphBLAS binaries + - name: Build GraphBLAS run: | - mkdir graphblas-binaries - cd graphblas-binaries - wget --quiet https://anaconda.org/conda-forge/graphblas/${{ matrix.config.grb_version }}/download/linux-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 + 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-binaries/include/suitesparse - export GRAPHBLAS_LIBRARY=`pwd`/graphblas-binaries/lib/libgraphblas.so + export GRAPHBLAS_INCLUDE_DIR=`pwd`/GraphBLAS/include/suitesparse + export GRAPHBLAS_LIBRARY=`pwd`/GraphBLAS/lib/libgraphblas.so cd build cmake .. -DCOVERAGE=1 -DGRAPHBLAS_INCLUDE_DIR=${GRAPHBLAS_INCLUDE_DIR} -DGRAPHBLAS_LIBRARY=${GRAPHBLAS_LIBRARY} JOBS=2 make @@ -57,7 +53,7 @@ jobs: strategy: matrix: config: - - {grb_version: 9.1.0, conda_grb_package_hash: heb48c95, conda_extension: conda} + - {grb_version: 9.3.1} steps: - name: Checkout uses: actions/checkout@v2.0.0 @@ -66,22 +62,18 @@ jobs: brew tap-new libomp/cask brew extract --version=14.0.6 libomp libomp/cask brew install libomp@14.0.6 - - name: Get GraphBLAS binaries + - name: Build GraphBLAS 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 + 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-binaries/include/suitesparse - export GRAPHBLAS_LIBRARY=`pwd`/graphblas-binaries/lib/libgraphblas.dylib + 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