WIP: Run of script remove_kokkos_subpackages_r.sh (trilinos#11545)

This is the result of running the script remove_kokkos_subpackages_r.sh to absorb the refactoring of Kokkos to remove the usage of TriBITS subpackages. Manual changes may need to be made after this.
bartlettroscoe · Apr 19, 2023 · 038e91f · 038e91f
1 parent 6f6ddbd
commit 038e91f
Show file tree

Hide file tree

Showing 43 changed files with 66 additions and 66 deletions.
diff --git a/packages/compadre/CMakeLists.txt b/packages/compadre/CMakeLists.txt
@@ -148,12 +148,12 @@ else() # Raw CMake Project
   endif()
 
   #KOKKOS
-  bob_input(KokkosCore_PREFIX "" PATH "Path to KokkosCore install")
-  if (KokkosCore_PREFIX)
-    if(NOT IS_ABSOLUTE ${KokkosCore_PREFIX})
-      set(KokkosCore_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/${KokkosCore_PREFIX}")
+  bob_input(Kokkos_PREFIX "" PATH "Path to KokkosCore install")
+  if (Kokkos_PREFIX)
+    if(NOT IS_ABSOLUTE ${Kokkos_PREFIX})
+      set(Kokkos_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/${Kokkos_PREFIX}")
     endif()
-    set(CMAKE_PREFIX_PATH ${KokkosCore_PREFIX} ${CMAKE_PREFIX_PATH})
+    set(CMAKE_PREFIX_PATH ${Kokkos_PREFIX} ${CMAKE_PREFIX_PATH})
   endif()
 
   #KOKKOS-KERNELS
@@ -213,7 +213,7 @@ else() # Raw CMake Project
     IF (KokkosCoreID GREATER -1 )
       MESSAGE(STATUS "Found KokkosCore inside Trilinos!")
       set(KOKKOS_IN_TRILINOS ON)
-      set(KokkosCore_FOUND ON)
+      set(Kokkos_FOUND ON)
     ELSE()
       MESSAGE(FATAL_ERROR "Found Trilinos but could not find KokkosCore.")
     ENDIF()
@@ -233,12 +233,12 @@ else() # Raw CMake Project
 
     #  Detect KokkosCore functionality from Trilinos
     include(${CMAKE_CURRENT_LIST_DIR}/cmake/detect_kokkos_opts.cmake)
-    # cmake/detect_kokkos_opts.cmake populates KokkosCore_HAS_* 
+    # cmake/detect_kokkos_opts.cmake populates Kokkos_HAS_* 
     detect_kokkos_opts()
 
     # get kokkos settings, change our settings, error to user if we something they requested is not enabled
-    if (KokkosCore_HAS_CUDA)
-      if (NOT KokkosCore_HAS_CUDA_LAMBDA)
+    if (Kokkos_HAS_CUDA)
+      if (NOT Kokkos_HAS_CUDA_LAMBDA)
         message(FATAL_ERROR "Please reconfigure Trilinos with -DKokkos_ENABLE_CUDA_LAMBDA:BOOL=ON")
       endif()
       message(STATUS "CUDA enabled in KokkosCore in Trilinos, setting Compadre_USE_CUDA to ON")
@@ -254,7 +254,7 @@ else() # Raw CMake Project
   ENDIF()
 
   if (NOT KOKKOS_IN_TRILINOS)
-    if (KokkosCore_PREFIX STREQUAL "")
+    if (Kokkos_PREFIX STREQUAL "")
       SET(KOKKOS_BUILT_FOR_USER ON)
       if (APPLE)
         bob_option(Kokkos_ENABLE_CUDA "Whether to use CUDA" OFF)
@@ -272,18 +272,18 @@ else() # Raw CMake Project
       option(Kokkos_ENABLE_TESTS "" OFF)
       option(Kokkos_ENABLE_EXAMPLES "" OFF)
       if (NOT(KokkosKernels_PREFIX STREQUAL ""))
-          MESSAGE(FATAL_ERROR "KokkosKernels_PREFIX specified but KokkosCore_PREFIX not specified. \
-          Either provide KokkosCore_PREFIX as well, or remove KokkosKernels_PREFIX specification.")
+          MESSAGE(FATAL_ERROR "KokkosKernels_PREFIX specified but Kokkos_PREFIX not specified. \
+          Either provide Kokkos_PREFIX as well, or remove KokkosKernels_PREFIX specification.")
       endif()
       # older version of Kokkos shipped with Compadre still uses PTHREAD naming
       set(Kokkos_ENABLE_PTHREAD ${Kokkos_ENABLE_THREADS}) 
       # set Compadre_USE_ to use whatever Kokkos_ENABLE_ specified, since user is building Kokkos
       set(Compadre_USE_CUDA ${Kokkos_ENABLE_CUDA})
       set(Kokkos_PREFIX ${CMAKE_INSTALL_PREFIX})
     else()
-      # Existing KokkosCore indicated by user by setting KokkosCore_PREFIX, so we look for it
+      # Existing KokkosCore indicated by user by setting Kokkos_PREFIX, so we look for it
       # where specified (only)
-      find_package(Kokkos PATHS "${KokkosCore_PREFIX}" NO_DEFAULT_PATH REQUIRED)
+      find_package(Kokkos PATHS "${Kokkos_PREFIX}" NO_DEFAULT_PATH REQUIRED)
       message(STATUS "Kokkos Version: ${Kokkos_VERSION}")
       if (Kokkos_VERSION VERSION_LESS "${KOKKOS_MIN}")
           message(FATAL_ERROR "${Kokkos_VERSION}: Requires Kokkos version ${KOKKOS_MIN} or greater")
@@ -293,14 +293,14 @@ else() # Raw CMake Project
       if (TARGET Kokkos::CUDA)
         set(Compadre_USE_CUDA ON)
       endif()
-      set(Kokkos_PREFIX "${KokkosCore_PREFIX}")
+      set(Kokkos_PREFIX "${Kokkos_PREFIX}")
     endif()
   endif()
   message(STATUS "Compadre_USE_CUDA: ${Compadre_USE_CUDA}")
 
   option(Kokkos_CXX_STANDARD "" "${CMAKE_CXX_STANDARD}")
 
-  if (NOT(KOKKOS_IN_TRILINOS) AND (KokkosCore_PREFIX STREQUAL ""))
+  if (NOT(KOKKOS_IN_TRILINOS) AND (Kokkos_PREFIX STREQUAL ""))
       add_subdirectory(kokkos)
       get_directory_property(Kokkos_VERSION DIRECTORY kokkos DEFINITION Kokkos_VERSION)
       message(STATUS "Kokkos Version: ${Kokkos_VERSION}")
@@ -351,13 +351,13 @@ else() # Raw CMake Project
       OPTION(KokkosKernels_INST_EXECSPACE_OPENMP "" ${Kokkos_ENABLE_OPENMP})
       SET(KokkosKernels_INST_EXECSPACE_OPENMP ${Kokkos_ENABLE_OPENMP})
       add_subdirectory(kokkos-kernels)
-      if (NOT(KokkosCore_PREFIX STREQUAL ""))
-          MESSAGE(FATAL_ERROR "KokkosCore_PREFIX specified but KokkosKernels_PREFIX not specified. \
-          Either provide KokkosKernels_PREFIX as well, or remove KokkosCore_PREFIX specification.")
+      if (NOT(Kokkos_PREFIX STREQUAL ""))
+          MESSAGE(FATAL_ERROR "Kokkos_PREFIX specified but KokkosKernels_PREFIX not specified. \
+          Either provide KokkosKernels_PREFIX as well, or remove Kokkos_PREFIX specification.")
       endif()
       set(KokkosKernels_PREFIX ${CMAKE_INSTALL_PREFIX})
     else()
-      # Existing KokkosCore indicated by user by setting KokkosCore_PREFIX, so we look for it
+      # Existing KokkosCore indicated by user by setting Kokkos_PREFIX, so we look for it
       # where specified (only)
       find_package(KokkosKernels PATHS "${KokkosKernels_PREFIX}" NO_DEFAULT_PATH REQUIRED)
       if(Compadre_USE_CUDA AND NOT(TARGET Kokkos::CUDA))

diff --git a/packages/compadre/cmake/Dependencies.cmake b/packages/compadre/cmake/Dependencies.cmake
@@ -1,6 +1,6 @@
 tribits_package_define_dependencies(
   LIB_REQUIRED_PACKAGES
-    KokkosCore KokkosContainers KokkosAlgorithms KokkosKernels
+    Kokkos KokkosKernels
   LIB_OPTIONAL_TPLS
     MPI CUDA
   )
diff --git a/packages/intrepid2/cmake/Dependencies.cmake b/packages/intrepid2/cmake/Dependencies.cmake
@@ -1,4 +1,4 @@
-SET(LIB_REQUIRED_DEP_PACKAGES TeuchosCore TeuchosNumerics Shards KokkosCore KokkosContainers KokkosAlgorithms)
+SET(LIB_REQUIRED_DEP_PACKAGES TeuchosCore TeuchosNumerics Shards Kokkos)
 SET(LIB_OPTIONAL_DEP_PACKAGES Sacado KokkosKernels)
 SET(TEST_REQUIRED_DEP_PACKAGES)
 SET(TEST_OPTIONAL_DEP_PACKAGES Sacado)

diff --git a/packages/kokkos-kernels/cmake/Dependencies.cmake b/packages/kokkos-kernels/cmake/Dependencies.cmake
@@ -1,5 +1,5 @@
 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-        LIB_REQUIRED_PACKAGES KokkosCore KokkosContainers KokkosAlgorithms
+        LIB_REQUIRED_PACKAGES Kokkos Kokkos
         LIB_OPTIONAL_TPLS quadmath MKL BLAS LAPACK CUSPARSE METIS SuperLU Cholmod CUBLAS ROCBLAS ROCSPARSE
         TEST_OPTIONAL_TPLS yaml-cpp
 )

diff --git a/packages/minitensor/cmake/Dependencies.cmake b/packages/minitensor/cmake/Dependencies.cmake
@@ -1,5 +1,5 @@
 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-  LIB_REQUIRED_PACKAGES TeuchosCore KokkosCore KokkosKernels Sacado
+  LIB_REQUIRED_PACKAGES TeuchosCore Kokkos KokkosKernels Sacado
   TEST_REQUIRED_PACKAGES Gtest
   LIB_REQUIRED_TPLS Boost
   )
diff --git a/packages/moertel/morkon/src/CMakeLists.txt b/packages/moertel/morkon/src/CMakeLists.txt
@@ -1,4 +1,4 @@
-# KokkosCore_config.h
+# Kokkos_config.h
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/kokkos/core/src)
 # TpetraKernels_config.h
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/kernels/src)

