Merge pull request #2490 from DARMA-tasking/2489-missing-c20-compatibility-issue

2489 missing cxx20 compatibility issue

Author: lifflander

docker-bake.hcl

@@ -340,6 +340,8 @@ target "vt-build-all" {
         image = "amd64-ubuntu-22.04-clang-15-cpp"
         variant = "cxx20"
         vt_cmake_cxx_standard = 20
+        vt_debug_verbose = 1
+        vt_production_build = 0
       },
       {
         image = "amd64-ubuntu-22.04-gcc-11-cpp"

src/vt/configs/debug/debug_print.h

@@ -283,12 +283,14 @@ namespace vt { namespace config {
 template <CatEnum cat, CtxEnum ctx, ModeEnum mod>
 struct DebugPrintOp;
 
-template <CatEnum cat, ModeEnum mod, typename Arg, typename... Args>
-static inline void debugPrintImpl(NodeType node, Arg&& arg, Args&&... args) {
+template <CatEnum cat, ModeEnum mod, typename... Args>
+static inline void debugPrintImpl(
+  NodeType node, fmt::format_string<Args...> arg, Args&&... args
+) {
   constexpr auto mask = ModeEnum::terse | ModeEnum::normal | ModeEnum::verbose;
   constexpr auto level = mod & mask;
   if (level <= vt::debug::preConfig()->vt_debug_level_val) {
-    auto user = fmt::format(std::forward<Arg>(arg),std::forward<Args>(args)...);
+    auto user = fmt::format(arg, std::forward<Args>(args)...);
     std::string debug_level = "";
     if (level == ModeEnum::terse) {
       debug_level = "(t)";
@@ -316,23 +318,26 @@ static inline void debugPrintImpl(NodeType node, Arg&& arg, Args&&... args) {
 
 template <CatEnum cat, ModeEnum mod>
 struct DebugPrintOp<cat, CtxEnum::node, mod> {
-  template <typename Arg, typename... Args>
-  void operator()(bool const rt_option, Arg&& arg, Args&&... args) {
+  template <typename... Args>
+  void operator()(
+    bool const rt_option, fmt::format_string<Args...> arg, Args&&... args
+  ) {
     if (rt_option or vt::debug::preConfig()->vt_debug_all) {
       debugPrintImpl<cat, mod>(
-        vt::debug::preNode(), std::forward<Arg>(arg),
-        std::forward<Args>(args)...
+        vt::debug::preNode(), arg, std::forward<Args>(args)...
       );
     }
   }
 };
 
 template <CatEnum cat, ModeEnum mod>
 struct DebugPrintOp<cat, CtxEnum::unknown, mod> {
-  template <typename Arg, typename... Args>
-  void operator()(bool const rt_option, Arg&& arg, Args&&... args) {
+  template <typename... Args>
+  void operator()(
+    bool const rt_option, fmt::format_string<Args...> arg, Args&&... args
+  ) {
     if (rt_option or vt::debug::preConfig()->vt_debug_all) {
-      debugPrintImpl<cat,mod>(-1,std::forward<Arg>(arg),std::forward<Args>(args)...);
+      debugPrintImpl<cat,mod>(-1, arg, std::forward<Args>(args)...);
     }
   }
 };
@@ -347,8 +352,10 @@ template <
 >
 struct DispatchOp {
   template <typename... Args>
-  static void apply(bool const op, Args&&... args) {
-    return Op<cat,ctx,mode>()(op,std::forward<Args>(args)...);
+  static void apply(
+    bool const op, fmt::format_string<Args...> arg, Args&&... args
+  ) {
+    return Op<cat,ctx,mode>()(op,arg,std::forward<Args>(args)...);
   }
 };
 
@@ -364,8 +371,10 @@ template <
 >
 struct CheckEnabled {
   template <typename... Args>
-  static void apply(bool const, Args&&... args) {
-    return vt::debug::useVars(std::forward<Args>(args)...);
+  static void apply(
+    bool const, fmt::format_string<Args...> arg, Args&&... args
+  ) {
+    return vt::debug::useVars(arg,std::forward<Args>(args)...);
   }
 };
 
@@ -384,8 +393,12 @@ struct CheckEnabled<
   >
 > {
   template <typename... Args>
-  static void apply(bool const op, Args&&... args) {
-    return DispatchOp<Op,C,cat,ctx,mod>::apply(op,std::forward<Args>(args)...);
+  static void apply(
+    bool const op, fmt::format_string<Args...> arg, Args&&... args
+  ) {
+    return DispatchOp<Op,C,cat,ctx,mod>::apply(
+      op, arg, std::forward<Args>(args)...
+    );
   }
 };
 
@@ -399,8 +412,12 @@ template <
 >
 struct ApplyOp {
   template <typename... Args>
-  static void apply(bool const op, Args&&... args) {
-    return CheckEnabled<Op,C,cat,ctx,mod>::apply(op,std::forward<Args>(args)...);
+  static void apply(
+    bool const op, fmt::format_string<Args...> arg, Args&&... args
+  ) {
+    return CheckEnabled<Op,C,cat,ctx,mod>::apply(
+      op, arg, std::forward<Args>(args)...
+    );
   }
 };
 

src/vt/messaging/active.impl.h

@@ -165,13 +165,19 @@ ActiveMessenger::PendingSendType ActiveMessenger::sendMsgCopyableImpl(
   const bool is_bcast = dest == broadcast_dest;
 
   if (!is_term || vt_check_enabled(print_term_msgs)) {
-    vt_debug_print(
-      verbose, active,
-      is_bcast
-        ? "broadcastMsg of ptr={}, type={}\n"
-        : "sendMsg of ptr={}, type={}\n",
-      print_ptr(rawMsg), typeid(MsgT).name()
-    );
+    if (is_bcast) {
+      vt_debug_print(
+        verbose, active,
+        "broadcastMsg of ptr={}, type={}\n",
+        print_ptr(rawMsg), typeid(MsgT).name()
+      );
+    } else {
+      vt_debug_print(
+        verbose, active,
+        "sendMsg of ptr={}, type={}\n",
+        print_ptr(rawMsg), typeid(MsgT).name()
+      );
+    }
   }
 
   if (is_bcast) {

src/vt/utils/memory/memory_usage.cc

@@ -371,11 +371,11 @@ void MemoryUsage::initialize() {
         thePhase()->registerHookUnsynchronized(
           phase::PhaseHook::EndPostMigration, []{
             auto cur_phase = thePhase()->getCurrentPhase();
-            auto memory_usage_str = fmt::format(
+            vt_print(
+              gen,
               "Memory Usage: phase={}: {}\n", cur_phase,
               theMemUsage()->getUsageAll()
             );
-            vt_print(gen, memory_usage_str);
           }
         );
       }