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

Stokhos/Sacado/TrilinosCouplings: Remove deprecated use of Kokkos::Impl::SpaceAccessibility #10005

Merged
merged 2 commits into from
Dec 10, 2021
Merged

Stokhos/Sacado/TrilinosCouplings: Remove deprecated use of Kokkos::Impl::SpaceAccessibility #10005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
827cd90
Stokhos/Sacado/TrilinosCouplings: Remove deprecated use of Kokkos::Im…
csiefer2 Dec 10, 2021
70cd69c
Stokhos/Sacado/TrilinosCouplings: Remove deprecated use of Kokkos::Im…
csiefer2 Dec 10, 2021
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
4 changes: 2 additions & 2 deletions packages/sacado/src/Kokkos_DynRankView_Fad.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,10 +1045,10 @@ void deep_copy
typedef typename src_type::memory_space src_memory_space ;

enum { DstExecCanAccessSrc =
Kokkos::Impl::SpaceAccessibility< typename dst_execution_space::memory_space, src_memory_space >::accessible };
Kokkos::SpaceAccessibility< typename dst_execution_space::memory_space, src_memory_space >::accessible };

enum { SrcExecCanAccessDst =
Kokkos::Impl::SpaceAccessibility< typename src_execution_space::memory_space, dst_memory_space >::accessible };
Kokkos::SpaceAccessibility< typename src_execution_space::memory_space, dst_memory_space >::accessible };

