fixes non-mpi residual norm dispatch

ginkgo-project · Mar 1, 2022 · 1dc6d94 · 1dc6d94
1 parent 4f09d10
commit 1dc6d94
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 36 deletions.
diff --git a/core/stop/residual_norm.cpp b/core/stop/residual_norm.cpp
@@ -101,28 +101,6 @@ bool use_distributed(Arg* linop, Rest*... rest)
 }
 
 
-#else
-
-
-template <typename ValueType, typename LinOp, typename... Rest>
-bool any_is_complex(const LinOp* in, Rest&&... rest)
-{
-    return !(is_complex<ValueType>() ||
-             dynamic_cast<const ConvertibleTo<matrix::Dense<>>*>(in)) ||
-           any_is_complex<ValueType>(std::forward<Rest>(rest)...);
-}
-
-
-template <typename... Args>
-bool use_distributed(Args*...)
-{
-    return false;
-}
-
-
-#endif
-
-
 template <typename ValueType, typename Function, typename... LinOps>
 void norm_dispatch(Function&& fn, LinOps*... linops)
 {
@@ -146,6 +124,33 @@ void norm_dispatch(Function&& fn, LinOps*... linops)
 }
 
 
+#else
+
+
+template <typename ValueType, typename LinOp, typename... Rest>
+bool any_is_complex(const LinOp* in, Rest&&... rest)
+{
+    return !(is_complex<ValueType>() ||
+             dynamic_cast<const ConvertibleTo<matrix::Dense<>>*>(in)) ||
+           any_is_complex<ValueType>(std::forward<Rest>(rest)...);
+}
+
+
+template <typename ValueType, typename Function, typename... LinOps>
+void norm_dispatch(Function&& fn, LinOps*... linops)
+{
+    if (any_is_complex<ValueType>(linops...)) {
+        precision_dispatch<to_complex<ValueType>>(std::forward<Function>(fn),
+                                                  linops...);
+    } else {
+        precision_dispatch<ValueType>(std::forward<Function>(fn), linops...);
+    }
+}
+
+
+#endif
+
+
 template <typename ValueType>
 ResidualNormBase<ValueType>::ResidualNormBase(
     std::shared_ptr<const gko::Executor> exec, const CriterionArgs& args,

diff --git a/include/ginkgo/core/base/precision_dispatch.hpp b/include/ginkgo/core/base/precision_dispatch.hpp
@@ -477,21 +477,10 @@ void precision_dispatch_real_complex_distributed(Function fn,
 #else
 
 
-template <typename ValueType, typename Function>
-void precision_dispatch_real_complex_distributed(Function fn, const LinOp* in,
-                                                 LinOp* out)
-{
-    precision_dispatch_real_complex<ValueType>(fn, in, out);
-}
-
-
-template <typename ValueType, typename Function>
-void precision_dispatch_real_complex_distributed(Function fn,
-                                                 const LinOp* alpha,
-                                                 const LinOp* in,
-                                                 const LinOp* beta, LinOp* out)
+template <typename ValueType, typename Function, typename... Args>
+void precision_dispatch_real_complex_distributed(Function fn, Args*... args)
 {
-    precision_dispatch_real_complex<ValueType>(fn, alpha, in, beta, out);
+    precision_dispatch_real_complex<ValueType>(fn, args...);
 }