-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge: Scalar Jacobi fixes and update to unified kernels.
This PR aims to fix some of the incomplete functionalities that were left during the specialization for Scalar Jacobi. Fixes #838 Related PR: #854
- Loading branch information
Showing
16 changed files
with
455 additions
and
275 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| /*******************************<GINKGO LICENSE>****************************** | ||
| Copyright (c) 2017-2021, the Ginkgo authors | ||
| All rights reserved. | ||
| Redistribution and use in source and binary forms, with or without | ||
| modification, are permitted provided that the following conditions | ||
| are met: | ||
| 1. Redistributions of source code must retain the above copyright | ||
| notice, this list of conditions and the following disclaimer. | ||
| 2. Redistributions in binary form must reproduce the above copyright | ||
| notice, this list of conditions and the following disclaimer in the | ||
| documentation and/or other materials provided with the distribution. | ||
| 3. Neither the name of the copyright holder nor the names of its | ||
| contributors may be used to endorse or promote products derived from | ||
| this software without specific prior written permission. | ||
| THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS | ||
| IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED | ||
| TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A | ||
| PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| ******************************<GINKGO LICENSE>*******************************/ | ||
|
|
||
| #include "core/preconditioner/jacobi_kernels.hpp" | ||
|
|
||
|
|
||
| #include <ginkgo/core/base/math.hpp> | ||
|
|
||
|
|
||
| #include "common/base/kernel_launch.hpp" | ||
|
|
||
|
|
||
| namespace gko { | ||
| namespace kernels { | ||
| namespace GKO_DEVICE_NAMESPACE { | ||
| /** | ||
| * @brief The Jacobi preconditioner namespace. | ||
| * | ||
| * @ingroup jacobi | ||
| */ | ||
| namespace jacobi { | ||
|
|
||
|
|
||
| template <typename ValueType> | ||
| void scalar_conj(std::shared_ptr<const DefaultExecutor> exec, | ||
| const Array<ValueType> &diag, Array<ValueType> &conj_diag) | ||
| { | ||
| run_kernel( | ||
| exec, | ||
| [] GKO_KERNEL(auto elem, auto diag, auto conj_diag) { | ||
| conj_diag[elem] = conj(diag[elem]); | ||
| }, | ||
| diag.get_num_elems(), diag, conj_diag); | ||
| } | ||
|
|
||
| GKO_INSTANTIATE_FOR_EACH_VALUE_TYPE(GKO_DECLARE_JACOBI_SCALAR_CONJ_KERNEL); | ||
|
|
||
|
|
||
| template <typename ValueType> | ||
| void invert_diagonal(std::shared_ptr<const DefaultExecutor> exec, | ||
| const Array<ValueType> &diag, Array<ValueType> &inv_diag) | ||
| { | ||
| run_kernel( | ||
| exec, | ||
| [] GKO_KERNEL(auto elem, auto diag, auto inv_diag) { | ||
| inv_diag[elem] = safe_divide(one(diag[elem]), diag[elem]); | ||
| }, | ||
| diag.get_num_elems(), diag, inv_diag); | ||
| } | ||
|
|
||
| GKO_INSTANTIATE_FOR_EACH_VALUE_TYPE(GKO_DECLARE_JACOBI_INVERT_DIAGONAL_KERNEL); | ||
|
|
||
|
|
||
| template <typename ValueType> | ||
| void scalar_apply(std::shared_ptr<const DefaultExecutor> exec, | ||
| const Array<ValueType> &diag, | ||
| const matrix::Dense<ValueType> *alpha, | ||
| const matrix::Dense<ValueType> *b, | ||
| const matrix::Dense<ValueType> *beta, | ||
| matrix::Dense<ValueType> *x) | ||
| { | ||
| if (alpha->get_size()[1] > 1) { | ||
| run_kernel( | ||
| exec, | ||
| [] GKO_KERNEL(auto row, auto col, auto diag, auto alpha, auto b, | ||
| auto beta, auto x) { | ||
| x(row, col) = beta[col] * x(row, col) + | ||
| alpha[col] * b(row, col) * diag[row]; | ||
| }, | ||
| x->get_size(), diag, alpha->get_const_values(), b, | ||
| beta->get_const_values(), x); | ||
| } else { | ||
| run_kernel( | ||
| exec, | ||
| [] GKO_KERNEL(auto row, auto col, auto diag, auto alpha, auto b, | ||
| auto beta, auto x) { | ||
| x(row, col) = | ||
| beta[0] * x(row, col) + alpha[0] * b(row, col) * diag[row]; | ||
| }, | ||
| x->get_size(), diag, alpha->get_const_values(), b, | ||
| beta->get_const_values(), x); | ||
| } | ||
| } | ||
|
|
||
| GKO_INSTANTIATE_FOR_EACH_VALUE_TYPE(GKO_DECLARE_JACOBI_SCALAR_APPLY_KERNEL); | ||
|
|
||
|
|
||
| template <typename ValueType> | ||
| void simple_scalar_apply(std::shared_ptr<const DefaultExecutor> exec, | ||
| const Array<ValueType> &diag, | ||
| const matrix::Dense<ValueType> *b, | ||
| matrix::Dense<ValueType> *x) | ||
| { | ||
| run_kernel( | ||
| exec, | ||
| [] GKO_KERNEL(auto row, auto col, auto diag, auto b, auto x) { | ||
| x(row, col) = b(row, col) * diag[row]; | ||
| }, | ||
| x->get_size(), diag, b, x); | ||
| } | ||
|
|
||
| GKO_INSTANTIATE_FOR_EACH_VALUE_TYPE( | ||
| GKO_DECLARE_JACOBI_SIMPLE_SCALAR_APPLY_KERNEL); | ||
|
|
||
|
|
||
| template <typename ValueType> | ||
| void scalar_convert_to_dense(std::shared_ptr<const DefaultExecutor> exec, | ||
| const Array<ValueType> &blocks, | ||
| matrix::Dense<ValueType> *result) | ||
| { | ||
| run_kernel( | ||
| exec, | ||
| [] GKO_KERNEL(auto row, auto col, auto diag, auto result) { | ||
| result(row, col) = zero(diag[row]); | ||
| if (row == col) { | ||
| result(row, col) = diag[row]; | ||
| } | ||
| }, | ||
| result->get_size(), blocks, result); | ||
| } | ||
|
|
||
| GKO_INSTANTIATE_FOR_EACH_VALUE_TYPE( | ||
| GKO_DECLARE_JACOBI_SCALAR_CONVERT_TO_DENSE_KERNEL); | ||
|
|
||
|
|
||
| } // namespace jacobi | ||
| } // namespace GKO_DEVICE_NAMESPACE | ||
| } // namespace kernels | ||
| } // namespace gko |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.