Skip to content

Commit 176bdd4

Browse files
homka122homka122
committed
Fix: change files according to v1.2 version
1 parent a9bc838 commit 176bdd4

File tree

7 files changed

+31
-44
lines changed

7 files changed

+31
-44
lines changed

‎.github/workflows/build.yml‎

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: LAGraph CI with Builtin GraphBLAS
1+
name: LAGraph CI
22

33
on:
44
workflow_dispatch:
@@ -22,18 +22,22 @@ jobs:
2222
- name: Install tools for build
2323
run: |
2424
sudo apt install -y lcov
25-
- name: Build GraphBLAS
25+
- name: Get GraphBLAS binaries
2626
run: |
27-
git clone https://github.com/DrTimothyAldenDavis/GraphBLAS.git
28-
cd GraphBLAS
29-
git checkout tags/v${{ matrix.config.grb_version }}
30-
make compact
31-
sudo make install
27+
mkdir graphblas-binaries
28+
cd graphblas-binaries
29+
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 }}
30+
if [ ${{ matrix.config.conda_extension }} == "tar.bz2" ]; then
31+
tar xf graphblas-${{ matrix.config.grb_version }}-${{ matrix.config.conda_grb_package_hash }}_0.${{ matrix.config.conda_extension }}
32+
else
33+
unzip graphblas-${{ matrix.config.grb_version }}-${{ matrix.config.conda_grb_package_hash }}_0.${{ matrix.config.conda_extension }}
34+
tar xf pkg-graphblas-${{ matrix.config.grb_version }}-${{ matrix.config.conda_grb_package_hash }}_0.tar.zst
35+
fi
3236
cd ..
3337
- name: Build project
3438
run: |
35-
export GRAPHBLAS_INCLUDE_DIR=`pwd`/GraphBLAS/include/suitesparse
36-
export GRAPHBLAS_LIBRARY=`pwd`/GraphBLAS/lib/libgraphblas.so
39+
export GRAPHBLAS_INCLUDE_DIR=`pwd`/graphblas-binaries/include
40+
export GRAPHBLAS_LIBRARY=`pwd`/graphblas-binaries/lib/libgraphblas.so
3741
cd build
3842
cmake .. -DCOVERAGE=1 -DGRAPHBLAS_INCLUDE_DIR=${GRAPHBLAS_INCLUDE_DIR} -DGRAPHBLAS_LIBRARY=${GRAPHBLAS_LIBRARY} -DLAGRAPH_VANILLA=${{ matrix.config.vanilla }}
3943
JOBS=2 make
@@ -66,18 +70,22 @@ jobs:
6670
brew tap-new libomp/cask
6771
brew extract --version=14.0.6 libomp libomp/cask
6872
brew install [email protected]
69-
- name: Build GraphBLAS
73+
- name: Get GraphBLAS binaries
7074
run: |
71-
git clone https://github.com/DrTimothyAldenDavis/GraphBLAS.git
72-
cd GraphBLAS
73-
git checkout tags/v${{ matrix.config.grb_version }}
74-
make compact
75-
sudo make install
75+
mkdir graphblas-binaries
76+
cd graphblas-binaries
77+
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 }}
78+
if [ ${{ matrix.config.conda_extension }} == "tar.bz2" ]; then
79+
tar xf graphblas-${{ matrix.config.grb_version }}-${{ matrix.config.conda_grb_package_hash }}_0.${{ matrix.config.conda_extension }}
80+
else
81+
unzip graphblas-${{ matrix.config.grb_version }}-${{ matrix.config.conda_grb_package_hash }}_0.${{ matrix.config.conda_extension }}
82+
tar xf pkg-graphblas-${{ matrix.config.grb_version }}-${{ matrix.config.conda_grb_package_hash }}_0.tar.zst
83+
fi
7684
cd ..
7785
- name: Build project
7886
run: |
79-
export GRAPHBLAS_INCLUDE_DIR=`pwd`/GraphBLAS/include/suitesparse
80-
export GRAPHBLAS_LIBRARY=`pwd`/GraphBLAS/lib/libgraphblas.dylib
87+
export GRAPHBLAS_INCLUDE_DIR=`pwd`/graphblas-binaries/include
88+
export GRAPHBLAS_LIBRARY=`pwd`/graphblas-binaries/lib/libgraphblas.dylib
8189
# adding an extra line to the CMakeLists.txt file to locate the libomp instance installed by brew
8290
echo 'include_directories("/usr/local/opt/libomp/include")' | cat - CMakeLists.txt
8391
cd build

