review updates

- fix failing tests
- move to experimental

cmake/Modules/FindMETIS.cmake

@@ -21,7 +21,7 @@
 #   where to find metis.h or metis64.h
 #
 # ``METIS_HEADER``
-#   either metis64.h or metis.h, dependent in which was found
+#   either metis64.h or metis.h, dependent on which was found
 #
 # ``METIS_LIBRARIES``
 #   the libraries to link against in order to use the METIS library.

core/reorder/nested_dissection.cpp

@@ -52,6 +52,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 namespace gko {
+namespace experimental {
 namespace reorder {
 namespace {
 
@@ -177,7 +178,7 @@ std::unique_ptr<LinOp> NestedDissection<ValueType, IndexType>::generate_impl(
     const auto num_rows = host_mtx->get_size()[0];
     array<IndexType> permutation(host_exec, num_rows);
     array<IndexType> inv_permutation(host_exec, num_rows);
-    exec->run(make_metis_nd(exec, num_rows, host_mtx->get_const_row_ptrs(),
+    exec->run(make_metis_nd(host_exec, num_rows, host_mtx->get_const_row_ptrs(),
                             host_mtx->get_const_col_idxs(),
                             build_metis_options(parameters_.options),
                             permutation.get_data(),
@@ -195,4 +196,5 @@ GKO_INSTANTIATE_FOR_EACH_VALUE_AND_INDEX_TYPE(GKO_DECLARE_ND);
 
 
 }  // namespace reorder
+}  // namespace experimental
 }  // namespace gko

include/ginkgo/core/reorder/nested_dissection.hpp

@@ -57,6 +57,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 namespace gko {
+namespace experimental {
 /**
  * @brief The Reorder namespace.
  *
@@ -137,6 +138,7 @@ class NestedDissection
 
 
 }  // namespace reorder
+}  // namespace experimental
 }  // namespace gko
 
 

test/matrix/sparsity_csr_kernels.cpp

@@ -58,8 +58,6 @@ namespace {
 
 class SparsityCsr : public CommonTestFixture {
 protected:
-    using value_type = double;
-    using index_type = int;
     using Mtx = gko::matrix::SparsityCsr<value_type, index_type>;
 
     SparsityCsr() : rng{9312}

test/reorder/CMakeLists.txt

@@ -1,3 +1,3 @@
 if (GINKGO_HAVE_METIS)
     ginkgo_create_common_test(nested_dissection)
-endif()
+endif()

test/reorder/nested_dissection.cpp

@@ -36,6 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <gtest/gtest.h>
 
 
+#include <ginkgo/core/base/array.hpp>
 #include <ginkgo/core/reorder/nested_dissection.hpp>
 
 
@@ -47,11 +48,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 template <typename IndexType>
 class NestedDissection : public CommonTestFixture {
 protected:
-    using v_type = double;
-    using i_type = IndexType;
-    using matrix_type = gko::matrix::Csr<v_type, i_type>;
-    using reorder_type = gko::reorder::NestedDissection<v_type, i_type>;
-    using perm_type = gko::matrix::Permutation<i_type>;
+    using index_type = IndexType;
+    using matrix_type = gko::matrix::Csr<value_type, index_type>;
+    using reorder_type =
+        gko::experimental::reorder::NestedDissection<value_type, index_type>;
+    using perm_type = gko::matrix::Permutation<index_type>;
 
 
     NestedDissection()
@@ -77,4 +78,10 @@ TYPED_TEST(NestedDissection, ResultIsEquivalentToRef)
 {
     auto perm = this->nd_factory->generate(this->mtx);
     auto dperm = this->dnd_factory->generate(this->dmtx);
+
+    auto perm_array = gko::make_array_view(this->ref, this->mtx->get_size()[0],
+                                           perm->get_permutation());
+    auto dperm_array = gko::make_array_view(
+        this->exec, this->mtx->get_size()[0], dperm->get_permutation());
+    GKO_ASSERT_ARRAY_EQ(perm_array, dperm_array);
 }