diff --git a/cuda/matrix/coo_kernels.cu b/cuda/matrix/coo_kernels.cu index c9c1328038b..7ad48c76b3f 100644 --- a/cuda/matrix/coo_kernels.cu +++ b/cuda/matrix/coo_kernels.cu @@ -40,7 +40,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include "core/components/fill_array.hpp" #include "core/matrix/dense_kernels.hpp" #include "cuda/base/config.hpp" #include "cuda/base/cusparse_bindings.hpp" @@ -82,9 +81,7 @@ void spmv(std::shared_ptr exec, const matrix::Coo *a, const matrix::Dense *b, matrix::Dense *c) { - components::fill_array(exec, c->get_values(), c->get_num_stored_elements(), - zero()); - + dense::fill(exec, c, zero()); spmv2(exec, a, b, c); } diff --git a/cuda/test/matrix/coo_kernels.cpp b/cuda/test/matrix/coo_kernels.cpp index 89c16183996..12b8b815d98 100644 --- a/cuda/test/matrix/coo_kernels.cpp +++ b/cuda/test/matrix/coo_kernels.cpp @@ -152,9 +152,9 @@ TEST_F(Coo, SimpleApplyDoesntOverwritePadding) dresult_padded->get_values() + 1); mtx->apply(y.get(), expected.get()); - dmtx->apply(dy.get(), dresult.get()); + dmtx->apply(dy.get(), dresult_padded.get()); - GKO_ASSERT_MTX_NEAR(dresult, expected, 1e-14); + GKO_ASSERT_MTX_NEAR(dresult_padded, expected, 1e-14); ASSERT_EQ(cuda->copy_val_to_host(dresult_padded->get_values() + 1), 1234.0); } @@ -193,9 +193,9 @@ TEST_F(Coo, AdvancedApplyDoesntOverwritePadding) dresult_padded->get_values() + 1); mtx->apply(alpha.get(), y.get(), beta.get(), expected.get()); - dmtx->apply(dalpha.get(), dy.get(), dbeta.get(), dresult.get()); + dmtx->apply(dalpha.get(), dy.get(), dbeta.get(), dresult_padded.get()); - GKO_ASSERT_MTX_NEAR(dresult, expected, 1e-14); + GKO_ASSERT_MTX_NEAR(dresult_padded, expected, 1e-14); ASSERT_EQ(cuda->copy_val_to_host(dresult_padded->get_values() + 1), 1234.0); } diff --git a/hip/matrix/coo_kernels.hip.cpp b/hip/matrix/coo_kernels.hip.cpp index 8f68bfa0867..c3c1a654f66 100644 --- a/hip/matrix/coo_kernels.hip.cpp +++ b/hip/matrix/coo_kernels.hip.cpp @@ -43,7 +43,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include "core/components/fill_array.hpp" #include "core/matrix/dense_kernels.hpp" #include "hip/base/config.hip.hpp" #include "hip/base/hipsparse_bindings.hip.hpp" @@ -85,9 +84,7 @@ void spmv(std::shared_ptr exec, const matrix::Coo *a, const matrix::Dense *b, matrix::Dense *c) { - components::fill_array(exec, c->get_values(), c->get_num_stored_elements(), - zero()); - + dense::fill(exec, c, zero()); spmv2(exec, a, b, c); } diff --git a/hip/test/matrix/coo_kernels.hip.cpp b/hip/test/matrix/coo_kernels.hip.cpp index ed7f82ae1e6..aeaa9a50206 100644 --- a/hip/test/matrix/coo_kernels.hip.cpp +++ b/hip/test/matrix/coo_kernels.hip.cpp @@ -153,9 +153,9 @@ TEST_F(Coo, SimpleApplyDoesntOverwritePadding) dresult_padded->get_values() + 1); mtx->apply(y.get(), expected.get()); - dmtx->apply(dy.get(), dresult.get()); + dmtx->apply(dy.get(), dresult_padded.get()); - GKO_ASSERT_MTX_NEAR(dresult, expected, 1e-14); + GKO_ASSERT_MTX_NEAR(dresult_padded, expected, 1e-14); ASSERT_EQ(hip->copy_val_to_host(dresult_padded->get_values() + 1), 1234.0); } @@ -194,9 +194,9 @@ TEST_F(Coo, AdvancedApplyDoesntOverwritePadding) dresult_padded->get_values() + 1); mtx->apply(alpha.get(), y.get(), beta.get(), expected.get()); - dmtx->apply(dalpha.get(), dy.get(), dbeta.get(), dresult.get()); + dmtx->apply(dalpha.get(), dy.get(), dbeta.get(), dresult_padded.get()); - GKO_ASSERT_MTX_NEAR(dresult, expected, 1e-14); + GKO_ASSERT_MTX_NEAR(dresult_padded, expected, 1e-14); ASSERT_EQ(hip->copy_val_to_host(dresult_padded->get_values() + 1), 1234.0); } diff --git a/omp/test/matrix/coo_kernels.cpp b/omp/test/matrix/coo_kernels.cpp index f40422f5bae..31f86355f8d 100644 --- a/omp/test/matrix/coo_kernels.cpp +++ b/omp/test/matrix/coo_kernels.cpp @@ -166,9 +166,9 @@ TEST_F(Coo, SimpleApplyDoesntOverwritePadding) dresult_padded->get_values()[1] = 1234.0; mtx->apply(y.get(), expected.get()); - dmtx->apply(dy.get(), dresult.get()); + dmtx->apply(dy.get(), dresult_padded.get()); - GKO_ASSERT_MTX_NEAR(dresult, expected, 1e-14); + GKO_ASSERT_MTX_NEAR(dresult_padded, expected, 1e-14); ASSERT_EQ(dresult_padded->get_values()[1], 1234.0); } @@ -193,9 +193,9 @@ TEST_F(Coo, AdvancedApplyDoesntOverwritePadding) dresult_padded->get_values()[1] = 1234.0; mtx->apply(alpha.get(), y.get(), beta.get(), expected.get()); - dmtx->apply(dalpha.get(), dy.get(), dbeta.get(), dresult.get()); + dmtx->apply(dalpha.get(), dy.get(), dbeta.get(), dresult_padded.get()); - GKO_ASSERT_MTX_NEAR(dresult, expected, 1e-14); + GKO_ASSERT_MTX_NEAR(dresult_padded, expected, 1e-14); ASSERT_EQ(dresult_padded->get_values()[1], 1234.0); }