Disable tests failing with SYCL+Cuda after update to oneAPI 2023.0.0

sandialabs · Jan 25, 2023 · b0be8e6 · b0be8e6
1 parent 3369267
commit b0be8e6
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 3 deletions.
diff --git a/algorithms/unit_tests/TestStdAlgorithmsCopyIf.cpp b/algorithms/unit_tests/TestStdAlgorithmsCopyIf.cpp
@@ -270,6 +270,9 @@ void run_all_scenarios() {
 }
 
 TEST(std_algorithms_mod_seq_ops, copy_if) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   run_all_scenarios<DynamicTag, int>();
   run_all_scenarios<StridedThreeTag, int>();
 }

diff --git a/algorithms/unit_tests/TestStdAlgorithmsRemove.cpp b/algorithms/unit_tests/TestStdAlgorithmsRemove.cpp
@@ -195,6 +195,9 @@ void run_all_scenarios() {
 }
 
 TEST(std_algorithms_mod_seq_ops, remove) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   run_all_scenarios<DynamicTag, int>();
   run_all_scenarios<StridedThreeTag, int>();
 }

diff --git a/algorithms/unit_tests/TestStdAlgorithmsRemoveCopy.cpp b/algorithms/unit_tests/TestStdAlgorithmsRemoveCopy.cpp
@@ -224,6 +224,9 @@ void run_all_scenarios() {
 }
 
 TEST(std_algorithms_mod_seq_ops, remove_copy) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   run_all_scenarios<DynamicTag, int>();
   run_all_scenarios<StridedThreeTag, int>();
   run_all_scenarios<DynamicTag, double>();

diff --git a/algorithms/unit_tests/TestStdAlgorithmsRemoveCopyIf.cpp b/algorithms/unit_tests/TestStdAlgorithmsRemoveCopyIf.cpp
@@ -208,6 +208,9 @@ void run_all_scenarios() {
 }
 
 TEST(std_algorithms_mod_seq_ops, remove_copy_if) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   run_all_scenarios<DynamicTag, int>();
   run_all_scenarios<StridedThreeTag, int>();
 }

diff --git a/algorithms/unit_tests/TestStdAlgorithmsRemoveIf.cpp b/algorithms/unit_tests/TestStdAlgorithmsRemoveIf.cpp
@@ -192,6 +192,9 @@ void run_all_scenarios() {
 }
 
 TEST(std_algorithms_mod_seq_ops, remove_if) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   run_all_scenarios<DynamicTag, int>();
   run_all_scenarios<StridedThreeTag, int>();
 }

diff --git a/algorithms/unit_tests/TestStdAlgorithmsReplaceIf.cpp b/algorithms/unit_tests/TestStdAlgorithmsReplaceIf.cpp
@@ -216,6 +216,9 @@ void run_all_scenarios() {
 }
 
 TEST(std_algorithms_replace_ops_test, replace_if) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   run_all_scenarios<DynamicTag, double>();
   run_all_scenarios<StridedThreeTag, double>();
   run_all_scenarios<DynamicTag, int>();

diff --git a/algorithms/unit_tests/TestStdAlgorithmsRotate.cpp b/algorithms/unit_tests/TestStdAlgorithmsRotate.cpp
@@ -234,6 +234,9 @@ void run_all_scenarios() {
 }
 
 TEST(std_algorithms_mod_seq_ops, rotate) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   run_all_scenarios<DynamicTag, int>();
   run_all_scenarios<StridedThreeTag, int>();
   run_all_scenarios<DynamicTag, double>();

diff --git a/algorithms/unit_tests/TestStdAlgorithmsShiftLeft.cpp b/algorithms/unit_tests/TestStdAlgorithmsShiftLeft.cpp
@@ -202,6 +202,9 @@ void run_all_scenarios() {
 }
 
 TEST(std_algorithms_mod_seq_ops, shift_left) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   run_all_scenarios<DynamicTag, int>();
   run_all_scenarios<StridedThreeTag, int>();
   run_all_scenarios<DynamicTag, double>();

diff --git a/algorithms/unit_tests/TestStdAlgorithmsShiftRight.cpp b/algorithms/unit_tests/TestStdAlgorithmsShiftRight.cpp
@@ -206,6 +206,9 @@ void run_all_scenarios() {
 }
 
 TEST(std_algorithms_mod_seq_ops, shift_right) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   run_all_scenarios<DynamicTag, int>();
   run_all_scenarios<StridedThreeTag, int>();
   run_all_scenarios<DynamicTag, double>();

