Fix ref test issues

ginkgo-project · Oct 23, 2023 · 26472b9 · 26472b9
1 parent f752d83
commit 26472b9
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 22 deletions.
diff --git a/core/base/batch_utilities.hpp b/core/base/batch_utilities.hpp
@@ -201,6 +201,8 @@ std::unique_ptr<OutputType> read(
                            std::forward<TArgs>(create_args)...);
 
     for (size_type b = 0; b < num_batch_items; ++b) {
+        if (data.at(b).size != data.at(0).size)
+            GKO_INVALID_STATE("Incorrect data passed in");
         tmp->create_view_for_item(b)->read(data[b]);
     }
 

diff --git a/core/test/utils/batch_helpers.hpp b/core/test/utils/batch_helpers.hpp
@@ -359,35 +359,33 @@ LinearSystem<MatrixType> generate_diag_dominant_batch_problem(
                         soa_data.get_const_col_idxs())
                         .copy_to_array();
 
-    std::vector<gko::matrix_data<value_type, index_type>> batch_data(
-        num_batch_items);
+    std::vector<gko::matrix_data<value_type, index_type>> batch_data;
     batch_data.reserve(num_batch_items);
+    batch_data.emplace_back(data);
     auto rand_val_dist = std::normal_distribution<>(-0.5, 0.5);
     for (size_type b = 1; b < num_batch_items; b++) {
         auto rand_data = fill_random_matrix_data<value_type, index_type>(
             num_rows, num_cols, row_idxs, col_idxs, rand_val_dist, engine);
         gko::utils::make_diag_dominant(rand_data);
         batch_data.emplace_back(rand_data);
+        GKO_ASSERT(rand_data.size == batch_data.at(0).size);
     }
 
     LinearSystem<MatrixType> sys;
-    sys.matrix = gko::give(gko::batch::read<value_type, index_type, MatrixType>(
-        exec, batch_data, std::forward<MatrixArgs>(args)...));
+    sys.matrix = gko::batch::read<value_type, index_type, MatrixType>(
+        exec, batch_data, std::forward<MatrixArgs>(args)...);
 
-    std::vector<gko::matrix_data<value_type, index_type>> batch_sol_data(
-        num_batch_items);
+    std::vector<gko::matrix_data<value_type, index_type>> batch_sol_data;
     batch_sol_data.reserve(num_batch_items);
     for (size_type b = 0; b < num_batch_items; b++) {
         auto rand_data = generate_random_matrix_data<value_type, index_type>(
-            num_rows, num_cols,
+            num_rows, num_rhs,
             std::uniform_int_distribution<index_type>(num_rhs, num_rhs),
             rand_val_dist, engine);
         batch_sol_data.emplace_back(rand_data);
     }
-    sys.exact_sol = gko::give(
-        gko::batch::read<value_type, index_type,
-                         typename LinearSystem<MatrixType>::multi_vec>(
-            exec, batch_sol_data));
+    sys.exact_sol = gko::batch::read<value_type, index_type, multi_vec>(
+        exec, batch_sol_data);
     sys.rhs = sys.exact_sol->clone();
     sys.matrix->apply(sys.exact_sol, sys.rhs);
     const gko::batch_dim<2> norm_dim(num_batch_items, gko::dim<2>(1, num_rhs));

diff --git a/dpcpp/preconditioner/batch_identity.hpp.inc b/dpcpp/preconditioner/batch_identity.hpp.inc
@@ -60,7 +60,7 @@ public:
      * preconditioner values are to be stored.
      */
     void generate(size_type batch_id,
-                  const gko::batch::matrix::ell::batch_item<const ValueType>&,
+                  const gko::batch::matrix::ell::batch_item<const ValueType, const gko::int32>&,
                   ValueType* const, sycl::nd_item<3> item_ct1)
     {}
 

diff --git a/include/ginkgo/core/solver/batch_solver_base.hpp b/include/ginkgo/core/solver/batch_solver_base.hpp
@@ -36,6 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <ginkgo/core/base/batch_lin_op.hpp>
 #include <ginkgo/core/base/batch_multi_vector.hpp>
+#include <ginkgo/core/base/utils_helper.hpp>
 #include <ginkgo/core/log/batch_logger.hpp>
 #include <ginkgo/core/matrix/batch_identity.hpp>
 
@@ -167,10 +168,10 @@ class EnableBatchSolver
     }
 
     const ConcreteSolver* apply_impl(
-        ptr_param<const MultiVector<ValueType>>* alpha,
-        ptr_param<const MultiVector<ValueType>>* b,
-        ptr_param<const MultiVector<ValueType>>* beta,
-        ptr_param<MultiVector<ValueType>>* x) const
+        ptr_param<const MultiVector<ValueType>> alpha,
+        ptr_param<const MultiVector<ValueType>> b,
+        ptr_param<const MultiVector<ValueType>> beta,
+        ptr_param<MultiVector<ValueType>> x) const
     {
         this->validate_application_parameters(alpha.get(), b.get(), beta.get(),
                                               x.get());
@@ -189,10 +190,10 @@ class EnableBatchSolver
         return self();
     }
 
-    ConcreteSolver* apply_impl(ptr_param<const MultiVector<ValueType>>* alpha,
-                               ptr_param<const MultiVector<ValueType>>* b,
-                               ptr_param<const MultiVector<ValueType>>* beta,
-                               ptr_param<MultiVector<ValueType>>* x)
+    ConcreteSolver* apply_impl(ptr_param<const MultiVector<ValueType>> alpha,
+                               ptr_param<const MultiVector<ValueType>> b,
+                               ptr_param<const MultiVector<ValueType>> beta,
+                               ptr_param<MultiVector<ValueType>> x)
     {
         static_cast<const ConcreteSolver*>(this)->apply(alpha, b, beta, x);
         return self();

diff --git a/reference/test/solver/batch_bicgstab_kernels.cpp b/reference/test/solver/batch_bicgstab_kernels.cpp
@@ -245,10 +245,10 @@ TYPED_TEST(BatchBicgstab, CanSolveDenseHpdSystem)
     auto res =
         gko::test::solve_linear_system(this->exec, linear_system, solver);
 
-    GKO_ASSERT_BATCH_MTX_NEAR(res.x, linear_system.exact_sol, tol * 10);
+    GKO_ASSERT_BATCH_MTX_NEAR(res.x, linear_system.exact_sol, tol * 500);
     for (size_t i = 0; i < num_batch_items; i++) {
         ASSERT_LE(res.res_norm->get_const_values()[i] /
                       linear_system.rhs_norm->get_const_values()[i],
-                  tol);
+                  tol * 100);
     }
 }