From f8e254e3fbd6f49430ba9686b8d4f2916c4fa7cd Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Fri, 14 Apr 2023 17:30:28 -0600 Subject: [PATCH 01/16] Kokkos: Remove TriBITS subpackages (#11545) * Removed the listing of subpackages from kokkos/cmake/Dependencies.cmake * Remove the now-unused files kokkos/[core,containers,algorithms,simd]/cmake/Dependencies.cmake * Removed TriBITS macros for a package with subpackages and replace with those for a package with no subpackages. Also, removed all subpackage macros. * Changed kokkos_process_subpackage() to just call add_subdirectory(). * Added prefix 'Core' to several tests in kokkos/Core/unit_tests/CMakeLists.txt now that prefix is 'Kokkos_' * Added prefix 'Containers' to several tests in kokkos/containers/unit_tests/CMakeLists.txt and kokkos/containers/performance_tests/CMakeLists.txt now that prefix is 'Kokkos_' * Change name of the kokkos/containers/performance_tests/CMakeLists.txt file test 'PerformanceTest_XXX' to 'ContainersPerformanceTest_XXX'. * Added prefix 'Algorithms' to several tests in kokkos/algorithms/unit_tests/CMakeLists.txt now that prefix is 'Kokkos_' * Removed the usage of tribits_configure_file() and wrapper kokkos_configure_file() and just call configure_file(). The location of PACKAGE_SORUCE_DIR changed so the calls to tribits_configure_file() no longer worked. (Also, these X_config.h.in files were not using any of the TriBITS-supported features that needed the calling of tribits_configure_file() so there was no reason to not just call raw configure_file().) SQUASH AGINST: Kokkos: Remove TriBITS subpackages (#11545) --- packages/kokkos/CMakeLists.txt | 5 +- packages/kokkos/algorithms/CMakeLists.txt | 8 -- .../algorithms/cmake/Dependencies.cmake | 5 - packages/kokkos/algorithms/src/CMakeLists.txt | 7 +- .../algorithms/unit_tests/CMakeLists.txt | 6 +- packages/kokkos/cmake/Dependencies.cmake | 12 +- packages/kokkos/cmake/fake_tribits.cmake | 13 -- packages/kokkos/cmake/kokkos_tribits.cmake | 12 +- packages/kokkos/containers/CMakeLists.txt | 6 - .../containers/cmake/Dependencies.cmake | 5 - .../performance_tests/CMakeLists.txt | 2 +- packages/kokkos/containers/src/CMakeLists.txt | 5 +- .../containers/unit_tests/CMakeLists.txt | 4 +- packages/kokkos/core/CMakeLists.txt | 6 - packages/kokkos/core/cmake/Dependencies.cmake | 6 - packages/kokkos/core/unit_test/CMakeLists.txt | 118 +++++++++--------- packages/kokkos/simd/CMakeLists.txt | 5 - packages/kokkos/simd/cmake/Dependencies.cmake | 5 - 18 files changed, 83 insertions(+), 147 deletions(-) delete mode 100644 packages/kokkos/algorithms/cmake/Dependencies.cmake delete mode 100644 packages/kokkos/containers/cmake/Dependencies.cmake delete mode 100644 packages/kokkos/core/cmake/Dependencies.cmake delete mode 100644 packages/kokkos/simd/cmake/Dependencies.cmake diff --git a/packages/kokkos/CMakeLists.txt b/packages/kokkos/CMakeLists.txt index aa712f56127a..3722b55b42f8 100644 --- a/packages/kokkos/CMakeLists.txt +++ b/packages/kokkos/CMakeLists.txt @@ -5,8 +5,8 @@ if( "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}" ) message( FATAL_ERROR "FATAL: In-source builds are not allowed. You should create a separate directory for build files and delete CMakeCache.txt." ) endif() -if (COMMAND TRIBITS_PACKAGE_DECL) - TRIBITS_PACKAGE_DECL(Kokkos) +if (COMMAND TRIBITS_PACKAGE) + TRIBITS_PACKAGE(Kokkos) endif() # We want to determine if options are given with the wrong case @@ -310,7 +310,6 @@ KOKKOS_PROCESS_SUBPACKAGES() # E) If Kokkos itself is enabled, process the Kokkos package # -KOKKOS_PACKAGE_DEF() KOKKOS_EXCLUDE_AUTOTOOLS_FILES() KOKKOS_PACKAGE_POSTPROCESS() KOKKOS_CONFIGURE_CORE() diff --git a/packages/kokkos/algorithms/CMakeLists.txt b/packages/kokkos/algorithms/CMakeLists.txt index f32363dc9acd..ab557ab66ae3 100644 --- a/packages/kokkos/algorithms/CMakeLists.txt +++ b/packages/kokkos/algorithms/CMakeLists.txt @@ -1,7 +1,3 @@ - - -KOKKOS_SUBPACKAGE(Algorithms) - IF (NOT Kokkos_INSTALL_TESTING) ADD_SUBDIRECTORY(src) ENDIF() @@ -9,7 +5,3 @@ ENDIF() 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 deleted file mode 100644 index c36b62523fad..000000000000 --- a/packages/kokkos/algorithms/cmake/Dependencies.cmake +++ /dev/null @@ -1,5 +0,0 @@ -TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( - LIB_REQUIRED_PACKAGES KokkosCore KokkosContainers - LIB_OPTIONAL_TPLS Pthread CUDA HWLOC - TEST_OPTIONAL_TPLS CUSPARSE - ) diff --git a/packages/kokkos/algorithms/src/CMakeLists.txt b/packages/kokkos/algorithms/src/CMakeLists.txt index 606d83d18b58..8f3066b6de96 100644 --- a/packages/kokkos/algorithms/src/CMakeLists.txt +++ b/packages/kokkos/algorithms/src/CMakeLists.txt @@ -1,5 +1,6 @@ - -KOKKOS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) +CONFIGURE_FILE( + ${PACKAGE_SOURCE_DIR}/algorithms/cmake/KokkosAlgorithms_config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/KokkosAlgorithms_config.h ) #I have to leave these here for tribits KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) @@ -9,7 +10,7 @@ KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) FILE(GLOB ALGO_HEADERS *.hpp) FILE(GLOB ALGO_SOURCES *.cpp) -LIST(APPEND ALGO_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}_config.h) +LIST(APPEND ALGO_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/KokkosAlgorithms_config.h) APPEND_GLOB(ALGO_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/std_algorithms/*.hpp) APPEND_GLOB(ALGO_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/std_algorithms/impl/*.hpp) diff --git a/packages/kokkos/algorithms/unit_tests/CMakeLists.txt b/packages/kokkos/algorithms/unit_tests/CMakeLists.txt index 0fe9c2006ee2..2d81e70179a7 100644 --- a/packages/kokkos/algorithms/unit_tests/CMakeLists.txt +++ b/packages/kokkos/algorithms/unit_tests/CMakeLists.txt @@ -164,7 +164,7 @@ endif() # when compiling for Intel's Xe-HP GPUs. if(NOT (KOKKOS_ENABLE_OPENMPTARGET AND KOKKOS_CXX_COMPILER_ID STREQUAL IntelLLVM)) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_RandomAndSort + AlgorithmsUnitTest_RandomAndSort SOURCES UnitTestMain.cpp ${SOURCES_A} @@ -173,7 +173,7 @@ endif() foreach(ID A;B;C;D;E) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_StdSet_${ID} + AlgorithmsUnitTest_StdSet_${ID} SOURCES UnitTestMain.cpp ${STDALGO_SOURCES_${ID}} @@ -184,7 +184,7 @@ endforeach() # when compiling for Intel's Xe-HP GPUs. if(NOT (KOKKOS_ENABLE_OPENMPTARGET AND KOKKOS_CXX_COMPILER_ID STREQUAL IntelLLVM)) KOKKOS_ADD_EXECUTABLE( - UnitTest_StdAlgoCompileOnly + AlgorithmsUnitTest_StdAlgoCompileOnly SOURCES TestStdAlgorithmsCompileOnly.cpp ) endif() diff --git a/packages/kokkos/cmake/Dependencies.cmake b/packages/kokkos/cmake/Dependencies.cmake index 23b473ce2471..611c089b2e3f 100644 --- 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/fake_tribits.cmake b/packages/kokkos/cmake/fake_tribits.cmake index 71e85e915c61..39822b8aad37 100644 --- a/packages/kokkos/cmake/fake_tribits.cmake +++ b/packages/kokkos/cmake/fake_tribits.cmake @@ -57,19 +57,6 @@ MACRO(PREPEND_TARGET_SET VARNAME TARGET_NAME TYPE) ENDMACRO() endif() - -FUNCTION(KOKKOS_CONFIGURE_FILE PACKAGE_NAME_CONFIG_FILE) - if (KOKKOS_HAS_TRILINOS) - TRIBITS_CONFIGURE_FILE(${PACKAGE_NAME_CONFIG_FILE}) - else() - # Configure the file - CONFIGURE_FILE( - ${PACKAGE_SOURCE_DIR}/cmake/${PACKAGE_NAME_CONFIG_FILE}.in - ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME_CONFIG_FILE} - ) - endif() -ENDFUNCTION() - MACRO(ADD_INTERFACE_LIBRARY LIB_NAME) FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "") ADD_LIBRARY(${LIB_NAME} STATIC ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp) diff --git a/packages/kokkos/cmake/kokkos_tribits.cmake b/packages/kokkos/cmake/kokkos_tribits.cmake index 0f39551423fb..746a227e23e1 100644 --- 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 index b450c2720993..0857d7007b44 100644 --- 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 deleted file mode 100644 index 1d71d8af3411..000000000000 --- a/packages/kokkos/containers/cmake/Dependencies.cmake +++ /dev/null @@ -1,5 +0,0 @@ -TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( - LIB_REQUIRED_PACKAGES KokkosCore - LIB_OPTIONAL_TPLS Pthread CUDA HWLOC - TEST_OPTIONAL_TPLS CUSPARSE - ) diff --git a/packages/kokkos/containers/performance_tests/CMakeLists.txt b/packages/kokkos/containers/performance_tests/CMakeLists.txt index 4f1eeacdad61..e325e45e85dc 100644 --- a/packages/kokkos/containers/performance_tests/CMakeLists.txt +++ b/packages/kokkos/containers/performance_tests/CMakeLists.txt @@ -16,7 +16,7 @@ foreach(Tag Threads;OpenMP;Cuda;HPX;HIP) ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - PerformanceTest_${Tag} + ContainersPerformanceTest_${Tag} SOURCES ${SOURCES} ) endif() diff --git a/packages/kokkos/containers/src/CMakeLists.txt b/packages/kokkos/containers/src/CMakeLists.txt index cdbc6527fda5..3e18a6d129f7 100644 --- a/packages/kokkos/containers/src/CMakeLists.txt +++ b/packages/kokkos/containers/src/CMakeLists.txt @@ -1,5 +1,6 @@ - -KOKKOS_CONFIGURE_FILE(${PACKAGE_NAME}_config.h) +CONFIGURE_FILE( + ${PACKAGE_SOURCE_DIR}/containers/cmake/KokkosContainers_config.h.in + ${CMAKE_CURRENT_BINARY_DIR}/KokkosContainers_config.h ) #need these here for now KOKKOS_INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/packages/kokkos/containers/unit_tests/CMakeLists.txt b/packages/kokkos/containers/unit_tests/CMakeLists.txt index 261d9dcd4215..d9f4d0d384f1 100644 --- a/packages/kokkos/containers/unit_tests/CMakeLists.txt +++ b/packages/kokkos/containers/unit_tests/CMakeLists.txt @@ -43,7 +43,7 @@ foreach(Tag Threads;Serial;OpenMP;HPX;Cuda;HIP;SYCL) LIST(REMOVE_ITEM UnitTestSources ${dir}/TestCuda_DynViewAPI_generic.cpp) endif() - KOKKOS_ADD_EXECUTABLE_AND_TEST(UnitTest_${Tag} SOURCES ${UnitTestSources}) + KOKKOS_ADD_EXECUTABLE_AND_TEST(ContainersUnitTest_${Tag} SOURCES ${UnitTestSources}) endif() endforeach() @@ -51,7 +51,7 @@ SET(COMPILE_ONLY_SOURCES TestCreateMirror.cpp ) KOKKOS_ADD_EXECUTABLE( - TestCompileOnly + ContainersTestCompileOnly SOURCES TestCompileMain.cpp ${COMPILE_ONLY_SOURCES} diff --git a/packages/kokkos/core/CMakeLists.txt b/packages/kokkos/core/CMakeLists.txt index 5d9fde56d202..10722b6b4d2e 100644 --- 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 deleted file mode 100644 index 611c089b2e3f..000000000000 --- a/packages/kokkos/core/cmake/Dependencies.cmake +++ /dev/null @@ -1,6 +0,0 @@ -TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( - LIB_OPTIONAL_TPLS Pthread CUDA HWLOC DLlib - TEST_OPTIONAL_TPLS CUSPARSE - ) - -TRIBITS_TPL_TENTATIVELY_ENABLE(DLlib) diff --git a/packages/kokkos/core/unit_test/CMakeLists.txt b/packages/kokkos/core/unit_test/CMakeLists.txt index 8019e5f3bbfb..db1da4450404 100644 --- a/packages/kokkos/core/unit_test/CMakeLists.txt +++ b/packages/kokkos/core/unit_test/CMakeLists.txt @@ -92,7 +92,7 @@ IF(KOKKOS_HAS_TRILINOS) LIST(REMOVE_ITEM COMPILE_ONLY_SOURCES TestInterOp.cpp) ENDIF() KOKKOS_ADD_EXECUTABLE( - TestCompileOnly + CoreTestCompileOnly SOURCES TestCompileMain.cpp ${COMPILE_ONLY_SOURCES} @@ -562,20 +562,20 @@ endif() if(Kokkos_ENABLE_SERIAL) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_Serial1 + CoreUnitTest_Serial1 SOURCES UnitTestMainInit.cpp ${Serial_SOURCES1} serial/TestSerial_Task.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_Serial2 + CoreUnitTest_Serial2 SOURCES UnitTestMainInit.cpp ${Serial_SOURCES2} ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_SerialGraph + CoreUnitTest_SerialGraph SOURCES UnitTestMainInit.cpp serial/TestSerial_Graph.cpp @@ -584,7 +584,7 @@ endif() if(Kokkos_ENABLE_THREADS) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_Threads + CoreUnitTest_Threads SOURCES ${Threads_SOURCES} UnitTestMainInit.cpp ) @@ -596,20 +596,20 @@ if (Kokkos_ENABLE_OPENMP) openmp/TestOpenMP_PartitionMaster.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_OpenMP + CoreUnitTest_OpenMP SOURCES UnitTestMainInit.cpp ${OpenMP_SOURCES} ${OpenMP_EXTRA_SOURCES} ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_OpenMPInterOp + CoreUnitTest_OpenMPInterOp SOURCES UnitTestMain.cpp openmp/TestOpenMP_InterOp.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_OpenMPGraph + CoreUnitTest_OpenMPGraph SOURCES UnitTestMainInit.cpp openmp/TestOpenMP_Graph.cpp @@ -618,20 +618,20 @@ endif() if(Kokkos_ENABLE_HPX) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_HPX + CoreUnitTest_HPX SOURCES UnitTestMainInit.cpp ${HPX_SOURCES} hpx/TestHPX_Task.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_HPXInterOp + CoreUnitTest_HPXInterOp SOURCES UnitTestMain.cpp hpx/TestHPX_InterOp.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_HPX_IndependentInstances + CoreUnitTest_HPX_IndependentInstances SOURCES UnitTestMainInit.cpp hpx/TestHPX_IndependentInstances.cpp @@ -643,7 +643,7 @@ endif() if(Kokkos_ENABLE_OPENMPTARGET) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_OpenMPTarget + CoreUnitTest_OpenMPTarget SOURCES UnitTestMainInit.cpp ${OpenMPTarget_SOURCES} @@ -652,7 +652,7 @@ endif() if(Kokkos_ENABLE_OPENACC) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_OpenACC + CoreUnitTest_OpenACC SOURCES UnitTestMainInit.cpp ${OpenACC_SOURCES} @@ -661,7 +661,7 @@ endif() if(Kokkos_ENABLE_CUDA) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_Cuda1 + CoreUnitTest_Cuda1 SOURCES UnitTestMainInit.cpp ${Cuda_SOURCES1} @@ -669,14 +669,14 @@ if(Kokkos_ENABLE_CUDA) ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_Cuda2 + CoreUnitTest_Cuda2 SOURCES UnitTestMainInit.cpp ${Cuda_SOURCES2} ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_Cuda3 + CoreUnitTest_Cuda3 SOURCES UnitTestMainInit.cpp cuda/TestCuda_Task.cpp @@ -687,7 +687,7 @@ if(Kokkos_ENABLE_CUDA) ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_CudaTimingBased + CoreUnitTest_CudaTimingBased SOURCES UnitTestMainInit.cpp cuda/TestCuda_DebugSerialExecution.cpp @@ -695,19 +695,19 @@ if(Kokkos_ENABLE_CUDA) ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_CudaInterOpInit + CoreUnitTest_CudaInterOpInit SOURCES UnitTestMain.cpp cuda/TestCuda_InterOp_Init.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_CudaInterOpStreams + CoreUnitTest_CudaInterOpStreams SOURCES UnitTestMain.cpp cuda/TestCuda_InterOp_Streams.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_CudaGraph + CoreUnitTest_CudaGraph SOURCES UnitTestMainInit.cpp cuda/TestCuda_Graph.cpp @@ -716,7 +716,7 @@ endif() if(Kokkos_ENABLE_HIP) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_HIP + CoreUnitTest_HIP SOURCES UnitTestMainInit.cpp ${HIP_SOURCES} @@ -728,13 +728,13 @@ if(Kokkos_ENABLE_HIP) hip/TestHIP_BlocksizeDeduction.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_HIPInterOpInit + CoreUnitTest_HIPInterOpInit SOURCES UnitTestMain.cpp hip/TestHIP_InterOp_Init.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_HIPInterOpStreams + CoreUnitTest_HIPInterOpStreams SOURCES UnitTestMain.cpp hip/TestHIP_InterOp_Streams.cpp @@ -752,49 +752,49 @@ if(Kokkos_ENABLE_SYCL) ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_SYCL1A + CoreUnitTest_SYCL1A SOURCES UnitTestMainInit.cpp ${SYCL_SOURCES1A} ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_SYCL1B + CoreUnitTest_SYCL1B SOURCES UnitTestMainInit.cpp ${SYCL_SOURCES1B} ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_SYCL2A + CoreUnitTest_SYCL2A SOURCES UnitTestMainInit.cpp ${SYCL_SOURCES2A} ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_SYCL2B + CoreUnitTest_SYCL2B SOURCES UnitTestMainInit.cpp ${SYCL_SOURCES2B} ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_SYCL2C + CoreUnitTest_SYCL2C SOURCES UnitTestMainInit.cpp ${SYCL_SOURCES2C} ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_SYCL2D + CoreUnitTest_SYCL2D SOURCES UnitTestMainInit.cpp ${SYCL_SOURCES2D} ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_SYCL3 + CoreUnitTest_SYCL3 SOURCES UnitTestMainInit.cpp # FIXME_SYCL @@ -805,19 +805,19 @@ if(Kokkos_ENABLE_SYCL) ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_SYCLInterOpInit + CoreUnitTest_SYCLInterOpInit SOURCES UnitTestMain.cpp sycl/TestSYCL_InterOp_Init.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_SYCLInterOpInit_Context + CoreUnitTest_SYCLInterOpInit_Context SOURCES UnitTestMainInit.cpp sycl/TestSYCL_InterOp_Init_Context.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_SYCLInterOpStreams + CoreUnitTest_SYCLInterOpStreams SOURCES UnitTestMain.cpp sycl/TestSYCL_InterOp_Streams.cpp @@ -865,19 +865,19 @@ if ((KOKKOS_ENABLE_OPENMPTARGET OR KOKKOS_ENABLE_OPENACC) AND KOKKOS_CXX_COMPILE endif() KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_Default + CoreUnitTest_Default SOURCES ${DEFAULT_DEVICE_SOURCES} ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_LegionInitialization + CoreUnitTest_LegionInitialization SOURCES UnitTestMain.cpp TestLegionInitialization.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_PushFinalizeHook + CoreUnitTest_PushFinalizeHook SOURCES UnitTest_PushFinalizeHook.cpp ) @@ -885,7 +885,7 @@ KOKKOS_ADD_EXECUTABLE_AND_TEST( # This test is intended for development and debugging by putting code # into TestDefaultDeviceDevelop.cpp. By default its empty. KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_Develop + CoreUnitTest_Develop SOURCES UnitTestMainInit.cpp default/TestDefaultDeviceDevelop.cpp @@ -900,7 +900,7 @@ KOKKOS_ADD_TEST_EXECUTABLE( push_finalize_hook_terminate SOURCES UnitTest_PushFinalizeHook_terminate.cpp ) -KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate +KOKKOS_ADD_ADVANCED_TEST( CoreUnitTest_PushFinalizeHook_terminate TEST_0 EXEC push_finalize_hook_terminate NUM_MPI_PROCS 1 @@ -910,24 +910,24 @@ KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate ) if(KOKKOS_ENABLE_TUNING) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_TuningBuiltins + CoreUnitTest_TuningBuiltins SOURCES tools/TestBuiltinTuners.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_TuningBasics + CoreUnitTest_TuningBasics SOURCES tools/TestTuning.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_CategoricalTuner + CoreUnitTest_CategoricalTuner SOURCES tools/TestCategoricalTuner.cpp ) endif() if((NOT Kokkos_ENABLE_OPENMPTARGET) AND (NOT Kokkos_ENABLE_OPENACC)) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_LogicalSpaces + CoreUnitTest_LogicalSpaces SOURCES tools/TestLogicalSpaces.cpp ) @@ -946,18 +946,18 @@ KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate endif() KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_KokkosP + CoreUnitTest_KokkosP SOURCES ${KOKKOSP_SOURCES} ) if(KOKKOS_ENABLE_LIBDL) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_ToolIndependence + CoreUnitTest_ToolIndependence SOURCES tools/TestIndependence.cpp ) TARGET_COMPILE_DEFINITIONS( - KokkosCore_UnitTest_ToolIndependence PUBLIC + Kokkos_CoreUnitTest_ToolIndependence PUBLIC KOKKOS_TOOLS_INDEPENDENT_BUILD ) KOKKOS_ADD_TEST_LIBRARY( @@ -987,7 +987,7 @@ KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate TOOL kokkosprinter-tool ARGS --kokkos-tools-help PASS_REGULAR_EXPRESSION - "kokkosp_init_library::kokkosp_print_help:KokkosCore_ProfilingAllCalls::kokkosp_finalize_library::") + "kokkosp_init_library::kokkosp_print_help:Kokkos_ProfilingAllCalls::kokkosp_finalize_library::") # check help works via direct library specification KOKKOS_ADD_TEST( @@ -997,7 +997,7 @@ KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate ARGS --kokkos-tools-help --kokkos-tools-libs=$ PASS_REGULAR_EXPRESSION - "kokkosp_init_library::kokkosp_print_help:KokkosCore_ProfilingAllCalls::kokkosp_finalize_library::") + "kokkosp_init_library::kokkosp_print_help:Kokkos_ProfilingAllCalls::kokkosp_finalize_library::") KOKKOS_ADD_TEST( SKIP_TRIBITS @@ -1005,7 +1005,7 @@ KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate EXE ProfilingAllCalls TOOL kokkosprinter-tool ARGS --kokkos-tools-args="-c test delimit" - PASS_REGULAR_EXPRESSION "kokkosp_init_library::kokkosp_parse_args:4:KokkosCore_ProfilingAllCalls:-c:test:delimit::.*::kokkosp_allocate_data:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_begin_parallel_for:Kokkos::View::initialization [[]source] via memset:[0-9]+:0::kokkosp_end_parallel_for:0::kokkosp_allocate_data:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:40::kokkosp_begin_parallel_for:Kokkos::View::initialization [[]destination] via memset:[0-9]+:0::kokkosp_end_parallel_for:0::kokkosp_begin_deep_copy:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::.*kokkosp_end_deep_copy::kokkosp_begin_parallel_for:parallel_for:${SIZE_REGEX}:0::kokkosp_end_parallel_for:0::kokkosp_begin_parallel_reduce:parallel_reduce:${SIZE_REGEX}:1${SKIP_SCRATCH_INITIALIZATION_REGEX}::kokkosp_end_parallel_reduce:1::kokkosp_begin_parallel_scan:parallel_scan:${SIZE_REGEX}:2::kokkosp_end_parallel_scan:2::kokkosp_push_profile_region:push_region::kokkosp_pop_profile_region::kokkosp_create_profile_section:created_section:3::kokkosp_start_profile_section:3::kokkosp_stop_profile_section:3::kokkosp_destroy_profile_section:3::kokkosp_profile_event:profiling_event::kokkosp_declare_metadata:dogs:good::kokkosp_deallocate_data:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:40::kokkosp_deallocate_data:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_finalize_library::" + PASS_REGULAR_EXPRESSION "kokkosp_init_library::kokkosp_parse_args:4:Kokkos_ProfilingAllCalls:-c:test:delimit::.*::kokkosp_allocate_data:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_begin_parallel_for:Kokkos::View::initialization [[]source] via memset:[0-9]+:0::kokkosp_end_parallel_for:0::kokkosp_allocate_data:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:40::kokkosp_begin_parallel_for:Kokkos::View::initialization [[]destination] via memset:[0-9]+:0::kokkosp_end_parallel_for:0::kokkosp_begin_deep_copy:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::.*kokkosp_end_deep_copy::kokkosp_begin_parallel_for:parallel_for:${SIZE_REGEX}:0::kokkosp_end_parallel_for:0::kokkosp_begin_parallel_reduce:parallel_reduce:${SIZE_REGEX}:1${SKIP_SCRATCH_INITIALIZATION_REGEX}::kokkosp_end_parallel_reduce:1::kokkosp_begin_parallel_scan:parallel_scan:${SIZE_REGEX}:2::kokkosp_end_parallel_scan:2::kokkosp_push_profile_region:push_region::kokkosp_pop_profile_region::kokkosp_create_profile_section:created_section:3::kokkosp_start_profile_section:3::kokkosp_stop_profile_section:3::kokkosp_destroy_profile_section:3::kokkosp_profile_event:profiling_event::kokkosp_declare_metadata:dogs:good::kokkosp_deallocate_data:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:40::kokkosp_deallocate_data:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_finalize_library::" ) # Above will test that leading/trailing quotes are stripped bc ctest cmd args is: @@ -1022,7 +1022,7 @@ KOKKOS_ADD_ADVANCED_TEST( UnitTest_PushFinalizeHook_terminate EXE ProfilingAllCalls ARGS [=[--kokkos-tools-args=-c test delimit]=] --kokkos-tools-libs=$ - PASS_REGULAR_EXPRESSION "kokkosp_init_library::kokkosp_parse_args:4:KokkosCore_ProfilingAllCalls:-c:test:delimit::.*::kokkosp_allocate_data:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_begin_parallel_for:Kokkos::View::initialization [[]source] via memset:[0-9]+:0::kokkosp_end_parallel_for:0::kokkosp_allocate_data:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:40::kokkosp_begin_parallel_for:Kokkos::View::initialization [[]destination] via memset:[0-9]+:0::kokkosp_end_parallel_for:0::kokkosp_begin_deep_copy:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::.*kokkosp_end_deep_copy::kokkosp_begin_parallel_for:parallel_for:${SIZE_REGEX}:0::kokkosp_end_parallel_for:0::kokkosp_begin_parallel_reduce:parallel_reduce:${SIZE_REGEX}:1${SKIP_SCRATCH_INITIALIZATION_REGEX}::kokkosp_end_parallel_reduce:1::kokkosp_begin_parallel_scan:parallel_scan:${SIZE_REGEX}:2::kokkosp_end_parallel_scan:2::kokkosp_push_profile_region:push_region::kokkosp_pop_profile_region::kokkosp_create_profile_section:created_section:3::kokkosp_start_profile_section:3::kokkosp_stop_profile_section:3::kokkosp_destroy_profile_section:3::kokkosp_profile_event:profiling_event::kokkosp_declare_metadata:dogs:good::kokkosp_deallocate_data:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:40::kokkosp_deallocate_data:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_finalize_library::" + PASS_REGULAR_EXPRESSION "kokkosp_init_library::kokkosp_parse_args:4:Kokkos_ProfilingAllCalls:-c:test:delimit::.*::kokkosp_allocate_data:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_begin_parallel_for:Kokkos::View::initialization [[]source] via memset:[0-9]+:0::kokkosp_end_parallel_for:0::kokkosp_allocate_data:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:40::kokkosp_begin_parallel_for:Kokkos::View::initialization [[]destination] via memset:[0-9]+:0::kokkosp_end_parallel_for:0::kokkosp_begin_deep_copy:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::.*kokkosp_end_deep_copy::kokkosp_begin_parallel_for:parallel_for:${SIZE_REGEX}:0::kokkosp_end_parallel_for:0::kokkosp_begin_parallel_reduce:parallel_reduce:${SIZE_REGEX}:1${SKIP_SCRATCH_INITIALIZATION_REGEX}::kokkosp_end_parallel_reduce:1::kokkosp_begin_parallel_scan:parallel_scan:${SIZE_REGEX}:2::kokkosp_end_parallel_scan:2::kokkosp_push_profile_region:push_region::kokkosp_pop_profile_region::kokkosp_create_profile_section:created_section:3::kokkosp_start_profile_section:3::kokkosp_stop_profile_section:3::kokkosp_destroy_profile_section:3::kokkosp_profile_event:profiling_event::kokkosp_declare_metadata:dogs:good::kokkosp_deallocate_data:${MEMSPACE_REGEX}:destination:${ADDRESS_REGEX}:40::kokkosp_deallocate_data:${MEMSPACE_REGEX}:source:${ADDRESS_REGEX}:40::kokkosp_finalize_library::" ) endif() #KOKKOS_ENABLE_LIBDL if(NOT KOKKOS_HAS_TRILINOS) @@ -1040,7 +1040,7 @@ KOKKOS_ADD_TEST_EXECUTABLE( # to work correctly with shared libraries KOKKOS_SET_EXE_PROPERTY(StackTraceTestExec ENABLE_EXPORTS ON) -KOKKOS_ADD_TEST( NAME UnitTest_StackTraceTest +KOKKOS_ADD_TEST( NAME CoreUnitTest_StackTraceTest EXE StackTraceTestExec FAIL_REGULAR_EXPRESSION "FAILED" ) @@ -1049,7 +1049,7 @@ endif() if(Kokkos_ENABLE_DEPRECATED_CODE_3) foreach(INITTESTS_NUM RANGE 1 18) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_DefaultInit_${INITTESTS_NUM} + CoreUnitTest_DefaultInit_${INITTESTS_NUM} SOURCES UnitTestMain.cpp default/TestDefaultDeviceTypeInit_${INITTESTS_NUM}.cpp ) endforeach(INITTESTS_NUM) @@ -1057,7 +1057,7 @@ endif() if (KOKKOS_ENABLE_HWLOC) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_HWLOC + CoreUnitTest_HWLOC SOURCES UnitTestMain.cpp TestHWLOC.cpp ) endif() @@ -1113,34 +1113,34 @@ FOREACH (DEVICE ${KOKKOS_ENABLED_DEVICES}) ENDFOREACH() KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_CTestDevice + CoreUnitTest_CTestDevice SOURCES UnitTestMain.cpp TestCTestDevice.cpp ) KOKKOS_ADD_EXECUTABLE_AND_TEST( - UnitTest_CMakePassCmdLineArgs + CoreUnitTest_CMakePassCmdLineArgs SOURCES UnitTest_CMakePassCmdLineArgs.cpp ARGS "one 2 THREE" ) # This test is not properly set up to run within Trilinos if (NOT KOKKOS_HAS_TRILINOS) - add_executable(KokkosCore_UnitTest_DeviceAndThreads UnitTest_DeviceAndThreads.cpp) - target_link_libraries(KokkosCore_UnitTest_DeviceAndThreads Kokkos::kokkoscore) + add_executable(Kokkos_CoreUnitTest_DeviceAndThreads CoreUnitTest_DeviceAndThreads.cpp) + target_link_libraries(Kokkos_CoreUnitTest_DeviceAndThreads Kokkos::kokkoscore) find_package(Python3 COMPONENTS Interpreter) if(Python3_Interpreter_FOUND AND Python3_VERSION VERSION_GREATER_EQUAL 3.7) if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.20) set(USE_SOURCE_PERMISSIONS_WHEN_SUPPORTED USE_SOURCE_PERMISSIONS) endif() file(GENERATE - OUTPUT $/TestDeviceAndThreads.py + OUTPUT $/TestDeviceAndThreads.py INPUT TestDeviceAndThreads.py ${USE_SOURCE_PERMISSIONS_WHEN_SUPPORTED} ) if(NOT Kokkos_ENABLE_OPENMPTARGET) # FIXME_OPENMPTARGET does not select the right device add_test( - NAME KokkosCore_UnitTest_DeviceAndThreads - COMMAND ${Python3_EXECUTABLE} -m unittest -v $/TestDeviceAndThreads.py + NAME Kokkos_CoreUnitTest_DeviceAndThreads + COMMAND ${Python3_EXECUTABLE} -m unittest -v $/TestDeviceAndThreads.py ) endif() endif() diff --git a/packages/kokkos/simd/CMakeLists.txt b/packages/kokkos/simd/CMakeLists.txt index 83557e61e627..59e09b85ac3d 100644 --- 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 deleted file mode 100644 index 1d71d8af3411..000000000000 --- a/packages/kokkos/simd/cmake/Dependencies.cmake +++ /dev/null @@ -1,5 +0,0 @@ -TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( - LIB_REQUIRED_PACKAGES KokkosCore - LIB_OPTIONAL_TPLS Pthread CUDA HWLOC - TEST_OPTIONAL_TPLS CUSPARSE - ) From 627b9b31fef1eba29c3dd47398d56a90e25c09f9 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 18 Apr 2023 12:43:09 -0600 Subject: [PATCH 02/16] Add script to remove usage of Kokkos subpackages from downstream packages (#11545) This script removes the usage of Kokkos subpackages from downstream TriBITS packages CMake files. --- commonTools/refactoring/refactors/README.md | 2 + .../refactors/remove_kokkos_subpackages_r.sh | 74 +++++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 commonTools/refactoring/refactors/README.md create mode 100755 commonTools/refactoring/refactors/remove_kokkos_subpackages_r.sh diff --git a/commonTools/refactoring/refactors/README.md b/commonTools/refactoring/refactors/README.md new file mode 100644 index 000000000000..2335417b3e85 --- /dev/null +++ b/commonTools/refactoring/refactors/README.md @@ -0,0 +1,2 @@ +This directory contains refactoring scripts that can't be put in individual +Trilinos package directories for some reason. diff --git a/commonTools/refactoring/refactors/remove_kokkos_subpackages_r.sh b/commonTools/refactoring/refactors/remove_kokkos_subpackages_r.sh new file mode 100755 index 000000000000..06e60d6bc728 --- /dev/null +++ b/commonTools/refactoring/refactors/remove_kokkos_subpackages_r.sh @@ -0,0 +1,74 @@ +#!/bin/bash +# +# Run this in a subdir to strip out usage of Kokkos subpackages for TriBITS +# packages downstream from the Kokkos package (4/19/2023). +# +# Run as: +# +# $ cd +# $ /remove_kokkos_subpackages_r.sh +# +# NOTE: Do **NOT** run this script on the packages/kokkos/subdirectory itself +# (or undo the changes if you do by accident). +# +# NOTE: Some manual modifications may be desired after running this script +# like removing duplicate if clauses like: +# +# if (_ENABLE_KokkosCore AND _ENABLE_KokkosContainers ...) +# +# becoming: +# +# if (_ENABLE_Kokkos AND _ENABLE_Kokkos ...) +# +# which should be manually refactored to be +# +# if (_ENABLE_Kokkos ...) +# +# NOTE: This script can't be in the packages/kokkos/ directory because the +# next Kokos snapshot would delete it and this refactoring is really +# Trilinos-specific and therefore does not need to be in the external kokkos +# repo. +# + +_SCRIPT_DIR=`echo $0 | sed "s/\(.*\)\/.*remove_kokkos_subpackages_r.sh/\1/g"` +#echo $_SCRIPT_DIR + +refactDir=${_SCRIPT_DIR}/.. + +kokkosSubpkgs=(Core Containers Algorithms Simd) + +for kokkosSubpkg in ${kokkosSubpkgs[@]}; do + + echo + echo "Replace Kokkos${kokkosSubpkg} with Kokkos in Dependencies.cmake file ..." + echo + + find . -name Dependencies.cmake -exec ${refactDir}/token-replace.pl Kokkos${kokkosSubpkg} Kokkos {} {} \; + + echo + echo "Replace Kokkos${kokkosSubpkg}_ with Kokkos_ in CMakeLists.txt and *.cmake files ..." + echo + + find . \( -name CMakeLists.txt -or -name "*.cmake" \) -exec ${refactDir}/string-replace.pl Kokkos${kokkosSubpkg}_ Kokkos_ {} {} \; + + echo + echo "Replace _Kokkos${kokkosSubpkg} with _Kokkos in CMakeLists.txt and *.cmake files ..." + echo + + find . \( -name CMakeLists.txt -or -name "*.cmake" \) -exec ${refactDir}/string-replace.pl _Kokkos${kokkosSubpkg} _Kokkos {} {} \; + + echo + echo "Replace _KOKKOS${kokkosSubpkg^^} with _KOKKOS in all files ..." + echo + + find . -type f -exec ${refactDir}/string-replace.pl _KOKKOS${kokkosSubpkg^^} _KOKKOS {} {} \; + +done + +echo +echo "Replace duplicates of 'Kokkos' in Dependencies.cmake file ..." +echo + +find . -name Dependencies.cmake -exec sed -i 's/Kokkos Kokkos\([ )\n]\)/Kokkos\1/g' {} \; +find . -name Dependencies.cmake -exec sed -i 's/Kokkos Kokkos\([ )\n]\)/Kokkos\1/g' {} \; +find . -name Dependencies.cmake -exec sed -i 's/Kokkos Kokkos\([ )\n]\)/Kokkos\1/g' {} \; From cdce0283576ff809112b2358a1331567debacaf4 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Wed, 19 Apr 2023 17:46:51 -0600 Subject: [PATCH 03/16] Add script remove_kokkos_subpackages_from_trilinos_packages_r.sh (#11545) This makes it a little more robust and reproducable to refactor the packages downstream from Kokkos. This script can also be used by other TriBITS and non-TriBITS CMake packages/projects that depend on Kokkos to adjust to this refactoring. --- ...os_subpackages_from_trilinos_packages_r.sh | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100755 commonTools/refactoring/refactors/remove_kokkos_subpackages_from_trilinos_packages_r.sh diff --git a/commonTools/refactoring/refactors/remove_kokkos_subpackages_from_trilinos_packages_r.sh b/commonTools/refactoring/refactors/remove_kokkos_subpackages_from_trilinos_packages_r.sh new file mode 100755 index 000000000000..623d64deb5ea --- /dev/null +++ b/commonTools/refactoring/refactors/remove_kokkos_subpackages_from_trilinos_packages_r.sh @@ -0,0 +1,31 @@ +#!/bin/bash +# +# Run this script from the Trilinos/packages/ subdir to remove the usage of Kokkos subpackages. +# +# Usage: +# +# $ cd Trilinos/packages/ +# $ ../commonTools/refactoring/refactors/remove_kokkos_subpackages_from_trilinos_packages.sh +# + +pkgsToRefactor=$(ls | grep -v "kokkos$" | grep -v framework | grep -v TrilinosInstallTests | grep -v new_package) + +for pkg in ${pkgsToRefactor} ; do + + if [[ -d ${pkg} ]] ; then + + echo + echo "***" + echo "*** Refactoring ${pkg}" + echo "***" + echo + + cd ${pkg} + + time ../../commonTools/refactoring/refactors/remove_kokkos_subpackages_r.sh + + cd .. + + fi + +done From 04ebecc8e69d579c4f340cff2deeb30c0fb08c4a Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Wed, 19 Apr 2023 09:53:08 -0600 Subject: [PATCH 04/16] Run script remove_kokkos_subpackages_from_trilinos_packages_r.sh (#11545) This is the result of running the script: cd Trilinos/ ../commonTools/refactoring/refactors/remove_kokkos_subpackages_from_trilinos_packages_r.sh which calls 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 to remove duplciation in various logic (see comments in the scripts). --- packages/compadre/CMakeLists.txt | 40 +++++++++---------- packages/compadre/cmake/Dependencies.cmake | 2 +- packages/intrepid2/cmake/Dependencies.cmake | 2 +- .../kokkos-kernels/cmake/Dependencies.cmake | 2 +- packages/minitensor/cmake/Dependencies.cmake | 2 +- packages/moertel/morkon/src/CMakeLists.txt | 2 +- .../moertel/morkon/unit_tests/CMakeLists.txt | 2 +- .../muelu/test/maxwell/ReitzingerPFactory.cpp | 4 +- .../panzer/disc-fe/cmake/Dependencies.cmake | 2 +- .../panzer/expr-eval/cmake/Dependencies.cmake | 2 +- .../build_scripts/build_phalanx_amt_gcc.sh | 2 +- .../build_phalanx_amt_gcc_gge.sh | 2 +- .../build_scripts/build_phalanx_cuda.sh | 2 +- .../build_scripts/build_phalanx_gcc_gge.sh | 2 +- packages/phalanx/cmake/Dependencies.cmake | 2 +- packages/phalanx/src/CMakeLists.txt | 2 +- .../src/deprecated/Phalanx_MDField_Def.hpp | 4 +- packages/sacado/cmake/Dependencies.cmake | 4 +- packages/sacado/cmake/Sacado_config.h.in | 4 +- packages/sacado/example/CMakeLists.txt | 2 +- .../sacado/example/view_factory_example.cpp | 4 +- packages/sacado/src/KokkosExp_View_Fad.hpp | 6 +-- .../src/KokkosExp_View_Fad_Contiguous.hpp | 4 +- .../sacado/src/Kokkos_DynRankView_Fad.hpp | 4 +- .../src/Kokkos_DynRankView_Fad_Contiguous.hpp | 4 +- packages/sacado/src/Kokkos_View_Fad_Fwd.hpp | 4 +- .../sacado/src/Sacado_CacheFad_DFadTraits.hpp | 2 +- .../sacado/src/Sacado_CacheFad_SFadTraits.hpp | 2 +- .../src/Sacado_CacheFad_SLFadTraits.hpp | 2 +- packages/sacado/src/Sacado_ConfigDefs.h | 2 +- .../sacado/src/Sacado_DisableKokkosCuda.hpp | 2 +- .../sacado/src/Sacado_DynamicArrayTraits.cpp | 4 +- .../sacado/src/Sacado_DynamicArrayTraits.hpp | 32 +++++++-------- .../src/Sacado_ELRCacheFad_DFadTraits.hpp | 2 +- .../src/Sacado_ELRCacheFad_SFadTraits.hpp | 2 +- .../src/Sacado_ELRCacheFad_SLFadTraits.hpp | 2 +- .../sacado/src/Sacado_ELRFad_DFadTraits.hpp | 2 +- .../sacado/src/Sacado_ELRFad_SFadTraits.hpp | 2 +- .../sacado/src/Sacado_ELRFad_SLFadTraits.hpp | 2 +- packages/sacado/src/Sacado_Fad_DFadTraits.hpp | 2 +- packages/sacado/src/Sacado_Fad_DFad_tmpl.hpp | 6 +-- packages/sacado/src/Sacado_Fad_SFadTraits.hpp | 2 +- packages/sacado/src/Sacado_Fad_SFad_tmpl.hpp | 6 +-- .../sacado/src/Sacado_Fad_SLFadTraits.hpp | 2 +- packages/sacado/src/Sacado_Fad_SLFad_tmpl.hpp | 6 +-- .../sacado/src/Sacado_Fad_ViewFad_tmpl.hpp | 4 +- packages/sacado/src/Sacado_MathFunctions.hpp | 2 +- .../src/new_design/Sacado_Fad_Exp_Atomic.hpp | 4 +- .../Sacado_Fad_Exp_GeneralFadTraits.hpp | 2 +- .../Sacado_Fad_Exp_MathFunctions.hpp | 2 +- .../src/new_design/Sacado_Fad_Exp_Ops.hpp | 6 +-- .../src/new_design/Sacado_Fad_Exp_ViewFad.hpp | 2 +- packages/sacado/test/UnitTests/CMakeLists.txt | 2 +- .../sacado/test/UnitTests/Fad_CommTests.hpp | 2 +- .../test/UnitTests/Fad_Fad_KokkosTests.hpp | 2 +- .../sacado/test/UnitTests/Fad_KokkosTests.hpp | 2 +- .../test/performance/advection/CMakeLists.txt | 2 +- .../advection_const_basis/CMakeLists.txt | 2 +- .../performance/fenl_assembly/CMakeLists.txt | 2 +- .../fenl_assembly_view/CMakeLists.txt | 2 +- .../test/performance/mat_vec/CMakeLists.txt | 2 +- .../shylu_node/tacho/cmake/Dependencies.cmake | 2 +- packages/stk/CMakeLists.txt | 4 +- packages/stk/cmake/STK_Trilinos_config.h.in | 2 +- .../stk/stk_expreval/cmake/Dependencies.cmake | 2 +- .../stk/stk_math/cmake/Dependencies.cmake | 2 +- .../stk/stk_mesh/cmake/Dependencies.cmake | 2 +- .../stk/stk_ngp_test/cmake/Dependencies.cmake | 2 +- .../stk/stk_simd/cmake/Dependencies.cmake | 2 +- .../unit_main_lib/UnitTestMain.cpp | 6 +-- packages/stk/stk_unit_tests/CMakeLists.txt | 2 +- .../stk/stk_util/cmake/Dependencies.cmake | 2 +- packages/stk/stk_util/stk_util/stk_config.h | 2 +- packages/stokhos/cmake/Dependencies.cmake | 6 +-- packages/stokhos/cmake/Stokhos_config.h.in | 2 +- packages/stokhos/src/CMakeLists.txt | 2 +- .../pce/algorithms/Kokkos_Random_UQ_PCE.hpp | 2 +- .../algorithms/Kokkos_Random_MP_Vector.hpp | 2 +- .../stokhos/test/Performance/CMakeLists.txt | 2 +- .../KokkosArraySPMVKernels/CMakeLists.txt | 2 +- packages/stokhos/test/UnitTest/CMakeLists.txt | 2 +- .../morgan/configure-tempus-morgan.sh | 2 +- .../shiller/configure-tempus-shiller.sh | 2 +- .../teuchos/comm/src/Teuchos_StackedTimer.hpp | 10 ++--- .../comm/test/StackedTimer/stacked_timer.cpp | 6 +-- .../comm/test/StackedTimer/stacked_timer4.cpp | 6 +-- .../teuchos/core/cmake/Dependencies.cmake | 4 +- .../core/cmake/TeuchosCore_config.h.in | 2 +- .../core/src/Teuchos_GlobalMPISession.cpp | 18 ++++----- .../core/src/Teuchos_GlobalMPISession.hpp | 8 ++-- .../teuchos/core/src/Teuchos_ScalarTraits.hpp | 8 ++-- packages/teuchos/core/src/Teuchos_Time.cpp | 6 +-- .../test/ScalarTraits/ScalarTraits_test.cpp | 4 +- .../UnitTest/GlobalMPISession_UnitTests.cpp | 8 ++-- .../kokkoscomm/cmake/Dependencies.cmake | 2 +- .../kokkoscompat/cmake/Dependencies.cmake | 2 +- packages/tpetra/core/CMakeLists.txt | 6 +-- packages/tpetra/core/cmake/Dependencies.cmake | 2 +- .../tpetra/core/cmake/TpetraCore_config.h.in | 16 ++++---- packages/tpetra/tsqr/cmake/Dependencies.cmake | 2 +- .../cmake/Dependencies.cmake | 2 +- ...Couplings_EpetraIntrepidPoissonExample.cpp | 2 +- ...s_TpetraIntrepidHybridPoisson2DExample.cpp | 2 +- ...s_TpetraIntrepidHybridPoisson3DExample.cpp | 2 +- ...Couplings_TpetraIntrepidPoissonExample.cpp | 2 +- ...TpetraIntrepidStructuredPoissonExample.cpp | 2 +- .../examples/scaling/example_Poisson.cpp | 2 +- .../examples/scaling/example_Poisson2D.cpp | 2 +- .../examples/scaling/example_Poisson2D_p2.cpp | 2 +- .../scaling/example_Poisson2D_p2_tpetra.cpp | 2 +- .../examples/scaling/example_Poisson2D_pn.cpp | 2 +- .../scaling/example_Poisson2D_pn_tpetra.cpp | 2 +- .../example_Poisson_BlockMaterials.cpp | 2 +- .../examples/scaling/example_Poisson_NoFE.cpp | 2 +- .../scaling/example_Poisson_NoFE_Epetra.cpp | 2 +- .../scaling/example_Poisson_NoFE_Tpetra.cpp | 2 +- .../examples/scaling/example_Poisson_stk.cpp | 2 +- .../scaling/example_StabilizedADR.cpp | 2 +- packages/xpetra/cmake/Dependencies.cmake | 2 +- packages/xpetra/cmake/Xpetra_config.hpp.in | 2 +- .../BlockedCrsMatrix_UnitTests.cpp | 2 +- .../ThyraBlockedOperator_UnitTests.cpp | 2 +- 122 files changed, 221 insertions(+), 221 deletions(-) diff --git a/packages/compadre/CMakeLists.txt b/packages/compadre/CMakeLists.txt index 8e2f53e2580d..bc6d1d44050d 100644 --- 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,8 +272,8 @@ 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}) @@ -281,9 +281,9 @@ else() # Raw CMake Project 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 index 163d104f2a18..3a1fffa74405 100644 --- 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 index fdf06cf1d4d1..d636c8b08596 100644 --- 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 index d3b393dddef1..3c58d5b318fa 100644 --- 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 index 86ad2cfb5b26..f569bf575165 100644 --- 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 index b6d35ebe6130..c07e6404d9d3 100644 --- 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 index d15eacc55d1d..71df5ad1d852 100644 --- 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/test/maxwell/ReitzingerPFactory.cpp b/packages/muelu/test/maxwell/ReitzingerPFactory.cpp index 9bf2b21c80f9..dc5ef61dd5af 100644 --- a/packages/muelu/test/maxwell/ReitzingerPFactory.cpp +++ b/packages/muelu/test/maxwell/ReitzingerPFactory.cpp @@ -729,7 +729,7 @@ int main(int argc, char* argv[]) { Teuchos::GlobalMPISession mpiSession(&argc, &argv); -#ifdef HAVE_MUELU_KOKKOSCORE +#ifdef HAVE_MUELU_KOKKOS Kokkos::initialize(argc , argv); #endif @@ -774,7 +774,7 @@ int main(int argc, char* argv[]) } TEUCHOS_STANDARD_CATCH_STATEMENTS(verbose, std::cerr, success); -#ifdef HAVE_MUELU_KOKKOSCORE +#ifdef HAVE_MUELU_KOKKOS Kokkos::finalize(); #endif diff --git a/packages/panzer/disc-fe/cmake/Dependencies.cmake b/packages/panzer/disc-fe/cmake/Dependencies.cmake index 92c8aec34089..af828fbe03b7 100644 --- 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 index 68d822ba4395..d530616a4364 100644 --- 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/build_scripts/build_phalanx_amt_gcc.sh b/packages/phalanx/build_scripts/build_phalanx_amt_gcc.sh index adafd2939429..7e3b108ea0f0 100755 --- a/packages/phalanx/build_scripts/build_phalanx_amt_gcc.sh +++ b/packages/phalanx/build_scripts/build_phalanx_amt_gcc.sh @@ -24,7 +24,7 @@ cmake \ -D Phalanx_ENABLE_KOKKOS_AMT:BOOL=ON \ -D Phalanx_EXPLICIT_TEMPLATE_INSTANTIATION=ON \ -D Phalanx_ALLOW_MULTIPLE_EVALUATORS_FOR_SAME_FIELD:BOOL=OFF \ --D HAVE_INTREPID_KOKKOSCORE:BOOL=ON \ +-D HAVE_INTREPID_KOKKOS:BOOL=ON \ -D TPL_ENABLE_MPI:BOOL=ON \ -D MPI_BASE_DIR:PATH="/home/rppawlo/install/gnu4.8.2/mpich" \ -D TPL_ENABLE_HWLOC:BOOL=ON \ diff --git a/packages/phalanx/build_scripts/build_phalanx_amt_gcc_gge.sh b/packages/phalanx/build_scripts/build_phalanx_amt_gcc_gge.sh index e914b34eeda0..6fb394b95fe3 100755 --- a/packages/phalanx/build_scripts/build_phalanx_amt_gcc_gge.sh +++ b/packages/phalanx/build_scripts/build_phalanx_amt_gcc_gge.sh @@ -24,7 +24,7 @@ cmake \ -D Phalanx_ENABLE_KOKKOS_AMT:BOOL=ON \ -D Phalanx_EXPLICIT_TEMPLATE_INSTANTIATION=ON \ -D Phalanx_ALLOW_MULTIPLE_EVALUATORS_FOR_SAME_FIELD:BOOL=OFF \ --D HAVE_INTREPID_KOKKOSCORE:BOOL=ON \ +-D HAVE_INTREPID_KOKKOS:BOOL=ON \ -D TPL_ENABLE_MPI:BOOL=ON \ -D MPI_BASE_DIR:PATH="$ROGER_MPICH_BASE_PATH" \ -D MPI_EXEC_POST_NUMPROCS_FLAGS="-bind-to;core;-map-by;core" \ diff --git a/packages/phalanx/build_scripts/build_phalanx_cuda.sh b/packages/phalanx/build_scripts/build_phalanx_cuda.sh index 42463f96ded7..76675d1ca3a4 100755 --- a/packages/phalanx/build_scripts/build_phalanx_cuda.sh +++ b/packages/phalanx/build_scripts/build_phalanx_cuda.sh @@ -20,7 +20,7 @@ cmake \ -D Phalanx_ENABLE_EXAMPLES:BOOL=ON \ -D Phalanx_EXPLICIT_TEMPLATE_INSTANTIATION=ON \ -D Phalanx_ALLOW_MULTIPLE_EVALUATORS_FOR_SAME_FIELD:BOOL=OFF \ --D HAVE_INTREPID_KOKKOSCORE:BOOL=ON \ +-D HAVE_INTREPID_KOKKOS:BOOL=ON \ -D TPL_ENABLE_CUDA=ON \ -D TPL_ENABLE_MPI:BOOL=ON \ -D MPI_BASE_DIR:PATH="$SEMS_OPENMPI_ROOT" \ diff --git a/packages/phalanx/build_scripts/build_phalanx_gcc_gge.sh b/packages/phalanx/build_scripts/build_phalanx_gcc_gge.sh index 93c551aae845..ddea4c22dc68 100755 --- a/packages/phalanx/build_scripts/build_phalanx_gcc_gge.sh +++ b/packages/phalanx/build_scripts/build_phalanx_gcc_gge.sh @@ -24,7 +24,7 @@ cmake \ -D Phalanx_EXPLICIT_TEMPLATE_INSTANTIATION=ON \ -D Phalanx_ALLOW_MULTIPLE_EVALUATORS_FOR_SAME_FIELD:BOOL=OFF \ -D Phalanx_ENABLE_KOKKOS_AMT:BOOL=ON \ --D HAVE_INTREPID_KOKKOSCORE:BOOL=ON \ +-D HAVE_INTREPID_KOKKOS:BOOL=ON \ -D TPL_ENABLE_MPI:BOOL=ON \ -D MPI_BASE_DIR:PATH="$ROGER_MPICH_BASE_PATH" \ -D TPL_ENABLE_BLAS:BOOL=ON \ diff --git a/packages/phalanx/cmake/Dependencies.cmake b/packages/phalanx/cmake/Dependencies.cmake index 083d70ad1a10..24b6ba76ad7b 100644 --- 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 index e9e430b89edc..65c1c17b656d 100644 --- 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/phalanx/src/deprecated/Phalanx_MDField_Def.hpp b/packages/phalanx/src/deprecated/Phalanx_MDField_Def.hpp index 70ccb82cb1fe..96f87e2bead6 100644 --- a/packages/phalanx/src/deprecated/Phalanx_MDField_Def.hpp +++ b/packages/phalanx/src/deprecated/Phalanx_MDField_Def.hpp @@ -57,7 +57,7 @@ #ifdef PHX_ENABLE_INTREPID2_DYN_RANK_VIEW_REFACTOR // no more intrepid dependencies! #else -#include "Intrepid2_config.h" // for HAVE_INTREPID_KOKKOSCORE define +#include "Intrepid2_config.h" // for HAVE_INTREPID_KOKKOS define #include "Intrepid2_KokkosRank.hpp" #endif // PHX_ENABLE_INTREPID2_DYN_RANK_VIEW_REFACTOR #endif //Phalanx_ENABLE_Intrepid2 @@ -1169,7 +1169,7 @@ std::ostream& PHX::operator<<(std::ostream& os, // no more intrepid dependencies! #else -#include "Intrepid2_config.h" // for HAVE_INTREPID_KOKKOSCORE define +#include "Intrepid2_config.h" // for HAVE_INTREPID_KOKKOS define #include "Intrepid2_KokkosRank.hpp" namespace Intrepid2 { template @@ -156,7 +156,7 @@ int main(int argc, char* argv[]) { } -#if defined(HAVE_SACADO_KOKKOSCONTAINERS) +#if defined(HAVE_SACADO_KOKKOS) // Now use the dynamic-rank view { diff --git a/packages/sacado/src/KokkosExp_View_Fad.hpp b/packages/sacado/src/KokkosExp_View_Fad.hpp index 1ab4dbb0e3b5..390581d07b26 100644 --- a/packages/sacado/src/KokkosExp_View_Fad.hpp +++ b/packages/sacado/src/KokkosExp_View_Fad.hpp @@ -31,7 +31,7 @@ #define KOKKOS_EXPERIMENTAL_VIEW_SACADO_FAD_HPP #include "Sacado_ConfigDefs.h" -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) // Only include forward declarations so any overloads appear before they // might be used inside Kokkos @@ -1955,7 +1955,7 @@ struct ViewMapping //---------------------------------------------------------------------------- //---------------------------------------------------------------------------- -#if defined(HAVE_SACADO_KOKKOSCORE) && \ +#if defined(HAVE_SACADO_KOKKOS) && \ defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && \ defined(HAVE_SACADO_VIEW_SPEC) && \ ! defined(SACADO_DISABLE_FAD_VIEW_SPEC) @@ -2117,7 +2117,7 @@ broadcast #endif // defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) -#endif // defined(HAVE_SACADO_KOKKOSCORE) +#endif // defined(HAVE_SACADO_KOKKOS) #include "KokkosExp_View_Fad_Contiguous.hpp" diff --git a/packages/sacado/src/KokkosExp_View_Fad_Contiguous.hpp b/packages/sacado/src/KokkosExp_View_Fad_Contiguous.hpp index fea523af3dfd..8f676d41dcb3 100644 --- a/packages/sacado/src/KokkosExp_View_Fad_Contiguous.hpp +++ b/packages/sacado/src/KokkosExp_View_Fad_Contiguous.hpp @@ -31,7 +31,7 @@ #define KOKKOS_EXPERIMENTAL_VIEW_SACADO_FAD_CONTIGUOUS_HPP #include "Sacado_ConfigDefs.h" -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) #include "Kokkos_LayoutContiguous.hpp" @@ -1796,6 +1796,6 @@ class ViewMapping< #endif // defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) -#endif // defined(HAVE_SACADO_KOKKOSCORE) +#endif // defined(HAVE_SACADO_KOKKOS) #endif /* #ifndef KOKKOS_EXPERIMENTAL_VIEW_SACADO_FAD_HPP */ diff --git a/packages/sacado/src/Kokkos_DynRankView_Fad.hpp b/packages/sacado/src/Kokkos_DynRankView_Fad.hpp index 7601808613d9..021817a21764 100644 --- a/packages/sacado/src/Kokkos_DynRankView_Fad.hpp +++ b/packages/sacado/src/Kokkos_DynRankView_Fad.hpp @@ -35,7 +35,7 @@ // This file is setup to always work even when KokkosContainers (which contains // Kokkos::DynRankView) isn't enabled. -#if defined(HAVE_SACADO_KOKKOSCONTAINERS) +#if defined(HAVE_SACADO_KOKKOS) // We are hooking into Kokkos Core internals here // Need to define this macro since we include non-public headers @@ -1315,7 +1315,7 @@ KOKKOS_FUNCTION auto as_view_of_rank_n( #endif //defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) -#endif // defined(HAVE_SACADO_KOKKOSCONTAINERS) +#endif // defined(HAVE_SACADO_KOKKOS) #include "Kokkos_DynRankView_Fad_Contiguous.hpp" diff --git a/packages/sacado/src/Kokkos_DynRankView_Fad_Contiguous.hpp b/packages/sacado/src/Kokkos_DynRankView_Fad_Contiguous.hpp index 1e982c0ac66e..34574e5c4c52 100644 --- a/packages/sacado/src/Kokkos_DynRankView_Fad_Contiguous.hpp +++ b/packages/sacado/src/Kokkos_DynRankView_Fad_Contiguous.hpp @@ -35,7 +35,7 @@ // This file is setup to always work even when KokkosContainers (which contains // Kokkos::DynRankView) isn't enabled. -#if defined(HAVE_SACADO_KOKKOSCONTAINERS) +#if defined(HAVE_SACADO_KOKKOS) #include "Kokkos_DynRankView.hpp" @@ -832,6 +832,6 @@ class ViewMapping< DstTraits , SrcTraits , #endif //defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) -#endif // defined(HAVE_SACADO_KOKKOSCONTAINERS) +#endif // defined(HAVE_SACADO_KOKKOS) #endif /* #ifndef KOKKOS_DYN_RANK_VIEW_SACADO_FAD_HPP */ diff --git a/packages/sacado/src/Kokkos_View_Fad_Fwd.hpp b/packages/sacado/src/Kokkos_View_Fad_Fwd.hpp index ffc5a58cc2d8..7a73d2509dec 100644 --- a/packages/sacado/src/Kokkos_View_Fad_Fwd.hpp +++ b/packages/sacado/src/Kokkos_View_Fad_Fwd.hpp @@ -31,7 +31,7 @@ #define KOKKOS_VIEW_FAD_FWD_HPP #include "Sacado_ConfigDefs.h" -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) // We are hooking into Kokkos Core internals here // Need to define this macro since we include non-public headers @@ -227,6 +227,6 @@ as_view_of_rank_n(View); #endif // defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) -#endif // defined(HAVE_SACADO_KOKKOSCORE) +#endif // defined(HAVE_SACADO_KOKKOS) #endif /* #ifndef KOKKOS_VIEW_FAD_FWD_HPP */ diff --git a/packages/sacado/src/Sacado_CacheFad_DFadTraits.hpp b/packages/sacado/src/Sacado_CacheFad_DFadTraits.hpp index 6df9f827397d..9da1d48593ce 100644 --- a/packages/sacado/src/Sacado_CacheFad_DFadTraits.hpp +++ b/packages/sacado/src/Sacado_CacheFad_DFadTraits.hpp @@ -207,7 +207,7 @@ namespace Teuchos { #endif // KokkosComm -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) #include "KokkosExp_View_Fad.hpp" #endif diff --git a/packages/sacado/src/Sacado_CacheFad_SFadTraits.hpp b/packages/sacado/src/Sacado_CacheFad_SFadTraits.hpp index 87c1c231fd7b..fc52d67d5afa 100644 --- a/packages/sacado/src/Sacado_CacheFad_SFadTraits.hpp +++ b/packages/sacado/src/Sacado_CacheFad_SFadTraits.hpp @@ -223,7 +223,7 @@ namespace Teuchos { #endif // KokkosComm -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) #include "KokkosExp_View_Fad.hpp" #endif diff --git a/packages/sacado/src/Sacado_CacheFad_SLFadTraits.hpp b/packages/sacado/src/Sacado_CacheFad_SLFadTraits.hpp index 5600f1954f23..1aaa5d11fd7a 100644 --- a/packages/sacado/src/Sacado_CacheFad_SLFadTraits.hpp +++ b/packages/sacado/src/Sacado_CacheFad_SLFadTraits.hpp @@ -192,7 +192,7 @@ namespace Teuchos { #endif // KokkosComm -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) #include "KokkosExp_View_Fad.hpp" #endif diff --git a/packages/sacado/src/Sacado_ConfigDefs.h b/packages/sacado/src/Sacado_ConfigDefs.h index 64836d8e5803..4ec573b74857 100644 --- a/packages/sacado/src/Sacado_ConfigDefs.h +++ b/packages/sacado/src/Sacado_ConfigDefs.h @@ -76,7 +76,7 @@ Questions? Contact David M. Gay (dmgay@sandia.gov) or Eric T. Phipps /* Kokkos macros */ -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) #include "Kokkos_Macros.hpp" #ifndef SACADO_FUNCTION diff --git a/packages/sacado/src/Sacado_DisableKokkosCuda.hpp b/packages/sacado/src/Sacado_DisableKokkosCuda.hpp index eef46de77330..495bc6a53684 100644 --- a/packages/sacado/src/Sacado_DisableKokkosCuda.hpp +++ b/packages/sacado/src/Sacado_DisableKokkosCuda.hpp @@ -45,7 +45,7 @@ #include "Sacado_ConfigDefs.h" // Redefine KOKKOS_*_FUNCTION macros to not include __device__ -#if defined(HAVE_SACADO_KOKKOSCORE) && ( defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP) ) +#if defined(HAVE_SACADO_KOKKOS) && ( defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP) ) // TODO double check me #if 1 #undef SACADO_FUNCTION diff --git a/packages/sacado/src/Sacado_DynamicArrayTraits.cpp b/packages/sacado/src/Sacado_DynamicArrayTraits.cpp index 2cd3b3920542..e6f70c9f56bd 100644 --- a/packages/sacado/src/Sacado_DynamicArrayTraits.cpp +++ b/packages/sacado/src/Sacado_DynamicArrayTraits.cpp @@ -29,7 +29,7 @@ #include "Sacado_DynamicArrayTraits.hpp" -#if 0 && defined(HAVE_SACADO_KOKKOSCORE) && defined(KOKKOS_ENABLE_OPENMP) +#if 0 && defined(HAVE_SACADO_KOKKOS) && defined(KOKKOS_ENABLE_OPENMP) namespace Sacado { namespace Impl { const Kokkos::MemoryPool* global_sacado_openmp_memory_pool = 0; @@ -37,7 +37,7 @@ namespace Sacado { } #endif -#if defined(HAVE_SACADO_KOKKOSCORE) && !defined(SACADO_DISABLE_CUDA_IN_KOKKOS) && defined(KOKKOS_ENABLE_CUDA) && defined(__CUDACC__) +#if defined(HAVE_SACADO_KOKKOS) && !defined(SACADO_DISABLE_CUDA_IN_KOKKOS) && defined(KOKKOS_ENABLE_CUDA) && defined(__CUDACC__) namespace Sacado { namespace Impl { const Kokkos::MemoryPool* global_sacado_cuda_memory_pool_host = 0; diff --git a/packages/sacado/src/Sacado_DynamicArrayTraits.hpp b/packages/sacado/src/Sacado_DynamicArrayTraits.hpp index 545ee7f4bb85..5791d73c780e 100644 --- a/packages/sacado/src/Sacado_DynamicArrayTraits.hpp +++ b/packages/sacado/src/Sacado_DynamicArrayTraits.hpp @@ -35,7 +35,7 @@ #include #include "Sacado_Traits.hpp" -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) #include "Kokkos_Core.hpp" #endif @@ -52,7 +52,7 @@ namespace Sacado { template void destroyGlobalMemoryPool(const ExecSpace& space) {} -#if 0 && defined(HAVE_SACADO_KOKKOSCORE) && defined(KOKKOS_ENABLE_OPENMP) +#if 0 && defined(HAVE_SACADO_KOKKOS) && defined(KOKKOS_ENABLE_OPENMP) namespace Impl { extern const Kokkos::MemoryPool* global_sacado_openmp_memory_pool; } @@ -80,7 +80,7 @@ namespace Sacado { } #endif -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) && !defined(SACADO_DISABLE_CUDA_IN_KOKKOS) && defined(KOKKOS_ENABLE_CUDA) && defined(__CUDACC__) +#if defined(HAVE_SACADO_KOKKOS) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) && !defined(SACADO_DISABLE_CUDA_IN_KOKKOS) && defined(KOKKOS_ENABLE_CUDA) && defined(__CUDACC__) namespace Impl { @@ -188,7 +188,7 @@ namespace Sacado { T* m = 0; if (sz > 0) KOKKOS_IMPL_CUDA_SAFE_CALL( cudaMallocManaged( (void**) &m, sz*sizeof(T), cudaMemAttachGlobal ) ); -#elif defined(HAVE_SACADO_KOKKOSCORE) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) && !defined(SACADO_DISABLE_CUDA_IN_KOKKOS) && defined(__CUDA_ARCH__) +#elif defined(HAVE_SACADO_KOKKOS) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) && !defined(SACADO_DISABLE_CUDA_IN_KOKKOS) && defined(__CUDA_ARCH__) // This code assumes all threads enter ds_alloc, even those with sz == 0 T* m = 0; const int total_sz = warpReduce(sz); @@ -200,7 +200,7 @@ namespace Sacado { } m = warpBcast(m,0); m += warpScan(sz); -#elif 0 && defined(HAVE_SACADO_KOKKOSCORE) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) && defined(KOKKOS_ENABLE_OPENMP) +#elif 0 && defined(HAVE_SACADO_KOKKOS) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) && defined(KOKKOS_ENABLE_OPENMP) T* m = 0; if (sz > 0) { if (global_sacado_openmp_memory_pool != 0) { @@ -215,7 +215,7 @@ namespace Sacado { T* m = 0; if (sz > 0) { m = static_cast(operator new(sz*sizeof(T))); -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) if (m == 0) Kokkos::abort("Allocation failed."); #endif @@ -230,13 +230,13 @@ namespace Sacado { #if defined( CUDA_VERSION ) && ( 6000 <= CUDA_VERSION ) && defined(KOKKOS_ENABLE_CUDA_UVM) && !defined( __CUDA_ARCH__ ) if (sz > 0) KOKKOS_IMPL_CUDA_SAFE_CALL( cudaFree(m) ); -#elif defined(HAVE_SACADO_KOKKOSCORE) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) && !defined(SACADO_DISABLE_CUDA_IN_KOKKOS) && defined(__CUDA_ARCH__) +#elif defined(HAVE_SACADO_KOKKOS) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) && !defined(SACADO_DISABLE_CUDA_IN_KOKKOS) && defined(__CUDA_ARCH__) const int total_sz = warpReduce(sz); const int lane = warpLane(); if (total_sz > 0 && lane == 0) { global_sacado_cuda_memory_pool_on_device->deallocate((void*) m, total_sz*sizeof(T)); } -#elif 0 && defined(HAVE_SACADO_KOKKOSCORE) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) && defined(KOKKOS_ENABLE_OPENMP) +#elif 0 && defined(HAVE_SACADO_KOKKOS) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) && defined(KOKKOS_ENABLE_OPENMP) if (sz > 0) { if (global_sacado_openmp_memory_pool != 0) global_sacado_openmp_memory_pool->deallocate((void*) m, sz*sizeof(T)); @@ -365,13 +365,13 @@ namespace Sacado { //const int lane = warpLane(); const int lane = threadIdx.x; if (sz > 0 && lane == 0) { -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) +#if defined(HAVE_SACADO_KOKKOS) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) m = static_cast(global_sacado_cuda_memory_pool_on_device->allocate(sz*sizeof(T))); if (m == 0) Kokkos::abort("Allocation failed. Kokkos memory pool is out of memory"); #else m = static_cast(operator new(sz*sizeof(T))); -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) if (m == 0) Kokkos::abort("Allocation failed."); #endif @@ -382,7 +382,7 @@ namespace Sacado { else { if (sz > 0) { m = static_cast(operator new(sz*sizeof(T))); -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) if (m == 0) Kokkos::abort("Allocation failed."); #endif @@ -399,7 +399,7 @@ namespace Sacado { // const int lane = warpLane(); const int lane = threadIdx.x; if (sz > 0 && lane == 0) { -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) +#if defined(HAVE_SACADO_KOKKOS) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) global_sacado_cuda_memory_pool_on_device->deallocate((void*) m, sz*sizeof(T)); #else operator delete((void*) m); @@ -518,13 +518,13 @@ namespace Sacado { const int total_sz = warpReduce(sz, blockDim.x); const int lane = threadIdx.x; if (total_sz > 0 && lane == 0) { -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) +#if defined(HAVE_SACADO_KOKKOS) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) m = static_cast(global_sacado_cuda_memory_pool_on_device->allocate(total_sz*sizeof(T))); if (m == 0) Kokkos::abort("Allocation failed. Kokkos memory pool is out of memory"); #else m = static_cast(operator new(total_sz*sizeof(T))); -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) if (m == 0) Kokkos::abort("Allocation failed."); #endif @@ -536,7 +536,7 @@ namespace Sacado { else { if (sz > 0) { m = static_cast(operator new(sz*sizeof(T))); -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) if (m == 0) Kokkos::abort("Allocation failed."); #endif @@ -555,7 +555,7 @@ namespace Sacado { const int total_sz = warpReduce(sz, blockDim.x); const int lane = threadIdx.x; if (total_sz > 0 && lane == 0) { -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) +#if defined(HAVE_SACADO_KOKKOS) && defined(SACADO_KOKKOS_USE_MEMORY_POOL) global_sacado_cuda_memory_pool_on_device->deallocate((void*) m, total_sz*sizeof(T)); #else operator delete((void*) m); diff --git a/packages/sacado/src/Sacado_ELRCacheFad_DFadTraits.hpp b/packages/sacado/src/Sacado_ELRCacheFad_DFadTraits.hpp index 01a31ddabf2b..4b435c5fab0c 100644 --- a/packages/sacado/src/Sacado_ELRCacheFad_DFadTraits.hpp +++ b/packages/sacado/src/Sacado_ELRCacheFad_DFadTraits.hpp @@ -207,7 +207,7 @@ namespace Teuchos { #endif // KokkosComm -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) #include "KokkosExp_View_Fad.hpp" #endif diff --git a/packages/sacado/src/Sacado_ELRCacheFad_SFadTraits.hpp b/packages/sacado/src/Sacado_ELRCacheFad_SFadTraits.hpp index dcf0c226b86a..1df4bc9cf941 100644 --- a/packages/sacado/src/Sacado_ELRCacheFad_SFadTraits.hpp +++ b/packages/sacado/src/Sacado_ELRCacheFad_SFadTraits.hpp @@ -223,7 +223,7 @@ namespace Teuchos { #endif // KokkosComm -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) #include "KokkosExp_View_Fad.hpp" #endif diff --git a/packages/sacado/src/Sacado_ELRCacheFad_SLFadTraits.hpp b/packages/sacado/src/Sacado_ELRCacheFad_SLFadTraits.hpp index 4b1164df38c9..34f7f64f2c81 100644 --- a/packages/sacado/src/Sacado_ELRCacheFad_SLFadTraits.hpp +++ b/packages/sacado/src/Sacado_ELRCacheFad_SLFadTraits.hpp @@ -192,7 +192,7 @@ namespace Teuchos { #endif // KokkosComm -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) #include "KokkosExp_View_Fad.hpp" #endif diff --git a/packages/sacado/src/Sacado_ELRFad_DFadTraits.hpp b/packages/sacado/src/Sacado_ELRFad_DFadTraits.hpp index 973ec71a6aef..82909b255f99 100644 --- a/packages/sacado/src/Sacado_ELRFad_DFadTraits.hpp +++ b/packages/sacado/src/Sacado_ELRFad_DFadTraits.hpp @@ -207,7 +207,7 @@ namespace Teuchos { #endif // KokkosComm -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) #include "KokkosExp_View_Fad.hpp" #endif diff --git a/packages/sacado/src/Sacado_ELRFad_SFadTraits.hpp b/packages/sacado/src/Sacado_ELRFad_SFadTraits.hpp index b44ded6d22ac..8828c340fade 100644 --- a/packages/sacado/src/Sacado_ELRFad_SFadTraits.hpp +++ b/packages/sacado/src/Sacado_ELRFad_SFadTraits.hpp @@ -223,7 +223,7 @@ namespace Teuchos { #endif // KokkosComm -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) #include "KokkosExp_View_Fad.hpp" #endif diff --git a/packages/sacado/src/Sacado_ELRFad_SLFadTraits.hpp b/packages/sacado/src/Sacado_ELRFad_SLFadTraits.hpp index ba917c49db24..138bdce9c850 100644 --- a/packages/sacado/src/Sacado_ELRFad_SLFadTraits.hpp +++ b/packages/sacado/src/Sacado_ELRFad_SLFadTraits.hpp @@ -192,7 +192,7 @@ namespace Teuchos { #endif // KokkosComm -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) #include "KokkosExp_View_Fad.hpp" #endif diff --git a/packages/sacado/src/Sacado_Fad_DFadTraits.hpp b/packages/sacado/src/Sacado_Fad_DFadTraits.hpp index 1c8c104eac90..a30cbb7636b9 100644 --- a/packages/sacado/src/Sacado_Fad_DFadTraits.hpp +++ b/packages/sacado/src/Sacado_Fad_DFadTraits.hpp @@ -220,7 +220,7 @@ namespace Teuchos { #endif // KokkosComm -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) #include "KokkosExp_View_Fad.hpp" #endif diff --git a/packages/sacado/src/Sacado_Fad_DFad_tmpl.hpp b/packages/sacado/src/Sacado_Fad_DFad_tmpl.hpp index cb07359cd193..c6616c91f604 100644 --- a/packages/sacado/src/Sacado_Fad_DFad_tmpl.hpp +++ b/packages/sacado/src/Sacado_Fad_DFad_tmpl.hpp @@ -27,7 +27,7 @@ // *********************************************************************** // @HEADER -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) #include "Kokkos_Atomic.hpp" #include "impl/Kokkos_Error.hpp" #endif @@ -308,7 +308,7 @@ namespace Sacado { } // namespace Sacado -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) //-------------------------- Atomic Operators ----------------------- @@ -348,4 +348,4 @@ namespace Sacado { } // namespace Sacado -#endif // HAVE_SACADO_KOKKOSCORE +#endif // HAVE_SACADO_KOKKOS diff --git a/packages/sacado/src/Sacado_Fad_SFadTraits.hpp b/packages/sacado/src/Sacado_Fad_SFadTraits.hpp index 0b987b27845d..7e79c3709348 100644 --- a/packages/sacado/src/Sacado_Fad_SFadTraits.hpp +++ b/packages/sacado/src/Sacado_Fad_SFadTraits.hpp @@ -237,7 +237,7 @@ namespace Teuchos { #endif // KokkosComm -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) #include "KokkosExp_View_Fad.hpp" #endif diff --git a/packages/sacado/src/Sacado_Fad_SFad_tmpl.hpp b/packages/sacado/src/Sacado_Fad_SFad_tmpl.hpp index 537560170e0e..21959c9a6807 100644 --- a/packages/sacado/src/Sacado_Fad_SFad_tmpl.hpp +++ b/packages/sacado/src/Sacado_Fad_SFad_tmpl.hpp @@ -27,7 +27,7 @@ // *********************************************************************** // @HEADER -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) #include "Kokkos_Atomic.hpp" #include "impl/Kokkos_Error.hpp" #endif @@ -311,7 +311,7 @@ namespace Sacado { } // namespace Sacado -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) //-------------------------- Atomic Operators ----------------------- @@ -351,4 +351,4 @@ namespace Sacado { } // namespace Sacado -#endif // HAVE_SACADO_KOKKOSCORE +#endif // HAVE_SACADO_KOKKOS diff --git a/packages/sacado/src/Sacado_Fad_SLFadTraits.hpp b/packages/sacado/src/Sacado_Fad_SLFadTraits.hpp index 5a141e6208ce..60444216551c 100644 --- a/packages/sacado/src/Sacado_Fad_SLFadTraits.hpp +++ b/packages/sacado/src/Sacado_Fad_SLFadTraits.hpp @@ -206,7 +206,7 @@ namespace Teuchos { #endif // KokkosComm -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) #include "KokkosExp_View_Fad.hpp" #endif diff --git a/packages/sacado/src/Sacado_Fad_SLFad_tmpl.hpp b/packages/sacado/src/Sacado_Fad_SLFad_tmpl.hpp index b86a8901734c..7c8a55baedee 100644 --- a/packages/sacado/src/Sacado_Fad_SLFad_tmpl.hpp +++ b/packages/sacado/src/Sacado_Fad_SLFad_tmpl.hpp @@ -27,7 +27,7 @@ // *********************************************************************** // @HEADER -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) #include "Kokkos_Atomic.hpp" #include "impl/Kokkos_Error.hpp" #endif @@ -319,7 +319,7 @@ namespace Sacado { } // namespace Sacado -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) //-------------------------- Atomic Operators ----------------------- @@ -359,4 +359,4 @@ namespace Sacado { } // namespace Sacado -#endif // HAVE_SACADO_KOKKOSCORE +#endif // HAVE_SACADO_KOKKOS diff --git a/packages/sacado/src/Sacado_Fad_ViewFad_tmpl.hpp b/packages/sacado/src/Sacado_Fad_ViewFad_tmpl.hpp index 18bb816415ed..c4b6fa004e04 100644 --- a/packages/sacado/src/Sacado_Fad_ViewFad_tmpl.hpp +++ b/packages/sacado/src/Sacado_Fad_ViewFad_tmpl.hpp @@ -31,7 +31,7 @@ #include "Sacado_mpl_if.hpp" #include "Sacado_mpl_type_wrap.hpp" -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) #include "Kokkos_Atomic.hpp" #include "impl/Kokkos_Error.hpp" #endif @@ -271,7 +271,7 @@ namespace Sacado { view_fad_type& operator*() { *this; } }; -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) // Overload of Kokkos::atomic_add for ViewFad types. template SACADO_INLINE_FUNCTION diff --git a/packages/sacado/src/Sacado_MathFunctions.hpp b/packages/sacado/src/Sacado_MathFunctions.hpp index e799278f3a9a..b8927711e636 100644 --- a/packages/sacado/src/Sacado_MathFunctions.hpp +++ b/packages/sacado/src/Sacado_MathFunctions.hpp @@ -460,7 +460,7 @@ BINARYFUNC_MACRO(min, MinOp) #undef BINARYFUNC_MACRO -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) namespace Sacado { #ifndef SACADO_NEW_FAD_DESIGN_IS_DEFAULT diff --git a/packages/sacado/src/new_design/Sacado_Fad_Exp_Atomic.hpp b/packages/sacado/src/new_design/Sacado_Fad_Exp_Atomic.hpp index c9dd17b21611..a5fd6ba58680 100644 --- a/packages/sacado/src/new_design/Sacado_Fad_Exp_Atomic.hpp +++ b/packages/sacado/src/new_design/Sacado_Fad_Exp_Atomic.hpp @@ -31,7 +31,7 @@ #define SACADO_FAD_EXP_ATOMIC_HPP #include "Sacado_ConfigDefs.h" -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) #include "Sacado_Fad_Exp_ViewFad.hpp" #include "Kokkos_Atomic.hpp" @@ -566,5 +566,5 @@ namespace Sacado { } // namespace Sacado -#endif // HAVE_SACADO_KOKKOSCORE +#endif // HAVE_SACADO_KOKKOS #endif // SACADO_FAD_EXP_VIEWFAD_HPP diff --git a/packages/sacado/src/new_design/Sacado_Fad_Exp_GeneralFadTraits.hpp b/packages/sacado/src/new_design/Sacado_Fad_Exp_GeneralFadTraits.hpp index 7ec0e0a52e24..ffb447f8a700 100644 --- a/packages/sacado/src/new_design/Sacado_Fad_Exp_GeneralFadTraits.hpp +++ b/packages/sacado/src/new_design/Sacado_Fad_Exp_GeneralFadTraits.hpp @@ -214,7 +214,7 @@ namespace Teuchos { #endif // KokkosComm -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) #include "KokkosExp_View_Fad.hpp" #endif diff --git a/packages/sacado/src/new_design/Sacado_Fad_Exp_MathFunctions.hpp b/packages/sacado/src/new_design/Sacado_Fad_Exp_MathFunctions.hpp index 529f2ebe2dd1..4cfdfa190e11 100644 --- a/packages/sacado/src/new_design/Sacado_Fad_Exp_MathFunctions.hpp +++ b/packages/sacado/src/new_design/Sacado_Fad_Exp_MathFunctions.hpp @@ -130,7 +130,7 @@ BINARYFUNC_MACRO(min, MinOp) #undef BINARYFUNC_MACRO -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) namespace Sacado { namespace Fad { diff --git a/packages/sacado/src/new_design/Sacado_Fad_Exp_Ops.hpp b/packages/sacado/src/new_design/Sacado_Fad_Exp_Ops.hpp index 82cde7ec6a82..2cd267d5d717 100644 --- a/packages/sacado/src/new_design/Sacado_Fad_Exp_Ops.hpp +++ b/packages/sacado/src/new_design/Sacado_Fad_Exp_Ops.hpp @@ -41,7 +41,7 @@ #include "Sacado_mpl_has_equal_to.hpp" -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) #include "Kokkos_Atomic.hpp" #include "impl/Kokkos_Error.hpp" #endif @@ -2200,7 +2200,7 @@ namespace Sacado { } // namespace Sacado -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) //-------------------------- Atomic Operators ----------------------- @@ -2242,6 +2242,6 @@ namespace Sacado { } // namespace Sacado -#endif // HAVE_SACADO_KOKKOSCORE +#endif // HAVE_SACADO_KOKKOS #endif // SACADO_FAD_OPS_HPP diff --git a/packages/sacado/src/new_design/Sacado_Fad_Exp_ViewFad.hpp b/packages/sacado/src/new_design/Sacado_Fad_Exp_ViewFad.hpp index 44a2b30bd3eb..dc81cefa80d4 100644 --- a/packages/sacado/src/new_design/Sacado_Fad_Exp_ViewFad.hpp +++ b/packages/sacado/src/new_design/Sacado_Fad_Exp_ViewFad.hpp @@ -33,7 +33,7 @@ #include "Sacado_Fad_Exp_GeneralFad.hpp" #include "Sacado_Fad_Exp_ViewStorage.hpp" -#if defined(HAVE_SACADO_KOKKOSCORE) +#if defined(HAVE_SACADO_KOKKOS) #include "Kokkos_Atomic.hpp" #include "impl/Kokkos_Error.hpp" #endif diff --git a/packages/sacado/test/UnitTests/CMakeLists.txt b/packages/sacado/test/UnitTests/CMakeLists.txt index a2e6b3c200ae..b56389ce7c6e 100644 --- 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/UnitTests/Fad_CommTests.hpp b/packages/sacado/test/UnitTests/Fad_CommTests.hpp index a03d911f5556..c29ddf619edf 100644 --- a/packages/sacado/test/UnitTests/Fad_CommTests.hpp +++ b/packages/sacado/test/UnitTests/Fad_CommTests.hpp @@ -909,7 +909,7 @@ TEUCHOS_UNIT_TEST( FAD##_Comm, FadFad_SendReceive ) { \ success = true; \ } -#if defined(HAVE_SACADO_KOKKOSCORE) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_TEUCHOSKOKKOSCOMM) #include "Kokkos_Core.hpp" diff --git a/packages/sacado/test/UnitTests/Fad_Fad_KokkosTests.hpp b/packages/sacado/test/UnitTests/Fad_Fad_KokkosTests.hpp index 291212c10a6b..9ea3d01aa323 100644 --- a/packages/sacado/test/UnitTests/Fad_Fad_KokkosTests.hpp +++ b/packages/sacado/test/UnitTests/Fad_Fad_KokkosTests.hpp @@ -154,7 +154,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( } } -#ifdef HAVE_SACADO_KOKKOSCONTAINERS +#ifdef HAVE_SACADO_KOKKOS TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( Kokkos_DynRankView_FadFad, DeepCopy, FadFadType, Layout, Device ) diff --git a/packages/sacado/test/UnitTests/Fad_KokkosTests.hpp b/packages/sacado/test/UnitTests/Fad_KokkosTests.hpp index 67ec01c3077e..dba210e765ef 100644 --- a/packages/sacado/test/UnitTests/Fad_KokkosTests.hpp +++ b/packages/sacado/test/UnitTests/Fad_KokkosTests.hpp @@ -1283,7 +1283,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( TEUCHOS_TEST_EQUALITY(h_v1().val(), h_v2(), out, success); } -#if defined(HAVE_SACADO_KOKKOSCONTAINERS) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) +#if defined(HAVE_SACADO_KOKKOS) && defined(HAVE_SACADO_VIEW_SPEC) && !defined(SACADO_DISABLE_FAD_VIEW_SPEC) TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( Kokkos_View_Fad, DynRankDimensionScalar, FadType, Layout, Device ) diff --git a/packages/sacado/test/performance/advection/CMakeLists.txt b/packages/sacado/test/performance/advection/CMakeLists.txt index f40134be90e4..f859848db8e1 100644 --- 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 index 394bdf04983d..e1e3f64e5b6c 100644 --- 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 index aafc162dc4bc..dcfceb6bc280 100644 --- 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 index e551a3ae4bc8..d96825a98627 100644 --- 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 index bdc592c348f9..bd59926ffc3d 100644 --- 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 index c1752bf3fde0..6f51e488432e 100644 --- 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 index 92d5fa55b99e..29d3cf7f3466 100644 --- a/packages/stk/CMakeLists.txt +++ b/packages/stk/CMakeLists.txt @@ -45,8 +45,8 @@ TRIBITS_ADD_SHOW_DEPRECATED_WARNINGS_OPTION() # B) Set up package-specific options # -IF (${${PROJECT_NAME}_ENABLE_KokkosCore}) - SET(STK_HAVE_KOKKOSCORE ON) +IF (${${PROJECT_NAME}_ENABLE_Kokkos}) + SET(STK_HAVE_KOKKOS ON) ENDIF() IF (TPL_ENABLE_Boost) diff --git a/packages/stk/cmake/STK_Trilinos_config.h.in b/packages/stk/cmake/STK_Trilinos_config.h.in index 3a1615d6ffdf..353c3adfa30c 100644 --- a/packages/stk/cmake/STK_Trilinos_config.h.in +++ b/packages/stk/cmake/STK_Trilinos_config.h.in @@ -40,7 +40,7 @@ #cmakedefine STK_HAVE_BOOST -#cmakedefine STK_HAVE_KOKKOSCORE +#cmakedefine STK_HAVE_KOKKOS #cmakedefine STK_HAVE_STKMESH diff --git a/packages/stk/stk_expreval/cmake/Dependencies.cmake b/packages/stk/stk_expreval/cmake/Dependencies.cmake index 12ab255beda4..3f4569ddbb29 100644 --- 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 index e01932e34031..cd18e037c31b 100644 --- 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 index e19f30d505a3..24a83e5a7782 100644 --- 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 index 4f0a3f0ebdbb..72f2f71786a3 100644 --- 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 index b4585cd3277c..24c9ba5b5501 100644 --- 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_test_utils/stk_unit_test_utils/unit_main_lib/UnitTestMain.cpp b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/unit_main_lib/UnitTestMain.cpp index d588ede4af48..dfa23eea41c6 100644 --- a/packages/stk/stk_unit_test_utils/stk_unit_test_utils/unit_main_lib/UnitTestMain.cpp +++ b/packages/stk/stk_unit_test_utils/stk_unit_test_utils/unit_main_lib/UnitTestMain.cpp @@ -34,7 +34,7 @@ #include #include "stk_unit_test_utils/getOption.h" -#ifdef STK_HAVE_KOKKOSCORE +#ifdef STK_HAVE_KOKKOS #include #endif #include // for InitGoogleTest, etc @@ -59,7 +59,7 @@ int main(int argc, char **argv) #ifdef STK_HAVE_STKNGP_TEST ngp_testing::NgpTestEnvironment testEnv(&argc, argv); #else -#ifdef STK_HAVE_KOKKOSCORE +#ifdef STK_HAVE_KOKKOS Kokkos::initialize(argc, argv); #endif testing::InitGoogleTest(&argc, argv); @@ -81,7 +81,7 @@ int main(int argc, char **argv) testEnv.finalize(); #else returnVal = RUN_ALL_TESTS(); -#ifdef STK_HAVE_KOKKOSCORE +#ifdef STK_HAVE_KOKKOS Kokkos::finalize(); #endif #endif diff --git a/packages/stk/stk_unit_tests/CMakeLists.txt b/packages/stk/stk_unit_tests/CMakeLists.txt index afd9bb1ccd76..b7ac624ecc9e 100644 --- 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 index 7a0a7e91e48d..d8b4aae74256 100644 --- 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/stk/stk_util/stk_util/stk_config.h b/packages/stk/stk_util/stk_util/stk_config.h index 89551060ddce..56df29ce350b 100644 --- a/packages/stk/stk_util/stk_util/stk_config.h +++ b/packages/stk/stk_util/stk_util/stk_config.h @@ -39,7 +39,7 @@ #define STK_HAS_MPI #define STK_HAVE_BOOST -#define STK_HAVE_KOKKOSCORE +#define STK_HAVE_KOKKOS #define STK_HAVE_STKMESH #define STK_HAVE_STKIO #define STK_HAVE_STKNGP_TEST diff --git a/packages/stokhos/cmake/Dependencies.cmake b/packages/stokhos/cmake/Dependencies.cmake index 4964cf6323f6..8c7b83f6cb22 100644 --- 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/cmake/Stokhos_config.h.in b/packages/stokhos/cmake/Stokhos_config.h.in index 7459bb627903..1a97d5227426 100644 --- a/packages/stokhos/cmake/Stokhos_config.h.in +++ b/packages/stokhos/cmake/Stokhos_config.h.in @@ -87,7 +87,7 @@ #endif // HAVE_STOKHOS_TEUCHOSKOKKOSCOMM /* Define if KokkosAlgorithms is enabled */ -#cmakedefine HAVE_STOKHOS_KOKKOSALGORITHMS +#cmakedefine HAVE_STOKHOS_KOKKOS /* Define if MueLu is enabled */ #cmakedefine HAVE_STOKHOS_MUELU diff --git a/packages/stokhos/src/CMakeLists.txt b/packages/stokhos/src/CMakeLists.txt index 4ec6986b2677..1a59219f7d8a 100644 --- 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/src/sacado/kokkos/pce/algorithms/Kokkos_Random_UQ_PCE.hpp b/packages/stokhos/src/sacado/kokkos/pce/algorithms/Kokkos_Random_UQ_PCE.hpp index 1429c81389d9..4b6d7064d41f 100644 --- a/packages/stokhos/src/sacado/kokkos/pce/algorithms/Kokkos_Random_UQ_PCE.hpp +++ b/packages/stokhos/src/sacado/kokkos/pce/algorithms/Kokkos_Random_UQ_PCE.hpp @@ -43,7 +43,7 @@ #define KOKKOS_RANDOM_UQ_PCE_HPP #include "Stokhos_ConfigDefs.h" -#if defined(HAVE_STOKHOS_KOKKOSALGORITHMS) +#if defined(HAVE_STOKHOS_KOKKOS) #include "Sacado_UQ_PCE.hpp" #include "Kokkos_View_UQ_PCE.hpp" diff --git a/packages/stokhos/src/sacado/kokkos/vector/algorithms/Kokkos_Random_MP_Vector.hpp b/packages/stokhos/src/sacado/kokkos/vector/algorithms/Kokkos_Random_MP_Vector.hpp index a8b9e0c8035b..7c9c96fcde5c 100644 --- a/packages/stokhos/src/sacado/kokkos/vector/algorithms/Kokkos_Random_MP_Vector.hpp +++ b/packages/stokhos/src/sacado/kokkos/vector/algorithms/Kokkos_Random_MP_Vector.hpp @@ -43,7 +43,7 @@ #define KOKKOS_RANDOM_MP_VECTOR_HPP #include "Stokhos_ConfigDefs.h" -#if defined(HAVE_STOKHOS_KOKKOSALGORITHMS) +#if defined(HAVE_STOKHOS_KOKKOS) #include "Sacado_MP_Vector.hpp" #include "Kokkos_View_MP_Vector.hpp" diff --git a/packages/stokhos/test/Performance/CMakeLists.txt b/packages/stokhos/test/Performance/CMakeLists.txt index 6f123b3898d1..b9d594a42c74 100644 --- 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 index 9192f807700c..8073696502df 100644 --- 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 index fe060f5efabb..c3cf907279c8 100644 --- 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/tempus/test_scripts/morgan/configure-tempus-morgan.sh b/packages/tempus/test_scripts/morgan/configure-tempus-morgan.sh index ed668588509f..f8258430a607 100755 --- a/packages/tempus/test_scripts/morgan/configure-tempus-morgan.sh +++ b/packages/tempus/test_scripts/morgan/configure-tempus-morgan.sh @@ -31,7 +31,7 @@ cmake \ -D CMAKE_BUILD_TYPE:STRING=${BUILD_TYPE} \ -D Phalanx_KOKKOS_DEVICE_TYPE:STRING="${NODE_TYPE}" \ -D Trilinos_ENABLE_Fortran:BOOL=ON \ --D HAVE_INTREPID_KOKKOSCORE:BOOL=ON \ +-D HAVE_INTREPID_KOKKOS:BOOL=ON \ -D Panzer_FADTYPE:STRING="Sacado::Fad::DFad" \ -D Panzer_ENABLE_TESTS:BOOL=OFF \ -D Trilinos_ENABLE_KokkosCore:BOOL=ON \ diff --git a/packages/tempus/test_scripts/shiller/configure-tempus-shiller.sh b/packages/tempus/test_scripts/shiller/configure-tempus-shiller.sh index 38a362211432..576de706147b 100755 --- a/packages/tempus/test_scripts/shiller/configure-tempus-shiller.sh +++ b/packages/tempus/test_scripts/shiller/configure-tempus-shiller.sh @@ -33,7 +33,7 @@ cmake \ -D CMAKE_BUILD_TYPE:STRING=${BUILD_TYPE} \ -D Phalanx_KOKKOS_DEVICE_TYPE:STRING="${NODE_TYPE}" \ -D Trilinos_ENABLE_Fortran:BOOL=ON \ --D HAVE_INTREPID_KOKKOSCORE:BOOL=ON \ +-D HAVE_INTREPID_KOKKOS:BOOL=ON \ -D Panzer_FADTYPE:STRING="Sacado::Fad::DFad" \ -D Panzer_ENABLE_TESTS:BOOL=OFF \ -D Trilinos_ENABLE_KokkosCore:BOOL=ON \ diff --git a/packages/teuchos/comm/src/Teuchos_StackedTimer.hpp b/packages/teuchos/comm/src/Teuchos_StackedTimer.hpp index 6ba204dd8266..d228f2b5545d 100644 --- a/packages/teuchos/comm/src/Teuchos_StackedTimer.hpp +++ b/packages/teuchos/comm/src/Teuchos_StackedTimer.hpp @@ -56,7 +56,7 @@ #include // for timestamp support #include -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) namespace Kokkos { namespace Profiling { extern void pushRegion (const std::string&); @@ -495,7 +495,7 @@ class StackedTimer */ void startBaseTimer() { timer_.BaseTimer::start(); -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) ::Kokkos::Profiling::pushRegion(timer_.get_full_name()); #endif } @@ -505,7 +505,7 @@ class StackedTimer */ void stopBaseTimer() { timer_.BaseTimer::stop(); -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) ::Kokkos::Profiling::popRegion(); #endif } @@ -522,7 +522,7 @@ class StackedTimer top_ = timer_.start(name.c_str()); else top_ = top_->start(name.c_str()); -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) if (push_kokkos_profiling_region) { ::Kokkos::Profiling::pushRegion(name); } @@ -561,7 +561,7 @@ class StackedTimer top_ = top_->stop(name); else timer_.BaseTimer::stop(); -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) if (pop_kokkos_profiling_region) { ::Kokkos::Profiling::popRegion(); } diff --git a/packages/teuchos/comm/test/StackedTimer/stacked_timer.cpp b/packages/teuchos/comm/test/StackedTimer/stacked_timer.cpp index fc7b39d54313..ae4401e773a5 100644 --- a/packages/teuchos/comm/test/StackedTimer/stacked_timer.cpp +++ b/packages/teuchos/comm/test/StackedTimer/stacked_timer.cpp @@ -15,7 +15,7 @@ #include #include -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) #include "Kokkos_Core.hpp" #endif @@ -551,7 +551,7 @@ int main( int argc, char* argv[] ) // Note that the dtor for GlobalMPISession will call // Kokkos::finalize(). Teuchos::GlobalMPISession mpiSession(&argc, &argv); -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) Kokkos::initialize(argc,argv); #endif { @@ -561,7 +561,7 @@ int main( int argc, char* argv[] ) Teuchos::UnitTestRepository::setGloballyReduceTestResult(true); auto return_val = Teuchos::UnitTestRepository::runUnitTestsFromMain(argc, argv); -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) if (Kokkos::is_initialized()) Kokkos::finalize(); #endif diff --git a/packages/teuchos/comm/test/StackedTimer/stacked_timer4.cpp b/packages/teuchos/comm/test/StackedTimer/stacked_timer4.cpp index 91d2f29e0d42..83a7f83a466b 100644 --- a/packages/teuchos/comm/test/StackedTimer/stacked_timer4.cpp +++ b/packages/teuchos/comm/test/StackedTimer/stacked_timer4.cpp @@ -15,7 +15,7 @@ #include #include -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) #include "Kokkos_Core.hpp" #endif @@ -71,7 +71,7 @@ int main( int argc, char* argv[] ) // Note that the dtor for GlobalMPISession will call // Kokkos::finalize(). Teuchos::GlobalMPISession mpiSession(&argc, &argv); -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) Kokkos::initialize(argc,argv); #endif { @@ -81,7 +81,7 @@ int main( int argc, char* argv[] ) Teuchos::UnitTestRepository::setGloballyReduceTestResult(true); auto return_val = Teuchos::UnitTestRepository::runUnitTestsFromMain(argc, argv); -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) if (Kokkos::is_initialized()) Kokkos::finalize(); #endif diff --git a/packages/teuchos/core/cmake/Dependencies.cmake b/packages/teuchos/core/cmake/Dependencies.cmake index e87fa90c4fa7..ada5b0c16a0a 100644 --- 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/core/cmake/TeuchosCore_config.h.in b/packages/teuchos/core/cmake/TeuchosCore_config.h.in index bcb172b3d9dc..c0705327830c 100644 --- a/packages/teuchos/core/cmake/TeuchosCore_config.h.in +++ b/packages/teuchos/core/cmake/TeuchosCore_config.h.in @@ -1,7 +1,7 @@ #ifndef TEUCHOSCORE_CONFIG_H_ #define TEUCHOSCORE_CONFIG_H_ -#cmakedefine HAVE_TEUCHOSCORE_KOKKOSCORE +#cmakedefine HAVE_TEUCHOSCORE_KOKKOS #cmakedefine HAVE_TEUCHOSCORE_CXX11 diff --git a/packages/teuchos/core/src/Teuchos_GlobalMPISession.cpp b/packages/teuchos/core/src/Teuchos_GlobalMPISession.cpp index f63bc3b99cae..7c4cff79006e 100644 --- a/packages/teuchos/core/src/Teuchos_GlobalMPISession.cpp +++ b/packages/teuchos/core/src/Teuchos_GlobalMPISession.cpp @@ -49,9 +49,9 @@ # include "mpi.h" #endif -#ifdef HAVE_TEUCHOSCORE_KOKKOSCORE +#ifdef HAVE_TEUCHOSCORE_KOKKOS # include "Kokkos_Core.hpp" -#endif // HAVE_TEUCHOSCORE_KOKKOSCORE +#endif // HAVE_TEUCHOSCORE_KOKKOS @@ -63,13 +63,13 @@ bool GlobalMPISession::mpiIsFinalized_ = false; int GlobalMPISession::rank_ = 0 ; int GlobalMPISession::nProc_ = 1 ; -#ifdef HAVE_TEUCHOSCORE_KOKKOSCORE +#ifdef HAVE_TEUCHOSCORE_KOKKOS // We have to invoke the std::vector's constructor here, // because it's a class (static) variable. std::vector GlobalMPISession::argvCopy_; -#endif // HAVE_TEUCHOSCORE_KOKKOSCORE +#endif // HAVE_TEUCHOSCORE_KOKKOS GlobalMPISession::GlobalMPISession( int* argc, char*** argv, std::ostream *out ) @@ -152,7 +152,7 @@ GlobalMPISession::GlobalMPISession( int* argc, char*** argv, std::ostream *out ) #endif -#ifdef HAVE_TEUCHOSCORE_KOKKOSCORE +#ifdef HAVE_TEUCHOSCORE_KOKKOS // mfh 15/16 Apr 2016: This is the one chance we get to save the // command-line arguments, so that we can (later) initialize Kokkos // with the correct number of threads as specified by (e.g.,) the @@ -172,22 +172,22 @@ GlobalMPISession::GlobalMPISession( int* argc, char*** argv, std::ostream *out ) for (int c = 0; c < numArgs; ++c) { argvCopy_[c] = std::string ((*argv)[c]); // deep copy } -#endif // HAVE_TEUCHOSCORE_KOKKOSCORE +#endif // HAVE_TEUCHOSCORE_KOKKOS } -#ifdef HAVE_TEUCHOSCORE_KOKKOSCORE +#ifdef HAVE_TEUCHOSCORE_KOKKOS std::vector GlobalMPISession::getArgv () { return argvCopy_; } -#endif // HAVE_TEUCHOSCORE_KOKKOSCORE +#endif // HAVE_TEUCHOSCORE_KOKKOS GlobalMPISession::~GlobalMPISession() { -#ifdef HAVE_TEUCHOSCORE_KOKKOSCORE +#ifdef HAVE_TEUCHOSCORE_KOKKOS try { if (Kokkos::is_initialized()) Kokkos::finalize(); diff --git a/packages/teuchos/core/src/Teuchos_GlobalMPISession.hpp b/packages/teuchos/core/src/Teuchos_GlobalMPISession.hpp index 4eacea5bb7b5..62cf415e158e 100644 --- a/packages/teuchos/core/src/Teuchos_GlobalMPISession.hpp +++ b/packages/teuchos/core/src/Teuchos_GlobalMPISession.hpp @@ -263,7 +263,7 @@ class TEUCHOSCORE_LIB_DLL_EXPORT GlobalMPISession */ static void allGather(int localVal, const ArrayView &allVals); -#ifdef HAVE_TEUCHOSCORE_KOKKOSCORE +#ifdef HAVE_TEUCHOSCORE_KOKKOS /// \brief Fetch a deep copy of the input arguments to \c main() /// (that is, \c argv), as given to GlobalMPISession's /// constructor. @@ -272,7 +272,7 @@ class TEUCHOSCORE_LIB_DLL_EXPORT GlobalMPISession /// yet, return an empty vector. Else, return the input /// arguments. static std::vector getArgv (); -#endif // HAVE_TEUCHOSCORE_KOKKOSCORE +#endif // HAVE_TEUCHOSCORE_KOKKOS //@} private: @@ -281,7 +281,7 @@ class TEUCHOSCORE_LIB_DLL_EXPORT GlobalMPISession static bool mpiIsFinalized_; static int rank_; static int nProc_; -#ifdef HAVE_TEUCHOSCORE_KOKKOSCORE +#ifdef HAVE_TEUCHOSCORE_KOKKOS /// \brief Deep copy of the input arguments. /// /// This is useful if we want to call Kokkos::initialize later with @@ -290,7 +290,7 @@ class TEUCHOSCORE_LIB_DLL_EXPORT GlobalMPISession /// after calling this object's constructor. That could mess up /// indexing if we just keep a pointer to the original. static std::vector argvCopy_; -#endif // HAVE_TEUCHOSCORE_KOKKOSCORE +#endif // HAVE_TEUCHOSCORE_KOKKOS static void initialize( std::ostream *out ); diff --git a/packages/teuchos/core/src/Teuchos_ScalarTraits.hpp b/packages/teuchos/core/src/Teuchos_ScalarTraits.hpp index d8c33dbab02c..f52b3cb83ee9 100644 --- a/packages/teuchos/core/src/Teuchos_ScalarTraits.hpp +++ b/packages/teuchos/core/src/Teuchos_ScalarTraits.hpp @@ -55,9 +55,9 @@ #include "Teuchos_ConfigDefs.hpp" -#ifdef HAVE_TEUCHOSCORE_KOKKOSCORE +#ifdef HAVE_TEUCHOSCORE_KOKKOS #include "Kokkos_Complex.hpp" -#endif // HAVE_TEUCHOSCORE_KOKKOSCORE +#endif // HAVE_TEUCHOSCORE_KOKKOS #ifdef HAVE_TEUCHOS_ARPREC #include @@ -1299,7 +1299,7 @@ struct ScalarTraits< }; #endif // HAVE_TEUCHOS_COMPLEX -#ifdef HAVE_TEUCHOSCORE_KOKKOSCORE +#ifdef HAVE_TEUCHOSCORE_KOKKOS // Partial specialization for Kokkos::complex template struct ScalarTraits< @@ -1365,7 +1365,7 @@ struct ScalarTraits< static inline ComplexT pow(ComplexT x, ComplexT y) { return pow(std::complex(x), std::complex(y)); } static inline ComplexT pi() { return ScalarTraits::pi(); } }; -#endif // HAVE_TEUCHOSCORE_KOKKOSCORE +#endif // HAVE_TEUCHOSCORE_KOKKOS #endif // DOXYGEN_SHOULD_SKIP_THIS diff --git a/packages/teuchos/core/src/Teuchos_Time.cpp b/packages/teuchos/core/src/Teuchos_Time.cpp index c652c6d84195..663e56030194 100644 --- a/packages/teuchos/core/src/Teuchos_Time.cpp +++ b/packages/teuchos/core/src/Teuchos_Time.cpp @@ -78,7 +78,7 @@ inline void seconds_initialize() { #include #endif -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) namespace Kokkos { namespace Profiling { extern void pushRegion (const std::string&); @@ -125,7 +125,7 @@ void Time::start(bool reset_in) } #endif startTime_ = wallTime(); -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) ::Kokkos::Profiling::pushRegion (name_); #endif } @@ -148,7 +148,7 @@ double Time::stop() numCallsMassifSnapshots_++; } #endif -#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOSCORE) +#if defined(HAVE_TEUCHOS_KOKKOS_PROFILING) && defined(HAVE_TEUCHOSCORE_KOKKOS) ::Kokkos::Profiling::popRegion (); #endif } diff --git a/packages/teuchos/core/test/ScalarTraits/ScalarTraits_test.cpp b/packages/teuchos/core/test/ScalarTraits/ScalarTraits_test.cpp index 3f03a256b3c8..d8889ff16ef2 100644 --- a/packages/teuchos/core/test/ScalarTraits/ScalarTraits_test.cpp +++ b/packages/teuchos/core/test/ScalarTraits/ScalarTraits_test.cpp @@ -347,13 +347,13 @@ int main( int argc, char* argv[] ) { if(!result) success = false; #endif // HAVE_TEUCHOS_COMPLEX -#ifdef HAVE_TEUCHOSCORE_KOKKOSCORE +#ifdef HAVE_TEUCHOSCORE_KOKKOS result = testScalarTraits >(*out); if(!result) success = false; result = testScalarTraits >(*out); if(!result) success = false; -#endif // HAVE_TEUCHOSCORE_KOKKOSCORE +#endif // HAVE_TEUCHOSCORE_KOKKOS #ifdef HAVE_TEUCHOSCORE_QUADMATH result = testScalarTraits<__float128>(*out); diff --git a/packages/teuchos/core/test/UnitTest/GlobalMPISession_UnitTests.cpp b/packages/teuchos/core/test/UnitTest/GlobalMPISession_UnitTests.cpp index 9cdc42dff0fa..0be23a15e22f 100644 --- a/packages/teuchos/core/test/UnitTest/GlobalMPISession_UnitTests.cpp +++ b/packages/teuchos/core/test/UnitTest/GlobalMPISession_UnitTests.cpp @@ -48,13 +48,13 @@ #include "Teuchos_UnitTestHarness.hpp" -#ifdef HAVE_TEUCHOSCORE_KOKKOSCORE +#ifdef HAVE_TEUCHOSCORE_KOKKOS # include // NOTE (mfh 18 Apr 2016) KokkosCore requires C++11, so we may include // type_traits here. Please do not include it unconditionally, // because TeuchosCore does NOT require C++11. # include -#endif // HAVE_TEUCHOSCORE_KOKKOSCORE +#endif // HAVE_TEUCHOSCORE_KOKKOS // // Unit tests for GlobalMPISession @@ -137,7 +137,7 @@ TEUCHOS_UNIT_TEST( GlobalMPISession, allGather ) } -#ifdef HAVE_TEUCHOSCORE_KOKKOSCORE +#ifdef HAVE_TEUCHOSCORE_KOKKOS // Check whether GlobalMPISession's constructor (called in the unit // test harness, not in this file) correctly saved a copy of the // command-line arguments. Command-line arguments _should_ be @@ -160,7 +160,7 @@ TEUCHOS_UNIT_TEST( GlobalMPISession, getArgv ) "that returns a type convertible to std::string."); } } -#endif // HAVE_TEUCHOSCORE_KOKKOSCORE +#endif // HAVE_TEUCHOSCORE_KOKKOS } // namespace Teuchos diff --git a/packages/teuchos/kokkoscomm/cmake/Dependencies.cmake b/packages/teuchos/kokkoscomm/cmake/Dependencies.cmake index c2251a7a282f..a81d5181056d 100644 --- 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) diff --git a/packages/teuchos/kokkoscompat/cmake/Dependencies.cmake b/packages/teuchos/kokkoscompat/cmake/Dependencies.cmake index c0b94d672ee6..16a121655bfa 100644 --- a/packages/teuchos/kokkoscompat/cmake/Dependencies.cmake +++ b/packages/teuchos/kokkoscompat/cmake/Dependencies.cmake @@ -1,4 +1,4 @@ -SET(LIB_REQUIRED_DEP_PACKAGES KokkosCore TeuchosCore TeuchosParameterList) +SET(LIB_REQUIRED_DEP_PACKAGES Kokkos TeuchosCore TeuchosParameterList) SET(LIB_OPTIONAL_DEP_PACKAGES) SET(TEST_REQUIRED_DEP_PACKAGES) SET(TEST_OPTIONAL_DEP_PACKAGES) diff --git a/packages/tpetra/core/CMakeLists.txt b/packages/tpetra/core/CMakeLists.txt index 3ce6600488da..6f891e9b9145 100644 --- a/packages/tpetra/core/CMakeLists.txt +++ b/packages/tpetra/core/CMakeLists.txt @@ -32,9 +32,9 @@ SET(Tpetra_MACHINE_XML_FILE_DIR # Set variables which were implicitly set when the Kokkos packages were optional dependencies GLOBAL_SET(HAVE_TPETRACORE_TEUCHOSKOKKOSCOMPAT ON) GLOBAL_SET(HAVE_TPETRACORE_TEUCHOSKOKKOSCOMM ON) -GLOBAL_SET(HAVE_TPETRACORE_KOKKOSCORE ON) -GLOBAL_SET(HAVE_TPETRACORE_KOKKOSALGORITHMS ON) -GLOBAL_SET(HAVE_TPETRACORE_KOKKOSCONTAINERS ON) +GLOBAL_SET(HAVE_TPETRACORE_KOKKOS ON) +GLOBAL_SET(HAVE_TPETRACORE_KOKKOS ON) +GLOBAL_SET(HAVE_TPETRACORE_KOKKOS ON) TRIBITS_ADD_OPTION_AND_DEFINE( ${PACKAGE_NAME}_ENABLE_SS_TESTING diff --git a/packages/tpetra/core/cmake/Dependencies.cmake b/packages/tpetra/core/cmake/Dependencies.cmake index 24db3febdf67..7f483312febe 100644 --- a/packages/tpetra/core/cmake/Dependencies.cmake +++ b/packages/tpetra/core/cmake/Dependencies.cmake @@ -1,5 +1,5 @@ TRIBITS_PACKAGE_DEFINE_DEPENDENCIES( - LIB_REQUIRED_PACKAGES Teuchos KokkosCore KokkosContainers KokkosAlgorithms TeuchosKokkosCompat TeuchosKokkosComm KokkosKernels + LIB_REQUIRED_PACKAGES Teuchos Kokkos TeuchosKokkosCompat TeuchosKokkosComm KokkosKernels LIB_OPTIONAL_PACKAGES Epetra TpetraTSQR TeuchosNumerics LIB_OPTIONAL_TPLS MPI CUDA QD quadmath mpi_advance ) diff --git a/packages/tpetra/core/cmake/TpetraCore_config.h.in b/packages/tpetra/core/cmake/TpetraCore_config.h.in index 2e1bf7f924b6..607d3370e972 100644 --- a/packages/tpetra/core/cmake/TpetraCore_config.h.in +++ b/packages/tpetra/core/cmake/TpetraCore_config.h.in @@ -80,11 +80,11 @@ #cmakedefine HAVE_TPETRA_DISTRIBUTOR_TIMINGS /* Define when enabling KokkosCore in Tpetra */ -#cmakedefine HAVE_TPETRACORE_KOKKOSCORE -#ifdef HAVE_TPETRACORE_KOKKOSCORE +#cmakedefine HAVE_TPETRACORE_KOKKOS +#ifdef HAVE_TPETRACORE_KOKKOS // For backwards compatibility -# define HAVE_TPETRA_KOKKOSCORE -#endif // HAVE_TPETRACORE_KOKKOSCORE +# define HAVE_TPETRA_KOKKOS +#endif // HAVE_TPETRACORE_KOKKOS /* Define when enabling KokkosCompat in TpetraCore */ #cmakedefine HAVE_TPETRACORE_TEUCHOSKOKKOSCOMPAT @@ -96,11 +96,11 @@ #endif // HAVE_TPETRACORE_TEUCHOSKOKKOSCOMPAT /* Define when enabling KokkosContainers in TpetraCore */ -#cmakedefine HAVE_TPETRACORE_KOKKOSCONTAINERS -#ifdef HAVE_TPETRACORE_KOKKOSCONTAINERS +#cmakedefine HAVE_TPETRACORE_KOKKOS +#ifdef HAVE_TPETRACORE_KOKKOS // For backwards compatibility -# define HAVE_TPETRA_KOKKOSCONTAINERS -#endif // HAVE_TPETRACORE_KOKKOSCONTAINERS +# define HAVE_TPETRA_KOKKOS +#endif // HAVE_TPETRACORE_KOKKOS /* Define when enabling KokkosComm in TpetraCore */ #cmakedefine HAVE_TPETRACORE_TEUCHOSKOKKOSCOMM diff --git a/packages/tpetra/tsqr/cmake/Dependencies.cmake b/packages/tpetra/tsqr/cmake/Dependencies.cmake index ad0a8f951ce7..c4ea93c415a7 100644 --- a/packages/tpetra/tsqr/cmake/Dependencies.cmake +++ b/packages/tpetra/tsqr/cmake/Dependencies.cmake @@ -1,4 +1,4 @@ -SET(LIB_REQUIRED_DEP_PACKAGES Teuchos KokkosCore KokkosKernels) +SET(LIB_REQUIRED_DEP_PACKAGES Teuchos Kokkos KokkosKernels) SET(LIB_OPTIONAL_DEP_PACKAGES) SET(TEST_REQUIRED_DEP_PACKAGES) SET(TEST_OPTIONAL_DEP_PACKAGES) diff --git a/packages/trilinoscouplings/cmake/Dependencies.cmake b/packages/trilinoscouplings/cmake/Dependencies.cmake index 5918fd8d77e9..74a7ddab7981 100644 --- a/packages/trilinoscouplings/cmake/Dependencies.cmake +++ b/packages/trilinoscouplings/cmake/Dependencies.cmake @@ -1,7 +1,7 @@ SET(LIB_REQUIRED_DEP_PACKAGES) SET(LIB_OPTIONAL_DEP_PACKAGES Amesos AztecOO Belos EpetraExt Ifpack Isorropia ML MueLu NOX Stokhos Zoltan) SET(TEST_REQUIRED_DEP_PACKAGES) -SET(TEST_OPTIONAL_DEP_PACKAGES Amesos AvatarT AztecOO Epetra EpetraExt Ifpack Ifpack2 Intrepid Intrepid2 Isorropia KokkosContainers KokkosCore KokkosKernels ML MueLu MueLu Pamgen SEACASExodus SEACASNemesis Sacado STKIO STKMesh Stokhos Stratimikos Teko TeuchosKokkosComm TeuchosKokkosCompat Tpetra TriKota Zoltan) +SET(TEST_OPTIONAL_DEP_PACKAGES Amesos AvatarT AztecOO Epetra EpetraExt Ifpack Ifpack2 Intrepid Intrepid2 Isorropia Kokkos KokkosKernels ML MueLu MueLu Pamgen SEACASExodus SEACASNemesis Sacado STKIO STKMesh Stokhos Stratimikos Teko TeuchosKokkosComm TeuchosKokkosCompat Tpetra TriKota Zoltan) SET(LIB_REQUIRED_DEP_TPLS) SET(LIB_OPTIONAL_DEP_TPLS) SET(TEST_REQUIRED_DEP_TPLS) diff --git a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_EpetraIntrepidPoissonExample.cpp b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_EpetraIntrepidPoissonExample.cpp index 9709b7f7038a..212506784955 100644 --- a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_EpetraIntrepidPoissonExample.cpp +++ b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_EpetraIntrepidPoissonExample.cpp @@ -52,7 +52,7 @@ #include #include -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.cpp b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.cpp index c9fda6d2e228..597257733530 100644 --- a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.cpp +++ b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson2DExample.cpp @@ -52,7 +52,7 @@ #include #include -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.cpp b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.cpp index e5395692d8d3..a4be4e8e7f19 100644 --- a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.cpp +++ b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidHybridPoisson3DExample.cpp @@ -52,7 +52,7 @@ #include #include -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidPoissonExample.cpp b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidPoissonExample.cpp index 98839c7af0e8..d7b428b5b17f 100644 --- a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidPoissonExample.cpp +++ b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidPoissonExample.cpp @@ -57,7 +57,7 @@ #include #include "RTC_FunctionRTC.hh" -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.cpp b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.cpp index b096ac3f2691..608ca4a5edff 100644 --- a/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.cpp +++ b/packages/trilinoscouplings/examples/scaling/TrilinosCouplings_TpetraIntrepidStructuredPoissonExample.cpp @@ -52,7 +52,7 @@ #include #include -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/example_Poisson.cpp b/packages/trilinoscouplings/examples/scaling/example_Poisson.cpp index 8556cd536438..51ef0720f39e 100644 --- a/packages/trilinoscouplings/examples/scaling/example_Poisson.cpp +++ b/packages/trilinoscouplings/examples/scaling/example_Poisson.cpp @@ -146,7 +146,7 @@ #include "Isorropia_EpetraPartitioner.hpp" #endif -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/example_Poisson2D.cpp b/packages/trilinoscouplings/examples/scaling/example_Poisson2D.cpp index 069b0b43f3b7..7548fa436ec0 100644 --- a/packages/trilinoscouplings/examples/scaling/example_Poisson2D.cpp +++ b/packages/trilinoscouplings/examples/scaling/example_Poisson2D.cpp @@ -135,7 +135,7 @@ #include "ml_MultiLevelPreconditioner.h" #include "ml_epetra_utils.h" -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/example_Poisson2D_p2.cpp b/packages/trilinoscouplings/examples/scaling/example_Poisson2D_p2.cpp index 338612bf32a0..5eaceeffe2e5 100644 --- a/packages/trilinoscouplings/examples/scaling/example_Poisson2D_p2.cpp +++ b/packages/trilinoscouplings/examples/scaling/example_Poisson2D_p2.cpp @@ -135,7 +135,7 @@ #include "ml_MultiLevelPreconditioner.h" #include "ml_epetra_utils.h" -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/example_Poisson2D_p2_tpetra.cpp b/packages/trilinoscouplings/examples/scaling/example_Poisson2D_p2_tpetra.cpp index 6a28e792f84b..779299ccc8ca 100644 --- a/packages/trilinoscouplings/examples/scaling/example_Poisson2D_p2_tpetra.cpp +++ b/packages/trilinoscouplings/examples/scaling/example_Poisson2D_p2_tpetra.cpp @@ -125,7 +125,7 @@ # include "MueLu_FactoryManagerBase.hpp" #endif // HAVE_TRILINOSCOUPLINGS_MUELU -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/example_Poisson2D_pn.cpp b/packages/trilinoscouplings/examples/scaling/example_Poisson2D_pn.cpp index 744673181a1f..a6f2503295cb 100644 --- a/packages/trilinoscouplings/examples/scaling/example_Poisson2D_pn.cpp +++ b/packages/trilinoscouplings/examples/scaling/example_Poisson2D_pn.cpp @@ -136,7 +136,7 @@ // ML Includes #include "ml_MultiLevelPreconditioner.h" -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/example_Poisson2D_pn_tpetra.cpp b/packages/trilinoscouplings/examples/scaling/example_Poisson2D_pn_tpetra.cpp index f8c1cb97274e..fff60cde2aa8 100644 --- a/packages/trilinoscouplings/examples/scaling/example_Poisson2D_pn_tpetra.cpp +++ b/packages/trilinoscouplings/examples/scaling/example_Poisson2D_pn_tpetra.cpp @@ -141,7 +141,7 @@ # include "MueLu_AvatarInterface.hpp" #endif -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/example_Poisson_BlockMaterials.cpp b/packages/trilinoscouplings/examples/scaling/example_Poisson_BlockMaterials.cpp index 7a9b7838f11a..56172c5a4a50 100644 --- a/packages/trilinoscouplings/examples/scaling/example_Poisson_BlockMaterials.cpp +++ b/packages/trilinoscouplings/examples/scaling/example_Poisson_BlockMaterials.cpp @@ -135,7 +135,7 @@ #include "ml_epetra_utils.h" -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/example_Poisson_NoFE.cpp b/packages/trilinoscouplings/examples/scaling/example_Poisson_NoFE.cpp index 5167e9393036..45cfb5e69486 100644 --- a/packages/trilinoscouplings/examples/scaling/example_Poisson_NoFE.cpp +++ b/packages/trilinoscouplings/examples/scaling/example_Poisson_NoFE.cpp @@ -136,7 +136,7 @@ #include "ml_MultiLevelPreconditioner.h" #include "ml_epetra_utils.h" -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/example_Poisson_NoFE_Epetra.cpp b/packages/trilinoscouplings/examples/scaling/example_Poisson_NoFE_Epetra.cpp index a2ea04f0c9dc..1258a42baeff 100644 --- a/packages/trilinoscouplings/examples/scaling/example_Poisson_NoFE_Epetra.cpp +++ b/packages/trilinoscouplings/examples/scaling/example_Poisson_NoFE_Epetra.cpp @@ -144,7 +144,7 @@ #include "ml_MultiLevelPreconditioner.h" #include "ml_epetra_utils.h" -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/example_Poisson_NoFE_Tpetra.cpp b/packages/trilinoscouplings/examples/scaling/example_Poisson_NoFE_Tpetra.cpp index 653ec3b6a17c..53b2b059b3c0 100644 --- a/packages/trilinoscouplings/examples/scaling/example_Poisson_NoFE_Tpetra.cpp +++ b/packages/trilinoscouplings/examples/scaling/example_Poisson_NoFE_Tpetra.cpp @@ -133,7 +133,7 @@ #include "BelosConfigDefs.hpp" #include "BelosTpetraAdapter.hpp" -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/example_Poisson_stk.cpp b/packages/trilinoscouplings/examples/scaling/example_Poisson_stk.cpp index acece92c3676..05b31183b5e0 100644 --- a/packages/trilinoscouplings/examples/scaling/example_Poisson_stk.cpp +++ b/packages/trilinoscouplings/examples/scaling/example_Poisson_stk.cpp @@ -136,7 +136,7 @@ #endif #endif -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/trilinoscouplings/examples/scaling/example_StabilizedADR.cpp b/packages/trilinoscouplings/examples/scaling/example_StabilizedADR.cpp index d15203cbcca7..6943e636477f 100644 --- a/packages/trilinoscouplings/examples/scaling/example_StabilizedADR.cpp +++ b/packages/trilinoscouplings/examples/scaling/example_StabilizedADR.cpp @@ -85,7 +85,7 @@ #include "Intrepid_DefaultCubatureFactory.hpp" #include "Intrepid_Utils.hpp" -#ifdef HAVE_INTREPID_KOKKOSCORE +#ifdef HAVE_INTREPID_KOKKOS #include "Sacado.hpp" #else // Sacado includes diff --git a/packages/xpetra/cmake/Dependencies.cmake b/packages/xpetra/cmake/Dependencies.cmake index b524d4f80807..72e6bbe1966a 100644 --- a/packages/xpetra/cmake/Dependencies.cmake +++ b/packages/xpetra/cmake/Dependencies.cmake @@ -1,4 +1,4 @@ -SET(LIB_REQUIRED_DEP_PACKAGES Teuchos KokkosCore KokkosContainers) +SET(LIB_REQUIRED_DEP_PACKAGES Teuchos Kokkos) SET(LIB_OPTIONAL_DEP_PACKAGES Epetra EpetraExt Tpetra KokkosKernels Thyra) SET(TEST_REQUIRED_DEP_PACKAGES) SET(TEST_OPTIONAL_DEP_PACKAGES Epetra EpetraExt Tpetra KokkosKernels Thyra) diff --git a/packages/xpetra/cmake/Xpetra_config.hpp.in b/packages/xpetra/cmake/Xpetra_config.hpp.in index aeb4e952e072..b0138ca557a1 100644 --- a/packages/xpetra/cmake/Xpetra_config.hpp.in +++ b/packages/xpetra/cmake/Xpetra_config.hpp.in @@ -22,7 +22,7 @@ #cmakedefine HAVE_XPETRA_KOKKOSCLASSIC -#cmakedefine HAVE_XPETRA_KOKKOSCONTAINERS +#cmakedefine HAVE_XPETRA_KOKKOS #cmakedefine HAVE_XPETRA_KOKKOSKERNELS diff --git a/packages/xpetra/test/BlockedCrsMatrix/BlockedCrsMatrix_UnitTests.cpp b/packages/xpetra/test/BlockedCrsMatrix/BlockedCrsMatrix_UnitTests.cpp index 98c99c3c9f83..abcc505e59c4 100644 --- a/packages/xpetra/test/BlockedCrsMatrix/BlockedCrsMatrix_UnitTests.cpp +++ b/packages/xpetra/test/BlockedCrsMatrix/BlockedCrsMatrix_UnitTests.cpp @@ -1380,7 +1380,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_6_DECL( BlockedCrsMatrix, ReadWriteBlockedMatrix, M, tname = tname + typeid(Scalar).name(); tname = tname + typeid(LO).name(); tname = tname + typeid(GO).name(); -#ifdef HAVE_MUELU_KOKKOSCORE +#ifdef HAVE_MUELU_KOKKOS std::string nn = Tpetra::KokkosCompat::KokkosDeviceWrapperNode::name(); nn.erase(std::remove(nn.begin(), nn.end(), '/'), nn.end()); tname = tname + nn; diff --git a/packages/xpetra/test/BlockedCrsMatrix/ThyraBlockedOperator_UnitTests.cpp b/packages/xpetra/test/BlockedCrsMatrix/ThyraBlockedOperator_UnitTests.cpp index be8bcfe6fd37..e9a832b0935e 100644 --- a/packages/xpetra/test/BlockedCrsMatrix/ThyraBlockedOperator_UnitTests.cpp +++ b/packages/xpetra/test/BlockedCrsMatrix/ThyraBlockedOperator_UnitTests.cpp @@ -964,7 +964,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_6_DECL( ThyraBlockedOperator, ReadWriteMatrixMatrixMa tname = tname + typeid(Scalar).name(); tname = tname + typeid(LO).name(); tname = tname + typeid(GO).name(); -#ifdef HAVE_MUELU_KOKKOSCORE +#ifdef HAVE_MUELU_KOKKOS std::string nn = Tpetra::KokkosCompat::KokkosDeviceWrapperNode::name(); nn.erase(std::remove(nn.begin(), nn.end(), '/'), nn.end()); tname = tname + nn; From 686f3d0486fed993e9a2ca7b8299344da7a0f626 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Fri, 21 Apr 2023 15:10:15 -0600 Subject: [PATCH 05/16] Explicitly split input string replacement list by whitespace (#11545) I am not sure what happened but this Python script but it was no longer breaking up the read in list of tokens into individual array entries by whitespace. Therefore, I add to add some code to make that split explicit. I manaully tested this and it seemed to work okay. --- .../refactoring/string-replace-list.pl | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/commonTools/refactoring/string-replace-list.pl b/commonTools/refactoring/string-replace-list.pl index b20ce9b97c13..53fb9fc36fff 100755 --- a/commonTools/refactoring/string-replace-list.pl +++ b/commonTools/refactoring/string-replace-list.pl @@ -4,22 +4,32 @@ # Here it is allowed for file_in and # file_out to be the same file. # + use strict; -# + my $g_use_msg = "Use: string-replace-list.pl string_file file_in file_out\n"; if( scalar(@ARGV) != 3 ) { print STDERR $g_use_msg; exit(-1); } -# + my $string_file = shift; my $file_in_name = shift; my $file_out_name = shift; -# + open STRING_NAMES_FILE, "<$string_file" || die "The file $string_file could not be opened!"; -my @string_names = ; -# +my @string_names_lines = ; +my @string_names; +foreach(@string_names_lines) { + my $line = $_; + my @string_names_line_array = split(' ', $line); + foreach(@string_names_line_array) { + chomp($_); + push @string_names, $_ + } +} + #print "file_in_name = $file_in_name\n"; if($file_in_name=~/CVS/) { # print "Do not replace in CVS\n"; @@ -28,24 +38,27 @@ open FILE_IN, "<$file_in_name"; my @file_in_array = ; close FILE_IN; -# + #print $match_str . "\n"; -# + my @file_out_array; my $did_replacement = 0; foreach(@file_in_array) { my $line = $_; + #print "\n"; + #print "----------------------------------------------------\n"; + #print "\n"; #print $line; my $i; - for( $i=0; $i Date: Fri, 21 Apr 2023 14:15:05 -0600 Subject: [PATCH 06/16] Add script remove_kokkos_subpackages_change_test_names_r.sh (#11545) This changes all test names, even ones for tests that don't exist in Kokkos anymore based on the basic name paterns. --- ..._kokkos_subpackages_change_test_names_r.sh | 25 +++++++++++++++++++ ...subpackages_change_test_names_r.token-list | 4 +++ 2 files changed, 29 insertions(+) create mode 100755 commonTools/refactoring/refactors/remove_kokkos_subpackages_change_test_names_r.sh create mode 100644 commonTools/refactoring/refactors/remove_kokkos_subpackages_change_test_names_r.token-list diff --git a/commonTools/refactoring/refactors/remove_kokkos_subpackages_change_test_names_r.sh b/commonTools/refactoring/refactors/remove_kokkos_subpackages_change_test_names_r.sh new file mode 100755 index 000000000000..61c5f60b324b --- /dev/null +++ b/commonTools/refactoring/refactors/remove_kokkos_subpackages_change_test_names_r.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +# Script to update the names of Kokkos tests after the refactoring to remove +# subpackages. +# +# Run this script from the base directory and it will update all files. +# +# Warning! Do not run this in a directory where the file +# remove_kokkos_subpackages_change_test_names.token-list will be found or this +# will change the names there too and destroy this script! +# +# Also, do not create a symbolic link to this script, just use a +# absolute or relative path from where it is defined in the +# Trilinos source tree. + +# Get the directory for this scirpt which will give us the Trilinos base +# directory +_SCRIPT_DIR=`echo $0 | sed "s/\(.*\)\/.*\.sh/\1/g"` +_TRILINOS_HOME=$_SCRIPT_DIR/../../.. + +# Run the replacements on all of the files found in subdirectories +find . -type f \ + -exec $_TRILINOS_HOME/commonTools/refactoring/string-replace-list.pl \ + $_SCRIPT_DIR/remove_kokkos_subpackages_change_test_names_r.token-list \ + '{}' '{}' ';' diff --git a/commonTools/refactoring/refactors/remove_kokkos_subpackages_change_test_names_r.token-list b/commonTools/refactoring/refactors/remove_kokkos_subpackages_change_test_names_r.token-list new file mode 100644 index 000000000000..26a35854e1c2 --- /dev/null +++ b/commonTools/refactoring/refactors/remove_kokkos_subpackages_change_test_names_r.token-list @@ -0,0 +1,4 @@ +KokkosCore_UnitTest Kokkos_CoreUnitTest +KokkosContainers_UnitTest Kokkos_ContainersUnitTest +KokkosAlgorithms_UnitTest Kokkos_AlgorithmsUnitTest +KokkosContainers_PerformanceTest Kokkos_ContainersPerformanceTest From eae2939efee1c76dcebb0ecb4513a6b68f786131 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 24 Apr 2023 08:37:39 -0600 Subject: [PATCH 07/16] Run remove_kokkos_subpackages_change_test_names_r.sh (#11545) Again, this changes the names of tests that may not even exist in the Kokkos test suite anymore since it changes the prefix for these test names. --- ...tDriverCore.ascicgpu031.gcc-cuda.crs.cmake | 2 +- ...cgpu031.gcc-cuda.deprecation-removal.cmake | 2 +- ...vmOffDisabledPackagesTestingSettings.cmake | 4 ++-- ...LinuxCuda11.4.2uvmOffTestingSettings.cmake | 4 ++-- cmake/std/atdm/ATDMDisables.cmake | 20 +++++++++---------- .../CUDA-9.2_DEBUG_CUDA_POWER9_VOLTA70.cmake | 2 +- packages/framework/ini-files/config-specs.ini | 18 ++++++++--------- .../unittests/config-specs.ini | 2 +- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cmake/ctest/drivers/ascicgpu031/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.crs.cmake b/cmake/ctest/drivers/ascicgpu031/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.crs.cmake index 158b93c3580f..aeaca6805296 100644 --- a/cmake/ctest/drivers/ascicgpu031/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.crs.cmake +++ b/cmake/ctest/drivers/ascicgpu031/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.crs.cmake @@ -89,7 +89,7 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER) set (Trilinos_ENABLE_Epetra OFF CACHE BOOL "We do not want Epetra" FORCE) # Select test disables - set (KokkosCore_UnitTest_CudaTimingBased_MPI_1_DISABLE ON CACHE BOOL "Not to be run in nightly testing" FORCE) + set (Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE ON CACHE BOOL "Not to be run in nightly testing" FORCE) SET(EXTRA_SYSTEM_CONFIGURE_OPTIONS "-DCMAKE_BUILD_TYPE:STRING=${BUILD_TYPE}" diff --git a/cmake/ctest/drivers/ascicgpu031/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.deprecation-removal.cmake b/cmake/ctest/drivers/ascicgpu031/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.deprecation-removal.cmake index 873d23ac9c51..1ac640b60903 100644 --- a/cmake/ctest/drivers/ascicgpu031/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.deprecation-removal.cmake +++ b/cmake/ctest/drivers/ascicgpu031/TrilinosCTestDriverCore.ascicgpu031.gcc-cuda.deprecation-removal.cmake @@ -89,7 +89,7 @@ MACRO(TRILINOS_SYSTEM_SPECIFIC_CTEST_DRIVER) set (Trilinos_ENABLE_Epetra OFF CACHE BOOL "We do not want Epetra" FORCE) # Select test disables - set (KokkosCore_UnitTest_CudaTimingBased_MPI_1_DISABLE ON CACHE BOOL "Not to be run in nightly testing" FORCE) + set (Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE ON CACHE BOOL "Not to be run in nightly testing" FORCE) SET(EXTRA_SYSTEM_CONFIGURE_OPTIONS "-DCMAKE_BUILD_TYPE:STRING=${BUILD_TYPE}" diff --git a/cmake/std/PullRequestLinuxCuda11.4.2uvmOffDisabledPackagesTestingSettings.cmake b/cmake/std/PullRequestLinuxCuda11.4.2uvmOffDisabledPackagesTestingSettings.cmake index e24f0f56889f..53dfffd45637 100644 --- a/cmake/std/PullRequestLinuxCuda11.4.2uvmOffDisabledPackagesTestingSettings.cmake +++ b/cmake/std/PullRequestLinuxCuda11.4.2uvmOffDisabledPackagesTestingSettings.cmake @@ -117,9 +117,9 @@ set (PanzerMiniEM_MiniEM-BlockPrec_Augmentation_MPI_4_DISABLE ON CACHE BOOL "Tem set (PanzerMiniEM_MiniEM-BlockPrec_RefMaxwell_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing") set (ROL_example_PDE-OPT_poisson-boltzmann_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing") -# Disable a couple of unit tests in test KokkosCore_UnitTest_Cuda_MPI_1 that +# Disable a couple of unit tests in test Kokkos_CoreUnitTest_Cuda_MPI_1 that # are randomly failing in PR test iterations (#6799) -set (KokkosCore_UnitTest_Cuda_MPI_1_EXTRA_ARGS +set (Kokkos_CoreUnitTest_Cuda_MPI_1_EXTRA_ARGS "--gtest_filter=-cuda.debug_pin_um_to_host:cuda.debug_serial_execution" CACHE STRING "Temporary disable for CUDA PR testing") diff --git a/cmake/std/PullRequestLinuxCuda11.4.2uvmOffTestingSettings.cmake b/cmake/std/PullRequestLinuxCuda11.4.2uvmOffTestingSettings.cmake index dcb4324107cd..85c1c7662cbf 100644 --- a/cmake/std/PullRequestLinuxCuda11.4.2uvmOffTestingSettings.cmake +++ b/cmake/std/PullRequestLinuxCuda11.4.2uvmOffTestingSettings.cmake @@ -117,9 +117,9 @@ set (MueLu_UnitTestsIntrepid2Tpetra_MPI_4_DISABLE ON CACHE BOOL "Temporary disab #set (PanzerMiniEM_MiniEM-BlockPrec_RefMaxwell_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing") set (ROL_example_PDE-OPT_poisson-boltzmann_example_01_MPI_4_DISABLE ON CACHE BOOL "Temporary disable for CUDA PR testing") -# Disable a couple of unit tests in test KokkosCore_UnitTest_Cuda_MPI_1 that +# Disable a couple of unit tests in test Kokkos_CoreUnitTest_Cuda_MPI_1 that # are randomly failing in PR test iterations (#6799) -set (KokkosCore_UnitTest_Cuda_MPI_1_EXTRA_ARGS +set (Kokkos_CoreUnitTest_Cuda_MPI_1_EXTRA_ARGS "--gtest_filter=-cuda.debug_pin_um_to_host:cuda.debug_serial_execution" CACHE STRING "Temporary disable for CUDA PR testing") diff --git a/cmake/std/atdm/ATDMDisables.cmake b/cmake/std/atdm/ATDMDisables.cmake index 70a278c991e4..8781d3855526 100644 --- a/cmake/std/atdm/ATDMDisables.cmake +++ b/cmake/std/atdm/ATDMDisables.cmake @@ -253,16 +253,16 @@ ATDM_SET_ENABLE(ROL_adapters_tpetra_test_vector_SimulatedVectorTpetraBatchManage ATDM_SET_ENABLE(ROL_adapters_tpetra_test_vector_SimulatedVectorTpetraBatchManagerInterface_MPI_4_DISABLE ON) # Disable Kokkos timing based test. See #8545. -ATDM_SET_ENABLE(KokkosCore_UnitTest_CudaTimingBased_MPI_1_DISABLE ON) +ATDM_SET_ENABLE(Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE ON) # Disable serial.Random_XorShift64 due to random failures. See #3282. -ATDM_SET_CACHE(KokkosAlgorithms_UnitTest_MPI_1_EXTRA_ARGS +ATDM_SET_CACHE(Kokkos_AlgorithmsUnitTest_MPI_1_EXTRA_ARGS "--gtest_filter=-*Random_XorShift64:-*Random_XorShift1024" CACHE STRING) IF (ATDM_NODE_TYPE STREQUAL "OPENMP") # Disable ctest DISABLED test (otherwise, this shows up on CDash as "NotRun") - ATDM_SET_ENABLE(KokkosContainers_PerformanceTest_OpenMP_DISABLE ON) + ATDM_SET_ENABLE(Kokkos_ContainersPerformanceTest_OpenMP_DISABLE ON) ENDIF() @@ -272,13 +272,13 @@ IF ("${ATDM_CMAKE_BUILD_TYPE}" STREQUAL "DEBUG") ATDM_SET_ENABLE(PanzerAdaptersSTK_MixedPoissonExample-ConvTest-Hex-Order-3_DISABLE ON) # Too expensive for full debug builds after Kokkos 2.99 upgrade - ATDM_SET_ENABLE(KokkosCore_UnitTest_Serial_MPI_1_DISABLE ON) + ATDM_SET_ENABLE(Kokkos_CoreUnitTest_Serial_MPI_1_DISABLE ON) ATDM_SET_ENABLE(KokkosKernels_blas_serial_MPI_1_DISABLE ON) IF (ATDM_USE_OPENMP) # Too expensive for full debug builds after Kokkos 2.99 upgrade - ATDM_SET_ENABLE(KokkosCore_UnitTest_OpenMP_MPI_1_DISABLE ON) + ATDM_SET_ENABLE(Kokkos_CoreUnitTest_OpenMP_MPI_1_DISABLE ON) ATDM_SET_ENABLE(KokkosKernels_blas_openmp_MPI_1_DISABLE ON) ENDIF() @@ -313,11 +313,11 @@ IF (ATDM_NODE_TYPE STREQUAL "CUDA") ATDM_SET_ENABLE(Zoltan_ch_simple_zoltan_parallel_DISABLE ON) # Disable ctest DISABLED test (otherwise, this shows up on CDash as "NotRun") - ATDM_SET_ENABLE(KokkosContainers_PerformanceTest_Cuda_DISABLE ON) + ATDM_SET_ENABLE(Kokkos_ContainersPerformanceTest_Cuda_DISABLE ON) - # Disable a couple of unit tests in test KokkosCore_UnitTest_Cuda_MPI_1 + # Disable a couple of unit tests in test Kokkos_CoreUnitTest_Cuda_MPI_1 # (#6799) - ATDM_SET_CACHE(KokkosCore_UnitTest_Cuda_MPI_1_EXTRA_ARGS + ATDM_SET_CACHE(Kokkos_CoreUnitTest_Cuda_MPI_1_EXTRA_ARGS "--gtest_filter=-cuda.debug_pin_um_to_host:cuda.debug_serial_execution" CACHE STRING ) @@ -326,9 +326,9 @@ IF (ATDM_NODE_TYPE STREQUAL "CUDA") # that this Kokkos inter operability test runs in serial, we ensure that the # GPU ID is not swapped upon initialize resulting in an invalid Cuda stream. # See #8544. - ATDM_SET_ENABLE(KokkosCore_UnitTest_CudaInterOpStreams_MPI_1_SET_RUN_SERIAL ON) + ATDM_SET_ENABLE(Kokkos_CoreUnitTest_CudaInterOpStreams_MPI_1_SET_RUN_SERIAL ON) # See #8543. - ATDM_SET_ENABLE(KokkosCore_UnitTest_CudaInterOpInit_MPI_1_SET_RUN_SERIAL ON) + ATDM_SET_ENABLE(Kokkos_CoreUnitTest_CudaInterOpInit_MPI_1_SET_RUN_SERIAL ON) # Attempt to address intermittent timeouts reported in #6805 ATDM_SET_ENABLE(KokkosKernels_sparse_cuda_MPI_1_SET_RUN_SERIAL ON) diff --git a/cmake/std/atdm/contributed/weaver/tweaks/CUDA-9.2_DEBUG_CUDA_POWER9_VOLTA70.cmake b/cmake/std/atdm/contributed/weaver/tweaks/CUDA-9.2_DEBUG_CUDA_POWER9_VOLTA70.cmake index af8b013e9347..41d15a4684fe 100644 --- a/cmake/std/atdm/contributed/weaver/tweaks/CUDA-9.2_DEBUG_CUDA_POWER9_VOLTA70.cmake +++ b/cmake/std/atdm/contributed/weaver/tweaks/CUDA-9.2_DEBUG_CUDA_POWER9_VOLTA70.cmake @@ -2,7 +2,7 @@ ATDM_SET_ENABLE(TeuchosNumerics_DISABLE_STEQR_TEST ON) # Disable timing out unit test in this debug build (#3336) -ATDM_SET_ENABLE(KokkosContainers_UnitTest_Serial_MPI_1_DISABLE ON) +ATDM_SET_ENABLE(Kokkos_ContainersUnitTest_Serial_MPI_1_DISABLE ON) # Disable some unit tests that run too slow in this DEBUG build (#2827) ATDM_SET_CACHE(KokkosKernels_sparse_serial_MPI_1_EXTRA_ARGS diff --git a/packages/framework/ini-files/config-specs.ini b/packages/framework/ini-files/config-specs.ini index 639c7a774076..dd6e1f1b12cb 100644 --- a/packages/framework/ini-files/config-specs.ini +++ b/packages/framework/ini-files/config-specs.ini @@ -349,14 +349,14 @@ opt-set-cmake-var Anasazi_Epetra_OrthoManagerGenTester_0_MPI_4_DISABLE BOOL : ON # Disable Random_XorShift64 and Random_XorShift1024 due to random failures. See #3282. -opt-set-cmake-var KokkosAlgorithms_UnitTest_MPI_1_EXTRA_ARGS STRING : --gtest_filter=-*Random_XorShift64:-*Random_XorShift1024 +opt-set-cmake-var Kokkos_AlgorithmsUnitTest_MPI_1_EXTRA_ARGS STRING : --gtest_filter=-*Random_XorShift64:-*Random_XorShift1024 # Disable this test due to temporary requirement on Kokkos_ENABLE_DEPRECATED_CODE_3 -opt-set-cmake-var KokkosCore_UnitTest_Serial1_MPI_1_EXTRA_ARGS STRING : --gtest_filter=-*join_backward_compatibility -opt-set-cmake-var KokkosCore_UnitTest_Serial1_EXTRA_ARGS STRING : --gtest_filter=-*join_backward_compatibility +opt-set-cmake-var Kokkos_CoreUnitTest_Serial1_MPI_1_EXTRA_ARGS STRING : --gtest_filter=-*join_backward_compatibility +opt-set-cmake-var Kokkos_CoreUnitTest_Serial1_EXTRA_ARGS STRING : --gtest_filter=-*join_backward_compatibility # Disable this test to avoid spurious failures, see kokkos/kokkos#5502 -opt-set-cmake-var KokkosCore_UnitTest_Default_MPI_1_EXTRA_ARGS STRING : --gtest_filter=-*defaultdevicetype.shared_space -opt-set-cmake-var KokkosCore_UnitTest_Default_EXTRA_ARGS STRING : --gtest_filter=-*defaultdevicetype.shared_space +opt-set-cmake-var Kokkos_CoreUnitTest_Default_MPI_1_EXTRA_ARGS STRING : --gtest_filter=-*defaultdevicetype.shared_space +opt-set-cmake-var Kokkos_CoreUnitTest_Default_EXTRA_ARGS STRING : --gtest_filter=-*defaultdevicetype.shared_space # Options from SEMSDevEnv.cmake opt-set-cmake-var Trilinos_ENABLE_PyTrilinos BOOL : OFF @@ -1295,9 +1295,9 @@ opt-set-cmake-var PanzerMiniEM_MiniEM-BlockPrec_Augmentation_MPI_4_DISABLE BOOL opt-set-cmake-var PanzerMiniEM_MiniEM-BlockPrec_RefMaxwell_MPI_4_DISABLE BOOL : ON opt-set-cmake-var ROL_example_PDE-OPT_poisson-boltzmann_example_01_MPI_4_DISABLE BOOL : ON -# Disable a couple of unit tests in test KokkosCore_UnitTest_Cuda_MPI_1 that +# Disable a couple of unit tests in test Kokkos_CoreUnitTest_Cuda_MPI_1 that # are randomly failing in PR test iterations (#6799) -opt-set-cmake-var KokkosCore_UnitTest_Cuda_MPI_1_EXTRA_ARGS STRING : "--gtest_filter=-cuda.debug_pin_um_to_host:cuda.debug_serial_execution" +opt-set-cmake-var Kokkos_CoreUnitTest_Cuda_MPI_1_EXTRA_ARGS STRING : "--gtest_filter=-cuda.debug_pin_um_to_host:cuda.debug_serial_execution" # Disable a few failing tests for initial release of Cuda 10.1.105 PR build opt-set-cmake-var EpetraExt_inout_test_LL_MPI_4_DISABLE BOOL : ON @@ -1441,7 +1441,7 @@ opt-set-cmake-var Intrepid_test_Discretization_Basis_HGRAD_TRI_Cn_FEM_ORTH_Test_ opt-set-cmake-var Intrepid_test_Discretization_Basis_HGRAD_TRI_Cn_FEM_Test_02_MPI_1_DISABLE BOOL : ON opt-set-cmake-var Intrepid_test_Discretization_Basis_HGRAD_WEDGE_C1_FEM_Test_02_MPI_1_DISABLE BOOL : ON opt-set-cmake-var Intrepid_test_Discretization_Basis_HGRAD_WEDGE_I2_FEM_Test_02_MPI_1_DISABLE BOOL : ON -opt-set-cmake-var KokkosCore_UnitTest_CudaTimingBased_MPI_1_DISABLE BOOL : ON +opt-set-cmake-var Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE BOOL : ON opt-set-cmake-var MueLu_UnitTestsTpetra_MPI_1_DISABLE BOOL : ON opt-set-cmake-var MueLu_UnitTestsTpetra_MPI_4_DISABLE BOOL : ON opt-set-cmake-var NOX_LOCA_AnasaziJacobianInverse_MPI_1_DISABLE BOOL : ON @@ -2234,7 +2234,7 @@ opt-set-cmake-var ROL_example_PDE-OPT_topo-opt_poisson_example_01_MPI_4_DISABLE opt-set-cmake-var ROL_test_elementwise_TpetraMultiVector_MPI_4_DISABLE BOOL : ON opt-set-cmake-var STKUnit_tests_stk_mesh_unit_tests_MPI_4_DISABLE BOOL : ON # This was failing fairly reliably and Nate said it should be okay to disable (https://github.com/trilinos/Trilinos/issues/11678) -opt-set-cmake-var KokkosCore_UnitTest_CudaTimingBased_MPI_1_DISABLE BOOL : ON +opt-set-cmake-var Kokkos_CoreUnitTest_CudaTimingBased_MPI_1_DISABLE BOOL : ON use RHEL7_POST diff --git a/packages/framework/pr_tools/trilinosprhelpers/unittests/config-specs.ini b/packages/framework/pr_tools/trilinosprhelpers/unittests/config-specs.ini index 6174dd775222..96a165635a40 100644 --- a/packages/framework/pr_tools/trilinosprhelpers/unittests/config-specs.ini +++ b/packages/framework/pr_tools/trilinosprhelpers/unittests/config-specs.ini @@ -332,7 +332,7 @@ opt-set-cmake-var Zoltan2_orderingTestDriverExample_MPI_1_DISABLE BOOL : ON opt-set-cmake-var Piro_EpetraSolver_MPI_4_DISABLE BOOL : ON opt-set-cmake-var PanzerAdaptersSTK_PoissonInterfaceExample_2d_diffsideids_MPI_1_DISABLE BOOL : ON opt-set-cmake-var Anasazi_Epetra_OrthoManagerGenTester_0_MPI_4_DISABLE BOOL : ON -opt-set-cmake-var KokkosAlgorithms_UnitTest_MPI_1_EXTRA_ARGS STRING : --gtest_filter=-*Random_XorShift64:-*Random_XorShift1024 +opt-set-cmake-var Kokkos_AlgorithmsUnitTest_MPI_1_EXTRA_ARGS STRING : --gtest_filter=-*Random_XorShift64:-*Random_XorShift1024 opt-set-cmake-var CMAKE_C_COMPILER FILEPATH : ${MPICC|ENV} opt-set-cmake-var CMAKE_CXX_COMPILER FILEPATH : ${MPICXX|ENV} opt-set-cmake-var CMAKE_Fortran_COMPILER FILEPATH : ${MPIF90|ENV} From c8490c446ded1e9affe1390ea5e866254600af86 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 25 Apr 2023 11:30:17 -0600 Subject: [PATCH 08/16] Add release notes for removing Kokkos subpackages (#11545) --- RELEASE_NOTES | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 572a29215f44..ef7ae6920494 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,3 +1,34 @@ + +############################################################################### +# # +# Trilinos Release 14.2 Release Notes # +# # +############################################################################### + +Kokkos + + - Subpackages have been removed Kokkos. That means that CMake cache + variables like Trilinos_ENABLE_KokkosCore or + Trilinos_ENABLE_KokkosAlgorithms no longer exist. Now there is just the + top-level package Kokkos enabled with Trilinos_ENABLE_Kokkos. In + addition, all downstream Trilinos packages that had dependencies on Kokkos + subpackages now just depend on the parent package Kokkos. That means that + any optional dependencies on a Kokkos subpackage is now an optional + dependency on the parent package Kokkos. For example, the Sacado package + had an optional dependency on KokkosCore which could be disabled with -D + Sacado_ENABLE_KokkosCore=OFF which now needs to be disabled with -D + Sacado_ENABLE_Kokkos=OFF. In addition, the #define macros for optional + dependencies on Kokkos subpackages have changed names. For example, the + Sacado_config.h file defined the preprocessor macros + HAVE_SACADO_KOKKOSCORE and HAVE_SACADO_KOKKOSCONTAINERS but now just + defines HAVE_SACADO_KOKKOS. Therefore, downstream C++ code will need to + adjust any code that depends on these preprocessor defines. However, + other than changes in the names of the the CMake Cache variables + `_ENABLE_Kokkos` to `_ENABLE_Kokkos` and the + changes in the names of the proprocessor defines ``XXX_KOKKOS`` to + ``XXX_KOKKOS``, all other behavior should be identical. + + ############################################################################### # # # Trilinos Release 14.0 Release Notes # From b7555af776a1ad2391955ca75b0a52c1fb78495a Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Fri, 28 Apr 2023 18:32:35 -0600 Subject: [PATCH 09/16] Put back compadre/CMakeLists.txt for non-TriBITS build (#11545) The script remove_kokkos_subpackages_from_trilinos_packages_r.sh changed the raw CMake package build for Compadre. If the raw CMake build of Compadre was building against installs of Kokkos using the native Kokkos Cmake build system, then this CMake code should never need to be updated. --- packages/compadre/CMakeLists.txt | 40 ++++++++++++++++---------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/packages/compadre/CMakeLists.txt b/packages/compadre/CMakeLists.txt index bc6d1d44050d..8e2f53e2580d 100644 --- a/packages/compadre/CMakeLists.txt +++ b/packages/compadre/CMakeLists.txt @@ -148,12 +148,12 @@ else() # Raw CMake Project endif() #KOKKOS - 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}") + 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}") endif() - set(CMAKE_PREFIX_PATH ${Kokkos_PREFIX} ${CMAKE_PREFIX_PATH}) + set(CMAKE_PREFIX_PATH ${KokkosCore_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(Kokkos_FOUND ON) + set(KokkosCore_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 Kokkos_HAS_* + # cmake/detect_kokkos_opts.cmake populates KokkosCore_HAS_* detect_kokkos_opts() # get kokkos settings, change our settings, error to user if we something they requested is not enabled - if (Kokkos_HAS_CUDA) - if (NOT Kokkos_HAS_CUDA_LAMBDA) + if (KokkosCore_HAS_CUDA) + if (NOT KokkosCore_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 (Kokkos_PREFIX STREQUAL "") + if (KokkosCore_PREFIX STREQUAL "") SET(KOKKOS_BUILT_FOR_USER ON) if (APPLE) bob_option(Kokkos_ENABLE_CUDA "Whether to use CUDA" OFF) @@ -272,8 +272,8 @@ 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 Kokkos_PREFIX not specified. \ - Either provide Kokkos_PREFIX as well, or remove KokkosKernels_PREFIX specification.") + MESSAGE(FATAL_ERROR "KokkosKernels_PREFIX specified but KokkosCore_PREFIX not specified. \ + Either provide KokkosCore_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}) @@ -281,9 +281,9 @@ else() # Raw CMake Project set(Compadre_USE_CUDA ${Kokkos_ENABLE_CUDA}) set(Kokkos_PREFIX ${CMAKE_INSTALL_PREFIX}) else() - # Existing KokkosCore indicated by user by setting Kokkos_PREFIX, so we look for it + # Existing KokkosCore indicated by user by setting KokkosCore_PREFIX, so we look for it # where specified (only) - find_package(Kokkos PATHS "${Kokkos_PREFIX}" NO_DEFAULT_PATH REQUIRED) + find_package(Kokkos PATHS "${KokkosCore_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 "${Kokkos_PREFIX}") + set(Kokkos_PREFIX "${KokkosCore_PREFIX}") endif() endif() message(STATUS "Compadre_USE_CUDA: ${Compadre_USE_CUDA}") option(Kokkos_CXX_STANDARD "" "${CMAKE_CXX_STANDARD}") - if (NOT(KOKKOS_IN_TRILINOS) AND (Kokkos_PREFIX STREQUAL "")) + if (NOT(KOKKOS_IN_TRILINOS) AND (KokkosCore_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(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.") + 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.") endif() set(KokkosKernels_PREFIX ${CMAKE_INSTALL_PREFIX}) else() - # Existing KokkosCore indicated by user by setting Kokkos_PREFIX, so we look for it + # Existing KokkosCore indicated by user by setting KokkosCore_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)) From 73d0362b0017b168a04499d09d744a305f97d640 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Tue, 2 May 2023 17:01:15 -0600 Subject: [PATCH 10/16] Manually remove redundant Kokkos dep (#11545) Somehow, the script remove_kokkos_subpackages_r.sh did not remove this redundancy. (This is likely because Kokkos was at the end of the line with no space and no ')' char .) But this looks to be the only case in Trilinos it appears where redundant 'Kokkos Kokkos' was not removed by that script. --- packages/kokkos-kernels/cmake/Dependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kokkos-kernels/cmake/Dependencies.cmake b/packages/kokkos-kernels/cmake/Dependencies.cmake index 3c58d5b318fa..777d4445b303 100644 --- 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 Kokkos Kokkos + LIB_REQUIRED_PACKAGES Kokkos LIB_OPTIONAL_TPLS quadmath MKL BLAS LAPACK CUSPARSE METIS SuperLU Cholmod CUBLAS ROCBLAS ROCSPARSE TEST_OPTIONAL_TPLS yaml-cpp ) From 12a983284e343f2624fa96f666b9906127e6f0f3 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Mon, 1 May 2023 18:50:46 -0600 Subject: [PATCH 11/16] Fix native build of Kokkos after removing subpackages (trilinos/Trilinos#11545) This restores the building of the raw CMake build of Kokkos after the refactoring to remove TriBITS subpackages. --- packages/kokkos/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/kokkos/CMakeLists.txt b/packages/kokkos/CMakeLists.txt index 3722b55b42f8..b4f8247d6fb0 100644 --- a/packages/kokkos/CMakeLists.txt +++ b/packages/kokkos/CMakeLists.txt @@ -37,6 +37,7 @@ IF(COMMAND TRIBITS_PACKAGE_DECL) SET(KOKKOS_HAS_TRILINOS ON) ELSE() SET(KOKKOS_HAS_TRILINOS OFF) + SET(PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") ENDIF() # Is this build a subdirectory of another project GET_DIRECTORY_PROPERTY(HAS_PARENT PARENT_DIRECTORY) From bdb73b00400a2f89ce067ed82934b01414d2c381 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Wed, 3 May 2023 18:08:19 -0600 Subject: [PATCH 12/16] MueLu: Fix Kokkos dependencies (#11545) Not sure how this got broken. Must have happended in my rebase on top of 'develop'. --- packages/muelu/cmake/Dependencies.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/muelu/cmake/Dependencies.cmake b/packages/muelu/cmake/Dependencies.cmake index 95b4e5e225c9..3448abbc02bd 100644 --- a/packages/muelu/cmake/Dependencies.cmake +++ b/packages/muelu/cmake/Dependencies.cmake @@ -1,4 +1,4 @@ -SET(LIB_REQUIRED_DEP_PACKAGES Teuchos Tpetra Xpetra KokkosCore KokkosContainers KokkosKernels) +SET(LIB_REQUIRED_DEP_PACKAGES Teuchos Tpetra Xpetra Kokkos KokkosKernels) SET(LIB_OPTIONAL_DEP_PACKAGES Amesos Amesos2 AvatarT Belos Epetra EpetraExt Teko Ifpack Ifpack2 Intrepid2 ML Zoltan Zoltan2Core Stratimikos Thyra ThyraTpetraAdapters From 05bd114292bcd11388c4f8a90fac1c95954257ac Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Thu, 4 May 2023 07:43:48 -0600 Subject: [PATCH 13/16] Stokhos: Remove duplicate deps on Kokkos (#11545) If a package is a required lib package, you don't need to list it again as any other type of dependency. --- packages/stokhos/cmake/Dependencies.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/stokhos/cmake/Dependencies.cmake b/packages/stokhos/cmake/Dependencies.cmake index 8c7b83f6cb22..6ed6bf08365d 100644 --- a/packages/stokhos/cmake/Dependencies.cmake +++ b/packages/stokhos/cmake/Dependencies.cmake @@ -1,7 +1,7 @@ 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(LIB_OPTIONAL_DEP_PACKAGES EpetraExt Ifpack ML TriKota Anasazi Sacado NOX Isorropia KokkosKernels TeuchosKokkosComm Tpetra Ifpack2 MueLu Belos Amesos2 Thyra Xpetra) SET(TEST_REQUIRED_DEP_PACKAGES) -SET(TEST_OPTIONAL_DEP_PACKAGES AztecOO Stratimikos Zoltan Kokkos) +SET(TEST_OPTIONAL_DEP_PACKAGES AztecOO Stratimikos Zoltan) 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) From bec68bf0341ada03c999fa9c352fb9c6c5fdc0d7 Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Thu, 4 May 2023 16:46:56 -0600 Subject: [PATCH 14/16] Kokkos: Remove last of subpackage stuff, fix for tests enable (trilinos/Trilinos#11545) This gives a full passing build and tests with the Trilinos PR GenConfig clang-11.0.1 build configuration. --- packages/kokkos/CMakeLists.txt | 5 +-- packages/kokkos/cmake/kokkos_tribits.cmake | 39 ------------------- packages/kokkos/core/unit_test/CMakeLists.txt | 2 +- packages/kokkos/example/CMakeLists.txt | 8 ---- 4 files changed, 2 insertions(+), 52 deletions(-) diff --git a/packages/kokkos/CMakeLists.txt b/packages/kokkos/CMakeLists.txt index b4f8247d6fb0..77d1b314b9a1 100644 --- a/packages/kokkos/CMakeLists.txt +++ b/packages/kokkos/CMakeLists.txt @@ -37,6 +37,7 @@ IF(COMMAND TRIBITS_PACKAGE_DECL) SET(KOKKOS_HAS_TRILINOS ON) ELSE() SET(KOKKOS_HAS_TRILINOS OFF) + SET(PACKAGE_NAME Kokkos) SET(PACKAGE_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") ENDIF() # Is this build a subdirectory of another project @@ -294,10 +295,6 @@ IF (KOKKOS_HAS_TRILINOS) $<$:${KOKKOS_ALL_COMPILE_OPTIONS}>) ENDIF() -if (NOT COMMAND TRIBITS_PACKAGE_DECL) - KOKKOS_PACKAGE_DECL() -endif() - #------------------------------------------------------------------------------ # diff --git a/packages/kokkos/cmake/kokkos_tribits.cmake b/packages/kokkos/cmake/kokkos_tribits.cmake index 746a227e23e1..01ea7efd8aa9 100644 --- a/packages/kokkos/cmake/kokkos_tribits.cmake +++ b/packages/kokkos/cmake/kokkos_tribits.cmake @@ -44,45 +44,6 @@ IF (KOKKOS_HAS_TRILINOS) ENDIF() ENDIF() -MACRO(KOKKOS_SUBPACKAGE NAME) - if (KOKKOS_HAS_TRILINOS) - TRIBITS_SUBPACKAGE(${NAME}) - else() - SET(PACKAGE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - SET(PARENT_PACKAGE_NAME ${PACKAGE_NAME}) - SET(PACKAGE_NAME ${PACKAGE_NAME}${NAME}) - STRING(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME_UC) - SET(${PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - #ADD_INTERFACE_LIBRARY(PACKAGE_${PACKAGE_NAME}) - #GLOBAL_SET(${PACKAGE_NAME}_LIBS "") - endif() -ENDMACRO() - -MACRO(KOKKOS_SUBPACKAGE_POSTPROCESS) - if (KOKKOS_HAS_TRILINOS) - TRIBITS_SUBPACKAGE_POSTPROCESS() - endif() -ENDMACRO() - -MACRO(KOKKOS_PACKAGE_DECL) - - if (KOKKOS_HAS_TRILINOS) - TRIBITS_PACKAGE_DECL(Kokkos) - else() - SET(PACKAGE_NAME Kokkos) - SET(${PACKAGE_NAME}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - STRING(TOUPPER ${PACKAGE_NAME} PACKAGE_NAME_UC) - endif() - - #SET(TRIBITS_DEPS_DIR "${CMAKE_SOURCE_DIR}/cmake/deps") - #FILE(GLOB TPLS_FILES "${TRIBITS_DEPS_DIR}/*.cmake") - #FOREACH(TPL_FILE ${TPLS_FILES}) - # TRIBITS_PROCESS_TPL_DEP_FILE(${TPL_FILE}) - #ENDFOREACH() - -ENDMACRO() - - MACRO(KOKKOS_PROCESS_SUBPACKAGES) ADD_SUBDIRECTORY(core) ADD_SUBDIRECTORY(containers) diff --git a/packages/kokkos/core/unit_test/CMakeLists.txt b/packages/kokkos/core/unit_test/CMakeLists.txt index db1da4450404..02e0388fe4e1 100644 --- a/packages/kokkos/core/unit_test/CMakeLists.txt +++ b/packages/kokkos/core/unit_test/CMakeLists.txt @@ -3,7 +3,7 @@ # IF(NOT GTest_FOUND) # fallback to internal gtest - SET(GTEST_SOURCE_DIR ${${PARENT_PACKAGE_NAME}_SOURCE_DIR}/tpls/gtest) + SET(GTEST_SOURCE_DIR ${Kokkos_SOURCE_DIR}/tpls/gtest) #need here for tribits KOKKOS_INCLUDE_DIRECTORIES(${GTEST_SOURCE_DIR}) diff --git a/packages/kokkos/example/CMakeLists.txt b/packages/kokkos/example/CMakeLists.txt index 7ecaec0f241d..3920dc9a2776 100644 --- a/packages/kokkos/example/CMakeLists.txt +++ b/packages/kokkos/example/CMakeLists.txt @@ -1,10 +1,2 @@ - - -# Subpackage name must match what appears in kokkos/cmake/Dependencies.cmake -# -KOKKOS_SUBPACKAGE(Example) - KOKKOS_ADD_EXAMPLE_DIRECTORIES(query_device) KOKKOS_ADD_EXAMPLE_DIRECTORIES(tutorial) - -KOKKOS_SUBPACKAGE_POSTPROCESS() From bcdb13779079c9dc5755b4ff580bcdb410da1dfb Mon Sep 17 00:00:00 2001 From: "Roscoe A. Bartlett" Date: Fri, 5 May 2023 06:39:44 -0600 Subject: [PATCH 15/16] Kokkos: Fix source file name (trilinos/Trilinos#11545) This was broken that was not fixed by the last commit pulled over from the native Kokkos repo branch 'tril-11545-kokkos-no-subpks-develop'. That latter branch is off of Kokkos 'develop' while this version of Kokkos in Trilinos is older. --- packages/kokkos/core/unit_test/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/kokkos/core/unit_test/CMakeLists.txt b/packages/kokkos/core/unit_test/CMakeLists.txt index 02e0388fe4e1..71a06e861215 100644 --- a/packages/kokkos/core/unit_test/CMakeLists.txt +++ b/packages/kokkos/core/unit_test/CMakeLists.txt @@ -1125,7 +1125,7 @@ KOKKOS_ADD_EXECUTABLE_AND_TEST( # This test is not properly set up to run within Trilinos if (NOT KOKKOS_HAS_TRILINOS) - add_executable(Kokkos_CoreUnitTest_DeviceAndThreads CoreUnitTest_DeviceAndThreads.cpp) + add_executable(Kokkos_CoreUnitTest_DeviceAndThreads UnitTest_DeviceAndThreads.cpp) target_link_libraries(Kokkos_CoreUnitTest_DeviceAndThreads Kokkos::kokkoscore) find_package(Python3 COMPONENTS Interpreter) if(Python3_Interpreter_FOUND AND Python3_VERSION VERSION_GREATER_EQUAL 3.7) From df12adb02da7f2d8a1b90a5acb5a1dcd3bff9b96 Mon Sep 17 00:00:00 2001 From: Damien L-G Date: Fri, 5 May 2023 09:29:17 -0600 Subject: [PATCH 16/16] Kokkos: Fixup update target name in python test script that gets configured (trilinos/Trilinos#11545) --- packages/kokkos/core/unit_test/TestDeviceAndThreads.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/kokkos/core/unit_test/TestDeviceAndThreads.py b/packages/kokkos/core/unit_test/TestDeviceAndThreads.py index fd70e3ff681d..1d3ff8eea7e7 100644 --- a/packages/kokkos/core/unit_test/TestDeviceAndThreads.py +++ b/packages/kokkos/core/unit_test/TestDeviceAndThreads.py @@ -18,8 +18,8 @@ import unittest import subprocess -PREFIX = "$" -EXECUTABLE = "$" +PREFIX = "$" +EXECUTABLE = "$" COMMAND = "/".join([PREFIX, EXECUTABLE])