diff --git a/core/matrix/coo.cpp b/core/matrix/coo.cpp index b9648d1dc70..50b42d04ab4 100644 --- a/core/matrix/coo.cpp +++ b/core/matrix/coo.cpp @@ -239,7 +239,7 @@ Coo::extract_diagonal() const template -void Coo::apply_absolute() +void Coo::compute_absolute_inplace() { auto exec = this->get_executor(); @@ -250,7 +250,7 @@ void Coo::apply_absolute() template std::unique_ptr::outplace_absolute_type> -Coo::get_absolute() const +Coo::compute_absolute() const { auto exec = this->get_executor(); diff --git a/core/matrix/csr.cpp b/core/matrix/csr.cpp index 8a6ad620885..605f7b09fed 100644 --- a/core/matrix/csr.cpp +++ b/core/matrix/csr.cpp @@ -487,7 +487,7 @@ Csr::extract_diagonal() const template -void Csr::apply_absolute() +void Csr::compute_absolute_inplace() { auto exec = this->get_executor(); @@ -498,7 +498,7 @@ void Csr::apply_absolute() template std::unique_ptr::outplace_absolute_type> -Csr::get_absolute() const +Csr::compute_absolute() const { auto exec = this->get_executor(); diff --git a/core/matrix/dense.cpp b/core/matrix/dense.cpp index 19152c62d9a..e51ad7bcff1 100644 --- a/core/matrix/dense.cpp +++ b/core/matrix/dense.cpp @@ -755,7 +755,7 @@ std::unique_ptr> Dense::extract_diagonal() const template -void Dense::apply_absolute() +void Dense::compute_absolute_inplace() { auto exec = this->get_executor(); @@ -765,7 +765,7 @@ void Dense::apply_absolute() template std::unique_ptr::outplace_absolute_type> -Dense::get_absolute() const +Dense::compute_absolute() const { auto exec = this->get_executor(); diff --git a/core/matrix/diagonal.cpp b/core/matrix/diagonal.cpp index e136e90a919..e1cb767efbf 100644 --- a/core/matrix/diagonal.cpp +++ b/core/matrix/diagonal.cpp @@ -267,7 +267,7 @@ void Diagonal::write(mat_data32 &data) const template -void Diagonal::apply_absolute() +void Diagonal::compute_absolute_inplace() { auto exec = this->get_executor(); @@ -278,7 +278,7 @@ void Diagonal::apply_absolute() template std::unique_ptr::outplace_absolute_type> -Diagonal::get_absolute() const +Diagonal::compute_absolute() const { auto exec = this->get_executor(); diff --git a/core/matrix/ell.cpp b/core/matrix/ell.cpp index 28acf7a3a39..26f518d2cbc 100644 --- a/core/matrix/ell.cpp +++ b/core/matrix/ell.cpp @@ -257,7 +257,7 @@ Ell::extract_diagonal() const template -void Ell::apply_absolute() +void Ell::compute_absolute_inplace() { auto exec = this->get_executor(); @@ -268,7 +268,7 @@ void Ell::apply_absolute() template std::unique_ptr::outplace_absolute_type> -Ell::get_absolute() const +Ell::compute_absolute() const { auto exec = this->get_executor(); diff --git a/core/matrix/hybrid.cpp b/core/matrix/hybrid.cpp index cd5adcfbdcd..9487bd99a4e 100644 --- a/core/matrix/hybrid.cpp +++ b/core/matrix/hybrid.cpp @@ -291,7 +291,7 @@ Hybrid::extract_diagonal() const template -void Hybrid::apply_absolute() +void Hybrid::compute_absolute_inplace() { auto exec = this->get_executor(); @@ -304,15 +304,15 @@ void Hybrid::apply_absolute() template std::unique_ptr::outplace_absolute_type> -Hybrid::get_absolute() const +Hybrid::compute_absolute() const { auto exec = this->get_executor(); // use default strategy auto abs_hybrid = outplace_absolute_type::create(exec, this->get_size()); - abs_hybrid->ell_->copy_from(ell_->get_absolute()); - abs_hybrid->coo_->copy_from(coo_->get_absolute()); + abs_hybrid->ell_->copy_from(ell_->compute_absolute()); + abs_hybrid->coo_->copy_from(coo_->compute_absolute()); return abs_hybrid; } diff --git a/core/matrix/sellp.cpp b/core/matrix/sellp.cpp index e57555c067b..81af57b5dd6 100644 --- a/core/matrix/sellp.cpp +++ b/core/matrix/sellp.cpp @@ -310,7 +310,7 @@ Sellp::extract_diagonal() const template -void Sellp::apply_absolute() +void Sellp::compute_absolute_inplace() { auto exec = this->get_executor(); @@ -321,7 +321,7 @@ void Sellp::apply_absolute() template std::unique_ptr::outplace_absolute_type> -Sellp::get_absolute() const +Sellp::compute_absolute() const { auto exec = this->get_executor(); diff --git a/core/test/base/lin_op.cpp b/core/test/base/lin_op.cpp index e5eea7d7c70..497396efaeb 100644 --- a/core/test/base/lin_op.cpp +++ b/core/test/base/lin_op.cpp @@ -331,9 +331,9 @@ class DummyLinOpWithType : gko::EnableLinOp(exec, size), value_(value) {} - void apply_absolute() override { value_ = gko::abs(value_); } + void compute_absolute_inplace() override { value_ = gko::abs(value_); } - std::unique_ptr get_absolute() const override + std::unique_ptr compute_absolute() const override { return std::make_unique( this->get_executor(), this->get_size(), gko::abs(value_)); @@ -369,7 +369,7 @@ class EnableAbsoluteComputation : public ::testing::Test { TEST_F(EnableAbsoluteComputation, InplaceAbsoluteOnConcreteType) { - op->apply_absolute(); + op->compute_absolute_inplace(); ASSERT_EQ(op->get_value(), std::complex{5.0}); } @@ -377,7 +377,7 @@ TEST_F(EnableAbsoluteComputation, InplaceAbsoluteOnConcreteType) TEST_F(EnableAbsoluteComputation, OutplaceAbsoluteOnConcreteType) { - auto abs_op = op->get_absolute(); + auto abs_op = op->compute_absolute(); ASSERT_EQ(typeid(abs_op), typeid(std::unique_ptr>)); @@ -389,7 +389,7 @@ TEST_F(EnableAbsoluteComputation, InplaceAbsoluteOnAbsoluteComputable) { auto linop = gko::as(op); - gko::as(linop)->apply_absolute(); + gko::as(linop)->compute_absolute_inplace(); ASSERT_EQ(gko::as(linop)->get_value(), std::complex{5.0}); @@ -398,7 +398,7 @@ TEST_F(EnableAbsoluteComputation, InplaceAbsoluteOnAbsoluteComputable) TEST_F(EnableAbsoluteComputation, OutplaceAbsoluteOnAbsoluteComputable) { - auto abs_op = op->get_absolute(); + auto abs_op = op->compute_absolute(); ASSERT_EQ(typeid(abs_op), typeid(std::unique_ptr>)); diff --git a/cuda/test/matrix/coo_kernels.cpp b/cuda/test/matrix/coo_kernels.cpp index 7575314ad7e..cc52e895097 100644 --- a/cuda/test/matrix/coo_kernels.cpp +++ b/cuda/test/matrix/coo_kernels.cpp @@ -275,8 +275,8 @@ TEST_F(Coo, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -286,8 +286,8 @@ TEST_F(Coo, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/cuda/test/matrix/csr_kernels.cpp b/cuda/test/matrix/csr_kernels.cpp index d51ea16bc33..f8a171719a1 100644 --- a/cuda/test/matrix/csr_kernels.cpp +++ b/cuda/test/matrix/csr_kernels.cpp @@ -744,8 +744,8 @@ TEST_F(Csr, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(std::make_shared(cuda)); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -755,8 +755,8 @@ TEST_F(Csr, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(std::make_shared(cuda)); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } @@ -766,8 +766,8 @@ TEST_F(Csr, InplaceAbsoluteComplexMatrixIsEquivalentToRef) { set_up_apply_complex_data(std::make_shared(cuda)); - complex_mtx->apply_absolute(); - complex_dmtx->apply_absolute(); + complex_mtx->compute_absolute_inplace(); + complex_dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(complex_mtx.get(), complex_dmtx.get(), 1e-14); } @@ -777,8 +777,8 @@ TEST_F(Csr, OutplaceAbsoluteComplexMatrixIsEquivalentToRef) { set_up_apply_complex_data(std::make_shared(cuda)); - auto abs_mtx = complex_mtx->get_absolute(); - auto dabs_mtx = complex_dmtx->get_absolute(); + auto abs_mtx = complex_mtx->compute_absolute(); + auto dabs_mtx = complex_dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/cuda/test/matrix/dense_kernels.cpp b/cuda/test/matrix/dense_kernels.cpp index 1121b994fd6..38273b107e1 100644 --- a/cuda/test/matrix/dense_kernels.cpp +++ b/cuda/test/matrix/dense_kernels.cpp @@ -591,8 +591,8 @@ TEST_F(Dense, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - x->apply_absolute(); - dx->apply_absolute(); + x->compute_absolute_inplace(); + dx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(x.get(), dx.get(), 1e-14); } @@ -602,8 +602,8 @@ TEST_F(Dense, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_x = x->get_absolute(); - auto dabs_x = dx->get_absolute(); + auto abs_x = x->compute_absolute(); + auto dabs_x = dx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_x.get(), dabs_x.get(), 1e-14); } diff --git a/cuda/test/matrix/diagonal_kernels.cpp b/cuda/test/matrix/diagonal_kernels.cpp index 6a357769022..a3471be6929 100644 --- a/cuda/test/matrix/diagonal_kernels.cpp +++ b/cuda/test/matrix/diagonal_kernels.cpp @@ -253,8 +253,8 @@ TEST_F(Diagonal, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - diag->apply_absolute(); - ddiag->apply_absolute(); + diag->compute_absolute_inplace(); + ddiag->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(diag.get(), ddiag.get(), 1e-14); } @@ -264,8 +264,8 @@ TEST_F(Diagonal, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_diag = diag->get_absolute(); - auto dabs_diag = ddiag->get_absolute(); + auto abs_diag = diag->compute_absolute(); + auto dabs_diag = ddiag->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_diag.get(), dabs_diag.get(), 1e-14); } diff --git a/cuda/test/matrix/ell_kernels.cpp b/cuda/test/matrix/ell_kernels.cpp index 3df92e8c859..86a2ed1d099 100644 --- a/cuda/test/matrix/ell_kernels.cpp +++ b/cuda/test/matrix/ell_kernels.cpp @@ -360,8 +360,8 @@ TEST_F(Ell, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -371,8 +371,8 @@ TEST_F(Ell, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/cuda/test/matrix/hybrid_kernels.cpp b/cuda/test/matrix/hybrid_kernels.cpp index f9adc82ff53..eb8b5ba7669 100644 --- a/cuda/test/matrix/hybrid_kernels.cpp +++ b/cuda/test/matrix/hybrid_kernels.cpp @@ -235,8 +235,8 @@ TEST_F(Hybrid, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -246,8 +246,8 @@ TEST_F(Hybrid, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/cuda/test/matrix/sellp_kernels.cpp b/cuda/test/matrix/sellp_kernels.cpp index 43375ffb0cf..91f063de36a 100644 --- a/cuda/test/matrix/sellp_kernels.cpp +++ b/cuda/test/matrix/sellp_kernels.cpp @@ -354,8 +354,8 @@ TEST_F(Sellp, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_matrix(32, 2); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -365,8 +365,8 @@ TEST_F(Sellp, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_matrix(32, 2); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/hip/test/matrix/coo_kernels.hip.cpp b/hip/test/matrix/coo_kernels.hip.cpp index 470694c1ece..b235da23077 100644 --- a/hip/test/matrix/coo_kernels.hip.cpp +++ b/hip/test/matrix/coo_kernels.hip.cpp @@ -275,8 +275,8 @@ TEST_F(Coo, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -286,8 +286,8 @@ TEST_F(Coo, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/hip/test/matrix/csr_kernels.hip.cpp b/hip/test/matrix/csr_kernels.hip.cpp index cbcb3c1b37e..2a2a8260cbf 100644 --- a/hip/test/matrix/csr_kernels.hip.cpp +++ b/hip/test/matrix/csr_kernels.hip.cpp @@ -729,8 +729,8 @@ TEST_F(Csr, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(std::make_shared(hip)); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -740,8 +740,8 @@ TEST_F(Csr, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(std::make_shared(hip)); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } @@ -751,8 +751,8 @@ TEST_F(Csr, InplaceAbsoluteComplexMatrixIsEquivalentToRef) { set_up_apply_complex_data(std::make_shared(hip)); - complex_mtx->apply_absolute(); - complex_dmtx->apply_absolute(); + complex_mtx->compute_absolute_inplace(); + complex_dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(complex_mtx.get(), complex_dmtx.get(), 1e-14); } @@ -762,8 +762,8 @@ TEST_F(Csr, OutplaceAbsoluteComplexMatrixIsEquivalentToRef) { set_up_apply_complex_data(std::make_shared(hip)); - auto abs_mtx = complex_mtx->get_absolute(); - auto dabs_mtx = complex_dmtx->get_absolute(); + auto abs_mtx = complex_mtx->compute_absolute(); + auto dabs_mtx = complex_dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/hip/test/matrix/dense_kernels.hip.cpp b/hip/test/matrix/dense_kernels.hip.cpp index 86e907d27ab..a1dd4f34ec8 100644 --- a/hip/test/matrix/dense_kernels.hip.cpp +++ b/hip/test/matrix/dense_kernels.hip.cpp @@ -573,8 +573,8 @@ TEST_F(Dense, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - x->apply_absolute(); - dx->apply_absolute(); + x->compute_absolute_inplace(); + dx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(x.get(), dx.get(), 1e-14); } @@ -584,8 +584,8 @@ TEST_F(Dense, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_x = x->get_absolute(); - auto dabs_x = dx->get_absolute(); + auto abs_x = x->compute_absolute(); + auto dabs_x = dx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_x.get(), dabs_x.get(), 1e-14); } diff --git a/hip/test/matrix/diagonal_kernels.hip.cpp b/hip/test/matrix/diagonal_kernels.hip.cpp index dd89c7945e5..d86e878dd66 100644 --- a/hip/test/matrix/diagonal_kernels.hip.cpp +++ b/hip/test/matrix/diagonal_kernels.hip.cpp @@ -253,8 +253,8 @@ TEST_F(Diagonal, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - diag->apply_absolute(); - ddiag->apply_absolute(); + diag->compute_absolute_inplace(); + ddiag->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(diag.get(), ddiag.get(), 1e-14); } @@ -264,8 +264,8 @@ TEST_F(Diagonal, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_diag = diag->get_absolute(); - auto dabs_diag = ddiag->get_absolute(); + auto abs_diag = diag->compute_absolute(); + auto dabs_diag = ddiag->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_diag.get(), dabs_diag.get(), 1e-14); } diff --git a/hip/test/matrix/ell_kernels.hip.cpp b/hip/test/matrix/ell_kernels.hip.cpp index 502035ba9c5..4ae03c3d00e 100644 --- a/hip/test/matrix/ell_kernels.hip.cpp +++ b/hip/test/matrix/ell_kernels.hip.cpp @@ -360,8 +360,8 @@ TEST_F(Ell, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -371,8 +371,8 @@ TEST_F(Ell, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/hip/test/matrix/hybrid_kernels.hip.cpp b/hip/test/matrix/hybrid_kernels.hip.cpp index be1cd12ae6c..dd79f63c0f8 100644 --- a/hip/test/matrix/hybrid_kernels.hip.cpp +++ b/hip/test/matrix/hybrid_kernels.hip.cpp @@ -235,8 +235,8 @@ TEST_F(Hybrid, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -246,8 +246,8 @@ TEST_F(Hybrid, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/hip/test/matrix/sellp_kernels.hip.cpp b/hip/test/matrix/sellp_kernels.hip.cpp index 59d5efda437..8b39aedb189 100644 --- a/hip/test/matrix/sellp_kernels.hip.cpp +++ b/hip/test/matrix/sellp_kernels.hip.cpp @@ -353,8 +353,8 @@ TEST_F(Sellp, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_matrix(32, 2); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -364,8 +364,8 @@ TEST_F(Sellp, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_matrix(32, 2); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/include/ginkgo/core/base/lin_op.hpp b/include/ginkgo/core/base/lin_op.hpp index 8c6819d0db5..a72f3685848 100644 --- a/include/ginkgo/core/base/lin_op.hpp +++ b/include/ginkgo/core/base/lin_op.hpp @@ -635,21 +635,21 @@ class AbsoluteComputable { * * @return a pointer to the new absolute LinOp */ - virtual std::unique_ptr get_absolute_linop() const = 0; + virtual std::unique_ptr compute_absolute_linop() const = 0; /** - * Apply absolute on each element. + * Compute absolute inplace on each element. */ - virtual void apply_absolute() = 0; + virtual void compute_absolute_inplace() = 0; }; /** * The EnableAbsoluteComputation mixin provides the default implementations of - * `get_absolute_linop` and the absolute interface. `get_absolute` gets a new - * remove_complex which removes the complex value_type by - * applying outplace absolute. `apply_absolute` applies absolute inplace, so it - * still keeps the value_type of the class. + * `compute_absolute_linop` and the absolute interface. `compute_absolute` gets + * a new remove_complex which removes the complex value_type by + * applying outplace absolute. `compute_absolute_inplace` applies absolute + * inplace, so it still keeps the value_type of the class. * * @tparam ConcreteLinOp the concrete LinOp which is being implemented * [CRTP parameter] @@ -663,17 +663,17 @@ class EnableAbsoluteComputation : public AbsoluteComputable { virtual ~EnableAbsoluteComputation() = default; - std::unique_ptr get_absolute_linop() const override + std::unique_ptr compute_absolute_linop() const override { - return this->get_absolute(); + return this->compute_absolute(); } /** - * Gets the absolute LinOp + * Gets the absolute ConcreteLinOp * * @return a pointer to the new absolute object */ - virtual std::unique_ptr get_absolute() const = 0; + virtual std::unique_ptr compute_absolute() const = 0; }; diff --git a/include/ginkgo/core/matrix/coo.hpp b/include/ginkgo/core/matrix/coo.hpp index bde9046aef4..45b1c257c96 100644 --- a/include/ginkgo/core/matrix/coo.hpp +++ b/include/ginkgo/core/matrix/coo.hpp @@ -121,9 +121,9 @@ class Coo : public EnableLinOp>, std::unique_ptr> extract_diagonal() const override; - std::unique_ptr get_absolute() const override; + std::unique_ptr compute_absolute() const override; - void apply_absolute() override; + void compute_absolute_inplace() override; /** * Returns the values of the matrix. diff --git a/include/ginkgo/core/matrix/csr.hpp b/include/ginkgo/core/matrix/csr.hpp index 60b32cc2196..bc41f528e23 100644 --- a/include/ginkgo/core/matrix/csr.hpp +++ b/include/ginkgo/core/matrix/csr.hpp @@ -712,9 +712,9 @@ class Csr : public EnableLinOp>, std::unique_ptr> extract_diagonal() const override; - std::unique_ptr get_absolute() const override; + std::unique_ptr compute_absolute() const override; - void apply_absolute() override; + void compute_absolute_inplace() override; /** * Sorts all (value, col_idx) pairs in each row by column index diff --git a/include/ginkgo/core/matrix/dense.hpp b/include/ginkgo/core/matrix/dense.hpp index ddc7b4d9519..6f7c2b16c99 100644 --- a/include/ginkgo/core/matrix/dense.hpp +++ b/include/ginkgo/core/matrix/dense.hpp @@ -249,9 +249,9 @@ class Dense : public EnableLinOp>, std::unique_ptr> extract_diagonal() const override; - std::unique_ptr get_absolute() const override; + std::unique_ptr compute_absolute() const override; - void apply_absolute() override; + void compute_absolute_inplace() override; /** * Returns a pointer to the array of values of the matrix. diff --git a/include/ginkgo/core/matrix/diagonal.hpp b/include/ginkgo/core/matrix/diagonal.hpp index ceb97e363ca..aec604de9cc 100644 --- a/include/ginkgo/core/matrix/diagonal.hpp +++ b/include/ginkgo/core/matrix/diagonal.hpp @@ -103,9 +103,9 @@ class Diagonal : public EnableLinOp>, void move_to(Csr *result) override; - std::unique_ptr get_absolute() const override; + std::unique_ptr compute_absolute() const override; - void apply_absolute() override; + void compute_absolute_inplace() override; /** * Returns a pointer to the array of values of the matrix. diff --git a/include/ginkgo/core/matrix/ell.hpp b/include/ginkgo/core/matrix/ell.hpp index 02b3a3613c8..6fa705f4ab9 100644 --- a/include/ginkgo/core/matrix/ell.hpp +++ b/include/ginkgo/core/matrix/ell.hpp @@ -114,9 +114,9 @@ class Ell : public EnableLinOp>, std::unique_ptr> extract_diagonal() const override; - std::unique_ptr get_absolute() const override; + std::unique_ptr compute_absolute() const override; - void apply_absolute() override; + void compute_absolute_inplace() override; /** * Returns the values of the matrix. diff --git a/include/ginkgo/core/matrix/hybrid.hpp b/include/ginkgo/core/matrix/hybrid.hpp index 6dcee07bbe2..8b19de70766 100644 --- a/include/ginkgo/core/matrix/hybrid.hpp +++ b/include/ginkgo/core/matrix/hybrid.hpp @@ -363,9 +363,9 @@ class Hybrid std::unique_ptr> extract_diagonal() const override; - std::unique_ptr get_absolute() const override; + std::unique_ptr compute_absolute() const override; - void apply_absolute() override; + void compute_absolute_inplace() override; /** * Returns the values of the ell part. diff --git a/include/ginkgo/core/matrix/sellp.hpp b/include/ginkgo/core/matrix/sellp.hpp index 6f4b879a0d9..fb5acd36526 100644 --- a/include/ginkgo/core/matrix/sellp.hpp +++ b/include/ginkgo/core/matrix/sellp.hpp @@ -111,9 +111,9 @@ class Sellp : public EnableLinOp>, std::unique_ptr> extract_diagonal() const override; - std::unique_ptr get_absolute() const override; + std::unique_ptr compute_absolute() const override; - void apply_absolute() override; + void compute_absolute_inplace() override; /** * Returns the values of the matrix. diff --git a/omp/test/matrix/coo_kernels.cpp b/omp/test/matrix/coo_kernels.cpp index 03090fd2f54..b2af927543a 100644 --- a/omp/test/matrix/coo_kernels.cpp +++ b/omp/test/matrix/coo_kernels.cpp @@ -238,8 +238,8 @@ TEST_F(Coo, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -249,8 +249,8 @@ TEST_F(Coo, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/omp/test/matrix/csr_kernels.cpp b/omp/test/matrix/csr_kernels.cpp index 8b6a54cdf37..25cb647d98d 100644 --- a/omp/test/matrix/csr_kernels.cpp +++ b/omp/test/matrix/csr_kernels.cpp @@ -553,8 +553,8 @@ TEST_F(Csr, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -564,8 +564,8 @@ TEST_F(Csr, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } @@ -575,8 +575,8 @@ TEST_F(Csr, InplaceAbsoluteComplexMatrixIsEquivalentToRef) { set_up_apply_data(); - complex_mtx->apply_absolute(); - complex_dmtx->apply_absolute(); + complex_mtx->compute_absolute_inplace(); + complex_dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(complex_mtx.get(), complex_dmtx.get(), 1e-14); } @@ -586,8 +586,8 @@ TEST_F(Csr, OutplaceAbsoluteComplexMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_mtx = complex_mtx->get_absolute(); - auto dabs_mtx = complex_dmtx->get_absolute(); + auto abs_mtx = complex_mtx->compute_absolute(); + auto dabs_mtx = complex_dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/omp/test/matrix/dense_kernels.cpp b/omp/test/matrix/dense_kernels.cpp index 65afcbf8502..77781b71aab 100644 --- a/omp/test/matrix/dense_kernels.cpp +++ b/omp/test/matrix/dense_kernels.cpp @@ -706,8 +706,8 @@ TEST_F(Dense, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - x->apply_absolute(); - dx->apply_absolute(); + x->compute_absolute_inplace(); + dx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(x.get(), dx.get(), 1e-14); } @@ -717,8 +717,8 @@ TEST_F(Dense, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_x = x->get_absolute(); - auto dabs_x = dx->get_absolute(); + auto abs_x = x->compute_absolute(); + auto dabs_x = dx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_x.get(), dabs_x.get(), 1e-14); } diff --git a/omp/test/matrix/diagonal_kernels.cpp b/omp/test/matrix/diagonal_kernels.cpp index 571ca6fe7e6..2d03fb74f8f 100644 --- a/omp/test/matrix/diagonal_kernels.cpp +++ b/omp/test/matrix/diagonal_kernels.cpp @@ -252,8 +252,8 @@ TEST_F(Diagonal, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - diag->apply_absolute(); - ddiag->apply_absolute(); + diag->compute_absolute_inplace(); + ddiag->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(diag.get(), ddiag.get(), 1e-14); } @@ -263,8 +263,8 @@ TEST_F(Diagonal, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_diag = diag->get_absolute(); - auto dabs_diag = ddiag->get_absolute(); + auto abs_diag = diag->compute_absolute(); + auto dabs_diag = ddiag->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_diag.get(), dabs_diag.get(), 1e-14); } diff --git a/omp/test/matrix/ell_kernels.cpp b/omp/test/matrix/ell_kernels.cpp index 584e88488c2..06195abe138 100644 --- a/omp/test/matrix/ell_kernels.cpp +++ b/omp/test/matrix/ell_kernels.cpp @@ -236,8 +236,8 @@ TEST_F(Ell, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -247,8 +247,8 @@ TEST_F(Ell, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/omp/test/matrix/hybrid_kernels.cpp b/omp/test/matrix/hybrid_kernels.cpp index 046d4c254a5..df85f18455f 100644 --- a/omp/test/matrix/hybrid_kernels.cpp +++ b/omp/test/matrix/hybrid_kernels.cpp @@ -234,8 +234,8 @@ TEST_F(Hybrid, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -245,8 +245,8 @@ TEST_F(Hybrid, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/omp/test/matrix/sellp_kernels.cpp b/omp/test/matrix/sellp_kernels.cpp index 9d861d2db69..69780f6071e 100644 --- a/omp/test/matrix/sellp_kernels.cpp +++ b/omp/test/matrix/sellp_kernels.cpp @@ -270,8 +270,8 @@ TEST_F(Sellp, InplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - mtx->apply_absolute(); - dmtx->apply_absolute(); + mtx->compute_absolute_inplace(); + dmtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(mtx.get(), dmtx.get(), 1e-14); } @@ -281,8 +281,8 @@ TEST_F(Sellp, OutplaceAbsoluteMatrixIsEquivalentToRef) { set_up_apply_data(); - auto abs_mtx = mtx->get_absolute(); - auto dabs_mtx = dmtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); + auto dabs_mtx = dmtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx.get(), dabs_mtx.get(), 1e-14); } diff --git a/reference/test/matrix/coo_kernels.cpp b/reference/test/matrix/coo_kernels.cpp index 0f75f7a1eea..d08ef5f9af9 100644 --- a/reference/test/matrix/coo_kernels.cpp +++ b/reference/test/matrix/coo_kernels.cpp @@ -540,7 +540,7 @@ TYPED_TEST(Coo, InplaceAbsolute) auto mtx = gko::initialize( {{1.0, 2.0, -2.0}, {3.0, -5.0, 0.0}, {0.0, 1.0, -1.5}}, this->exec); - mtx->apply_absolute(); + mtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR( mtx, l({{1.0, 2.0, 2.0}, {3.0, 5.0, 0.0}, {0.0, 1.0, 1.5}}), 0.0); @@ -553,7 +553,7 @@ TYPED_TEST(Coo, OutplaceAbsolute) auto mtx = gko::initialize( {{1.0, 2.0, -2.0}, {3.0, -5.0, 0.0}, {0.0, 1.0, -1.5}}, this->exec); - auto abs_mtx = mtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); GKO_ASSERT_MTX_NEAR( abs_mtx, l({{1.0, 2.0, 2.0}, {3.0, 5.0, 0.0}, {0.0, 1.0, 1.5}}), 0.0); @@ -586,7 +586,7 @@ TYPED_TEST(CooComplex, OutplaceAbsolute) {T{0.0, 0.0}, T{0.0, -1.5}, T{2.0, 0.0}}}, exec); // clang-format on - auto abs_mtx = mtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); GKO_ASSERT_MTX_NEAR( abs_mtx, l({{1.0, 5.0, 2.0}, {5.0, 1.0, 0.0}, {0.0, 1.5, 2.0}}), 0.0); @@ -606,7 +606,7 @@ TYPED_TEST(CooComplex, InplaceAbsolute) {T{0.0, 0.0}, T{0.0, -1.5}, T{2.0, 0.0}}}, exec); // clang-format on - mtx->apply_absolute(); + mtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR( mtx, l({{1.0, 5.0, 2.0}, {5.0, 1.0, 0.0}, {0.0, 1.5, 2.0}}), 0.0); diff --git a/reference/test/matrix/csr_kernels.cpp b/reference/test/matrix/csr_kernels.cpp index e2fc18432aa..ac9ae9f64d8 100644 --- a/reference/test/matrix/csr_kernels.cpp +++ b/reference/test/matrix/csr_kernels.cpp @@ -1313,7 +1313,7 @@ TYPED_TEST(Csr, InplaceAbsolute) auto mtx = gko::initialize( {{1.0, 2.0, -2.0}, {3.0, -5.0, 0.0}, {0.0, 1.0, -1.5}}, this->exec); - mtx->apply_absolute(); + mtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR( mtx, l({{1.0, 2.0, 2.0}, {3.0, 5.0, 0.0}, {0.0, 1.0, 1.5}}), 0.0); @@ -1326,7 +1326,7 @@ TYPED_TEST(Csr, OutplaceAbsolute) auto mtx = gko::initialize( {{1.0, 2.0, -2.0}, {3.0, -5.0, 0.0}, {0.0, 1.0, -1.5}}, this->exec); - auto abs_mtx = mtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); GKO_ASSERT_MTX_NEAR( abs_mtx, l({{1.0, 2.0, 2.0}, {3.0, 5.0, 0.0}, {0.0, 1.0, 1.5}}), 0.0); @@ -1386,7 +1386,7 @@ TYPED_TEST(CsrComplex, InplaceAbsolute) {T{0.0, 0.0}, T{0.0, -1.5}, T{2.0, 0.0}}}, exec); // clang-format on - mtx->apply_absolute(); + mtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR( mtx, l({{1.0, 5.0, 2.0}, {5.0, 1.0, 0.0}, {0.0, 1.5, 2.0}}), 0.0); @@ -1406,7 +1406,7 @@ TYPED_TEST(CsrComplex, OutplaceAbsolute) {T{0.0, 0.0}, T{0.0, -1.5}, T{2.0, 0.0}}}, exec); // clang-format on - auto abs_mtx = mtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); GKO_ASSERT_MTX_NEAR( abs_mtx, l({{1.0, 5.0, 2.0}, {5.0, 1.0, 0.0}, {0.0, 1.5, 2.0}}), 0.0); diff --git a/reference/test/matrix/dense_kernels.cpp b/reference/test/matrix/dense_kernels.cpp index 94cb1c42542..cea66d04f43 100644 --- a/reference/test/matrix/dense_kernels.cpp +++ b/reference/test/matrix/dense_kernels.cpp @@ -2017,7 +2017,7 @@ TYPED_TEST(Dense, InplaceAbsolute) // {-2.0, 2.0, 4.5}, // {2.1, 3.4, 1.2} // clang-format on - this->mtx5->apply_absolute(); + this->mtx5->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(this->mtx5, l({{1.0, 1.0, 0.5}, {2.0, 2.0, 4.5}, {2.1, 3.4, 1.2}}), @@ -2035,7 +2035,7 @@ TYPED_TEST(Dense, InplaceAbsoluteSubMatrix) // {-2.0, 2.0, 4.5}, // {2.1, 3.4, 1.2} // clang-format on - mtx->apply_absolute(); + mtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR(this->mtx5, l({{1.0, 1.0, -0.5}, {2.0, 2.0, 4.5}, {2.1, 3.4, 1.2}}), @@ -2051,7 +2051,7 @@ TYPED_TEST(Dense, OutplaceAbsolute) // {-2.0, 2.0, 4.5}, // {2.1, 3.4, 1.2} // clang-format on - auto abs_mtx = this->mtx5->get_absolute(); + auto abs_mtx = this->mtx5->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx, l({{1.0, 1.0, 0.5}, {2.0, 2.0, 4.5}, {2.1, 3.4, 1.2}}), @@ -2069,7 +2069,7 @@ TYPED_TEST(Dense, OutplaceAbsoluteSubMatrix) // {-2.0, 2.0, 4.5}, // {2.1, 3.4, 1.2} // clang-format on - auto abs_mtx = mtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); GKO_ASSERT_MTX_NEAR(abs_mtx, l({{1.0, 1.0}, {2.0, 2.0}}), r::value); @@ -2119,7 +2119,7 @@ TYPED_TEST(DenseComplex, InplaceAbsolute) {T{0.0, 0.0}, T{0.0, -1.5}, T{2.0, 0.0}}}, exec); // clang-format on - mtx->apply_absolute(); + mtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR( mtx, l({{1.0, 5.0, 2.0}, {5.0, 1.0, 0.0}, {0.0, 1.5, 2.0}}), 0.0); @@ -2138,7 +2138,7 @@ TYPED_TEST(DenseComplex, OutplaceAbsolute) {T{0.0, 0.0}, T{0.0, -1.5}, T{2.0, 0.0}}}, exec); // clang-format on - auto abs_mtx = mtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); GKO_ASSERT_MTX_NEAR( abs_mtx, l({{1.0, 5.0, 2.0}, {5.0, 1.0, 0.0}, {0.0, 1.5, 2.0}}), 0.0); diff --git a/reference/test/matrix/diagonal_kernels.cpp b/reference/test/matrix/diagonal_kernels.cpp index 69502cca362..fc207889de3 100644 --- a/reference/test/matrix/diagonal_kernels.cpp +++ b/reference/test/matrix/diagonal_kernels.cpp @@ -360,7 +360,7 @@ TYPED_TEST(Diagonal, InplaceAbsolute) { using value_type = typename TestFixture::value_type; - this->diag1->apply_absolute(); + this->diag1->compute_absolute_inplace(); auto values = this->diag1->get_values(); EXPECT_EQ(values[0], value_type(2.0)); @@ -373,7 +373,7 @@ TYPED_TEST(Diagonal, OutplaceAbsolute) using value_type = typename TestFixture::value_type; using abs_type = gko::remove_complex; - auto abs_diag = this->diag1->get_absolute(); + auto abs_diag = this->diag1->compute_absolute(); auto values = abs_diag->get_values(); EXPECT_EQ(values[0], value_type(2.0)); @@ -425,7 +425,7 @@ TYPED_TEST(DiagonalComplex, InplaceAbsolute) diag_values[1] = value_type{-3.0, 0.0}; diag_values[2] = value_type{0.0, -1.5}; - diag->apply_absolute(); + diag->compute_absolute_inplace(); EXPECT_EQ(diag_values[0], (value_type{5.0, 0.0})); EXPECT_EQ(diag_values[1], (value_type{3.0, 0.0})); @@ -446,7 +446,7 @@ TYPED_TEST(DiagonalComplex, OutplaceAbsolute) diag_values[1] = value_type{-3.0, 0.0}; diag_values[2] = value_type{0.0, -1.5}; - auto abs_diag = diag->get_absolute(); + auto abs_diag = diag->compute_absolute(); auto abs_values = abs_diag->get_values(); EXPECT_EQ(abs_values[0], (value_type{5.0})); diff --git a/reference/test/matrix/ell_kernels.cpp b/reference/test/matrix/ell_kernels.cpp index 13b7decd1f1..cc87f580f9e 100644 --- a/reference/test/matrix/ell_kernels.cpp +++ b/reference/test/matrix/ell_kernels.cpp @@ -618,7 +618,7 @@ TYPED_TEST(Ell, InplaceAbsolute) auto mtx = gko::initialize( {{1.0, 2.0, -2.0}, {3.0, -5.0, 0.0}, {0.0, 1.0, -1.5}}, this->exec); - mtx->apply_absolute(); + mtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR( mtx, l({{1.0, 2.0, 2.0}, {3.0, 5.0, 0.0}, {0.0, 1.0, 1.5}}), 0.0); @@ -631,7 +631,7 @@ TYPED_TEST(Ell, OutplaceAbsolute) auto mtx = gko::initialize( {{1.0, 2.0, -2.0}, {3.0, -5.0, 0.0}, {0.0, 1.0, -1.5}}, this->exec); - auto abs_mtx = mtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); GKO_ASSERT_MTX_NEAR( abs_mtx, l({{1.0, 2.0, 2.0}, {3.0, 5.0, 0.0}, {0.0, 1.0, 1.5}}), 0.0); @@ -664,7 +664,7 @@ TYPED_TEST(EllComplex, InplaceAbsolute) {T{0.0, 0.0}, T{0.0, -1.5}, T{2.0, 0.0}}}, exec); // clang-format on - mtx->apply_absolute(); + mtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR( mtx, l({{1.0, 5.0, 2.0}, {5.0, 1.0, 0.0}, {0.0, 1.5, 2.0}}), 0.0); @@ -684,7 +684,7 @@ TYPED_TEST(EllComplex, OutplaceAbsolute) {T{0.0, 0.0}, T{0.0, -1.5}, T{2.0, 0.0}}}, exec); // clang-format on - auto abs_mtx = mtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); GKO_ASSERT_MTX_NEAR( abs_mtx, l({{1.0, 5.0, 2.0}, {5.0, 1.0, 0.0}, {0.0, 1.5, 2.0}}), 0.0); diff --git a/reference/test/matrix/hybrid_kernels.cpp b/reference/test/matrix/hybrid_kernels.cpp index 17f0aae4c50..46123df227b 100644 --- a/reference/test/matrix/hybrid_kernels.cpp +++ b/reference/test/matrix/hybrid_kernels.cpp @@ -662,7 +662,7 @@ TYPED_TEST(Hybrid, InplaceAbsolute) auto mtx = gko::initialize( {{1.0, 2.0, -2.0}, {3.0, -5.0, 0.0}, {0.0, 1.0, -1.5}}, this->exec); - mtx->apply_absolute(); + mtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR( mtx, l({{1.0, 2.0, 2.0}, {3.0, 5.0, 0.0}, {0.0, 1.0, 1.5}}), 0.0); @@ -675,7 +675,7 @@ TYPED_TEST(Hybrid, OutplaceAbsolute) auto mtx = gko::initialize( {{1.0, 2.0, -2.0}, {3.0, -5.0, 0.0}, {0.0, 1.0, -1.5}}, this->exec); - auto abs_mtx = mtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); GKO_ASSERT_MTX_NEAR( abs_mtx, l({{1.0, 2.0, 2.0}, {3.0, 5.0, 0.0}, {0.0, 1.0, 1.5}}), 0.0); @@ -708,7 +708,7 @@ TYPED_TEST(HybridComplex, OutplaceAbsolute) {T{0.0, 0.0}, T{0.0, -1.5}, T{2.0, 0.0}}}, exec); // clang-format on - auto abs_mtx = mtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); GKO_ASSERT_MTX_NEAR( abs_mtx, l({{1.0, 5.0, 2.0}, {5.0, 1.0, 0.0}, {0.0, 1.5, 2.0}}), 0.0); @@ -728,7 +728,7 @@ TYPED_TEST(HybridComplex, InplaceAbsolute) {T{0.0, 0.0}, T{0.0, -1.5}, T{2.0, 0.0}}}, exec); // clang-format on - mtx->apply_absolute(); + mtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR( mtx, l({{1.0, 5.0, 2.0}, {5.0, 1.0, 0.0}, {0.0, 1.5, 2.0}}), 0.0); diff --git a/reference/test/matrix/sellp_kernels.cpp b/reference/test/matrix/sellp_kernels.cpp index 7eef159ddeb..5c24e7afe3d 100644 --- a/reference/test/matrix/sellp_kernels.cpp +++ b/reference/test/matrix/sellp_kernels.cpp @@ -621,7 +621,7 @@ TYPED_TEST(Sellp, InplaceAbsolute) auto mtx = gko::initialize( {{1.0, 2.0, -2.0}, {3.0, -5.0, 0.0}, {0.0, 1.0, -1.5}}, this->exec); - mtx->apply_absolute(); + mtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR( mtx, l({{1.0, 2.0, 2.0}, {3.0, 5.0, 0.0}, {0.0, 1.0, 1.5}}), 0.0); @@ -634,7 +634,7 @@ TYPED_TEST(Sellp, OutplaceAbsolute) auto mtx = gko::initialize( {{1.0, 2.0, -2.0}, {3.0, -5.0, 0.0}, {0.0, 1.0, -1.5}}, this->exec); - auto abs_mtx = mtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); GKO_ASSERT_MTX_NEAR( abs_mtx, l({{1.0, 2.0, 2.0}, {3.0, 5.0, 0.0}, {0.0, 1.0, 1.5}}), 0.0); @@ -667,7 +667,7 @@ TYPED_TEST(SellpComplex, OutplaceAbsolute) {T{0.0, 0.0}, T{0.0, -1.5}, T{2.0, 0.0}}}, exec); // clang-format on - auto abs_mtx = mtx->get_absolute(); + auto abs_mtx = mtx->compute_absolute(); GKO_ASSERT_MTX_NEAR( abs_mtx, l({{1.0, 5.0, 2.0}, {5.0, 1.0, 0.0}, {0.0, 1.5, 2.0}}), 0.0); @@ -687,7 +687,7 @@ TYPED_TEST(SellpComplex, InplaceAbsolute) {T{0.0, 0.0}, T{0.0, -1.5}, T{2.0, 0.0}}}, exec); // clang-format on - mtx->apply_absolute(); + mtx->compute_absolute_inplace(); GKO_ASSERT_MTX_NEAR( mtx, l({{1.0, 5.0, 2.0}, {5.0, 1.0, 0.0}, {0.0, 1.5, 2.0}}), 0.0);