Merge pull request #277 from DrTimothyAldenDavis/v9.0.0.branch

JIT performance fix for v9.0.3
DrTimothyAldenDavis · Mar 2, 2024 · 6fea8b7 · 6fea8b7
2 parents cc3e1af + e3e01d2
commit 6fea8b7
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -459,6 +459,7 @@ if ( GRAPHBLAS_HAS_OPENMP )
         target_link_libraries ( GraphBLAS_static PRIVATE OpenMP::OpenMP_C )
     endif ( )
     message ( STATUS "CMAKE OpenMP C flags:      ${OpenMP_C_FLAGS}" )
+    set ( GB_OPENMP_C_FLAGS "${OpenMP_C_FLAGS}" )
 else ( )
     message ( WARNING
     "WARNING:  OpenMP was not found (or was disabled with "
@@ -479,6 +480,7 @@ else ( )
         "The C compiler does not support thread-local-storage; "
         "GxB_Context_engage will return GrB_NOT_IMPLEMENTED." )
     endif ( )
+    set ( GB_OPENMP_C_FLAGS "" )
 endif ( )
 
 if ( SUITESPARSE_HAS_CUDA AND GRAPHBLAS_USE_CUDA )

diff --git a/Config/GB_config.h.in b/Config/GB_config.h.in
@@ -21,7 +21,7 @@
 // GB_C_FLAGS: the C compiler flags used to compile GraphBLAS.  Used
 // for compiling and linking:
 #ifndef GB_C_FLAGS
-#define GB_C_FLAGS      "@GB_C_FLAGS@"
+#define GB_C_FLAGS      "@GB_C_FLAGS@ @GB_OPENMP_C_FLAGS@"
 #endif
 
 // GB_C_LINK_FLAGS: the flags passed to the C compiler for the link phase:

diff --git a/Doc/ChangeLog b/Doc/ChangeLog
@@ -1,3 +1,8 @@
+Mar 1, 2024: version 9.0.3
+
+    * (52) performance bug fix: JIT kernels since v8.3.1 were not compiled with
+        OpenMP.
+
 Feb 26, 2024: version 9.0.2
 
     * (51) bug fix: GraphBLAS/Makefile "make static" was incorrect.

diff --git a/Doc/GraphBLAS_UserGuide.pdf b/Doc/GraphBLAS_UserGuide.pdf
diff --git a/Doc/GraphBLAS_UserGuide.tex b/Doc/GraphBLAS_UserGuide.tex
@@ -14768,6 +14768,13 @@ \section{Release Notes}
 
 \begin{itemize}
 
+\item Mar 1, 2024: version 9.0.3
+
+    \begin{itemize}
+    \item (52) performance bug fix: JIT kernels since v8.3.1 were not compiled
+    with OpenMP.
+    \end{itemize}
+
 \item Feb 26, 2024: version 9.0.2
 
     \begin{itemize}

diff --git a/Doc/GraphBLAS_version.tex b/Doc/GraphBLAS_version.tex
@@ -1,5 +1,5 @@
 % version of SuiteSparse:GraphBLAS
 \date{VERSION
-9.0.2,
-Feb 26, 2024}
+9.0.3,
+Mar 1, 2024}
 
diff --git a/Include/GraphBLAS.h b/Include/GraphBLAS.h
@@ -1,4 +1,4 @@
-// SuiteSparse:GraphBLAS 9.0.2
+// SuiteSparse:GraphBLAS 9.0.3
 //------------------------------------------------------------------------------
 // GraphBLAS.h: definitions for the GraphBLAS package
 //------------------------------------------------------------------------------
@@ -226,10 +226,10 @@
 
 // The version of this implementation, and the GraphBLAS API version:
 #define GxB_IMPLEMENTATION_NAME "SuiteSparse:GraphBLAS"
-#define GxB_IMPLEMENTATION_DATE "Feb 26, 2024"
+#define GxB_IMPLEMENTATION_DATE "Mar 1, 2024"
 #define GxB_IMPLEMENTATION_MAJOR 9
 #define GxB_IMPLEMENTATION_MINOR 0
-#define GxB_IMPLEMENTATION_SUB   2
+#define GxB_IMPLEMENTATION_SUB   3
 #define GxB_SPEC_DATE "Dec 22, 2023"
 #define GxB_SPEC_MAJOR 2
 #define GxB_SPEC_MINOR 1

diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ SuiteSparse:GraphBLAS, Timothy A. Davis, (c) 2017-2024, All Rights Reserved.
 
 SPDX-License-Identifier: Apache-2.0
 
-VERSION 9.0.2, Feb 26, 2024
+VERSION 9.0.3, Mar 1, 2024
 
 SuiteSparse:GraphBLAS is a complete implementation of the GraphBLAS standard,
 which defines a set of sparse matrix operations on an extended algebra of

diff --git a/cmake_modules/GraphBLAS_JIT_configure.cmake b/cmake_modules/GraphBLAS_JIT_configure.cmake
@@ -114,7 +114,7 @@ if ( GRAPHBLAS_USE_JIT OR GRAPHBLAS_USE_CUDA )
     message ( STATUS "------------------------------------------------------------------------" )
     # one or both JITs are enabled; make sure the cache path exists
     message ( STATUS "JIT C compiler: ${GB_C_COMPILER}" )
-    message ( STATUS "JIT C flags:    ${GB_C_FLAGS}" )
+    message ( STATUS "JIT C flags:    ${GB_C_FLAGS} ${GB_OPENMP_C_FLAGS}" )
     message ( STATUS "JIT link flags: ${GB_C_LINK_FLAGS}" )
     message ( STATUS "JIT lib prefix: ${GB_LIB_PREFIX}" )
     message ( STATUS "JIT lib suffix: ${GB_LIB_SUFFIX}" )

diff --git a/cmake_modules/GraphBLAS_version.cmake b/cmake_modules/GraphBLAS_version.cmake
@@ -8,10 +8,10 @@
 #-------------------------------------------------------------------------------
 
 # version of SuiteSparse:GraphBLAS
-set ( GraphBLAS_DATE "Feb 26, 2024" )
+set ( GraphBLAS_DATE "Mar 1, 2024" )
 set ( GraphBLAS_VERSION_MAJOR 9 CACHE STRING "" FORCE )
 set ( GraphBLAS_VERSION_MINOR 0 CACHE STRING "" FORCE )
-set ( GraphBLAS_VERSION_SUB   2 CACHE STRING "" FORCE )
+set ( GraphBLAS_VERSION_SUB   3 CACHE STRING "" FORCE )
 
 # GraphBLAS C API Specification version, at graphblas.org
 set ( GraphBLAS_API_DATE "Dec 22, 2023" )