diff --git a/packages/sacado/src/Kokkos_DynRankView_Fad.hpp b/packages/sacado/src/Kokkos_DynRankView_Fad.hpp index 5d0bbe6..114bc31 100644 --- a/packages/sacado/src/Kokkos_DynRankView_Fad.hpp +++ b/packages/sacado/src/Kokkos_DynRankView_Fad.hpp @@ -44,7 +44,6 @@ #include "Kokkos_View_Fad.hpp" namespace Kokkos { -namespace Experimental { namespace Impl { template <> @@ -266,7 +265,7 @@ struct DynRankDimTraits { }; -}}} // namespace Kokkos::Experimental::Impl +}} // namespace Kokkos::Impl namespace Kokkos { namespace Impl { @@ -486,7 +485,7 @@ struct ViewMapping std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutStride >::value ) - ), Kokkos::Experimental::Impl::DynRankSubviewTag >::type + ), Kokkos::Impl::DynRankSubviewTag >::type , SrcTraits , Args ... > { @@ -560,7 +559,7 @@ public: template < typename T , class ... P > KOKKOS_INLINE_FUNCTION - static ret_type subview( const unsigned src_rank , Kokkos::Experimental::DynRankView< T , P...> const & src , Args ... args ) + static ret_type subview( const unsigned src_rank , Kokkos::DynRankView< T , P...> const & src , Args ... args ) { typedef ViewMapping< traits_type, void > DstType ; @@ -684,7 +683,7 @@ class ViewMapping< DstTraits , SrcTraits , // Source view has FAD only std::is_same< typename SrcTraits::specialize , ViewSpecializeSacadoFad >::value - ), Kokkos::Experimental::Impl::ViewToDynRankViewTag >::type > + ), Kokkos::Impl::ViewToDynRankViewTag >::type > { public: @@ -812,7 +811,7 @@ void deep_copy( typename ViewTraits::non_const_value_type >::value , "Can only deep copy into non-const type" ); - Kokkos::Experimental::Impl::DynRankViewFill< DynRankView >( view , value ); + Kokkos::Impl::DynRankViewFill< DynRankView >( view , value ); } // Overload of deep_copy for Fad views intializing to a constant Fad @@ -832,7 +831,7 @@ void deep_copy( typename ViewTraits::non_const_value_type >::value , "Can only deep copy into non-const type" ); - Kokkos::Experimental::Impl::DynRankViewFill< DynRankView >( view , value ); + Kokkos::Impl::DynRankViewFill< DynRankView >( view , value ); } template< class DstType , class SrcType > @@ -851,7 +850,7 @@ void deep_copy std::is_same< typename SrcType::traits::specialize , Kokkos::Impl::ViewSpecializeSacadoFadContiguous >::value ) && - ( Kokkos::Experimental::is_dyn_rank_view::value || Kokkos::Experimental::is_dyn_rank_view::value || Kokkos::is_dyn_rank_view::value ) )>::type * = 0 ) { @@ -967,11 +966,11 @@ void deep_copy } else if ( DstExecCanAccessSrc ) { // Copying data between views in accessible memory spaces and either non-contiguous or incompatible shape. - Kokkos::Experimental::Impl::DynRankViewRemap< dst_type , src_type >( dst , src ); + Kokkos::Impl::DynRankViewRemap< dst_type , src_type >( dst , src ); } else if ( SrcExecCanAccessDst ) { // Copying data between views in accessible memory spaces and either non-contiguous or incompatible shape. - Kokkos::Experimental::Impl::DynRankViewRemap< dst_type , src_type , src_execution_space >( dst , src ); + Kokkos::Impl::DynRankViewRemap< dst_type , src_type , src_execution_space >( dst , src ); } else { Kokkos::Impl::throw_runtime_exception("deep_copy given views that would require a temporary allocation"); diff --git a/packages/sacado/src/Kokkos_DynRankView_Fad_Contiguous.hpp b/packages/sacado/src/Kokkos_DynRankView_Fad_Contiguous.hpp index 0bb0773..34b1297 100644 --- a/packages/sacado/src/Kokkos_DynRankView_Fad_Contiguous.hpp +++ b/packages/sacado/src/Kokkos_DynRankView_Fad_Contiguous.hpp @@ -44,7 +44,6 @@ #include "Kokkos_View_Fad.hpp" namespace Kokkos { -namespace Experimental { namespace Impl { template <> @@ -267,7 +266,7 @@ struct DynRankDimTraits { }; -}}} // end Kokkos::Experimental::Impl +}} // end Kokkos::Impl namespace Kokkos { namespace Impl { @@ -286,7 +285,7 @@ struct ViewMapping std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutStride >::value ) - ), Kokkos::Experimental::Impl::DynRankSubviewTag >::type + ), Kokkos::Impl::DynRankSubviewTag >::type , SrcTraits , Args ... > { @@ -371,7 +370,7 @@ public: template < typename T , class ... P > KOKKOS_INLINE_FUNCTION - static ret_type subview( const unsigned src_rank , Kokkos::Experimental::DynRankView< T , P...> const & src , Args ... args ) + static ret_type subview( const unsigned src_rank , Kokkos::DynRankView< T , P...> const & src , Args ... args ) { typedef ViewMapping< traits_type, void > DstType ; @@ -478,7 +477,7 @@ struct ViewMapping && std::is_same< typename SrcTraits::array_layout , Kokkos::LayoutLeft >::value - ), Kokkos::Experimental::Impl::DynRankSubviewTag >::type + ), Kokkos::Impl::DynRankSubviewTag >::type , SrcTraits , Args ... > { @@ -563,7 +562,7 @@ public: template < typename T , class ... P > KOKKOS_INLINE_FUNCTION - static ret_type subview( const unsigned src_rank , Kokkos::Experimental::DynRankView< T , P...> const & src , Args ... args ) + static ret_type subview( const unsigned src_rank , Kokkos::DynRankView< T , P...> const & src , Args ... args ) { typedef ViewMapping< traits_type, void > DstType ; @@ -692,7 +691,7 @@ class ViewMapping< DstTraits , SrcTraits , // Source view has FAD only std::is_same< typename SrcTraits::specialize , Kokkos::Impl::ViewSpecializeSacadoFadContiguous >::value - ), Kokkos::Experimental::Impl::ViewToDynRankViewTag >::type > + ), Kokkos::Impl::ViewToDynRankViewTag >::type > { public: @@ -779,7 +778,7 @@ class ViewMapping< DstTraits , SrcTraits , // Source view has FAD only std::is_same< typename SrcTraits::specialize , Kokkos::Impl::ViewSpecializeSacadoFadContiguous >::value - ), Kokkos::Experimental::Impl::ViewToDynRankViewTag >::type > + ), Kokkos::Impl::ViewToDynRankViewTag >::type > { public: diff --git a/packages/sacado/src/Kokkos_ViewFactory.hpp b/packages/sacado/src/Kokkos_ViewFactory.hpp index 787e154..bdf5223 100644 --- a/packages/sacado/src/Kokkos_ViewFactory.hpp +++ b/packages/sacado/src/Kokkos_ViewFactory.hpp @@ -104,7 +104,7 @@ struct ViewFactory { // Reconstruct layout for dynamic rank if (is_dyn_rank) { constexpr unsigned r = is_scalar ? rank : rank + 1; - layout = Experimental::Impl::reconstructLayout(layout, r); + layout = Impl::reconstructLayout(layout, r); } return ResultView(prop, layout); diff --git a/packages/sacado/test/UnitTests/Fad_KokkosTests.hpp b/packages/sacado/test/UnitTests/Fad_KokkosTests.hpp index 8cf74aa..78d9355 100644 --- a/packages/sacado/test/UnitTests/Fad_KokkosTests.hpp +++ b/packages/sacado/test/UnitTests/Fad_KokkosTests.hpp @@ -999,7 +999,7 @@ TEUCHOS_UNIT_TEST_TEMPLATE_3_DECL( // Create subview of first column size_type col = 1; - auto s = Kokkos::Experimental::subdynrankview(v, Kokkos::ALL(), col); + auto s = Kokkos::subdynrankview(v, Kokkos::ALL(), col); // Copy back typedef decltype(s) SubviewType; diff --git a/packages/sacado/test/UnitTests/ViewFactoryTests.cpp b/packages/sacado/test/UnitTests/ViewFactoryTests.cpp index b9fcf74..5df627b 100644 --- a/packages/sacado/test/UnitTests/ViewFactoryTests.cpp +++ b/packages/sacado/test/UnitTests/ViewFactoryTests.cpp @@ -160,7 +160,7 @@ TEUCHOS_UNIT_TEST(view_factory, dyn_rank_views) TEST_EQUALITY(vct1.extent(0), v1.extent(0)); TEST_EQUALITY(vct1.extent(1), v1.extent(1)); TEST_EQUALITY(vct1.extent(2), v1.extent(2)); - TEST_EQUALITY(Kokkos::Experimental::rank(vct1), 2); + TEST_EQUALITY(Kokkos::rank(vct1), 2); bool check_neq_kokkos_type = std::is_same < CommonValueType, ScalarArrayType >::value; bool check_eq_fad_type = std::is_same < CommonValueType, FadType >::value; bool check_eq_scalar_double = std::is_same < double, ScalarArrayType >::value; @@ -192,7 +192,7 @@ TEUCHOS_UNIT_TEST(view_factory, dyn_rank_views) TEST_EQUALITY(vct1.extent(0), v1.extent(0)); TEST_EQUALITY(vct1.extent(1), v1.extent(1)); TEST_EQUALITY(vct1.extent(2), v1.extent(2)); - TEST_EQUALITY(Kokkos::Experimental::rank(vct1), 2); + TEST_EQUALITY(Kokkos::rank(vct1), 2); bool check_neq_kokkos_type = std::is_same < CommonValueType, ScalarArrayType >::value; bool check_eq_fad_type = std::is_same < CommonValueType, FadType >::value; bool check_eq_scalar_double = std::is_same < double, ScalarArrayType >::value;