Enable shp-tests (#743)

* resolve ambiguity (format_to)

* re-enable shp tests

Author: haichangsi

.github/workflows/pr.yml

@@ -55,8 +55,6 @@ jobs:
     - name: MHP unit tests
       run: ctest --test-dir build -L MHP -j 4
     - name: SHP unit tests
-      # Does not work on CPU
-      if: false
       run: ctest --test-dir build -L SHP -j 4
     - uses: actions/upload-artifact@v4
       if: always()

benchmarks/gbench/mhp/fft3d.cpp

@@ -31,7 +31,7 @@ struct fmt::formatter<std::complex<Base>, char>
     : public formatter<string_view> {
   template <typename FmtContext>
   auto format(std::complex<Base> c, FmtContext &ctx) const {
-    format_to(ctx.out(), "{}+{}i", c.real(), c.imag());
+    fmt::format_to(ctx.out(), "{}+{}i", c.real(), c.imag());
     return ctx.out();
   }
 };

benchmarks/gbench/shp/CMakeLists.txt

@@ -34,7 +34,7 @@ if(NOT ENABLE_CUDA)
   target_sources(shp-bench PRIVATE ../common/black_scholes.cpp)
 endif()
 target_link_libraries(shp-bench shp-benchmark)
-add_shp_disabled_ctest(shp-bench shp-bench --vector-size 200000 --check)
+add_shp_ctest(shp-bench shp-bench --vector-size 200000 --check)
 
 # builds only 1 benchmark for quick testing. Change this to the benchmark you
 # are testing

include/dr/detail/mdspan_utils.hpp

@@ -260,14 +260,14 @@ struct fmt::formatter<Mdspan, char> : public formatter<string_view> {
       index[dim] = i;
       if (dim == mdspan.rank() - 1) {
         if (i == 0) {
-          format_to(ctx.out(), "{}: ", index);
+          fmt::format_to(ctx.out(), "{}: ", index);
         }
-        format_to(ctx.out(), "{:4} ", mdspan(index));
+        fmt::format_to(ctx.out(), "{:4} ", mdspan(index));
       } else {
         format_mdspan(ctx, mdspan, index, dim + 1);
       }
     }
-    format_to(ctx.out(), "\n");
+    fmt::format_to(ctx.out(), "\n");
   }
 };
 

include/dr/mhp/halo.hpp

@@ -426,7 +426,7 @@ template <>
 struct fmt::formatter<dr::mhp::halo_bounds> : formatter<string_view> {
   template <typename FmtContext>
   auto format(dr::mhp::halo_bounds hb, FmtContext &ctx) {
-    return format_to(ctx.out(), "prev: {} next: {}", hb.prev, hb.next);
+    return fmt::format_to(ctx.out(), "prev: {} next: {}", hb.prev, hb.next);
   }
 };
 

test/gtest/shp/CMakeLists.txt

@@ -26,7 +26,7 @@ foreach(test-exec IN ITEMS shp-tests shp-tests-3 shp-quick-test)
 endforeach()
 
 # timeout in SHP tests
-add_shp_disabled_ctest(shp-tests shp-tests)
-add_shp_disabled_ctest(shp-tests-3 shp-tests --devicesCount 3)
+add_shp_ctest(shp-tests shp-tests)
+add_shp_ctest(shp-tests-3 shp-tests --devicesCount 3)
 
 add_shp_ctest(shp-tests-3-only shp-tests-3 --devicesCount 3)