Skip to content

Commit fc6cd19

Browse files
DrTimothyAldenDavisDrTimothyAldenDavis
authored
Merge pull request DrTimothyAldenDavis#912 from DrTimothyAldenDavis/dev2
GraphBLAS v10
2 parents 32349be + 698545f commit fc6cd19

File tree

5,179 files changed

+85202
-94987
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

5,179 files changed

+85202
-94987
lines changed

‎ChangeLog

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
Mar 1, 2025: version 7.10.0
2+
3+
* GraphBLAS v10.0.0: major upgrade, now supporting 32-bit/64-bit integer
4+
indices. Note the SO version change from 9 to 10. GraphBLAS v10 is
5+
upward compatible with v9, but only if the user application is
6+
recompiled.
7+
* Package versions in this release: (* denotes a new version)
8+
SuiteSparse_config 7.10.0 *
9+
AMD 3.3.3
10+
BTF 2.3.2
11+
CAMD 3.3.3
12+
CCOLAMD 3.3.4
13+
CHOLMOD 5.3.1
14+
COLAMD 3.3.4
15+
CSparse 4.3.2
16+
CXSparse 4.4.1
17+
Example 1.8.5 *
18+
GraphBLAS 10.0.0 *
19+
KLU 2.3.5
20+
LDL 3.3.2
21+
LAGraph 1.1.5
22+
SuiteSparse_Mongoose 3.3.4
23+
ParU 1.0.0
24+
RBio 4.3.4
25+
SPEX 3.2.3
26+
SPQR 4.3.4
27+
UMFPACK 6.3.5
28+
129
Feb 20, 2025: version 7.9.0
230

331
* GraphBLAS v9.4.5: Added the GxB_IndexBinaryOp. Added new JIT kernels.

‎Example/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ message ( STATUS "MY prefix path: ${CMAKE_PREFIX_PATH}" )
5353
#-------------------------------------------------------------------------------
5454

5555
# cmake inserts the date and version number into Include/my.h:
56-
set ( MY_DATE "Feb 20, 2025" )
56+
set ( MY_DATE "Mar 1, 2025" )
5757
set ( MY_VERSION_MAJOR 1 )
5858
set ( MY_VERSION_MINOR 8 )
59-
set ( MY_VERSION_PATCH 4 )
59+
set ( MY_VERSION_PATCH 5 )
6060

