Skip to content

Commit

Permalink
Merge pull request #534 from DrTimothyAldenDavis/singledev2
Browse files Browse the repository at this point in the history 
revert to GraphBLAS v8.2.1 for SuiteSparse 7.4.0
  • Loading branch information
@DrTimothyAldenDavis
DrTimothyAldenDavis authored Nov 27, 2023
2 parents daf0bef + 49d604a commit 65e31fd
Show file tree
Hide file tree
Showing 9 changed files with 318 additions and 2,318 deletions.
5 changes: 0 additions & 5 deletions GraphBLAS/Config/.gitignore
View file

This file was deleted.

6 changes: 3 additions & 3 deletions GraphBLAS/Config/GB_config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#define GB_LIB_SUFFIX ".so"
#endif

// GB_OBJ_SUFFIX: object suffix (.o for Linux/Unix/Mac/MinGW, .obj for MSVC):
// GB_OBJ_SUFFIX: object suffix (.o for Linux/Unix/Mac, .obj for Windows):
#ifndef GB_OBJ_SUFFIX
#define GB_OBJ_SUFFIX ".o"
#endif
Expand All @@ -57,12 +57,12 @@

// GB_C_LIBRARIES: libraries to link with when using direct compile/link:
#ifndef GB_C_LIBRARIES
#define GB_C_LIBRARIES " -lm -ldl -lgomp -lpthread"
#define GB_C_LIBRARIES " -lm -ldl /usr/lib/gcc/x86_64-linux-gnu/9/libgomp.so /usr/lib/x86_64-linux-gnu/libpthread.so"
#endif

// GB_CMAKE_LIBRARIES: libraries to link with when using cmake
#ifndef GB_CMAKE_LIBRARIES
#define GB_CMAKE_LIBRARIES "m;dl;/usr/lib/gcc/x86_64-linux-gnu/7/libgomp.so;/usr/lib/x86_64-linux-gnu/libpthread.so"
#define GB_CMAKE_LIBRARIES "m;dl;/usr/lib/gcc/x86_64-linux-gnu/9/libgomp.so;/usr/lib/x86_64-linux-gnu/libpthread.so"
#endif

#endif
Expand Down
2 changes: 1 addition & 1 deletion GraphBLAS/Config/GB_config.h.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
#define GB_LIB_SUFFIX "@GB_LIB_SUFFIX@"
#endif

// GB_OBJ_SUFFIX: object suffix (.o for Linux/Unix/Mac/MinGW, .obj for MSVC):
// GB_OBJ_SUFFIX: object suffix (.o for Linux/Unix/Mac, .obj for Windows):
#ifndef GB_OBJ_SUFFIX
#define GB_OBJ_SUFFIX "@GB_OBJ_SUFFIX@"
#endif
Expand Down
225 changes: 65 additions & 160 deletions GraphBLAS/Demo/Output/gauss_demo.out
View file

Large diffs are not rendered by default.

1,895 changes: 0 additions & 1,895 deletions GraphBLAS/Demo/Output/gauss_demo1.out
View file

This file was deleted.

32 changes: 16 additions & 16 deletions GraphBLAS/Demo/Output/import_demo.out
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
========================= import_test: format 0

67x67 GraphBLAS double matrix, sparse by row
C to export, 294 entries, memory: 5.3 KB
C to export, 294 entries, memory: 9.2 KB

(0,7) -0.834182
(0,12) 1.26582
Expand Down Expand Up @@ -40,7 +40,7 @@
========================= import_test: format 1

67x67 GraphBLAS double matrix, sparse by row
C to export, 294 entries, memory: 5.3 KB
C to export, 294 entries, memory: 9.2 KB

(0,7) -0.834182
(0,12) 1.26582
Expand Down Expand Up @@ -76,7 +76,7 @@
========================= import_test: format 2

67x67 GraphBLAS double matrix, sparse by row
C to export, 294 entries, memory: 5.3 KB
C to export, 294 entries, memory: 9.2 KB

(0,7) -0.834182
(0,12) 1.26582
Expand Down Expand Up @@ -112,7 +112,7 @@
========================= import_test: format 3

