Fix reviewer's comments

tcclevenger · Aug 28, 2023 · 9fde326 · 9fde326
1 parent 277e4a6
commit 9fde326
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/core/src/HIP/Kokkos_HIP_GraphNodeKernel.hpp b/core/src/HIP/Kokkos_HIP_GraphNodeKernel.hpp
@@ -31,12 +31,6 @@
 namespace Kokkos {
 namespace Impl {
 
-template <class CombinedFunctorReducer, class PolicyType>
-struct PatternImplSpecializationFromTag<
-    Kokkos::ParallelReduceTag, CombinedFunctorReducer, PolicyType, Kokkos::HIP>
-    : type_identity<
-          ParallelReduce<CombinedFunctorReducer, PolicyType, Kokkos::HIP>> {};
-
 template <typename PolicyType, typename Functor, typename PatternTag,
           typename... Args>
 class GraphNodeKernelImpl<Kokkos::HIP, PolicyType, Functor, PatternTag, Args...>
@@ -105,7 +99,7 @@ struct HIPGraphNodeAggregateKernel {
   using graph_kernel = HIPGraphNodeAggregateKernel;
 
   // Aggregates don't need a policy, but for the purposes of checking the static
-  // assertions about graph kerenls,
+  // assertions about graph kernels,
   struct Policy {
     using is_graph_kernel = std::true_type;
   };

diff --git a/core/src/HIP/Kokkos_HIP_Graph_Impl.hpp b/core/src/HIP/Kokkos_HIP_Graph_Impl.hpp
@@ -19,9 +19,6 @@
 
 #include <Kokkos_Macros.hpp>
 
-#if defined(KOKKOS_ENABLE_HIP)
-#if (HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR > 2)
-
 #include <Kokkos_Graph_fwd.hpp>
 
 #include <impl/Kokkos_GraphImpl.hpp>
@@ -188,5 +185,3 @@ auto GraphImpl<Kokkos::HIP>::create_aggregate_ptr(PredecessorRefs&&...) {
 }  // namespace Kokkos
 
 #endif
-#endif
-#endif
diff --git a/core/src/HIP/Kokkos_HIP_KernelLaunch.hpp b/core/src/HIP/Kokkos_HIP_KernelLaunch.hpp
@@ -25,7 +25,7 @@
 #include <HIP/Kokkos_HIP_Instance.hpp>
 #include <HIP/Kokkos_HIP_Space.hpp>
 
-#if (HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR > 2)
+#if !((HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR == 2))
 #include <HIP/Kokkos_HIP_GraphNodeKernel.hpp>
 #include <impl/Kokkos_GraphImpl_fwd.hpp>
 #endif
@@ -380,7 +380,7 @@ struct HIPParallelLaunchKernelInvoker<DriverType, LaunchBounds,
         driver);
   }
 
-#if (HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR > 2)
+#if !((HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR == 2))
   static void create_parallel_launch_graph_node(
       DriverType const &driver, dim3 const &grid, dim3 const &block, int shmem,
       HIPInternal const * /*hip_instance*/) {
@@ -438,7 +438,7 @@ struct HIPParallelLaunchKernelInvoker<DriverType, LaunchBounds,
         driver_ptr);
   }
 
-#if (HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR > 2)
+#if !((HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR == 2))
   static void create_parallel_launch_graph_node(
       DriverType const &driver, dim3 const &grid, dim3 const &block, int shmem,
       HIPInternal const *hip_instance) {
@@ -581,7 +581,7 @@ void hip_parallel_launch(const DriverType &driver, const dim3 &grid,
                          const dim3 &block, const int shmem,
                          const HIPInternal *hip_instance,
                          const bool prefer_shmem) {
-#if (HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR > 2)
+#if !((HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR == 2))
   if constexpr (DoGraph) {
     // Graph launch
     using base_t = HIPParallelLaunchKernelInvoker<DriverType, LaunchBounds,

diff --git a/core/src/Kokkos_Graph.hpp b/core/src/Kokkos_Graph.hpp
@@ -161,7 +161,11 @@ Graph<ExecutionSpace> create_graph(Closure&& arg_closure) {
 #include <impl/Kokkos_GraphNodeImpl.hpp>
 #include <impl/Kokkos_Default_Graph_Impl.hpp>
 #include <Cuda/Kokkos_Cuda_Graph_Impl.hpp>
+#if defined(KOKKOS_ENABLE_HIP)
+#if !((HIP_VERSION_MAJOR == 5) && (HIP_VERSION_MINOR == 2))
 #include <HIP/Kokkos_HIP_Graph_Impl.hpp>
+#endif
+#endif
 #ifdef KOKKOS_IMPL_PUBLIC_INCLUDE_NOTDEFINED_GRAPH
 #undef KOKKOS_IMPL_PUBLIC_INCLUDE
 #undef KOKKOS_IMPL_PUBLIC_INCLUDE_NOTDEFINED_GRAPH