Skip to content

Commit 6fea8b7

Browse files
Merge pull request #277 from DrTimothyAldenDavis/v9.0.0.branch
JIT performance fix for v9.0.3
2 parents cc3e1af + e3e01d2 commit 6fea8b7

File tree

10 files changed

+24
-10
lines changed

10 files changed

+24
-10
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -459,6 +459,7 @@ if ( GRAPHBLAS_HAS_OPENMP )
459459
target_link_libraries ( GraphBLAS_static PRIVATE OpenMP::OpenMP_C )
460460
endif ( )
461461
message ( STATUS "CMAKE OpenMP C flags: ${OpenMP_C_FLAGS}" )
462+
set ( GB_OPENMP_C_FLAGS "${OpenMP_C_FLAGS}" )
462463
else ( )
463464
message ( WARNING
464465
"WARNING: OpenMP was not found (or was disabled with "
@@ -479,6 +480,7 @@ else ( )
479480
"The C compiler does not support thread-local-storage; "
480481
"GxB_Context_engage will return GrB_NOT_IMPLEMENTED." )
481482
endif ( )
483+
set ( GB_OPENMP_C_FLAGS "" )
482484
endif ( )
483485

484486
if ( SUITESPARSE_HAS_CUDA AND GRAPHBLAS_USE_CUDA )

Config/GB_config.h.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
// GB_C_FLAGS: the C compiler flags used to compile GraphBLAS. Used
2222
// for compiling and linking:
2323
#ifndef GB_C_FLAGS
24-
#define GB_C_FLAGS "@GB_C_FLAGS@"
24+
#define GB_C_FLAGS "@GB_C_FLAGS@ @GB_OPENMP_C_FLAGS@"
2525
#endif
2626

2727
// GB_C_LINK_FLAGS: the flags passed to the C compiler for the link phase:

Doc/ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
Mar 1, 2024: version 9.0.3
2+
3+
* (52) performance bug fix: JIT kernels since v8.3.1 were not compiled with
4+
OpenMP.
5+
16
Feb 26, 2024: version 9.0.2
27

38
* (51) bug fix: GraphBLAS/Makefile "make static" was incorrect.

Doc/GraphBLAS_UserGuide.pdf

66 Bytes
Binary file not shown.

Doc/GraphBLAS_UserGuide.tex

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14768,6 +14768,13 @@ \section{Release Notes}
1476814768

1476914769
\begin{itemize}
1477014770

14771+
\item Mar 1, 2024: version 9.0.3
14772+
14773+
\begin{itemize}
14774+
\item (52) performance bug fix: JIT kernels since v8.3.1 were not compiled
14775+
with OpenMP.
14776+
\end{itemize}
14777+
1477114778
\item Feb 26, 2024: version 9.0.2
1477214779

1477314780
\begin{itemize}

Doc/GraphBLAS_version.tex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
% version of SuiteSparse:GraphBLAS
22
\date{VERSION
3-
9.0.2,
4-
Feb 26, 2024}
3+
9.0.3,
4+
Mar 1, 2024}
55

Include/GraphBLAS.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// SuiteSparse:GraphBLAS 9.0.2
1+
// SuiteSparse:GraphBLAS 9.0.3
22
//------------------------------------------------------------------------------
33
// GraphBLAS.h: definitions for the GraphBLAS package
44
//------------------------------------------------------------------------------
@@ -226,10 +226,10 @@
226226

227227
// The version of this implementation, and the GraphBLAS API version:
228228
#define GxB_IMPLEMENTATION_NAME "SuiteSparse:GraphBLAS"
229-
#define GxB_IMPLEMENTATION_DATE "Feb 26, 2024"
229+
#define GxB_IMPLEMENTATION_DATE "Mar 1, 2024"
230230
#define GxB_IMPLEMENTATION_MAJOR 9
231231
#define GxB_IMPLEMENTATION_MINOR 0
232-
#define GxB_IMPLEMENTATION_SUB 2
232+
#define GxB_IMPLEMENTATION_SUB 3
233233
#define GxB_SPEC_DATE "Dec 22, 2023"
234234
#define GxB_SPEC_MAJOR 2
235235
#define GxB_SPEC_MINOR 1

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.
44

55
SPDX-License-Identifier: Apache-2.0
66

7-
VERSION 9.0.2, Feb 26, 2024
7+
VERSION 9.0.3, Mar 1, 2024
88

99
SuiteSparse:GraphBLAS is a complete implementation of the GraphBLAS standard,
1010
which defines a set of sparse matrix operations on an extended algebra of

cmake_modules/GraphBLAS_JIT_configure.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ if ( GRAPHBLAS_USE_JIT OR GRAPHBLAS_USE_CUDA )
114114
message ( STATUS "------------------------------------------------------------------------" )
115115
# one or both JITs are enabled; make sure the cache path exists
116116
message ( STATUS "JIT C compiler: ${GB_C_COMPILER}" )
117-
message ( STATUS "JIT C flags: ${GB_C_FLAGS}" )
117+
message ( STATUS "JIT C flags: ${GB_C_FLAGS} ${GB_OPENMP_C_FLAGS}" )
118118
message ( STATUS "JIT link flags: ${GB_C_LINK_FLAGS}" )
119119
message ( STATUS "JIT lib prefix: ${GB_LIB_PREFIX}" )
120120
message ( STATUS "JIT lib suffix: ${GB_LIB_SUFFIX}" )

cmake_modules/GraphBLAS_version.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
#-------------------------------------------------------------------------------
99

1010
# version of SuiteSparse:GraphBLAS
11-
set ( GraphBLAS_DATE "Feb 26, 2024" )
11+
set ( GraphBLAS_DATE "Mar 1, 2024" )
1212
set ( GraphBLAS_VERSION_MAJOR 9 CACHE STRING "" FORCE )
1313
set ( GraphBLAS_VERSION_MINOR 0 CACHE STRING "" FORCE )
14-
set ( GraphBLAS_VERSION_SUB 2 CACHE STRING "" FORCE )
14+
set ( GraphBLAS_VERSION_SUB 3 CACHE STRING "" FORCE )
1515

1616
# GraphBLAS C API Specification version, at graphblas.org
1717
set ( GraphBLAS_API_DATE "Dec 22, 2023" )

0 commit comments

Comments
 (0)