fix windows and icpx

ginkgo-project · Sep 18, 2024 · 4e332c0 · 4e332c0
1 parent e4268ed
commit 4e332c0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/include/ginkgo/core/preconditioner/ic.hpp b/include/ginkgo/core/preconditioner/ic.hpp
@@ -442,7 +442,7 @@ class Ic : public EnableLinOp<Ic<LSolverType, IndexType>>, public Transposable {
     generate_default_solver(const std::shared_ptr<const Executor>& exec,
                             const std::shared_ptr<const LinOp>& mtx)
     {
-        constexpr gko::remove_complex<value_type> default_reduce_residual{1e-4};
+        const gko::remove_complex<value_type> default_reduce_residual{1e-4};
         const unsigned int default_max_iters{
             static_cast<unsigned int>(mtx->get_size()[0])};
 

diff --git a/reference/test/reorder/mc64.cpp b/reference/test/reorder/mc64.cpp
@@ -86,12 +86,13 @@ TYPED_TEST(Mc64, HasSensibleDefaults)
 TYPED_TEST(Mc64, CanBeCreatedWithReorderingStrategy)
 {
     using reorder_type = typename TestFixture::reorder_type;
+    using real_type = typename TestFixture::real_type;
 
     auto mc64 =
         reorder_type::build()
             .with_strategy(
                 gko::experimental::reorder::mc64_strategy::max_diagonal_sum)
-            .with_tolerance(1e-4)
+            .with_tolerance(real_type{1e-4})
             .on(this->exec)
             ->generate(this->not_id3_mtx);
 

diff --git a/reference/test/reorder/mc64_kernels.cpp b/reference/test/reorder/mc64_kernels.cpp
@@ -284,7 +284,7 @@ TYPED_TEST(Mc64, CreatesCorrectPermutationAndScalingExampleSum)
         gko::experimental::reorder::Mc64<value_type, index_type>::build()
             .with_strategy(
                 gko::experimental::reorder::mc64_strategy::max_diagonal_sum)
-            .with_tolerance(1e-4)
+            .with_tolerance(real_type{1e-4})
             .on(this->ref);
 
     auto mc64 = mc64_factory->generate(this->mtx);
@@ -304,11 +304,12 @@ TYPED_TEST(Mc64, CreatesCorrectPermutationAndScalingExampleProduct)
 {
     using index_type = typename TestFixture::index_type;
     using value_type = typename TestFixture::value_type;
+    using real_type = typename TestFixture::real_type;
     auto mc64_factory =
         gko::experimental::reorder::Mc64<value_type, index_type>::build()
             .with_strategy(
                 gko::experimental::reorder::mc64_strategy::max_diagonal_product)
-            .with_tolerance(1e-4)
+            .with_tolerance(real_type{1e-4})
             .on(this->ref);
     auto mc64 = mc64_factory->generate(this->mtx);
 
@@ -356,7 +357,7 @@ TYPED_TEST(Mc64, CreatesCorrectPermutationAndScalingLargeTrivialExampleProduct)
         gko::experimental::reorder::Mc64<value_type, index_type>::build()
             .with_strategy(
                 gko::experimental::reorder::mc64_strategy::max_diagonal_product)
-            .with_tolerance(1e-4)
+            .with_tolerance(real_type{1e-4})
             .on(this->ref);
     auto mc64 = mc64_factory->generate(mtx);
     // get components