‎.readthedocs.yaml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22

33
version: 2
44

5-
build:
6-
os: ubuntu-22.04
7-
tools:
8-
python: "3.12"
9-
105
formats:
116
- pdf
127

‎experimental/algorithm/LAGraph_FastGraphletTransform.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -613,10 +613,6 @@ int LAGraph_FastGraphletTransform
613613
//--------------------------------------------------------------------------
614614

615615
LG_FREE_WORK ;
616-
free ((void *) A_Tiles) ; A_Tiles = NULL ;
617-
free ((void *) D_Tiles) ; D_Tiles = NULL ;
618-
free ((void *) C_Tiles) ; C_Tiles = NULL ;
619-
free ((void *) Tile_nrows) ; Tile_nrows = NULL ;
620616

621617
return (0) ;
622618
#endif

‎experimental/algorithm/LG_CC_FastSV5.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,6 @@ int LG_CC_FastSV5 // SuiteSparse:GraphBLAS method
491491
// determine the number entries to be constructed in T for each thread
492492
//----------------------------------------------------------------------
493493

494-
int tid;
495494
#pragma omp parallel for num_threads(nthreads) schedule(static)
496495
for (tid = 0 ; tid < nthreads ; tid++)
497496
{
@@ -679,7 +678,6 @@ int LG_CC_FastSV5 // SuiteSparse:GraphBLAS method
679678
// this is safe (memmove_s not necessary):
680679
memmove (Tj + offset, Tj + Tp [range [tid]],
681680
sizeof (GrB_Index) * count [tid]) ;
682-
683681
offset += count [tid] ;
684682
count [tid] = offset - count [tid] ;
685683
}

‎rtdocs/requirements.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
sphinx
2-
sphinx_rtd_theme
3-
breathe
1+
sphinx==4.0.3
2+
sphinx_rtd_theme>=0.5.2
3+
breathe

‎src/test/test_ConnectedComponents.c‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
#include "LAGraphX.h"
2424
#include "LG_alg_internal.h"
2525

26-
#undef NDEBUG
27-
#include <assert.h>
28-
2926
char msg [LAGRAPH_MSG_LEN] ;
3027
LAGraph_Graph G = NULL ;
3128
#define LEN 512
@@ -138,16 +135,14 @@ void test_cc_matrices (void)
138135
#endif
139136

140137
// find the connected components with LG_CC_Boruvka
141-
int result = GrB_SUCCESS ;
142138
printf ("\n------ CC_BORUVKA:\n") ;
143-
result = LG_CC_Boruvka (&C2, G, msg) ;
144-
OK (result) ;
139+
OK (LG_CC_Boruvka (&C2, G, msg)) ;
145140
ncomponents = count_connected_components (C2) ;
146141
TEST_CHECK (ncomponents == ncomp) ;
147142
OK (LG_check_cc (C2, G, msg)) ;
148143
OK (GrB_free (&C2)) ;
149144

150-
result = LG_CC_Boruvka (NULL, G, msg) ;
145+
int result = LG_CC_Boruvka (NULL, G, msg) ;
151146
TEST_CHECK (result == GrB_NULL_POINTER) ;
152147

153148
if (trial == 0)
@@ -189,11 +184,8 @@ void test_cc_errors (void)
189184
printf ("\n") ;
190185

191186
// check for null pointers
192-
int result = GrB_SUCCESS ;
193-
194-
result = LG_CC_Boruvka (NULL, NULL, msg) ;
187+
int result = LG_CC_Boruvka (NULL, NULL, msg) ;
195188
TEST_CHECK (result == GrB_NULL_POINTER) ;
196-
197189
#if LAGRAPH_SUITESPARSE
198190
result = LG_CC_FastSV6 (NULL, NULL, msg) ;
199191
TEST_CHECK (result == GrB_NULL_POINTER) ;
@@ -212,7 +204,6 @@ void test_cc_errors (void)
212204
result = LG_CC_Boruvka (&C, G, msg) ;
213205
TEST_CHECK (result == -1001) ;
214206
printf ("result expected: %d msg:\n%s\n", result, msg) ;
215-
216207
#if LAGRAPH_SUITESPARSE
217208
result = LG_CC_FastSV6 (&C, G, msg) ;
218209
TEST_CHECK (result == -1001) ;

‎src/utility/LAGr_Init.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,4 +346,3 @@ int LAGr_Init
346346
LG_set_LAGr_Init_has_been_called (true) ;
347347
return (GrB_SUCCESS) ;
348348
}
349-

0 commit comments

Comments
 (0)