Disable tests for OpenMPTarget

nliber · May 16, 2023 · 99161e0 · 99161e0
1 parent f8ed850
commit 99161e0
Showing 1 changed file with 38 additions and 20 deletions.
diff --git a/core/unit_test/TestReducers.hpp b/core/unit_test/TestReducers.hpp
@@ -1188,23 +1188,33 @@ struct TestReducers {
     test_sum(10001);
     test_prod(35);
     test_min(10003);
-#if !defined(KOKKOS_ENABLE_OPENACC)
-    // FIXME_OPENACC - OpenACC (V3.3) does not support custom reductions.
+#if !defined(KOKKOS_ENABLE_OPENACC)  // FIXME_OPENACC - OpenACC (V3.3) does not
+                                     // support custom reductions.
     test_minloc(10003);
+#if !defined(KOKKOS_ENABLE_OPENMPTARGET)  // FIXME_OPENMPTARGET requires custom
+                                          // reductions.
     test_minloc_2d(100);
+#endif
 #endif
     test_max(10007);
-#if !defined(KOKKOS_ENABLE_OPENACC)
-    // FIXME_OPENACC - OpenACC (V3.3) does not support custom reductions.
+#if !defined(KOKKOS_ENABLE_OPENACC)  // FIXME_OPENACC - OpenACC (V3.3) does not
+                                     // support custom reductions.
     test_maxloc(10007);
+#if !defined(KOKKOS_ENABLE_OPENMPTARGET)  // FIXME_OPENMPTARGET requires custom
+                                          // reductions.
     test_maxloc_2d(100);
 #endif
-#if defined(KOKKOS_ENABLE_OPENMPTARGET) && defined(KOKKOS_COMPILER_CLANG) && \
-    (KOKKOS_COMPILER_CLANG < 1300)
-    // FIXME_OPENMPTARGET - The minmaxloc test fails llvm <= 13 version.
+#endif
+#if !defined(KOKKOS_ENABLE_OPENACC)  // FIXME_OPENACC - OpenACC (V3.3) does not
+                                     // support custom reductions.
+#if defined(KOKKOS_ENABLE_OPENMPTARGET)
+#if defined(KOKKOS_COMPILER_CLANG) && \
+    (KOKKOS_COMPILER_CLANG >=         \
+     1300)  // FIXME_OPENMPTARGET - The minmaxloc test fails llvm < 13 version,
+            // test_minmaxloc_2d requires custom reductions
+    test_minmaxloc(10007);
+#endif
 #else
-#if !defined(KOKKOS_ENABLE_OPENACC)
-    // FIXME_OPENACC - OpenACC (V3.3) does not support custom reductions.
     test_minmaxloc(10007);
     test_minmaxloc_2d(100);
 #endif
@@ -1218,29 +1228,37 @@ struct TestReducers {
     test_sum(10001);
     test_prod(sizeof(Scalar) > 4 ? 35 : 19);  // avoid int overflow (see above)
     test_min(10003);
-#if !defined(KOKKOS_ENABLE_OPENACC)
-    // FIXME_OPENACC - OpenACC (V3.3) does not support custom reductions.
+#if !defined(KOKKOS_ENABLE_OPENACC)  // FIXME_OPENACC - OpenACC (V3.3) does not
+                                     // support custom reductions.
     test_minloc(10003);
-// FIXME_NVHPC misaligned memory
-#if !defined(KOKKOS_COMPILER_NVHPC)
+#if !defined(KOKKOS_COMPILER_NVHPC)       // FIXME_NVHPC misaligned memory
+#if !defined(KOKKOS_ENABLE_OPENMPTARGET)  // FIXME_OPENMPTARGET requires custom
+                                          // reductions.
     test_minloc_2d(100);
 #endif
+#endif
 #endif
     test_max(10007);
 #if !defined(KOKKOS_ENABLE_OPENACC)
     // FIXME_OPENACC - OpenACC (V3.3) does not support custom reductions.
     test_maxloc(10007);
-// FIXME_NVHPC misaligned memory
-#if !defined(KOKKOS_COMPILER_NVHPC)
+#if !defined(KOKKOS_COMPILER_NVHPC)       // FIXME_NVHPC misaligned memory
+#if !defined(KOKKOS_ENABLE_OPENMPTARGET)  // FIXME_OPENMPTARGET requires custom
+                                          // reductions.
     test_maxloc_2d(100);
 #endif
 #endif
-#if defined(KOKKOS_ENABLE_OPENMPTARGET) && defined(KOKKOS_COMPILER_CLANG) && \
-    (KOKKOS_COMPILER_CLANG < 1300)
-    // FIXME_OPENMPTARGET - The minmaxloc test fails llvm <= 13 version.
+#endif
+#if !defined(KOKKOS_ENABLE_OPENACC)  // FIXME_OPENACC - OpenACC (V3.3) does not
+                                     // support custom reductions.
+#if defined( \
+    KOKKOS_ENABLE_OPENMPTARGET)  // FIXME_OPENMPTARGET - The minmaxloc test
+                                 // fails llvm <= 13 version, the minmaxloc_2d
+                                 // test requires custom reductions.
+#if defined(KOKKOS_COMPILER_CLANG) && (KOKKOS_COMPILER_CLANG > 1300)
+    test_minmaxloc(10007);
+#endif
 #else
-#if !defined(KOKKOS_ENABLE_OPENACC)
-    // FIXME_OPENACC - OpenACC (V3.3) does not support custom reductions.
     test_minmaxloc(10007);
     test_minmaxloc_2d(100);
 #endif