Skip to content

Commit

Permalink
HIP is no longer experimental, thus removing this code.
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulMullowney committed Dec 12, 2024
1 parent 5254d77 commit fa1dff4
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion include/KokkosInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ namespace nalu {
#if defined(KOKKOS_ENABLE_CUDA)
typedef Kokkos::CudaSpace MemSpace;
#elif defined(KOKKOS_ENABLE_HIP)
typedef Kokkos::Experimental::HIPSpace MemSpace;
typedef Kokkos::HIPSpace MemSpace;
#elif defined(KOKKOS_HAVE_OPENMP)
typedef Kokkos::OpenMP MemSpace;
#else
Expand Down
2 changes: 1 addition & 1 deletion include/aero/actuator/ActuatorTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace nalu {
using ActuatorMemSpace = Kokkos::CudaSpace;
using ActuatorExecutionSpace = Kokkos::DefaultExecutionSpace;
#elif defined(KOKKOS_ENABLE_HIP)
using ActuatorMemSpace = Kokkos::Experimental::HIPSpace;
using ActuatorMemSpace = Kokkos::HIPSpace;
using ActuatorExecutionSpace = Kokkos::DefaultExecutionSpace;
#else
using ActuatorMemSpace = Kokkos::HostSpace;
Expand Down
4 changes: 2 additions & 2 deletions include/matrix_free/KokkosFramework.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ struct ExecTraits<Kokkos::Cuda>

#if defined(KOKKOS_ENABLE_HIP)
template <>
struct ExecTraits<Kokkos::Experimental::HIP>
struct ExecTraits<Kokkos::HIP>
{
using data_type = double;
using memory_traits =
Kokkos::MemoryTraits<Kokkos::Restrict | Kokkos::Aligned>;
using memory_space = typename Kokkos::Experimental::HIP::memory_space;
using memory_space = typename Kokkos::HIP::memory_space;
using layout = Kokkos::LayoutLeft;
static constexpr int alignment = alignof(data_type);
static constexpr int simd_len = 1;
Expand Down
2 changes: 1 addition & 1 deletion unit_tests/UnitTestBasicKokkos.C
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ TEST(BasicKokkos, discover_execution_space)
#endif

#if defined(KOKKOS_ENABLE_HIP)
std::cout << "Kokkos::Experimental::HIP is available." << std::endl;
std::cout << "Kokkos::HIP is available." << std::endl;
#endif

std::cout << "Default execution space info: ";
Expand Down
2 changes: 1 addition & 1 deletion wind-utils

0 comments on commit fa1dff4

Please sign in to comment.