WIP: Kokkos: Remove TriBITS subpackages (trilinos#11545)

bartlettroscoe · Apr 14, 2023 · 8f93097 · 8f93097
1 parent f1408d2
commit 8f93097
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 62 deletions.
diff --git a/packages/kokkos/CMakeLists.txt b/packages/kokkos/CMakeLists.txt
@@ -6,7 +6,7 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}" )
 endif()
 
 if (COMMAND TRIBITS_PACKAGE_DECL)
-  TRIBITS_PACKAGE_DECL(Kokkos)
+  TRIBITS_PACKAGE(Kokkos)
 endif()
 
 # We want to determine if options are given with the wrong case

diff --git a/packages/kokkos/algorithms/CMakeLists.txt b/packages/kokkos/algorithms/CMakeLists.txt
@@ -1,15 +1,7 @@
-
-
-KOKKOS_SUBPACKAGE(Algorithms)
-
 IF (NOT Kokkos_INSTALL_TESTING)
   ADD_SUBDIRECTORY(src)
 ENDIF()
 # FIXME_OPENACC: temporarily disabled due to unimplemented features
 IF(NOT ((KOKKOS_ENABLE_OPENMPTARGET OR KOKKOS_ENABLE_OPENACC) AND KOKKOS_CXX_COMPILER_ID STREQUAL NVHPC))
   KOKKOS_ADD_TEST_DIRECTORIES(unit_tests)
 ENDIF()
-
-KOKKOS_SUBPACKAGE_POSTPROCESS()
-
-
diff --git a/packages/kokkos/algorithms/cmake/Dependencies.cmake b/packages/kokkos/algorithms/cmake/Dependencies.cmake
diff --git a/packages/kokkos/cmake/Dependencies.cmake b/packages/kokkos/cmake/Dependencies.cmake
@@ -1,10 +1,6 @@
 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-  SUBPACKAGES_DIRS_CLASSIFICATIONS_OPTREQS
-    #SubPackageName       Directory         Class    Req/Opt
-    #
-    # New Kokkos subpackages:
-    Core                  core              PS       REQUIRED
-    Containers            containers        PS       OPTIONAL
-    Algorithms            algorithms        PS       OPTIONAL
-    Simd                  simd              PT       OPTIONAL
+  LIB_OPTIONAL_TPLS Pthread CUDA HWLOC DLlib
+  TEST_OPTIONAL_TPLS CUSPARSE
   )
+
+TRIBITS_TPL_TENTATIVELY_ENABLE(DLlib)
diff --git a/packages/kokkos/cmake/kokkos_tribits.cmake b/packages/kokkos/cmake/kokkos_tribits.cmake
@@ -84,13 +84,11 @@ ENDMACRO()
 
 
 MACRO(KOKKOS_PROCESS_SUBPACKAGES)
-  if (KOKKOS_HAS_TRILINOS)
-    TRIBITS_PROCESS_SUBPACKAGES()
-  else()
-    ADD_SUBDIRECTORY(core)
-    ADD_SUBDIRECTORY(containers)
-    ADD_SUBDIRECTORY(algorithms)
-    ADD_SUBDIRECTORY(simd)
+  ADD_SUBDIRECTORY(core)
+  ADD_SUBDIRECTORY(containers)
+  ADD_SUBDIRECTORY(algorithms)
+  ADD_SUBDIRECTORY(simd)
+  if (NOT KOKKOS_HAS_TRILINOS)
     ADD_SUBDIRECTORY(example)
   endif()
 ENDMACRO()

diff --git a/packages/kokkos/containers/CMakeLists.txt b/packages/kokkos/containers/CMakeLists.txt
@@ -1,7 +1,3 @@
-
-
-KOKKOS_SUBPACKAGE(Containers)
-
 IF (NOT Kokkos_INSTALL_TESTING)
   ADD_SUBDIRECTORY(src)
 ENDIF()
@@ -11,5 +7,3 @@ IF(NOT KOKKOS_ENABLE_OPENACC)
 KOKKOS_ADD_TEST_DIRECTORIES(unit_tests)
 KOKKOS_ADD_TEST_DIRECTORIES(performance_tests)
 ENDIF()
-
-KOKKOS_SUBPACKAGE_POSTPROCESS()
diff --git a/packages/kokkos/containers/cmake/Dependencies.cmake b/packages/kokkos/containers/cmake/Dependencies.cmake
diff --git a/packages/kokkos/core/CMakeLists.txt b/packages/kokkos/core/CMakeLists.txt
@@ -1,7 +1,3 @@
-
-
-KOKKOS_SUBPACKAGE(Core)
-
 IF (NOT Kokkos_INSTALL_TESTING)
   ADD_SUBDIRECTORY(src)
 ENDIF()
@@ -11,5 +7,3 @@ IF (NOT KOKKOS_HAS_TRILINOS)
   # We are using the githash etc in here, which does not work correct in Trilinos
   KOKKOS_ADD_TEST_DIRECTORIES(perf_test)
 ENDIF()
-
-KOKKOS_SUBPACKAGE_POSTPROCESS()
diff --git a/packages/kokkos/core/cmake/Dependencies.cmake b/packages/kokkos/core/cmake/Dependencies.cmake
diff --git a/packages/kokkos/simd/CMakeLists.txt b/packages/kokkos/simd/CMakeLists.txt
@@ -1,10 +1,5 @@
-
-KOKKOS_SUBPACKAGE(Simd)
-
 IF (NOT Kokkos_INSTALL_TESTING)
   ADD_SUBDIRECTORY(src)
 ENDIF()
 
 KOKKOS_ADD_TEST_DIRECTORIES(unit_tests)
-
-KOKKOS_SUBPACKAGE_POSTPROCESS()
diff --git a/packages/kokkos/simd/cmake/Dependencies.cmake b/packages/kokkos/simd/cmake/Dependencies.cmake