diff --git a/algorithms/unit_tests/TestStdAlgorithmsUnique.cpp b/algorithms/unit_tests/TestStdAlgorithmsUnique.cpp
@@ -273,6 +273,9 @@ void run_all_scenarios() {
 }
 
 TEST(std_algorithms_mod_seq_ops, unique) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   run_all_scenarios<DynamicTag, int>();
   run_all_scenarios<StridedThreeTag, int>();
 }

diff --git a/algorithms/unit_tests/TestStdAlgorithmsUniqueCopy.cpp b/algorithms/unit_tests/TestStdAlgorithmsUniqueCopy.cpp
@@ -322,6 +322,9 @@ void run_all_scenarios() {
 }
 
 TEST(std_algorithms_mod_seq_ops, unique_copy) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   run_all_scenarios<DynamicTag, int>();
   run_all_scenarios<StridedThreeTag, int>();
 }

diff --git a/containers/unit_tests/TestScatterView.hpp b/containers/unit_tests/TestScatterView.hpp
@@ -758,6 +758,9 @@ void test_scatter_view(int64_t n) {
 }
 
 TEST(TEST_CATEGORY, scatterview) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   test_scatter_view<TEST_EXECSPACE, Kokkos::Experimental::ScatterSum, double>(
       10);
 
@@ -789,6 +792,10 @@ TEST(TEST_CATEGORY, scatterview) {
 }
 
 TEST(TEST_CATEGORY, scatterview_devicetype) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
+
   using device_type =
       Kokkos::Device<TEST_EXECSPACE, typename TEST_EXECSPACE::memory_space>;
 

diff --git a/core/perf_test/PerfTest_ExecSpacePartitioning.cpp b/core/perf_test/PerfTest_ExecSpacePartitioning.cpp
@@ -155,6 +155,10 @@ struct FunctorTeamReduce {
 };
 
 TEST(default_exec, overlap_range_policy) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
+
   int N = 2000;
   int M = 10000;
   int R = 10;
@@ -316,6 +320,10 @@ TEST(default_exec, overlap_range_policy) {
 }
 
 TEST(default_exec, overlap_mdrange_policy) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
+
   int N = 200;
   int M = 10000;
   int R = 10;
@@ -495,6 +503,10 @@ TEST(default_exec, overlap_mdrange_policy) {
 }
 
 TEST(default_exec, overlap_team_policy) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
+
   int N = 20;
   int M = 1000000;
   int R = 10;

diff --git a/core/unit_test/TestCrs.hpp b/core/unit_test/TestCrs.hpp
@@ -174,6 +174,9 @@ void test_constructor(std::int32_t nrows) {
 }  // anonymous namespace
 
 TEST(TEST_CATEGORY, crs_count_fill) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   test_count_fill<TEST_EXECSPACE>(0);
   test_count_fill<TEST_EXECSPACE>(1);
   test_count_fill<TEST_EXECSPACE>(2);
@@ -185,6 +188,9 @@ TEST(TEST_CATEGORY, crs_count_fill) {
 }
 
 TEST(TEST_CATEGORY, crs_copy_constructor) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   test_constructor<TEST_EXECSPACE>(0);
   test_constructor<TEST_EXECSPACE>(1);
   test_constructor<TEST_EXECSPACE>(2);

diff --git a/core/unit_test/sycl/TestSYCL_TeamScratchStreams.cpp b/core/unit_test/sycl/TestSYCL_TeamScratchStreams.cpp
@@ -76,13 +76,12 @@ void sycl_queue_scratch_test(
   Kokkos::Experimental::SYCL default_space;
   sycl::context default_context = default_space.sycl_queue().get_context();
 
-  sycl::default_selector device_selector;
-  sycl::queue queue(default_context, device_selector);
+  sycl::queue queue(default_context, sycl::default_selector_v);
 
   std::array<Kokkos::Experimental::SYCL, K> sycl;
   for (int i = 0; i < K; i++) {
     sycl[i] = Kokkos::Experimental::SYCL(
-        sycl::queue(default_context, device_selector));
+        sycl::queue(default_context, sycl::default_selector_v));
   }
 
   // Test that growing scratch size in subsequent calls doesn't crash things
@@ -111,6 +110,9 @@ void sycl_queue_scratch_test(
 }  // namespace Impl
 
 TEST(sycl, team_scratch_1_queues) {
+#if defined(KOKKOS_ENABLE_SYCL) && !defined(KOKKOS_ARCH_INTEL_GPU)
+  GTEST_SKIP() << "skipping for SYCL+Cuda";
+#endif
   int N      = 1000000;
   int T      = 10;
   int M_base = 150;