Merge pull request #450 from mmuetzel/ci

Add new projects ParU and LAGraph to CI
DrTimothyAldenDavis · Oct 20, 2023 · 0900858 · 0900858
2 parents 3e44355 + e1c7e4e
commit 0900858
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 175 deletions.
diff --git a/.github/workflows/build-arch-emu.yaml b/.github/workflows/build-arch-emu.yaml
@@ -9,7 +9,7 @@ concurrency: ci-arch-emu-${{ github.ref }}
 
 env:
   # string with name of libraries to be built
-  BUILD_LIBS: "SuiteSparse_config:Mongoose:AMD:BTF:CAMD:CCOLAMD:COLAMD:CHOLMOD:CSparse:CXSparse:LDL:KLU:UMFPACK:RBio:SPQR:SPEX"
+  BUILD_LIBS: "SuiteSparse_config:Mongoose:AMD:BTF:CAMD:CCOLAMD:COLAMD:CHOLMOD:CSparse:CXSparse:LDL:KLU:UMFPACK:RBio:SPQR:SPEX:ParU"
   # string with name of libraries to be checked
   CHECK_LIBS: "SuiteSparse_config:Mongoose:AMD:BTF:CAMD:CCOLAMD:COLAMD:CHOLMOD:CSparse:CXSparse:LDL:KLU:UMFPACK:RBio:SPQR:SPEX"
 

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -10,7 +10,7 @@ concurrency: ci-${{ github.ref }}
 
 env:
   # string with name of libraries to be built
-  BUILD_LIBS: "SuiteSparse_config:Mongoose:AMD:BTF:CAMD:CCOLAMD:COLAMD:CHOLMOD:CSparse:CXSparse:LDL:KLU:UMFPACK:RBio:SPQR:GraphBLAS:SPEX"
+  BUILD_LIBS: "SuiteSparse_config:Mongoose:AMD:BTF:CAMD:CCOLAMD:COLAMD:CHOLMOD:CSparse:CXSparse:LDL:KLU:UMFPACK:RBio:SPQR:GraphBLAS:SPEX:LAGraph:ParU"
   # string with name of libraries to be checked
   CHECK_LIBS: "SuiteSparse_config:Mongoose:AMD:BTF:CAMD:CCOLAMD:COLAMD:CHOLMOD:CSparse:CXSparse:LDL:KLU:UMFPACK:RBio:SPQR:GraphBLAS:SPEX"
 

diff --git a/GraphBLAS/CMakeLists.txt b/GraphBLAS/CMakeLists.txt
@@ -240,7 +240,7 @@ set_target_properties ( GraphBLAS PROPERTIES
     WINDOWS_EXPORT_ALL_SYMBOLS ON )
 
 target_include_directories ( GraphBLAS
-    INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Include>
               $<INSTALL_INTERFACE:${SUITESPARSE_INCLUDEDIR}> )
 
 if ( SUITESPARSE_CUDA )

diff --git a/LAGraph/CMakeLists.txt b/LAGraph/CMakeLists.txt
@@ -118,7 +118,11 @@ endif ( )
 # set ( ENV{GRAPHBLAS_ROOT} ${CMAKE_SOURCE_DIR}/../GraphBLAS )
 message ( STATUS "GraphBLAS_ROOT: ${GraphBLAS_ROOT} $ENV{GraphBLAS_ROOT}" )
 message ( STATUS "GRAPHBLAS_ROOT: ${GRAPHBLAS_ROOT} $ENV{GRAPHBLAS_ROOT}" )
-find_package (GraphBLAS 7.0.1 REQUIRED MODULE)
+find_package ( GraphBLAS 8.2.1
+    PATHS ${CMAKE_SOURCE_DIR}/../GraphBLAS/build NO_DEFAULT_PATH )
+if ( NOT TARGET SuiteSparse::GraphBLAS )
+    find_package ( GraphBLAS 8.2.1 REQUIRED )
+endif ( )
 
 #-------------------------------------------------------------------------------
 # determine what user threading model to use

diff --git a/LAGraph/cmake_modules/FindGraphBLAS.cmake b/LAGraph/cmake_modules/FindGraphBLAS.cmake
diff --git a/ParU/CMakeLists.txt b/ParU/CMakeLists.txt
@@ -56,13 +56,25 @@ project ( paru
 enable_language ( C CXX Fortran )
 message ( STATUS "Fortran: ${CMAKE_Fortran_COMPILER_ID} ") 
 find_package ( OpenMP )
-find_package ( SuiteSparse_config 6.0.0 REQUIRED )
-find_package ( AMD 3.0.0 REQUIRED )
-find_package ( CAMD 3.0.0 REQUIRED )
-find_package ( COLAMD 3.0.0 REQUIRED )
-find_package ( CCOLAMD 3.0.0 REQUIRED )
-find_package ( CHOLMOD 4.0.0 REQUIRED )
-find_package ( UMFPACK 6.0.0 REQUIRED )
+
+find_package ( SuiteSparse_config 7.2.0
+    PATHS ${CMAKE_SOURCE_DIR}/../SuiteSparse_config/build NO_DEFAULT_PATH )
+if ( NOT TARGET SuiteSparse::SuiteSparseConfig )
+    find_package ( SuiteSparse_config 7.2.0 REQUIRED )
+endif ( )
+
+find_package ( CHOLMOD 4.2.2
+    PATHS ${CMAKE_SOURCE_DIR}/../CHOLMOD/build NO_DEFAULT_PATH )
+if ( NOT CHOLMOD_FOUND )
+    find_package ( CHOLMOD 4.2.2 REQUIRED )
+endif ( )
+
+find_package ( UMFPACK 6.2.1
+    PATHS ${CMAKE_SOURCE_DIR}/../UMFPACK/build NO_DEFAULT_PATH )
+if ( NOT CAMD_FOUND )
+    find_package ( UMFPACK 6.2.1 REQUIRED )
+endif ( )
+
 include ( SuiteSparseBLAS )     # requires cmake 3.22
 
 #-------------------------------------------------------------------------------