From 046dd58235c6de07403633c4922ff7e5d2dee0c8 Mon Sep 17 00:00:00 2001 From: Tobias Ribizel Date: Tue, 10 Oct 2023 10:18:00 +0200 Subject: [PATCH] revert to old permutation interface for now --- benchmark/utils/general_matrix.hpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/benchmark/utils/general_matrix.hpp b/benchmark/utils/general_matrix.hpp index 41b3459bc5a..3d063e91981 100644 --- a/benchmark/utils/general_matrix.hpp +++ b/benchmark/utils/general_matrix.hpp @@ -95,7 +95,9 @@ std::unique_ptr> reorder( throw std::runtime_error{"Unknown reordering algorithm " + FLAGS_reorder}; } - mtx->permute(perm)->write(data); + auto perm_arr = + gko::array::view(ref, data.size[0], perm->get_permutation()); + gko::as(mtx->permute(&perm_arr))->write(data); test_case["reordered"] = FLAGS_reorder; return perm; } @@ -103,16 +105,18 @@ std::unique_ptr> reorder( template void permute(std::unique_ptr>& vec, - const gko::matrix::Permutation* perm) + gko::matrix::Permutation* perm) { - vec = vec->permute(perm, gko::matrix::permute_mode::rows); + auto perm_arr = gko::array::view( + perm->get_executor(), perm->get_size()[0], perm->get_permutation()); + vec = gko::as>(vec->row_permute(&perm_arr)); } template void permute( std::unique_ptr>& vec, - const gko::matrix::Permutation* perm) + gko::matrix::Permutation* perm) {}