Fixed and simplified the unit test

ldh4 · Apr 2, 2024 · 879ca05 · 879ca05
1 parent 3911681
commit 879ca05
Showing 1 changed file with 14 additions and 18 deletions.
diff --git a/core/unit_test/TestMDRangePolicyConstructors.hpp b/core/unit_test/TestMDRangePolicyConstructors.hpp
@@ -158,25 +158,21 @@ TEST(TEST_CATEGORY, policy_get_tile_size) {
               policy.tile_size_max_total());
 
     for (std::size_t i = 0; i < rank; ++i) {
-#if defined(KOKKOS_ENABLE_CUDA) || defined(KOKKOS_ENABLE_HIP) || \
-    defined(KOKKOS_ENABLE_SYCL)
-      EXPECT_EQ(default_size_properties.default_largest_tile_size,
-                policy.tile_size_max_recommended_per_rank(i));
-      if (i == last_rank) {
-        if (default_size_properties.default_largest_tile_size == 0)
-          EXPECT_EQ(100, rec_tile_size[i]);
-        else
-          EXPECT_EQ(default_size_properties.default_largest_tile_size,
-                    rec_tile_size[i]);
+      if (default_size_properties.default_largest_tile_size == 0) {
+        EXPECT_EQ(100, policy.tile_size_max_recommended_per_rank(i));
+
+        auto expected_rec_tile_size =
+            (i == last_rank) ? 100 : default_size_properties.default_tile_size;
+        EXPECT_EQ(expected_rec_tile_size, rec_tile_size[i]);
+      } else {
+        EXPECT_EQ(default_size_properties.default_largest_tile_size,
+                  policy.tile_size_max_recommended_per_rank(i));
+
+        auto expected_rec_tile_size =
+            (i == last_rank) ? default_size_properties.default_largest_tile_size
+                             : default_size_properties.default_tile_size;
+        EXPECT_EQ(expected_rec_tile_size, rec_tile_size[i]);
       }
-#else
-      EXPECT_EQ(100, policy.tile_size_max_recommended_per_rank(i));
-      if (i == last_rank)
-        EXPECT_EQ(policy.tile_size_max_recommended_per_rank(last_rank),
-                  rec_tile_size[i]);
-#endif
-      else
-        EXPECT_EQ(default_size_properties.default_tile_size, rec_tile_size[i]);
     }
   }
 }