if ( (void *) dst.data() != (void*) src.data() ) {

Expand Down
8 changes: 4 additions & 4 deletions packages/stokhos/src/sacado/kokkos/pce/KokkosExp_View_UQ_PCE_Contiguous.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ void deep_copy(
const View<DT,DP...> & view ,
const typename View<DT,DP...>::array_type::value_type & value
, typename std::enable_if<(
Kokkos::Impl::is_execution_space< ExecSpace >::value &&
Kokkos::is_execution_space< ExecSpace >::value &&
std::is_same< typename ViewTraits<DT,DP...>::specialize
, Kokkos::Experimental::Impl::ViewPCEContiguous >::value
)>::type * = 0 );
Expand All @@ -169,7 +169,7 @@ void deep_copy(
const View<DT,DP...> & view ,
const typename View<DT,DP...>::value_type & value
, typename std::enable_if<(
Kokkos::Impl::is_execution_space< ExecSpace >::value &&
Kokkos::is_execution_space< ExecSpace >::value &&
std::is_same< typename ViewTraits<DT,DP...>::specialize
, Kokkos::Experimental::Impl::ViewPCEContiguous >::value
)>::type * = 0 );
Expand Down Expand Up @@ -437,7 +437,7 @@ void deep_copy(
const View<DT,DP...> & view ,
const typename View<DT,DP...>::array_type::value_type & value
, typename std::enable_if<(
Kokkos::Impl::is_execution_space< ExecSpace >::value &&
Kokkos::is_execution_space< ExecSpace >::value &&
std::is_same< typename ViewTraits<DT,DP...>::specialize
, Kokkos::Experimental::Impl::ViewPCEContiguous >::value
)>::type * )
Expand All @@ -463,7 +463,7 @@ void deep_copy(
const View<DT,DP...> & view ,
const typename View<DT,DP...>::value_type & value
, typename std::enable_if<(
Kokkos::Impl::is_execution_space< ExecSpace >::value &&
Kokkos::is_execution_space< ExecSpace >::value &&
std::is_same< typename ViewTraits<DT,DP...>::specialize
, Kokkos::Experimental::Impl::ViewPCEContiguous >::value
)>::type * )
Expand Down
4 changes: 2 additions & 2 deletions packages/stokhos/src/sacado/kokkos/pce/tpetra/Stokhos_Tpetra_UQ_PCE.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ namespace Kokkos {
getKokkosViewDeepCopy(const Teuchos::ArrayView< Sacado::UQ::PCE<S> >& a) {
typedef Sacado::UQ::PCE<S> T;
typedef typename Kokkos::Impl::if_c<
::Kokkos::Impl::SpaceAccessibility< D, Kokkos::HostSpace>::accessible,
::Kokkos::SpaceAccessibility< D, Kokkos::HostSpace>::accessible,
typename D::execution_space, Kokkos::HostSpace>::type
HostDevice;
typedef Kokkos::View<T*,D> view_type;
Expand All @@ -86,7 +86,7 @@ namespace Kokkos {
getKokkosViewDeepCopy(const Teuchos::ArrayView<const Sacado::UQ::PCE<S> >& a) {
typedef Sacado::UQ::PCE<S> T;
typedef typename Kokkos::Impl::if_c<
::Kokkos::Impl::SpaceAccessibility< D, Kokkos::HostSpace>::accessible,
::Kokkos::SpaceAccessibility< D, Kokkos::HostSpace>::accessible,
typename D::execution_space, Kokkos::HostSpace>::type
HostDevice;
typedef Kokkos::View<T*,D> view_type;
Expand Down
8 changes: 4 additions & 4 deletions packages/stokhos/src/sacado/kokkos/vector/KokkosExp_View_MP_Vector_Contiguous.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ void deep_copy(
const View<DT,DP...> & view ,
const typename View<DT,DP...>::array_type::value_type & value
, typename std::enable_if<(
Kokkos::Impl::is_execution_space< ExecSpace >::value &&
Kokkos::is_execution_space< ExecSpace >::value &&
std::is_same< typename ViewTraits<DT,DP...>::specialize
, Kokkos::Experimental::Impl::ViewMPVectorContiguous >::value
)>::type * = 0 );
Expand All @@ -180,7 +180,7 @@ void deep_copy(
const View<DT,DP...> & view ,
const typename View<DT,DP...>::value_type & value
, typename std::enable_if<(
Kokkos::Impl::is_execution_space< ExecSpace >::value &&
Kokkos::is_execution_space< ExecSpace >::value &&
std::is_same< typename ViewTraits<DT,DP...>::specialize
, Kokkos::Experimental::Impl::ViewMPVectorContiguous >::value
)>::type * = 0 );
Expand Down Expand Up @@ -357,7 +357,7 @@ void deep_copy(
const View<DT,DP...> & view ,
const typename View<DT,DP...>::array_type::value_type & value
, typename std::enable_if<(
Kokkos::Impl::is_execution_space< ExecSpace >::value &&
Kokkos::is_execution_space< ExecSpace >::value &&
std::is_same< typename ViewTraits<DT,DP...>::specialize
, Kokkos::Experimental::Impl::ViewMPVectorContiguous >::value
)>::type * )
Expand All @@ -378,7 +378,7 @@ void deep_copy(
const View<DT,DP...> & view ,
const typename View<DT,DP...>::value_type & value
, typename std::enable_if<(
Kokkos::Impl::is_execution_space< ExecSpace >::value &&
Kokkos::is_execution_space< ExecSpace >::value &&
std::is_same< typename ViewTraits<DT,DP...>::specialize
, Kokkos::Experimental::Impl::ViewMPVectorContiguous >::value
)>::type * )
Expand Down
2 changes: 1 addition & 1 deletion packages/trilinoscouplings/examples/fenl/fenl_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ class Problem {
throw std::runtime_error(std::string("Problem fixture setup failed"));
}

print_flag = use_print && Kokkos::Impl::SpaceAccessibility< Kokkos::HostSpace::execution_space , typename Device::memory_space >::accessible ;
print_flag = use_print && Kokkos::SpaceAccessibility< Kokkos::HostSpace::execution_space , typename Device::memory_space >::accessible ;

perf.global_elem_count = fixture.elem_count_global();
perf.global_node_count = fixture.node_count_global();
Expand Down