From 47cfc9f0b1a0ea8cb0354d5cc7af4d5cee3fc3a3 Mon Sep 17 00:00:00 2001 From: Tim Davis Date: Fri, 23 Aug 2024 16:07:55 -0500 Subject: [PATCH] sync with LAGraph 1.1.4 --- ChangeLog | 2 +- LAGraph/experimental/test/test_BF.c | 2 - LAGraph/github_workflows/workflows/build.yml | 50 +++++++++----------- 3 files changed, 23 insertions(+), 31 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b4ed646ec..d8a7ed8b1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,7 +21,7 @@ Aug 20, 2024: version 7.8.2 LDL 3.3.2 LAGraph 1.1.4 * SuiteSparse_Mongoose 3.3.4 - ParU 0.3.0 * + ParU 0.3.0 * RBio 4.3.3 SPEX 3.2.1 * SPQR 4.3.4 diff --git a/LAGraph/experimental/test/test_BF.c b/LAGraph/experimental/test/test_BF.c index ad48ca5d68..e5e88ff4e6 100644 --- a/LAGraph/experimental/test/test_BF.c +++ b/LAGraph/experimental/test/test_BF.c @@ -396,8 +396,6 @@ void test_BF (void) // since d5 is a dense vector filled with infinity, we have // to compare it against d seperaterly OK (GrB_Vector_extractElement (&di, d5, i)) ; - printf ("di %g d[i] %g difference %g\n", - di, d [i], di - d [i]) ; TEST_CHECK (di == d[i]) ; // since d5a is a dense vector filled with infinity, we diff --git a/LAGraph/github_workflows/workflows/build.yml b/LAGraph/github_workflows/workflows/build.yml index b02eb2bfed..f1562e1b0f 100644 --- a/LAGraph/github_workflows/workflows/build.yml +++ b/LAGraph/github_workflows/workflows/build.yml @@ -1,4 +1,4 @@ -name: LAGraph CI +name: LAGraph CI with Builtin GraphBLAS on: workflow_dispatch: @@ -13,36 +13,34 @@ jobs: strategy: matrix: config: - - {grb_version: 9.1.0, conda_grb_package_hash: hd29ac08, conda_extension: conda} + # if there are multiple items in this list, only use should + # deployit=true for just one of them. + - {grb_version: 9.3.1, deployit: true} 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 make test_coverage - name: Deploy uses: JamesIves/github-pages-deploy-action@4.1.1 - if: matrix.config.grb_version == '9.1.0' && github.event_name == 'push' && github.ref == 'refs/heads/stable' + if: matrix.config.deployit && github.event_name == 'push' && github.ref == 'refs/heads/stable' with: branch: gh-pages folder: build/test_coverage/ @@ -57,7 +55,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 +64,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