make permuting_reuse_info default-constructible

ginkgo-project · Feb 18, 2025 · cccf80d · cccf80d
1 parent a524589
commit cccf80d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/core/matrix/csr.cpp b/core/matrix/csr.cpp
@@ -670,6 +670,12 @@ transform_reusable(const Csr<ValueType, IndexType>* input, gko::dim<2> out_size,
 }
 
 
+template <typename ValueType, typename IndexType>
+Csr<ValueType, IndexType>::permuting_reuse_info::permuting_reuse_info()
+    : permuting_reuse_info{nullptr}
+{}
+
+
 template <typename ValueType, typename IndexType>
 Csr<ValueType, IndexType>::permuting_reuse_info::permuting_reuse_info(
     std::unique_ptr<Permutation<index_type>> value_permutation)
@@ -681,6 +687,9 @@ template <typename ValueType, typename IndexType>
 void Csr<ValueType, IndexType>::permuting_reuse_info::update_values(
     ptr_param<const Csr> input, ptr_param<Csr> output) const
 {
+    if (!value_permutation) {
+        GKO_NOT_SUPPORTED(value_permutation);
+    }
     input->create_const_value_view()->permute(
         value_permutation, output->create_value_view(), permute_mode::rows);
 }

diff --git a/core/test/matrix/csr.cpp b/core/test/matrix/csr.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2017 - 2024 The Ginkgo authors
+// SPDX-FileCopyrightText: 2017 - 2025 The Ginkgo authors
 //
 // SPDX-License-Identifier: BSD-3-Clause
 
@@ -8,6 +8,7 @@
 #include <ginkgo/core/matrix/csr.hpp>
 
 #include "core/test/utils.hpp"
+#include "ginkgo/core/base/exception.hpp"
 
 
 namespace {
@@ -419,4 +420,13 @@ TYPED_TEST(Csr, GeneratesCorrectMatrixData)
 }
 
 
+TYPED_TEST(Csr, PermutingReuseInfoDefaultUpdateException)
+{
+    using Mtx = typename TestFixture::Mtx;
+    typename Mtx::permuting_reuse_info reuse;
+
+    ASSERT_THROW(reuse.update_values(this->mtx, this->mtx), gko::NotSupported);
+}
+
+
 }  // namespace
diff --git a/include/ginkgo/core/matrix/csr.hpp b/include/ginkgo/core/matrix/csr.hpp
@@ -762,6 +762,9 @@ class Csr : public EnableLinOp<Csr<ValueType, IndexType>>,
      * values of the matrix into the transformed matrix.
      */
     struct permuting_reuse_info {
+        /** Creates an empty reuse info. */
+        explicit permuting_reuse_info();
+
         /** Creates a reuse info structure from its value permutation. */
         permuting_reuse_info(
             std::unique_ptr<Permutation<index_type>> value_permutation);
@@ -805,9 +808,7 @@ class Csr : public EnableLinOp<Csr<ValueType, IndexType>>,
      *              If permute_mode::rows is set, the rows will be permuted.
      *              If permute_mode::columns is set, the columns will be
      *              permuted.
-     * @return an std::pair consisting of the transposed matrix and the reuse
-     *         info struct that can be used to update values in the transposed
-     *         matrix.
+     * @return  The permuted matrix.
      */
     std::unique_ptr<Csr> permute(
         ptr_param<const Permutation<index_type>> permutation,