Skip to content

Commit

Permalink
Merge Pull Request #12417 from trilinos/Trilinos/csiefer-97c51a4
Browse files Browse the repository at this point in the history 
Automatically Merged using Trilinos Pull Request AutoTester
PR Title: b'Trilinos: Kokkos::Experimental::HIP* -> Kokkos::HIP*'
PR Author: csiefer2
  • Loading branch information
@trilinos-autotester
trilinos-autotester authored Oct 18, 2023
2 parents 5f0945b + 97c51a4 commit 0134f8e
Show file tree
Hide file tree
Showing 105 changed files with 161 additions and 161 deletions.
2 changes: 1 addition & 1 deletion packages/amesos2/src/Amesos2_Cholmod_decl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ class Cholmod : public SolverCore<Amesos2::Cholmod, Matrix, Vector>
using DeviceMemSpaceType = typename Kokkos::CudaSpace;
#elif KOKKOS_ENABLE_HIP
// same as above, make the solver UVM off
using DeviceMemSpaceType = typename Kokkos::Experimental::HIPSpace;
using DeviceMemSpaceType = typename Kokkos::HIPSpace;
#else
using DeviceMemSpaceType = typename DeviceExecSpaceType::memory_space;
#endif
Expand Down
16 changes: 8 additions & 8 deletions packages/ifpack2/src/Ifpack2_BlockTriDiContainer_impl.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ namespace Ifpack2 {
///
template<typename T> struct is_hip { enum : bool { value = false }; };
#if defined(KOKKOS_ENABLE_HIP)
template<> struct is_hip<Kokkos::Experimental::HIP> { enum : bool { value = true }; };
template<> struct is_hip<Kokkos::HIP> { enum : bool { value = true }; };
#endif

///
Expand Down Expand Up @@ -237,9 +237,9 @@ namespace Ifpack2 {

#if defined(KOKKOS_ENABLE_HIP)
template<>
struct ExecutionSpaceFactory<Kokkos::Experimental::HIP> {
static void createInstance(Kokkos::Experimental::HIP &exec_instance) {
exec_instance = Kokkos::Experimental::HIP();
struct ExecutionSpaceFactory<Kokkos::HIP> {
static void createInstance(Kokkos::HIP &exec_instance) {
exec_instance = Kokkos::HIP();
}
};
#endif
Expand Down Expand Up @@ -1927,7 +1927,7 @@ namespace Ifpack2 {
return 2*total_team_size/vector_size;
}
template<>
struct ExtractAndFactorizeTridiagsDefaultModeAndAlgo<Kokkos::Experimental::HIPSpace> {
struct ExtractAndFactorizeTridiagsDefaultModeAndAlgo<Kokkos::HIPSpace> {
typedef KB::Mode::Team mode_type;
typedef KB::Algo::Level3::Unblocked algo_type;
static int recommended_team_size(const int blksize,
Expand All @@ -1937,7 +1937,7 @@ namespace Ifpack2 {
}
};
template<>
struct ExtractAndFactorizeTridiagsDefaultModeAndAlgo<Kokkos::Experimental::HIPHostPinnedSpace> {
struct ExtractAndFactorizeTridiagsDefaultModeAndAlgo<Kokkos::HIPHostPinnedSpace> {
typedef KB::Mode::Team mode_type;
typedef KB::Algo::Level3::Unblocked algo_type;
static int recommended_team_size(const int blksize,
Expand Down Expand Up @@ -2524,7 +2524,7 @@ namespace Ifpack2 {
}

template<>
struct SolveTridiagsDefaultModeAndAlgo<Kokkos::Experimental::HIPSpace> {
struct SolveTridiagsDefaultModeAndAlgo<Kokkos::HIPSpace> {
typedef KB::Mode::Team mode_type;
typedef KB::Algo::Level2::Unblocked single_vector_algo_type;
typedef KB::Algo::Level3::Unblocked multi_vector_algo_type;
Expand All @@ -2535,7 +2535,7 @@ namespace Ifpack2 {
}
};
template<>
struct SolveTridiagsDefaultModeAndAlgo<Kokkos::Experimental::HIPHostPinnedSpace> {
struct SolveTridiagsDefaultModeAndAlgo<Kokkos::HIPHostPinnedSpace> {
typedef KB::Mode::Team mode_type;
typedef KB::Algo::Level2::Unblocked single_vector_algo_type;
typedef KB::Algo::Level3::Unblocked multi_vector_algo_type;
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/src/Shared/Intrepid2_TestUtils.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ namespace Intrepid2
#if defined(KOKKOS_ENABLE_CUDA)
using DefaultTestDeviceType = Kokkos::Device<Kokkos::Cuda,Kokkos::CudaSpace>;
#elif defined(KOKKOS_ENABLE_HIP)
using DefaultTestDeviceType = Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>;
using DefaultTestDeviceType = Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>;
#else
using DefaultTestDeviceType = typename Kokkos::DefaultExecutionSpace::device_type;
#endif
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Cell/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_HEX_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
# LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
# LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
# LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_QUAD_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
# LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
# LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
# LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TET_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
# LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
# LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
# LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/DeRHAM_TRI_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
# LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
# LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
# LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_I1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HCURL_HEX_In_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_I1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HCURL_QUAD_In_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_I1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HCURL_TET_In_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_I1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HCURL_TRI_In_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HCURL_WEDGE_I1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_I1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HDIV_HEX_In_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_I1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HDIV_QUAD_In_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_I1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HDIV_TET_In_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_I1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HDIV_TRI_In_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HDIV_WEDGE_I1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_C2_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
4 changes: 2 additions & 2 deletions packages/intrepid2/unit-test/Discretization/Basis/HGRAD_HEX_Cn_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down Expand Up @@ -119,7 +119,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_C1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_C2_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HGRAD_LINE_Cn_FEM_JACOBI/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HGRAD_PYR_C1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HGRAD_PYR_I2_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C1_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
2 changes: 1 addition & 1 deletion packages/intrepid2/unit-test/Discretization/Basis/HGRAD_QUAD_C2_FEM/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ IF(Kokkos_ENABLE_CUDA)
ENDIF()
IF(Kokkos_ENABLE_HIP)
LIST(APPEND Intrepid2_TEST_ETI_DEVICE_NAME "HIP")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::Experimental::HIP,Kokkos::Experimental::HIPSpace>")
LIST(APPEND Intrepid2_TEST_ETI_DEVICE "Kokkos::Device<Kokkos::HIP,Kokkos::HIPSpace>")
ENDIF()

LIST(LENGTH Intrepid2_TEST_ETI_DEVICE_NAME ETI_DEVICE_COUNT)
Expand Down
Loading

0 comments on commit 0134f8e

Please sign in to comment.