added cholmod and superul tpls

kokkos · Mar 3, 2020 · c4cb5be · c4cb5be
1 parent d817b62
commit c4cb5be
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 0 deletions.
diff --git a/cmake/Modules/FindTPLCHOLMOD.cmake b/cmake/Modules/FindTPLCHOLMOD.cmake
@@ -0,0 +1,15 @@
+IF (DEFINED CHOLMOD_LIBRARIES)
+  #we were given the exact list of libraries to find
+  KOKKOSKERNELS_FIND_IMPORTED(CHOLMOD INTERFACE
+    LIBRARIES ${CHOLMOD_LIBRARIES}
+    LIBRARY_PATHS ${CHOLMOD_LIBRARY_DIRS}
+    HEADERS cholmod.h
+    HEADER_PATHS ${CHOLMOD_INCLUDE_DIRS})
+ELSE()
+  #we need to find one of the valid versions from the list below
+  KOKKOSKERNELS_FIND_IMPORTED(CHOLMOD
+    LIBRARY cholmod
+    LIBRARY_PATHS ${CHOLMOD_LIBRARY_DIRS}
+    HEADERS cholmod.h
+    HEADER_PATHS ${CHOLMOD_INCLUDE_DIRS})
+ENDIF()
diff --git a/cmake/Modules/FindTPLSUPERLU.cmake b/cmake/Modules/FindTPLSUPERLU.cmake
@@ -0,0 +1,15 @@
+IF (DEFINED SUPERLU_LIBRARIES)
+  #we were given the exact list of libraries to find
+  KOKKOSKERNELS_FIND_IMPORTED(SUPERLU INTERFACE
+    LIBRARIES ${SUPERLU_LIBRARIES}
+    LIBRARY_PATHS ${SUPERLU_LIBRARY_DIRS}
+    HEADERS slu_ddefs.h
+    HEADER_PATHS ${SUPERLU_INCLUDE_DIRS})
+ELSE()
+  #we need to find one of the valid versions from the list below
+  KOKKOSKERNELS_FIND_IMPORTED(SUPERLU
+    LIBRARY superlu
+    LIBRARY_PATHS ${SUPERLU_LIBRARY_DIRS}
+    HEADERS slu_ddefs.h
+    HEADER_PATHS ${SUPERLU_INCLUDE_DIRS})
+ENDIF()
diff --git a/cmake/kokkoskernels_tpls.cmake b/cmake/kokkoskernels_tpls.cmake
@@ -469,6 +469,8 @@ IF (NOT KOKKOSKERNELS_HAS_TRILINOS)
   KOKKOSKERNELS_IMPORT_TPL(CUSPARSE)
   KOKKOSKERNELS_IMPORT_TPL(CBLAS)
   KOKKOSKERNELS_IMPORT_TPL(LAPACKE)
+  KOKKOSKERNELS_IMPORT_TPL(CHOLMOD)
+  KOKKOSKERNELS_IMPORT_TPL(SUPERLU)
 ENDIF()
 
 #Convert list to newlines (which CMake doesn't always like in cache variables)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -133,6 +133,10 @@ ENDIF()
 
 KOKKOSKERNELS_LINK_TPL(kokkoskernels PUBLIC BLAS)
 KOKKOSKERNELS_LINK_TPL(kokkoskernels PUBLIC LAPACK)
+KOKKOSKERNELS_LINK_TPL(kokkoskernels PUBLIC CBLAS)
+KOKKOSKERNELS_LINK_TPL(kokkoskernels PUBLIC LAPACKE)
+KOKKOSKERNELS_LINK_TPL(kokkoskernels PUBLIC SUPERLU)
+KOKKOSKERNELS_LINK_TPL(kokkoskernels PUBLIC CHOLMOD)
 KOKKOSKERNELS_LINK_TPL(kokkoskernels PUBLIC MKL)
 KOKKOSKERNELS_LINK_TPL(kokkoskernels PUBLIC CUBLAS)
 KOKKOSKERNELS_LINK_TPL(kokkoskernels PUBLIC CUSPARSE)