Tacho : buid with CUDA + OpenMP

Signed-off-by: iyamazaki <[email protected]>
trilinos · Dec 11, 2024 · 324ba20 · 324ba20
1 parent f590a0a
commit 324ba20
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 24 deletions.
diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Chol.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Chol.hpp
@@ -32,10 +32,10 @@ struct CholAlgorithm {
 };
 
 struct CholAlgorithm_Team {
-#if defined(KOKKOS_ENABLE_OPENMP)
-  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
-#else
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP)
   using type = ActiveAlgorithm<runsOnCudaOrHIP()>::type;
+#else
+  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
 #endif
 };
 } // namespace Tacho

diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Gemm.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Gemm.hpp
@@ -31,10 +31,10 @@ struct GemmAlgorithm {
 };
 
 struct GemmAlgorithm_Team {
-#if defined(KOKKOS_ENABLE_OPENMP)
-  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
-#else
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP)
   using type = ActiveAlgorithm<runsOnCudaOrHIP()>::type;
+#else
+  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
 #endif
 };
 

diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Gemv.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Gemv.hpp
@@ -31,10 +31,10 @@ struct GemvAlgorithm {
 };
 
 struct GemvAlgorithm_Team {
-#if defined(KOKKOS_ENABLE_OPENMP)
-  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
-#else
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP)
   using type = ActiveAlgorithm<runsOnCudaOrHIP()>::type;
+#else
+  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
 #endif
 };
 } // namespace Tacho

diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Herk.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Herk.hpp
@@ -31,10 +31,10 @@ struct HerkAlgorithm {
 };
 
 struct HerkAlgorithm_Team {
-#if defined(KOKKOS_ENABLE_OPENMP)
-  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
-#else
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP)
   using type = ActiveAlgorithm<runsOnCudaOrHIP()>::type;
+#else
+  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
 #endif
 };
 } // namespace Tacho

diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_LDL.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_LDL.hpp
@@ -32,10 +32,10 @@ struct LDL_Algorithm {
 };
 
 struct LDL_Algorithm_Team {
-#if defined(KOKKOS_ENABLE_OPENMP)
-  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
-#else
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP)
   using type = ActiveAlgorithm<runsOnCudaOrHIP()>::type;
+#else
+  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
 #endif
 };
 } // namespace Tacho

diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_LU.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_LU.hpp
@@ -32,10 +32,10 @@ struct LU_Algorithm {
 };
 
 struct LU_Algorithm_Team {
-#if defined(KOKKOS_ENABLE_OPENMP)
-  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
-#else
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP)
   using type = ActiveAlgorithm<runsOnCudaOrHIP()>::type;
+#else
+  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
 #endif
 };
 

diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Trsm.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Trsm.hpp
@@ -30,10 +30,10 @@ struct TrsmAlgorithm {
 };
 
 struct TrsmAlgorithm_Team {
-#if defined(KOKKOS_ENABLE_OPENMP)
-  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
-#else
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP)
   using type = ActiveAlgorithm<runsOnCudaOrHIP()>::type;
+#else
+  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
 #endif
 };
 

diff --git a/packages/shylu/shylu_node/tacho/src/impl/Tacho_Trsv.hpp b/packages/shylu/shylu_node/tacho/src/impl/Tacho_Trsv.hpp
@@ -30,10 +30,10 @@ struct TrsvAlgorithm {
 };
 
 struct TrsvAlgorithm_Team {
-#if defined(KOKKOS_ENABLE_OPENMP)
-  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
-#else
+#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP)
   using type = ActiveAlgorithm<runsOnCudaOrHIP()>::type;
+#else
+  using type = ActiveHostAlgorithm<runsWithOMP()>::type;
 #endif
 };