sync with SuiteSparse v7.2.0

DrTimothyAldenDavis · Sep 14, 2023 · 3c8a19e · 3c8a19e
1 parent 8e67037
commit 3c8a19e
Show file tree

Hide file tree

Showing 6 changed files with 94 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -61,7 +61,6 @@ endif ( )
 
 if ( SUITESPARSE_CUDA )
     # with CUDA and RMM
-    set ( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -DSUITESPARSE_CUDA" )
     add_subdirectory ( CUDA )
     set ( GB_CUDA GraphBLAS_CUDA  ${CUDA_LIBRARIES} )
     set ( GB_RMM rmm_wrap ${CUDA_LIBRARIES} )
@@ -263,9 +262,9 @@ if ( NOT NSTATIC )
     add_library ( GraphBLAS_static STATIC ${GRAPHBLAS_SOURCES} )
 
     set_target_properties ( GraphBLAS_static PROPERTIES
-       VERSION ${GraphBLAS_VERSION_MAJOR}.${GraphBLAS_VERSION_MINOR}.${GraphBLAS_VERSION_SUB}
-       OUTPUT_NAME graphblas
-       SOVERSION ${GraphBLAS_VERSION_MAJOR}
+        VERSION ${GraphBLAS_VERSION_MAJOR}.${GraphBLAS_VERSION_MINOR}.${GraphBLAS_VERSION_SUB}
+        OUTPUT_NAME graphblas
+        SOVERSION ${GraphBLAS_VERSION_MAJOR}
         C_STANDARD 11
         C_STANDARD_REQUIRED ON )
 
@@ -280,6 +279,7 @@ if ( NOT NSTATIC )
 
     if ( SUITESPARSE_CUDA )
         add_dependencies ( GraphBLAS_static GraphBLAS_CUDA )
+        set ( GRAPHBLAS_STATIC_MODULES "${GRAPHBLAS_STATIC_MODULES} GraphBLAS_CUDA" )
 #       add_dependencies ( GraphBLAS_static rmm_wrap )
     endif ( )
 endif ( )

diff --git a/CUDA/CMakeLists.txt b/CUDA/CMakeLists.txt
@@ -38,6 +38,7 @@ add_library ( GraphBLAS_CUDA SHARED ${GRAPHBLAS_CUDA_SOURCES} )
 
 set_target_properties ( GraphBLAS_CUDA PROPERTIES
     VERSION ${GraphBLAS_VERSION_MAJOR}.${GraphBLAS_VERSION_MINOR}.${GraphBLAS_VERSION_SUB}
+    OUTPUT_NAME graphblascuda
     SOVERSION ${GraphBLAS_VERSION_MAJOR}
     C_STANDARD 11
     C_STANDARD_REQUIRED ON )
@@ -72,6 +73,8 @@ set_target_properties(GraphBLAS_CUDA PROPERTIES CUDA_ARCHITECTURES "52;75;80" )
 
 target_link_libraries(GraphBLAS_CUDA CUDA::nvrtc CUDA::cudart_static CUDA::cuda_driver CUDA::nvToolsExt )
 
+target_compile_definitions ( GraphBLAS_CUDA PUBLIC "SUITESPARSE_CUDA" )
+
 target_include_directories ( GraphBLAS_CUDA
     INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
               $<INSTALL_INTERFACE:${SUITESPARSE_INCLUDEDIR}> )
@@ -113,6 +116,35 @@ install ( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/GraphBLAS_CUDAConfigVersion.cmake
     DESTINATION ${SUITESPARSE_LIBDIR}/cmake/GraphBLAS )
 
+#-------------------------------------------------------------------------------
+# create pkg-config file
+#-------------------------------------------------------------------------------
+
+if ( NOT MSVC )
+    set ( prefix "${CMAKE_INSTALL_PREFIX}" )
+    set ( exec_prefix "\${prefix}" )
+    cmake_path ( IS_ABSOLUTE SUITESPARSE_LIBDIR SUITESPARSE_LIBDIR_IS_ABSOLUTE )
+    if (SUITESPARSE_LIBDIR_IS_ABSOLUTE)
+        set ( libdir "${SUITESPARSE_LIBDIR}")
+    else ( )
+        set ( libdir "\${exec_prefix}/${SUITESPARSE_LIBDIR}")
+    endif ( )
+    cmake_path ( IS_ABSOLUTE SUITESPARSE_INCLUDEDIR SUITESPARSE_INCLUDEDIR_IS_ABSOLUTE )
+    if (SUITESPARSE_INCLUDEDIR_IS_ABSOLUTE)
+        set ( includedir "${SUITESPARSE_INCLUDEDIR}")
+    else ( )
+        set ( includedir "\${prefix}/${SUITESPARSE_INCLUDEDIR}")
+    endif ( )
+    configure_file (
+        Config/GraphBLAS_CUDA.pc.in
+        GraphBLAS_CUDA.pc
+        @ONLY
+        NEWLINE_STYLE LF )
+    install ( FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/GraphBLAS_CUDA.pc
+        DESTINATION ${SUITESPARSE_LIBDIR}/pkgconfig )
+endif ( )
+
 #-------------------------------------------------------------------------------
 # test suite for the CUDA kernels
 #-------------------------------------------------------------------------------

diff --git a/CUDA/Config/GraphBLAS_CUDA.pc.in b/CUDA/Config/GraphBLAS_CUDA.pc.in
@@ -0,0 +1,17 @@
+# GraphBLAS_CUDA, Copyright (c) 2017-2023, Timothy A. Davis.
+# All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+# FIXME: Which flags do we need to statically link CUDA?
+
+Name: GraphBLAS_CUDA
+URL: https://github.com/DrTimothyAldenDavis/SuiteSparse
+Description: CUDA support library for GraphBLAS in SuiteSparse
+Version: @GraphBLAS_VERSION_MAJOR@.@GraphBLAS_VERSION_MINOR@.@GraphBLAS_VERSION_SUB@
+Libs: -L${libdir} -lgraphblascuda
+Cflags: -I${includedir} -DSUITESPARSE_CUDA
diff --git a/CUDA/Config/GraphBLAS_CUDAConfig.cmake.in b/CUDA/Config/GraphBLAS_CUDAConfig.cmake.in
@@ -35,9 +35,24 @@ set ( GRAPHBLAS_CUDA_VERSION_MINOR @GraphBLAS_VERSION_MINOR@ )
 set ( GRAPHBLAS_CUDA_VERSION_PATCH @GraphBLAS_VERSION_SUB@ )
 set ( GRAPHBLAS_CUDA_VERSION "@GraphBLAS_VERSION_MAJOR@.@GraphBLAS_VERSION_MINOR@.@GraphBLAS_VERSION_SUB@" )
 
+# Check for dependent targets
+include ( CMakeFindDependencyMacro )
+set ( _dependencies_found ON )
+
 # Look for NVIDIA CUDA toolkit
-find_package ( CUDAToolkit @CUDAToolkit_VERSION_MAJOR@ REQUIRED )
+if ( NOT CUDAToolkit_FOUND )
+    find_dependency ( CUDAToolkit @CUDAToolkit_VERSION_MAJOR@ )
+    if ( NOT CUDAToolkit_FOUND )
+        set ( _dependencies_found OFF )
+    endif ( )
+endif ( )
+
+if ( NOT _dependencies_found )
+    set ( GraphBLAS_CUDA_FOUND OFF )
+    return ( )
+endif ( )
 
+# Import target
 include ( ${CMAKE_CURRENT_LIST_DIR}/GraphBLAS_CUDATargets.cmake )
 
 # The following is only for backward compatibility with FindGraphBLAS_CUDA.

diff --git a/Config/GraphBLAS.pc.in b/Config/GraphBLAS.pc.in
@@ -13,6 +13,7 @@ Name: GraphBLAS
 URL: https://github.com/DrTimothyAldenDavis/SuiteSparse
 Description: Complete implementation of the GraphBLAS standard in SuiteSparse
 Version: @GraphBLAS_VERSION_MAJOR@.@GraphBLAS_VERSION_MINOR@.@GraphBLAS_VERSION_SUB@
+Requires.private: @GRAPHBLAS_STATIC_MODULES@
 Libs: -L${libdir} -lgraphblas
 Libs.private: @GRAPHBLAS_STATIC_LIBS@
 Cflags: -I${includedir}
diff --git a/Config/GraphBLASConfig.cmake.in b/Config/GraphBLASConfig.cmake.in
@@ -35,22 +35,37 @@ set ( GRAPHBLAS_VERSION_MINOR @GraphBLAS_VERSION_MINOR@ )
 set ( GRAPHBLAS_VERSION_PATCH @GraphBLAS_VERSION_SUB@ )
 set ( GRAPHBLAS_VERSION "@GraphBLAS_VERSION_MAJOR@.@GraphBLAS_VERSION_MINOR@.@GraphBLAS_VERSION_SUB@" )
 
+# Check for dependent targets
+include ( CMakeFindDependencyMacro )
+set ( _dependencies_found ON )
+
 if ( @SUITESPARSE_CUDA@ )
     # Look for imported targets of additional dependency if GraphBLAS was built with CUDA
 
-    if ( @SUITESPARSE_IN_BUILD_TREE@ )
-        # First check in a common build tree
-        find_package ( GraphBLAS_CUDA @GraphBLAS_VERSION_MAJOR@.@GraphBLAS_VERSION_MINOR@.@GraphBLAS_VERSION_SUB@
-            PATHS ${CMAKE_SOURCE_DIR}/../GraphBLAS/build/CUDA NO_DEFAULT_PATH )
-        # Then, check in the currently active CMAKE_MODULE_PATH
-        if ( NOT TARGET SuiteSparse::GraphBLAS_CUDA )
-            find_package ( GraphBLAS_CUDA @GraphBLAS_VERSION_MAJOR@.@GraphBLAS_VERSION_MINOR@.@GraphBLAS_VERSION_SUB@ REQUIRED )
+    if ( NOT GraphBLAS_CUDA_FOUND )
+        if ( @SUITESPARSE_IN_BUILD_TREE@ )
+            # First check in a common build tree
+            find_dependency ( GraphBLAS_CUDA @GraphBLAS_VERSION_MAJOR@.@GraphBLAS_VERSION_MINOR@.@GraphBLAS_VERSION_SUB@
+                PATHS ${CMAKE_SOURCE_DIR}/../GraphBLAS/build/CUDA NO_DEFAULT_PATH )
+            # Then, check in the currently active CMAKE_MODULE_PATH
+            if ( NOT GraphBLAS_CUDA_FOUND )
+                find_dependency ( GraphBLAS_CUDA @GraphBLAS_VERSION_MAJOR@.@GraphBLAS_VERSION_MINOR@.@GraphBLAS_VERSION_SUB@ )
+            endif ( )
+        else ( )
+            find_dependency ( GraphBLAS_CUDA @GraphBLAS_VERSION_MAJOR@.@GraphBLAS_VERSION_MINOR@.@GraphBLAS_VERSION_SUB@ )
         endif ( )
-    else ( )
-        find_package ( GraphBLAS_CUDA @GraphBLAS_VERSION_MAJOR@.@GraphBLAS_VERSION_MINOR@.@GraphBLAS_VERSION_SUB@ REQUIRED )
     endif ( )
+    if ( NOT GraphBLAS_CUDA_FOUND )
+        set ( _dependencies_found OFF )
+    endif ( )
+endif ( )
+
+if ( NOT _dependencies_found )
+    set ( GraphBLAS_FOUND OFF )
+    return ( )
 endif ( )
 
+# Import target
 include ( ${CMAKE_CURRENT_LIST_DIR}/GraphBLASTargets.cmake )
 
 # The following is only for backward compatibility with FindGraphBLAS.