67x67 GraphBLAS double matrix, sparse by row
C to export, 294 entries, memory: 5.3 KB
C to export, 294 entries, memory: 9.2 KB

(0,7) -0.834182
(0,12) 1.26582
Expand Down Expand Up @@ -150,7 +150,7 @@
========================= import_test: format 0

67x67 GraphBLAS double matrix, sparse by col
C to export, 294 entries, memory: 5.3 KB
C to export, 294 entries, memory: 9.2 KB

(4,0) -0.278842
(5,0) -0.268019
Expand Down Expand Up @@ -186,7 +186,7 @@
========================= import_test: format 1

67x67 GraphBLAS double matrix, sparse by col
C to export, 294 entries, memory: 5.3 KB
C to export, 294 entries, memory: 9.2 KB

(4,0) -0.278842
(5,0) -0.268019
Expand Down Expand Up @@ -222,7 +222,7 @@
========================= import_test: format 2

67x67 GraphBLAS double matrix, sparse by col
C to export, 294 entries, memory: 5.3 KB
C to export, 294 entries, memory: 9.2 KB

(4,0) -0.278842
(5,0) -0.268019
Expand Down Expand Up @@ -258,7 +258,7 @@
========================= import_test: format 3

67x67 GraphBLAS double matrix, sparse by col
C to export, 294 entries, memory: 5.3 KB
C to export, 294 entries, memory: 9.2 KB

(4,0) -0.278842
(5,0) -0.268019
Expand Down Expand Up @@ -296,7 +296,7 @@
========================= import_test: format 0

67x67 GraphBLAS double matrix, hypersparse by row
C to export, 294 entries, memory: 5.9 KB
C to export, 294 entries, memory: 10.2 KB

(0,7) -0.834182
(0,12) 1.26582
Expand Down Expand Up @@ -332,7 +332,7 @@
========================= import_test: format 1

67x67 GraphBLAS double matrix, hypersparse by row
C to export, 294 entries, memory: 5.9 KB
C to export, 294 entries, memory: 10.2 KB

(0,7) -0.834182
(0,12) 1.26582
Expand Down Expand Up @@ -368,7 +368,7 @@
========================= import_test: format 2

67x67 GraphBLAS double matrix, hypersparse by row
C to export, 294 entries, memory: 5.9 KB
C to export, 294 entries, memory: 10.2 KB

(0,7) -0.834182
(0,12) 1.26582
Expand Down Expand Up @@ -404,7 +404,7 @@
========================= import_test: format 3

67x67 GraphBLAS double matrix, hypersparse by row
C to export, 294 entries, memory: 5.9 KB
C to export, 294 entries, memory: 10.2 KB

(0,7) -0.834182
(0,12) 1.26582
Expand Down Expand Up @@ -442,7 +442,7 @@
========================= import_test: format 0

67x67 GraphBLAS double matrix, hypersparse by col
C to export, 294 entries, memory: 5.9 KB
C to export, 294 entries, memory: 10.2 KB

(4,0) -0.278842
(5,0) -0.268019
Expand Down Expand Up @@ -478,7 +478,7 @@
========================= import_test: format 1

67x67 GraphBLAS double matrix, hypersparse by col
C to export, 294 entries, memory: 5.9 KB
C to export, 294 entries, memory: 10.2 KB

(4,0) -0.278842
(5,0) -0.268019
Expand Down Expand Up @@ -514,7 +514,7 @@
========================= import_test: format 2

67x67 GraphBLAS double matrix, hypersparse by col
C to export, 294 entries, memory: 5.9 KB
C to export, 294 entries, memory: 10.2 KB

(4,0) -0.278842
(5,0) -0.268019
Expand Down Expand Up @@ -550,7 +550,7 @@
========================= import_test: format 3

67x67 GraphBLAS double matrix, hypersparse by col
C to export, 294 entries, memory: 5.9 KB
C to export, 294 entries, memory: 10.2 KB

(4,0) -0.278842
(5,0) -0.268019
Expand Down
Loading

0 comments on commit 65e31fd

Please sign in to comment.