fix Ref also considered as Omp executor

Co-authored-by: Marcel Koch <[email protected]>
ginkgo-project · Nov 27, 2024 · 8204f85 · 8204f85
1 parent 88854e3
commit 8204f85
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/core/factorization/ic.cpp b/core/factorization/ic.cpp
@@ -160,7 +160,8 @@ std::unique_ptr<Composition<ValueType>> Ic<ValueType, IndexType>::generate(
             transpose_idxs.get_const_data(), *forest, factors.get(), false,
             tmp));
         ic = factors;
-    } else if (std::dynamic_pointer_cast<const OmpExecutor>(exec)) {
+    } else if (std::dynamic_pointer_cast<const OmpExecutor>(exec) &&
+               !std::dynamic_pointer_cast<const ReferenceExecutor>(exec)) {
         GKO_INVALID_STATE(
             "OmpExecutor does not support sparselib algorithm. Please use "
             "syncfree algorithm.");

diff --git a/core/factorization/ilu.cpp b/core/factorization/ilu.cpp
@@ -144,7 +144,8 @@ std::unique_ptr<Composition<ValueType>> Ilu<ValueType, IndexType>::generate_l_u(
             storage.get_const_data(), diag_idxs.get_const_data(), factors.get(),
             false, tmp));
         ilu = factors;
-    } else if (std::dynamic_pointer_cast<const OmpExecutor>(exec)) {
+    } else if (std::dynamic_pointer_cast<const OmpExecutor>(exec) &&
+               !std::dynamic_pointer_cast<const ReferenceExecutor>(exec)) {
         GKO_INVALID_STATE(
             "OmpExecutor does not support sparselib algorithm. Please use "
             "syncfree algorithm.");

diff --git a/test/factorization/ic_kernels.cpp b/test/factorization/ic_kernels.cpp
@@ -40,10 +40,12 @@ class Ic : public CommonTestFixture {
 
 TEST_F(Ic, ComputeICBySyncfreeIsEquivalentToRefSorted)
 {
-    auto fact = gko::factorization::Ic<>::build()
-                    .with_skip_sorting(true)
-                    .on(ref)
-                    ->generate(mtx);
+    auto fact =
+        gko::factorization::Ic<>::build()
+            .with_skip_sorting(true)
+            .with_algorithm(gko::factorization::incomplete_algorithm::syncfree)
+            .on(ref)
+            ->generate(mtx);
     auto dfact =
         gko::factorization::Ic<>::build()
             .with_skip_sorting(true)

diff --git a/test/factorization/ilu_kernels.cpp b/test/factorization/ilu_kernels.cpp
@@ -40,10 +40,12 @@ class Ilu : public CommonTestFixture {
 
 TEST_F(Ilu, ComputeILUBySyncfreeIsEquivalentToRefSorted)
 {
-    auto fact = gko::factorization::Ilu<>::build()
-                    .with_skip_sorting(true)
-                    .on(ref)
-                    ->generate(mtx);
+    auto fact =
+        gko::factorization::Ilu<>::build()
+            .with_skip_sorting(true)
+            .with_algorithm(gko::factorization::incomplete_algorithm::syncfree)
+            .on(ref)
+            ->generate(mtx);
     auto dfact =
         gko::factorization::Ilu<>::build()
             .with_skip_sorting(true)