fixup! test using multivector in cg

Author: MarcelKoch

core/solver/cg.cpp

@@ -52,22 +52,23 @@ void Cg<ValueType>::apply(const matrix::MultiVector* b,
                           matrix::MultiVector* x) const
 {
     // @todo: need precision dispatch
+    auto dense_b = b->temporary_precision<ValueType>();
+    auto dense_x = x->temporary_precision<ValueType>();
 
     using std::swap;
     constexpr uint8 RelativeStoppingId{1};
 
     auto exec = this->get_executor();
     this->setup_workspace();
 
-    auto dense_b = b.get();
-    GKO_SOLVER_VECTOR(r, dense_b);
-    GKO_SOLVER_VECTOR(z, dense_b);
-    GKO_SOLVER_VECTOR(p, dense_b);
-    GKO_SOLVER_VECTOR(q, dense_b);
+    GKO_SOLVER_VECTOR(r, dense_b.get());
+    GKO_SOLVER_VECTOR(z, dense_b.get());
+    GKO_SOLVER_VECTOR(p, dense_b.get());
+    GKO_SOLVER_VECTOR(q, dense_b.get());
 
-    GKO_SOLVER_SCALAR(beta, dense_b);
-    GKO_SOLVER_SCALAR(prev_rho, dense_b);
-    GKO_SOLVER_SCALAR(rho, dense_b);
+    GKO_SOLVER_SCALAR(beta, dense_b.get());
+    GKO_SOLVER_SCALAR(prev_rho, dense_b.get());
+    GKO_SOLVER_SCALAR(rho, dense_b.get());
 
     GKO_SOLVER_ONE_MINUS_ONE();
 
@@ -80,18 +81,19 @@ void Cg<ValueType>::apply(const matrix::MultiVector* b,
     // z = p = q = 0
     // @todo: I think the template keyword is necessary because some of these
     //        variables are defined via auto.
-    exec->run(
-        cg::make_initialize(b->template create_local_view<ValueType>().get(),
-                            r->template create_local_view<ValueType>().get(),
-                            z->template create_local_view<ValueType>().get(),
-                            p->template create_local_view<ValueType>().get(),
-                            q->template create_local_view<ValueType>().get(),
-                            prev_rho, rho, &stop_status));
+    exec->run(cg::make_initialize(
+        dense_b->template create_local_view<ValueType>().get(),
+        r->template create_local_view<ValueType>().get(),
+        z->template create_local_view<ValueType>().get(),
+        p->template create_local_view<ValueType>().get(),
+        q->template create_local_view<ValueType>().get(), prev_rho, rho,
+        &stop_status));
 
-    this->get_system_matrix()->apply(neg_one_op, x, one_op, r);
+    this->get_system_matrix()->apply(neg_one_op, dense_x, one_op, r);
     auto stop_criterion = this->get_stop_criterion_factory()->generate(
         this->get_system_matrix(),
-        std::shared_ptr<const LinOp>(dense_b, [](const LinOp*) {}), x.get(), r);
+        std::shared_ptr<const LinOp>(dense_b.get(), [](const LinOp*) {}),
+        dense_x.get(), r);
 
     int iter = -1;
     /* Memory movement summary:
@@ -115,11 +117,11 @@ void Cg<ValueType>::apply(const matrix::MultiVector* b,
                 .num_iterations(iter)
                 .residual(r)
                 .implicit_sq_residual_norm(rho)
-                .solution(x.get())
+                .solution(dense_x.get())
                 .check(RelativeStoppingId, true, &stop_status, &one_changed);
         this->template log<log::Logger::iteration_complete>(
-            this, dense_b, x.get(), iter, r, nullptr, rho, &stop_status,
-            all_stopped);
+            this, dense_b.get(), dense_x.get(), iter, r, nullptr, rho,
+            &stop_status, all_stopped);
         if (all_stopped) {
             break;
         }
@@ -137,12 +139,12 @@ void Cg<ValueType>::apply(const matrix::MultiVector* b,
         // tmp = rho / beta
         // x = x + tmp * p
         // r = r - tmp * q
-        exec->run(
-            cg::make_step_2(x->template create_local_view<ValueType>().get(),
-                            r->template create_local_view<ValueType>().get(),
-                            p->template create_local_view<ValueType>().get(),
-                            q->template create_local_view<ValueType>().get(),
-                            beta, rho, &stop_status));
+        exec->run(cg::make_step_2(
+            dense_x->template create_local_view<ValueType>().get(),
+            r->template create_local_view<ValueType>().get(),
+            p->template create_local_view<ValueType>().get(),
+            q->template create_local_view<ValueType>().get(), beta, rho,
+            &stop_status));
         swap(prev_rho, rho);
     }
 }

reference/test/solver/cg_kernels.cpp

@@ -246,6 +246,27 @@ TYPED_TEST(Cg, SolvesStencilSystemMultiVector)
                         r<value_type>::value);
 }
 
+TYPED_TEST(Cg, SolvesStencilSystemMultiVectorMixed)
+{
+    using value_type = typename TestFixture::value_type;
+    using snd_value_type = gko::next_precision<value_type>;
+    using Mtx = gko::matrix::Dense<snd_value_type>;
+    auto solver =
+        gko::solver::Cg<value_type>::build()
+            .with_criteria(gko::stop::Iteration::build().with_max_iters(3u))
+            .on(this->exec)
+            ->generate(this->mtx);
+    std::unique_ptr<gko::matrix::MultiVector> b =
+        gko::initialize<Mtx>({-1.0, 3.0, 1.0}, this->exec);
+    std::unique_ptr<gko::matrix::MultiVector> x =
+        gko::initialize<Mtx>({0.0, 0.0, 0.0}, this->exec);
+
+    solver->apply(b.get(), x.get());
+
+    GKO_ASSERT_MTX_NEAR(gko::as<Mtx>(x.get()), l({1.0, 3.0, 2.0}),
+                        (r_mixed<value_type, TypeParam>()));
+}
+
 
 TYPED_TEST(Cg, SolvesStencilSystemMixed)
 {