Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KokkosKernels Utils: cleaning the zero_vector interface #2147

Merged
merged 3 commits into from
Mar 26, 2024
Merged

KokkosKernels Utils: cleaning the zero_vector interface #2147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d842175
KokkosKernels Utils: cleaning the zero_vector interface
lucbv Mar 18, 2024
e88b1a1
Kokkos Kernels: fixing call to zero_vector in Gauss-Seidel
Mar 18, 2024
44b4418
Applying clang-format
lucbv Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions common/src/KokkosKernels_Utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,7 +890,7 @@ void permute_block_vector(typename idx_array_type::value_type num_elements,
// TODO BMK: clean this up by removing 1st argument. It is unused but
// its name gives the impression that only num_elements of the vector are
// zeroed, when really it's always the whole thing.
template <class ExecSpaceIn, typename value_array_type, typename MyExecSpace>
template <class ExecSpaceIn, typename value_array_type>
void zero_vector(ExecSpaceIn &exec_space_in,
typename value_array_type::value_type /* num_elements */,
value_array_type &vector) {
Expand All @@ -906,8 +906,7 @@ void zero_vector(typename value_array_type::value_type /* num_elements */,
using ne_tmp_t = typename value_array_type::value_type;
ne_tmp_t ne_tmp = ne_tmp_t(0);
MyExecSpace my_exec_space;
zero_vector<MyExecSpace, value_array_type, MyExecSpace>(my_exec_space, ne_tmp,
vector);
zero_vector(my_exec_space, ne_tmp, vector);
}

template <typename v1, typename v2, typename v3>
Expand Down
8 changes: 4 additions & 4 deletions sparse/impl/KokkosSparse_gauss_seidel_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1547,8 +1547,8 @@ class PointGaussSeidel {
Permuted_Yvector);
}
if (init_zero_x_vector) {
KokkosKernels::Impl::zero_vector<
MyExecSpace, scalar_persistent_work_view2d_t, MyExecSpace>(
KokkosKernels::Impl::zero_vector<MyExecSpace,
scalar_persistent_work_view2d_t>(
my_exec_space, num_cols * block_size, Permuted_Xvector);
} else {
KokkosKernels::Impl::permute_block_vector<
Expand Down Expand Up @@ -1664,8 +1664,8 @@ class PointGaussSeidel {
Permuted_Yvector);
}
if (init_zero_x_vector) {
KokkosKernels::Impl::zero_vector<
MyExecSpace, scalar_persistent_work_view2d_t, MyExecSpace>(
KokkosKernels::Impl::zero_vector<MyExecSpace,
scalar_persistent_work_view2d_t>(
my_exec_space, num_cols, Permuted_Xvector);
} else {
KokkosKernels::Impl::permute_vector<
Expand Down