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

Hands off namespace Kokkos::Impl - cleanup couple violations that snuck in #2094

Merged
merged 3 commits into from
Feb 6, 2024
Merged

Hands off namespace Kokkos::Impl - cleanup couple violations that snuck in #2094

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
9331932
Do not use things from namespace Kokkos::Impl (Kokkos::{Impl:: -> }AL…
dalg24 Feb 2, 2024
0ed5a88
Do not use things from namespace Kokkos::Impl (Kokkos::Impl::DeepCopy)
dalg24 Feb 2, 2024
a22f22b
Fix warning `declaration of ‘std::size_t n’ shadows a parameter`
dalg24 Feb 5, 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 batched/KokkosBatched_Util.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,8 +629,7 @@ KOKKOS_INLINE_FUNCTION auto subview_wrapper(ViewType v, IdxType1 i1,
#if KOKKOS_VERSION < 40099
template <class ViewType, class IdxType1>
KOKKOS_INLINE_FUNCTION auto subview_wrapper(ViewType v, IdxType1 i1,
Kokkos::Impl::ALL_t i2,
Kokkos::Impl::ALL_t i3,
Kokkos::ALL_t i2, Kokkos::ALL_t i3,
const BatchLayout::Left &layout_tag,
const Trans::Transpose) {
auto sv_nt = subview_wrapper(v, i1, i3, i2, layout_tag);
Expand Down Expand Up @@ -674,7 +673,7 @@ KOKKOS_INLINE_FUNCTION auto subview_wrapper(
#if KOKKOS_VERSION < 40099
template <class ViewType, class IdxType1>
KOKKOS_INLINE_FUNCTION auto subview_wrapper(
ViewType v, IdxType1 i1, Kokkos::Impl::ALL_t i2, Kokkos::Impl::ALL_t i3,
ViewType v, IdxType1 i1, Kokkos::ALL_t i2, Kokkos::ALL_t i3,
const BatchLayout::Right &layout_tag, const Trans::Transpose &) {
auto sv_nt = subview_wrapper(v, i1, i3, i2, layout_tag);

Expand Down
9 changes: 7 additions & 2 deletions sparse/impl/KokkosSparse_coo2crs_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,13 @@ class Coo2Crs {
reinterpret_cast<UmapType *>(Kokkos::kokkos_malloc<UmapMemorySpace>(
"m_umaps", m_nrows * sizeof(UmapType)));

using shallow_copy_to_device =
Kokkos::Impl::DeepCopy<UmapMemorySpace, typename Kokkos::HostSpace>;
auto shallow_copy_to_device = [](UmapType *dst, UmapType const *src,
std::size_t cnt) {
std::size_t nn = cnt / sizeof(UmapType);
Kokkos::deep_copy(
Kokkos::View<UmapType *, UmapMemorySpace>(dst, nn),
Kokkos::View<UmapType const *, Kokkos::HostSpace>(src, nn));
};

UmapType **umap_ptrs = new UmapType *[m_nrows];
// TODO: use host-level parallel_for with tag rowmapRp1
Expand Down