fix batch ell infinite loop

ginkgo-project · Oct 20, 2023 · 59f099d · 59f099d
1 parent 0726ab6
commit 59f099d
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/core/matrix/batch_ell.cpp b/core/matrix/batch_ell.cpp
@@ -134,10 +134,7 @@ Ell<ValueType, IndexType>* Ell<ValueType, IndexType>::apply(
     ptr_param<const MultiVector<ValueType>> b,
     ptr_param<MultiVector<ValueType>> x)
 {
-    this->validate_application_parameters(b.get(), x.get());
-    auto exec = this->get_executor();
-    this->apply_impl(make_temporary_clone(exec, b).get(),
-                     make_temporary_clone(exec, x).get());
+    static_cast<const Ell*>(this)->apply(b, x);
     return this;
 }
 
@@ -147,7 +144,10 @@ const Ell<ValueType, IndexType>* Ell<ValueType, IndexType>::apply(
     ptr_param<const MultiVector<ValueType>> b,
     ptr_param<MultiVector<ValueType>> x) const
 {
-    this->apply(b, x);
+    this->validate_application_parameters(b.get(), x.get());
+    auto exec = this->get_executor();
+    this->apply_impl(make_temporary_clone(exec, b).get(),
+                     make_temporary_clone(exec, x).get());
     return this;
 }
 
@@ -159,13 +159,7 @@ Ell<ValueType, IndexType>* Ell<ValueType, IndexType>::apply(
     ptr_param<const MultiVector<ValueType>> beta,
     ptr_param<MultiVector<ValueType>> x)
 {
-    this->validate_application_parameters(alpha.get(), b.get(), beta.get(),
-                                          x.get());
-    auto exec = this->get_executor();
-    this->apply_impl(make_temporary_clone(exec, alpha).get(),
-                     make_temporary_clone(exec, b).get(),
-                     make_temporary_clone(exec, beta).get(),
-                     make_temporary_clone(exec, x).get());
+    static_cast<const Ell*>(this)->apply(alpha, b, beta, x);
     return this;
 }
 
@@ -177,7 +171,13 @@ const Ell<ValueType, IndexType>* Ell<ValueType, IndexType>::apply(
     ptr_param<const MultiVector<ValueType>> beta,
     ptr_param<MultiVector<ValueType>> x) const
 {
-    this->apply(alpha, b, beta, x);
+    this->validate_application_parameters(alpha.get(), b.get(), beta.get(),
+                                          x.get());
+    auto exec = this->get_executor();
+    this->apply_impl(make_temporary_clone(exec, alpha).get(),
+                     make_temporary_clone(exec, b).get(),
+                     make_temporary_clone(exec, beta).get(),
+                     make_temporary_clone(exec, x).get());
     return this;
 }