diff --git a/packages/moertel/morkon/unit_tests/CMakeLists.txt b/packages/moertel/morkon/unit_tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-# KokkosCore_config.h
+# Kokkos_config.h
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/kokkos/core/src)
 # TpetraKernels_config.h
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/packages/tpetra/kernels/src)

diff --git a/packages/muelu/CMakeLists.txt b/packages/muelu/CMakeLists.txt
@@ -16,7 +16,7 @@ ASSERT_DEFINED(Xpetra_ENABLE_Epetra)
 ASSERT_DEFINED(Xpetra_ENABLE_Tpetra)
 ASSERT_DEFINED(Xpetra_INT_LONG_LONG)
 ASSERT_DEFINED(Xpetra_ENABLE_Experimental)
-IF (${PACKAGE_NAME}_ENABLE_KokkosCore AND NOT ${PACKAGE_NAME}_ENABLE_Tpetra)
+IF (${PACKAGE_NAME}_ENABLE_Kokkos AND NOT ${PACKAGE_NAME}_ENABLE_Tpetra)
   MESSAGE(FATAL_ERROR "MueLu requires that if Kokkos is enabled, Tpetra must also be enabled.")
 ENDIF()
 

diff --git a/packages/muelu/cmake/Dependencies.cmake b/packages/muelu/cmake/Dependencies.cmake
@@ -1,4 +1,4 @@
-SET(LIB_REQUIRED_DEP_PACKAGES Teuchos Xpetra KokkosCore KokkosContainers KokkosKernels)
+SET(LIB_REQUIRED_DEP_PACKAGES Teuchos Xpetra Kokkos KokkosKernels)
 SET(LIB_OPTIONAL_DEP_PACKAGES Amesos Amesos2 AvatarT Belos Epetra EpetraExt Teko
                               Ifpack Ifpack2 Intrepid2 ML Tpetra
                               Zoltan Zoltan2Core Stratimikos Thyra ThyraTpetraAdapters

diff --git a/packages/muelu/test/interface/CMakeLists.txt b/packages/muelu/test/interface/CMakeLists.txt
@@ -41,7 +41,7 @@ TRIBITS_ADD_EXECUTABLE(
 #
 
 # Run the ParameterListInterpreter test with a single thread to avoid non-deterministic behavior
-IF (${PACKAGE_NAME}_ENABLE_KokkosCore)
+IF (${PACKAGE_NAME}_ENABLE_Kokkos)
   SET(${PACKAGE_NAME}_PARAMETERLISTINTERPRETERTEST_SINGLETHREAD " --kokkos-num-threads=1")
 ELSE()
   SET(${PACKAGE_NAME}_PARAMETERLISTINTERPRETERTEST_SINGLETHREAD "")

diff --git a/packages/panzer/disc-fe/cmake/Dependencies.cmake b/packages/panzer/disc-fe/cmake/Dependencies.cmake
@@ -1,4 +1,4 @@
-SET(LIB_REQUIRED_DEP_PACKAGES TeuchosCore TeuchosParameterList TeuchosComm KokkosCore Sacado Phalanx Intrepid2 ThyraCore ThyraTpetraAdapters Tpetra Zoltan PanzerCore PanzerDofMgr)
+SET(LIB_REQUIRED_DEP_PACKAGES TeuchosCore TeuchosParameterList TeuchosComm Kokkos Sacado Phalanx Intrepid2 ThyraCore ThyraTpetraAdapters Tpetra Zoltan PanzerCore PanzerDofMgr)
 SET(LIB_OPTIONAL_DEP_PACKAGES ThyraEpetraAdapters ThyraEpetraExtAdapters Epetra EpetraExt)
 SET(TEST_REQUIRED_DEP_PACKAGES)
 SET(TEST_OPTIONAL_DEP_PACKAGES)

diff --git a/packages/panzer/expr-eval/cmake/Dependencies.cmake b/packages/panzer/expr-eval/cmake/Dependencies.cmake
@@ -1,3 +1,3 @@
 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-  LIB_REQUIRED_PACKAGES KokkosCore TeuchosParser
+  LIB_REQUIRED_PACKAGES Kokkos TeuchosParser
   )
diff --git a/packages/phalanx/cmake/Dependencies.cmake b/packages/phalanx/cmake/Dependencies.cmake
@@ -1,4 +1,4 @@
-SET(LIB_REQUIRED_DEP_PACKAGES TeuchosCore TeuchosParameterList TeuchosComm KokkosCore KokkosContainers Sacado)
+SET(LIB_REQUIRED_DEP_PACKAGES TeuchosCore TeuchosParameterList TeuchosComm Kokkos Sacado)
 SET(LIB_OPTIONAL_DEP_PACKAGES )
 SET(TEST_REQUIRED_DEP_PACKAGES KokkosKernels)
 SET(TEST_OPTIONAL_DEP_PACKAGES )

diff --git a/packages/phalanx/src/CMakeLists.txt b/packages/phalanx/src/CMakeLists.txt
@@ -32,7 +32,7 @@ IF(CMAKE_VERSION VERSION_LESS "3.17.0" AND PHX_KOKKOS_DEVICE_TYPE_CUDA)
         CUDA_INCLUDE_DIRECTORIES( ${MPI_BASE_DIR}/include )
     ENDIF()
 
-    CUDA_INCLUDE_DIRECTORIES( ${KokkosCore_INCLUDE_DIRS}
+    CUDA_INCLUDE_DIRECTORIES( ${Kokkos_INCLUDE_DIRS}
                               ${Phalanx_INCLUDE_DIRS})
 ENDIF()
 

diff --git a/packages/sacado/cmake/Dependencies.cmake b/packages/sacado/cmake/Dependencies.cmake
@@ -1,7 +1,7 @@
 SET(LIB_REQUIRED_DEP_PACKAGES)
-SET(LIB_OPTIONAL_DEP_PACKAGES KokkosCore TeuchosCore TeuchosNumerics TeuchosComm TeuchosKokkosComm)
+SET(LIB_OPTIONAL_DEP_PACKAGES Kokkos TeuchosCore TeuchosNumerics TeuchosComm TeuchosKokkosComm)
 SET(TEST_REQUIRED_DEP_PACKAGES)
-SET(TEST_OPTIONAL_DEP_PACKAGES KokkosContainers)
+SET(TEST_OPTIONAL_DEP_PACKAGES Kokkos)
 SET(LIB_REQUIRED_DEP_TPLS)
 SET(LIB_OPTIONAL_DEP_TPLS)
 SET(TEST_REQUIRED_DEP_TPLS)

diff --git a/packages/sacado/example/CMakeLists.txt b/packages/sacado/example/CMakeLists.txt
@@ -141,7 +141,7 @@ IF(Sacado_ENABLE_TeuchosNumerics)
 
 ENDIF()
 
-IF (Sacado_ENABLE_KokkosCore)
+IF (Sacado_ENABLE_Kokkos)
 
   IF (Sacado_ENABLE_TeuchosCore)
     TRIBITS_ADD_EXECUTABLE(

diff --git a/packages/sacado/test/UnitTests/CMakeLists.txt b/packages/sacado/test/UnitTests/CMakeLists.txt
@@ -72,7 +72,7 @@ IF (Sacado_ENABLE_TeuchosCore)
 
   ENDIF()
 
-  IF (Sacado_ENABLE_KokkosCore)
+  IF (Sacado_ENABLE_Kokkos)
 
     IF (Kokkos_ENABLE_SERIAL)
       IF (Sacado_ENABLE_TeuchosKokkosComm)

diff --git a/packages/sacado/test/performance/advection/CMakeLists.txt b/packages/sacado/test/performance/advection/CMakeLists.txt
@@ -3,7 +3,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
 TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
-IF (Sacado_ENABLE_KokkosCore AND Sacado_ENABLE_TeuchosCore)
+IF (Sacado_ENABLE_Kokkos AND Sacado_ENABLE_TeuchosCore)
 
   IF(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8")))
 

diff --git a/packages/sacado/test/performance/advection_const_basis/CMakeLists.txt b/packages/sacado/test/performance/advection_const_basis/CMakeLists.txt
@@ -3,7 +3,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
 TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
-IF (Sacado_ENABLE_KokkosCore AND Sacado_ENABLE_TeuchosCore)
+IF (Sacado_ENABLE_Kokkos AND Sacado_ENABLE_TeuchosCore)
 
   IF(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8")))
 

diff --git a/packages/sacado/test/performance/fenl_assembly/CMakeLists.txt b/packages/sacado/test/performance/fenl_assembly/CMakeLists.txt
@@ -3,7 +3,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
 TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
-IF (Sacado_ENABLE_KokkosCore AND Sacado_ENABLE_KokkosContainers AND
+IF (Sacado_ENABLE_Kokkos AND Sacado_ENABLE_Kokkos AND
     Sacado_ENABLE_TeuchosCore)
 
   TRIBITS_ADD_EXECUTABLE(

diff --git a/packages/sacado/test/performance/fenl_assembly_view/CMakeLists.txt b/packages/sacado/test/performance/fenl_assembly_view/CMakeLists.txt
@@ -3,7 +3,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
 
-IF (Sacado_ENABLE_KokkosCore AND Sacado_ENABLE_KokkosContainers AND
+IF (Sacado_ENABLE_Kokkos AND Sacado_ENABLE_Kokkos AND
     Sacado_ENABLE_TeuchosCore)
 
   TRIBITS_ADD_EXECUTABLE(

diff --git a/packages/sacado/test/performance/mat_vec/CMakeLists.txt b/packages/sacado/test/performance/mat_vec/CMakeLists.txt
@@ -3,7 +3,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
 TRIBITS_INCLUDE_DIRECTORIES(REQUIRED_DURING_INSTALLATION_TESTING ${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
-IF (Sacado_ENABLE_KokkosCore AND Sacado_ENABLE_TeuchosCore)
+IF (Sacado_ENABLE_Kokkos AND Sacado_ENABLE_TeuchosCore)
 
   IF(NOT ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.8")))
 

diff --git a/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake b/packages/shylu/shylu_node/tacho/cmake/Dependencies.cmake
@@ -1,6 +1,6 @@
 SET(LIB_REQUIRED_DEP_PACKAGES Kokkos)
 SET(LIB_OPTIONAL_DEP_PACKAGES)
-SET(TEST_REQUIRED_DEP_PACKAGES Kokkos KokkosAlgorithms)
+SET(TEST_REQUIRED_DEP_PACKAGES Kokkos)
 SET(TEST_OPTIONAL_DEP_PACKAGES)
 SET(LIB_REQUIRED_DEP_TPLS)
 SET(LIB_OPTIONAL_DEP_TPLS METIS HWLOC HYPRE MKL LAPACK BLAS Pthread QTHREAD VTune CUSOLVER CUSPARSE CUBLAS CUDA)

diff --git a/packages/stk/CMakeLists.txt b/packages/stk/CMakeLists.txt
@@ -45,7 +45,7 @@ TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION()
 # B) Set up package-specific options
 #
 
-IF (${${PROJECT_NAME}_ENABLE_KokkosCore})
+IF (${${PROJECT_NAME}_ENABLE_Kokkos})
   SET(STK_HAVE_KOKKOSCORE ON)
 ENDIF()
 

diff --git a/packages/stk/stk_expreval/cmake/Dependencies.cmake b/packages/stk/stk_expreval/cmake/Dependencies.cmake
@@ -1,4 +1,4 @@
-SET(LIB_REQUIRED_DEP_PACKAGES STKUtil STKMath KokkosContainers)
+SET(LIB_REQUIRED_DEP_PACKAGES STKUtil STKMath Kokkos)
 SET(LIB_OPTIONAL_DEP_PACKAGES)
 SET(TEST_REQUIRED_DEP_PACKAGES Gtest STKUnit_test_utils)
 SET(TEST_OPTIONAL_DEP_PACKAGES)

diff --git a/packages/stk/stk_math/cmake/Dependencies.cmake b/packages/stk/stk_math/cmake/Dependencies.cmake
@@ -1,4 +1,4 @@
-SET(LIB_REQUIRED_DEP_PACKAGES KokkosCore STKUtil)
+SET(LIB_REQUIRED_DEP_PACKAGES Kokkos STKUtil)
 SET(LIB_OPTIONAL_DEP_PACKAGES)
 SET(TEST_REQUIRED_DEP_PACKAGES Gtest)
 SET(TEST_OPTIONAL_DEP_PACKAGES)

diff --git a/packages/stk/stk_mesh/cmake/Dependencies.cmake b/packages/stk/stk_mesh/cmake/Dependencies.cmake
@@ -1,4 +1,4 @@
-SET(LIB_REQUIRED_DEP_PACKAGES TeuchosCore Shards STKTopology STKUtil Kokkos KokkosCore)
+SET(LIB_REQUIRED_DEP_PACKAGES TeuchosCore Shards STKTopology STKUtil Kokkos)
 SET(LIB_OPTIONAL_DEP_PACKAGES)
 SET(TEST_REQUIRED_DEP_PACKAGES)
 SET(TEST_OPTIONAL_DEP_PACKAGES)

diff --git a/packages/stk/stk_ngp_test/cmake/Dependencies.cmake b/packages/stk/stk_ngp_test/cmake/Dependencies.cmake
@@ -1,4 +1,4 @@
-SET(LIB_REQUIRED_DEP_PACKAGES Gtest Kokkos KokkosCore KokkosContainers STKUtil)
+SET(LIB_REQUIRED_DEP_PACKAGES Gtest Kokkos STKUtil)
 SET(LIB_OPTIONAL_DEP_PACKAGES)
 SET(TEST_REQUIRED_DEP_PACKAGES)
 SET(TEST_OPTIONAL_DEP_PACKAGES)

diff --git a/packages/stk/stk_simd/cmake/Dependencies.cmake b/packages/stk/stk_simd/cmake/Dependencies.cmake
@@ -1,4 +1,4 @@
-SET(LIB_REQUIRED_DEP_PACKAGES KokkosCore STKMath)
+SET(LIB_REQUIRED_DEP_PACKAGES Kokkos STKMath)
 SET(LIB_OPTIONAL_DEP_PACKAGES)
 SET(TEST_REQUIRED_DEP_PACKAGES Gtest)
 SET(TEST_OPTIONAL_DEP_PACKAGES)

diff --git a/packages/stk/stk_unit_tests/CMakeLists.txt b/packages/stk/stk_unit_tests/CMakeLists.txt
@@ -4,7 +4,7 @@ IF(Trilinos_ENABLE_STKUtil)
 TRIBITS_ADD_TEST_DIRECTORIES(stk_util)
 ENDIF()
 
-IF(Trilinos_ENABLE_KokkosCore)
+IF(Trilinos_ENABLE_Kokkos)
 TRIBITS_ADD_TEST_DIRECTORIES(stk_math)
 ENDIF()
 

diff --git a/packages/stk/stk_util/cmake/Dependencies.cmake b/packages/stk/stk_util/cmake/Dependencies.cmake
@@ -1,4 +1,4 @@
-SET(LIB_REQUIRED_DEP_PACKAGES KokkosCore)
+SET(LIB_REQUIRED_DEP_PACKAGES Kokkos)
 SET(LIB_OPTIONAL_DEP_PACKAGES SEACASAprepro_lib)
 SET(TEST_REQUIRED_DEP_PACKAGES Gtest)
 SET(TEST_OPTIONAL_DEP_PACKAGES)

diff --git a/packages/stokhos/cmake/Dependencies.cmake b/packages/stokhos/cmake/Dependencies.cmake
@@ -1,7 +1,7 @@
-SET(LIB_REQUIRED_DEP_PACKAGES Teuchos KokkosCore KokkosContainers)
-SET(LIB_OPTIONAL_DEP_PACKAGES EpetraExt Ifpack ML TriKota Anasazi Sacado NOX Isorropia KokkosKernels TeuchosKokkosComm KokkosAlgorithms Tpetra Ifpack2 MueLu Belos Amesos2 Thyra Xpetra)
+SET(LIB_REQUIRED_DEP_PACKAGES Teuchos Kokkos)
+SET(LIB_OPTIONAL_DEP_PACKAGES EpetraExt Ifpack ML TriKota Anasazi Sacado NOX Isorropia KokkosKernels TeuchosKokkosComm Kokkos Tpetra Ifpack2 MueLu Belos Amesos2 Thyra Xpetra)
 SET(TEST_REQUIRED_DEP_PACKAGES)
-SET(TEST_OPTIONAL_DEP_PACKAGES AztecOO Stratimikos Zoltan KokkosContainers)
+SET(TEST_OPTIONAL_DEP_PACKAGES AztecOO Stratimikos Zoltan Kokkos)
 SET(LIB_REQUIRED_DEP_TPLS)
 SET(LIB_OPTIONAL_DEP_TPLS ForUQTK CUDA Thrust Cusp CUSPARSE Clp GLPK qpOASES Boost MATLABLib MKL)
 SET(TEST_REQUIRED_DEP_TPLS)

diff --git a/packages/stokhos/src/CMakeLists.txt b/packages/stokhos/src/CMakeLists.txt
@@ -762,7 +762,7 @@ IF (Stokhos_ENABLE_Sacado)
     ENDIF()
   ENDIF()
 
-  IF (Stokhos_ENABLE_KokkosAlgorithms)
+  IF (Stokhos_ENABLE_Kokkos)
     IF(Stokhos_ENABLE_Ensemble_Scalar_Type)
       TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sacado/kokkos/vector/algorithms)
       LIST(APPEND SACADO_HEADERS

diff --git a/packages/stokhos/test/Performance/CMakeLists.txt b/packages/stokhos/test/Performance/CMakeLists.txt
@@ -18,7 +18,7 @@ ADD_SUBDIRECTORY(CuspAMG)
 IF (Stokhos_ENABLE_PCE_Scalar_Type AND Stokhos_ENABLE_KokkosKernels)
   ADD_SUBDIRECTORY(PCEMeanMultiply)
 ENDIF()
-IF (Stokhos_ENABLE_Ensemble_Scalar_Type AND Stokhos_ENABLE_KokkosContainers)
+IF (Stokhos_ENABLE_Ensemble_Scalar_Type AND Stokhos_ENABLE_Kokkos)
   ADD_SUBDIRECTORY(MPAssembly)
   ADD_SUBDIRECTORY(FadMPAssembly)
 ENDIF()
diff --git a/packages/stokhos/test/Performance/KokkosArraySPMVKernels/CMakeLists.txt b/packages/stokhos/test/Performance/KokkosArraySPMVKernels/CMakeLists.txt
@@ -3,7 +3,7 @@ ASSERT_DEFINED(PACKAGE_SOURCE_DIR CMAKE_CURRENT_SOURCE_DIR)
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 TRIBITS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 
-IF (Stokhos_ENABLE_EpetraExt AND Stokhos_ENABLE_KokkosContainers)
+IF (Stokhos_ENABLE_EpetraExt AND Stokhos_ENABLE_Kokkos)
 
   SET(CUDA_SOURCES "")
   IF (Stokhos_ENABLE_CUDA AND Kokkos_ENABLE_CUDA AND Stokhos_ENABLE_CUSPARSE)

diff --git a/packages/stokhos/test/UnitTest/CMakeLists.txt b/packages/stokhos/test/UnitTest/CMakeLists.txt
@@ -804,7 +804,7 @@ IF(Stokhos_ENABLE_Sacado)
 ENDIF()
 
 # Need to fix these tests so they don't require Epetra
-IF (Stokhos_ENABLE_EpetraExt AND Stokhos_ENABLE_KokkosContainers)
+IF (Stokhos_ENABLE_EpetraExt AND Stokhos_ENABLE_Kokkos)
 
   IF (Kokkos_ENABLE_SERIAL)
     TRIBITS_ADD_EXECUTABLE_AND_TEST(

diff --git a/packages/teuchos/core/cmake/Dependencies.cmake b/packages/teuchos/core/cmake/Dependencies.cmake
@@ -1,6 +1,6 @@
 TRIBITS_PACKAGE_DEFINE_DEPENDENCIES(
-  LIB_OPTIONAL_PACKAGES  KokkosCore
+  LIB_OPTIONAL_PACKAGES  Kokkos
   LIB_OPTIONAL_TPLS  BinUtils  Boost  MPI  ARPREC  QD  QT  quadmath yaml-cpp  Pthread  Valgrind
   )
 
-TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(KokkosCore)
+TRIBITS_ALLOW_MISSING_EXTERNAL_PACKAGES(Kokkos)
diff --git a/packages/teuchos/kokkoscomm/cmake/Dependencies.cmake b/packages/teuchos/kokkoscomm/cmake/Dependencies.cmake
@@ -1,4 +1,4 @@
-SET(LIB_REQUIRED_DEP_PACKAGES KokkosCore TeuchosKokkosCompat TeuchosComm)
+SET(LIB_REQUIRED_DEP_PACKAGES Kokkos TeuchosKokkosCompat TeuchosComm)
 SET(LIB_OPTIONAL_DEP_PACKAGES)
 SET(TEST_REQUIRED_DEP_PACKAGES)
 SET(TEST_OPTIONAL_DEP_PACKAGES)