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

GraphBLAS 9.0.1: minor updates to build system

CMakeLists.txt

@@ -57,9 +57,6 @@ endif ( )
 
 # in the future, when GraphBLAS can use CUDA in production:
 # option ( GRAPHBLAS_USE_CUDA "ON (default): enable CUDA acceleration for GraphBLAS, OFF: do not use CUDA" ${SUITESPARSE_USE_CUDA} )
-# if ( NOT SUITESPARSE_USE_CUDA )
-#     set ( GRAPHBLAS_USE_CUDA "OFF" CACHE STRING "" FORCE )
-# endif ( )
 
 if ( SUITESPARSE_HAS_CUDA AND GRAPHBLAS_USE_CUDA )
     # FOR NOW: do not compile FactoryKernels when developing the CUDA kernels
@@ -101,9 +98,6 @@ endif ( )
 #-------------------------------------------------------------------------------
 
 option ( GRAPHBLAS_USE_OPENMP "ON: Use OpenMP in GraphBLAS if available.  OFF: Do not use OpenMP.  (Default: SUITESPARSE_USE_OPENMP)" ${SUITESPARSE_USE_OPENMP} )
-if ( NOT SUITESPARSE_USE_OPENMP )
-    set ( GRAPHBLAS_USE_OPENMP "OFF" CACHE STRING "" FORCE )
-endif ( )
 if ( GRAPHBLAS_USE_OPENMP )
     if ( CMAKE_VERSION VERSION_LESS 3.24 )
         find_package ( OpenMP COMPONENTS C )
@@ -115,7 +109,7 @@ else ( )
     set ( OpenMP_C_FOUND OFF )
 endif ( )
 
-if ( OpenMP_C_FOUND )
+if ( GRAPHBLAS_USE_OPENMP AND OpenMP_C_FOUND )
     set ( GRAPHBLAS_HAS_OPENMP ON )
 else ( )
     set ( GRAPHBLAS_HAS_OPENMP OFF )

Doc/ChangeLog

@@ -1,3 +1,7 @@
+Jan 20, 2024: version 9.0.1
+
+    * minor updates to build system
+
 Jan 10, 2024: version 9.0.0
 
     * GrB_get/GrB_set: new functions from the v2.1 C API.

Doc/GraphBLAS_UserGuide.tex

@@ -14768,6 +14768,12 @@ \section{Release Notes}
 
 \begin{itemize}
 
+\item Jan 20, 2024: version 9.0.1
+
+    \begin{itemize}
+    \item minor updates to build system
+    \end{itemize}
+
 \item Version 9.0.0, Jan 10, 2024
 
     \begin{itemize}

Doc/GraphBLAS_version.tex

@@ -1,5 +1,5 @@
 % version of SuiteSparse:GraphBLAS
 \date{VERSION
-9.0.0,
-Jan 10, 2024}
+9.0.1,
+Jan 20, 2024}
 

GraphBLAS/CMakeLists.txt

@@ -40,9 +40,6 @@ include ( SuiteSparsePolicy )
 
 # in the future, when GraphBLAS can use CUDA in production:
 # option ( GRAPHBLAS_USE_CUDA "ON (default): enable CUDA acceleration for GraphBLAS, OFF: do not use CUDA" ${SUITESPARSE_USE_CUDA} )
-# if ( NOT SUITESPARSE_USE_CUDA )
-#     set ( GRAPHBLAS_USE_CUDA "OFF" CACHE STRING "" FORCE )
-# endif ( )
 
 set ( GRAPHBLAS_HAS_CUDA OFF )
 