6161
message ( STATUS "Building MY library version: v"
6262
${MY_VERSION_MAJOR}.
@@ -87,15 +87,15 @@ project ( my
8787
#-------------------------------------------------------------------------------
8888

8989
# look for all SuiteSparse packages:
90-
find_package ( SuiteSparse_config 7.9.0 REQUIRED )
90+
find_package ( SuiteSparse_config 7.10.0 REQUIRED )
9191
find_package ( AMD 3.3.3 REQUIRED )
9292
find_package ( BTF 2.3.2 REQUIRED )
9393
find_package ( CAMD 3.3.3 REQUIRED )
9494
find_package ( CCOLAMD 3.3.4 REQUIRED )
9595
find_package ( CHOLMOD 5.3.1 REQUIRED )
9696
find_package ( COLAMD 3.3.4 REQUIRED )
9797
find_package ( CXSparse 4.4.1 REQUIRED )
98-
find_package ( GraphBLAS 9.4.5 )
98+
find_package ( GraphBLAS 10.0.0 )
9999
find_package ( KLU 2.3.5 REQUIRED )
100100
find_package ( KLU_CHOLMOD 2.3.5 REQUIRED )
101101
find_package ( LDL 3.3.2 REQUIRED )

‎Example/Include/my_internal.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
// SuiteSparse include files for C/C++:
1616
#include "SuiteSparse_config.h"
17-
#if !defined (SUITESPARSE__VERSION) || SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,9,0)
18-
#error "This library requires SuiteSparse_config 7.9.0 or later"
17+
#if !defined (SUITESPARSE__VERSION) || SUITESPARSE__VERSION < SUITESPARSE__VERCODE(7,10,0)
18+
#error "This library requires SuiteSparse_config 7.10.0 or later"
1919
#endif
2020

2121
#include "amd.h"
@@ -56,8 +56,8 @@
5656
#if ! defined (NO_GRAPHBLAS)
5757
#include "GraphBLAS.h"
5858
#if !defined ( GxB_SUITESPARSE_GRAPHBLAS ) || \
59-
GxB_IMPLEMENTATION < GxB_VERSION (9,4,5)
60-
#error "This library requires SuiteSparse:GraphBLAS 9.4.5 or later"
59+
GxB_IMPLEMENTATION < GxB_VERSION (10,0,0)
60+
#error "This library requires SuiteSparse:GraphBLAS 10.0.0 or later"
6161
#endif
6262
#endif
6363

‎GraphBLAS/.gitignore

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,7 @@ errlog*.txt
4141
fprint.txt
4242
log.txt
4343

44-
Demo/bfs_demo.out
45-
Demo/openmp_demo.out
46-
Demo/pagerank_demo.out
47-
Demo/pthread_demo.out
48-
Demo/simple_demo.out
49-
Demo/tri_demo.out
50-
Demo/wildtype_demo.out
5144
Demo/*.log
52-
Demo/complex_demo_out.m
53-
Demo/complex_demo_out2.m
54-
Demo/import_demo.out
55-
Demo/gauss_demo1.out
56-
Demo/gauss_demo.out
57-
Demo/t1.out
58-
Demo/t2.out
5945

6046
Test/*.log
6147
Test/errlog.txt

‎GraphBLAS/CMakeLists.txt

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# GraphBLAS/CMakeLists.txt: cmake script for GraphBLAS
33
#-------------------------------------------------------------------------------
44

5-
# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2023, All Rights Reserved.
5+
# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2025, All Rights Reserved.
66
# SPDX-License-Identifier: Apache-2.0
77

88
# See the User Guide for details on how to compile SuiteSparse:GraphBLAS.
@@ -41,7 +41,7 @@ if ( NOT BUILD_SHARED_LIBS )
4141
endif ( )
4242

4343
# CUDA is under development for now, and not deployed in production:
44-
set ( GRAPHBLAS_USE_CUDA OFF )
44+
set ( GRAPHBLAS_USE_CUDA OFF ) # turn CUDA off in production
4545
# set ( GRAPHBLAS_USE_CUDA ON ) # use this for CUDA development only
4646

4747
include ( SuiteSparsePolicy )
@@ -517,65 +517,42 @@ if ( SUITESPARSE_DEMOS )
517517
# Demo programs
518518
#---------------------------------------------------------------------------
519519

520-
add_executable ( openmp_demo "Demo/Program/openmp_demo.c" )
521-
add_executable ( openmp2_demo "Demo/Program/openmp2_demo.c" )
522520
add_executable ( complex_demo "Demo/Program/complex_demo.c" )
523-
add_executable ( kron_demo "Demo/Program/kron_demo.c" )
524521
add_executable ( simple_demo "Demo/Program/simple_demo.c" )
525522
add_executable ( wildtype_demo "Demo/Program/wildtype_demo.c" )
526-
add_executable ( reduce_demo "Demo/Program/reduce_demo.c" )
527-
add_executable ( import_demo "Demo/Program/import_demo.c" )
528523
add_executable ( wathen_demo "Demo/Program/wathen_demo.c" )
529524
add_executable ( context_demo "Demo/Program/context_demo.c" )
530525
add_executable ( gauss_demo "Demo/Program/gauss_demo.c" )
531526
add_executable ( grow_demo "Demo/Program/grow_demo.c" )
532527

533528
# Libraries required for Demo programs
534529
if ( BUILD_SHARED_LIBS )
535-
target_link_libraries ( openmp_demo PUBLIC GraphBLAS )
536-
target_link_libraries ( openmp2_demo PUBLIC GraphBLAS )
537530
target_link_libraries ( complex_demo PUBLIC GraphBLAS )
538-
target_link_libraries ( kron_demo PUBLIC GraphBLAS )
539531
target_link_libraries ( simple_demo PUBLIC GraphBLAS )
540532
target_link_libraries ( wildtype_demo PUBLIC GraphBLAS )
541-
target_link_libraries ( reduce_demo PUBLIC GraphBLAS )
542-
target_link_libraries ( import_demo PUBLIC GraphBLAS )
543533
target_link_libraries ( wathen_demo PUBLIC GraphBLAS )
544534
target_link_libraries ( context_demo PUBLIC GraphBLAS )
545535
target_link_libraries ( gauss_demo PUBLIC GraphBLAS )
546536
target_link_libraries ( grow_demo PUBLIC GraphBLAS )
547537
else ( )
548-
target_link_libraries ( openmp_demo PUBLIC GraphBLAS_static )
549-
target_link_libraries ( openmp2_demo PUBLIC GraphBLAS_static )
550538
target_link_libraries ( complex_demo PUBLIC GraphBLAS_static )
551-
target_link_libraries ( kron_demo PUBLIC GraphBLAS_static )
552539
target_link_libraries ( simple_demo PUBLIC GraphBLAS_static )
553540
target_link_libraries ( wildtype_demo PUBLIC GraphBLAS_static )
554-
target_link_libraries ( reduce_demo PUBLIC GraphBLAS_static )
555-
target_link_libraries ( import_demo PUBLIC GraphBLAS_static )
556541
target_link_libraries ( wathen_demo PUBLIC GraphBLAS_static )
557542
target_link_libraries ( context_demo PUBLIC GraphBLAS_static )
558543
target_link_libraries ( gauss_demo PUBLIC GraphBLAS_static )
559544
target_link_libraries ( grow_demo PUBLIC GraphBLAS_static )
560545
endif ( )
561546

562-
target_link_libraries ( openmp_demo PUBLIC ${GB_M} ${GB_CUDA} ${GB_RMM} )
563-
target_link_libraries ( openmp2_demo PUBLIC ${GB_M} ${GB_CUDA} ${GB_RMM} )
564547
target_link_libraries ( complex_demo PUBLIC ${GB_M} ${GB_CUDA} ${GB_RMM} )
565-
target_link_libraries ( kron_demo PUBLIC ${GB_M} ${GB_CUDA} ${GB_RMM} )
566548
target_link_libraries ( simple_demo PUBLIC ${GB_M} ${GB_CUDA} ${GB_RMM} )
567549
target_link_libraries ( wildtype_demo PUBLIC ${GB_M} ${GB_CUDA} ${GB_RMM} )
568-
target_link_libraries ( reduce_demo PUBLIC ${GB_M} ${GB_CUDA} ${GB_RMM} )
569-
target_link_libraries ( import_demo PUBLIC ${GB_M} ${GB_CUDA} ${GB_RMM} )
570550
target_link_libraries ( wathen_demo PUBLIC ${GB_M} ${GB_CUDA} ${GB_RMM} )
571551
target_link_libraries ( context_demo PUBLIC ${GB_M} ${GB_CUDA} ${GB_RMM} )
572552
target_link_libraries ( gauss_demo PUBLIC ${GB_M} ${GB_CUDA} ${GB_RMM} )
573553
target_link_libraries ( grow_demo PUBLIC ${GB_M} ${GB_CUDA} ${GB_RMM} )
574554

575555
if ( GRAPHBLAS_HAS_OPENMP )
576-
target_link_libraries ( openmp_demo PUBLIC OpenMP::OpenMP_C )
577-
target_link_libraries ( openmp2_demo PUBLIC OpenMP::OpenMP_C )
578-
target_link_libraries ( reduce_demo PUBLIC OpenMP::OpenMP_C )
579556
target_link_libraries ( wathen_demo PUBLIC OpenMP::OpenMP_C )
580557
target_link_libraries ( context_demo PUBLIC OpenMP::OpenMP_C )
581558
target_link_libraries ( grow_demo PUBLIC OpenMP::OpenMP_C )

‎GraphBLAS/CUDA/CMakeLists.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# GraphBLAS/CUDA/CMakeLists.txt: cmake script for GraphBLAS/CUDA
33
#-------------------------------------------------------------------------------
44

5-
# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.
5+
# SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2025, All Rights Reserved.
66

77
# Some files in this folder are (c) NVIDIA or (c) Google. Please refer
88
# to their individual licenses (Apache, BSD, or others).
@@ -16,7 +16,10 @@ project ( GRAPHBLAS_CUDA
1616
VERSION "${GraphBLAS_VERSION_MAJOR}.${GraphBLAS_VERSION_MINOR}.${GraphBLAS_VERSION_SUB}"
1717
LANGUAGES CXX CUDA )
1818

19-
cmake_policy ( SET CMP0135 NEW ) # URL download timestamp policy
19+
if ( CMAKE_VERSION VERSION_GREATER_EQUAL 3.24 )
20+
# requires cmake 3.24:
21+
cmake_policy ( SET CMP0135 NEW ) # URL download timestamp policy
22+
endif ( )
2023

2124
set ( CMAKE_CXX_STANDARD 17 )
2225

@@ -49,6 +52,7 @@ target_include_directories ( GraphBLAS_CUDA PRIVATE
4952
../Include
5053
../rmm_wrap
5154
../Source
55+
../Source/hyper
5256
../Source/builtin
5357
)
5458

‎GraphBLAS/CUDA/Config/GraphBLAS_CUDA.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# GraphBLAS_CUDA, Copyright (c) 2017-2024, FIXME
1+
# GraphBLAS_CUDA, Copyright (c) 2017-2025, FIXME
22
# All Rights Reserved.
33
# SPDX-License-Identifier: Apache-2.0
44

‎GraphBLAS/CUDA/Config/GraphBLAS_CUDAConfig.cmake.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
# The following copyright and license applies to just this file only, not to
66
# the library itself:
7-
# GraphBLASConfig.cmake, Copyright (c) 2023-2024, FIXME
7+
# GraphBLASConfig.cmake, Copyright (c) 2023-2025, FIXME
88
# SPDX-License-Identifier: BSD-3-clause
99

1010
#-------------------------------------------------------------------------------

‎GraphBLAS/CUDA/GB_cuda.hpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// GraphBLAS/CUDA/GB_cuda.hpp: include file for host CUDA methods (not for JIT)
33
//------------------------------------------------------------------------------
44

5-
// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.
6-
// This file: Copyright (c) 2024, NVIDIA CORPORATION. All rights reserved.
5+
// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2025, All Rights Reserved.
6+
// This file: Copyright (c) 2024-2025, NVIDIA CORPORATION. All rights reserved.
77
// SPDX-License-Identifier: Apache-2.0
88

99
//------------------------------------------------------------------------------
@@ -39,7 +39,7 @@ extern "C"
3939
//------------------------------------------------------------------------------
4040

4141
// for the "which" parameter of GB_cuda_matrix_prefetch:
42-
// FIXME: rename this to GB_WHATEVER_P for GB_cuda_matrix_advise
42+
// FIXME: rename this to GB_WHATEVER_P for GB_cuda_matrix_memadvise
4343

4444
#define GB_PREFETCH_P 1
4545
#define GB_PREFETCH_H 2
@@ -64,13 +64,11 @@ GrB_Info GB_cuda_matrix_prefetch
6464
) ;
6565

6666
#if 0
67-
// do we need this function too?
68-
GrB_Info GB_cuda_matrix_advise
67+
// we need this function too:
68+
GrB_Info GB_cuda_matrix_memadvise
6969
(
7070
GrB_Matrix A,
7171

72-
p, h, y, b, i, x? 6 bools
73-
7472
what to do: advise (prefer location? access by)? prefetch? nothing?
7573
avdice: enum (1 to 6)
7674

‎GraphBLAS/CUDA/GB_cuda_AxB.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// GraphBLAS/CUDA/GB_cuda_AxB.hpp
33
//------------------------------------------------------------------------------
44

5-
// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.
5+
// SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2025, All Rights Reserved.
66
// SPDX-License-Identifier: Apache-2.0
77

88
//------------------------------------------------------------------------------

0 commit comments

Comments
 (0)