@@ -65,9 +62,6 @@ project ( graphblas_matlab
 #-------------------------------------------------------------------------------
 
 option ( GRAPHBLAS_USE_OPENMP "ON: Use OpenMP in GraphBLAS if available.  OFF: Do not use OpenMP.  (Default: SUITESPARSE_USE_OPENMP)" ${SUITESPARSE_USE_OPENMP} )
-if ( NOT SUITESPARSE_USE_OPENMP )
-    set ( GRAPHBLAS_USE_OPENMP "OFF" CACHE STRING "" FORCE )
-endif ( )
 if ( GRAPHBLAS_USE_OPENMP )
     find_package ( OpenMP COMPONENTS C )
 else ( )

GraphBLAS/Makefile

@@ -44,7 +44,7 @@ remake:
 
 # just run cmake; do not compile
 setup:
-	( cd build ; cmake $(CMAKE_OPTIONS) .. ; )
+	( cd build && cmake $(CMAKE_OPTIONS) .. ; )
 
 # installs GraphBLAS to the install location defined by cmake, usually
 # /usr/local/lib and /usr/local/include

Include/GraphBLAS.h

@@ -1,4 +1,4 @@
-// SuiteSparse:GraphBLAS 9.0.0
+// SuiteSparse:GraphBLAS 9.0.1
 //------------------------------------------------------------------------------
 // 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 "Jan 10, 2024"
+#define GxB_IMPLEMENTATION_DATE "Jan 20, 2024"
 #define GxB_IMPLEMENTATION_MAJOR 9
 #define GxB_IMPLEMENTATION_MINOR 0
-#define GxB_IMPLEMENTATION_SUB   0
+#define GxB_IMPLEMENTATION_SUB   1
 #define GxB_SPEC_DATE "Dec 22, 2023"
 #define GxB_SPEC_MAJOR 2
 #define GxB_SPEC_MINOR 1

JITpackage/CMakeLists.txt

@@ -29,6 +29,11 @@ if ( CMAKE_CROSSCOMPILING )
         CMAKE_ARGS ${GRAPHBLAS_CROSS_TOOLCHAIN_FLAGS_NATIVE}
         INSTALL_COMMAND "" )
 
+    # Overriding this variable seems to be necessary if users set
+    # CMAKE_FIND_ROOT_PATH_MODE_PACKAGE to ONLY.
+    # See: https://github.com/DrTimothyAldenDavis/SuiteSparse/issues/729
+    set( GrBJITPackageGenerator_DIR ${PROJECT_BINARY_DIR}/native )
+
     # The following package won't be found on the first run (before the native
     # grb_jitpackage has been built). But it should be found after the above
     # external project has built it.

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.0, Jan 10, 2024
+VERSION 9.0.1, Jan 20, 2024
 
 SuiteSparse:GraphBLAS is a complete implementation of the GraphBLAS standard,
 which defines a set of sparse matrix operations on an extended algebra of

cmake_modules/GraphBLAS_version.cmake

@@ -8,10 +8,10 @@
 #-------------------------------------------------------------------------------
 
 # version of SuiteSparse:GraphBLAS
-set ( GraphBLAS_DATE "Jan 10, 2024" )
+set ( GraphBLAS_DATE "Jan 20, 2024" )
 set ( GraphBLAS_VERSION_MAJOR 9 CACHE STRING "" FORCE )
 set ( GraphBLAS_VERSION_MINOR 0 CACHE STRING "" FORCE )
-set ( GraphBLAS_VERSION_SUB   0 CACHE STRING "" FORCE )
+set ( GraphBLAS_VERSION_SUB   1 CACHE STRING "" FORCE )
 
 # GraphBLAS C API Specification version, at graphblas.org
 set ( GraphBLAS_API_DATE "Dec 22, 2023" )

cmake_modules/SuiteSparsePolicy.cmake

@@ -107,6 +107,16 @@ if (${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.18.0" )
     cmake_policy ( SET CMP0104 NEW )    # initialize CUDA architectures
 endif ( )
 
+# SuiteSparse packages have many intentional extra semicolons, for code
+# readability (such as "/* do nothing */ ;" in SuiteSparse_config.c).  Disable
+# the clang warning for these statements:
+if ( CMAKE_C_COMPILER_ID STREQUAL "Clang" )
+    set ( CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wno-extra-semi-stmt" )
+endif ( )
+if ( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" )
+    set ( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wno-extra-semi-stmt" )
+endif ( )
+
 if ( WIN32 )
     set ( CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS true )
     add_compile_definitions ( _CRT_SECURE_NO_WARNINGS )
@@ -120,7 +130,7 @@ set ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
     ${CMAKE_SOURCE_DIR}/cmake_modules )
 
 # Use OpenMP
-option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP if available.  OFF: Do not use OpenMP" ON )
+option ( SUITESPARSE_USE_OPENMP "ON (default): Use OpenMP in libraries by default if available.  OFF: Do not use OpenMP by default." ON )
 
 # strict usage
 option ( SUITESPARSE_USE_STRICT "ON: treat all _USE__ settings as strict if they are ON. OFF (default): consider *_USE_* as preferences, not strict" OFF )

cpu_features/Makefile

@@ -9,7 +9,7 @@ go:
 distclean: purge
 
 install:
-	( cd build ; make install )
+	( cd build && make install )
 
 purge:
 	- rm -rf ./build/*