diff --git a/common/src/KokkosFFT_traits.hpp b/common/src/KokkosFFT_traits.hpp index c48cf8cc..9fa348f7 100644 --- a/common/src/KokkosFFT_traits.hpp +++ b/common/src/KokkosFFT_traits.hpp @@ -63,15 +63,15 @@ struct is_admissible_value_type< template struct is_admissible_value_type< - T, std::enable_if_t::value && + T, std::enable_if_t && (is_real_v || is_complex_v)>> : std::true_type {}; /// \brief Helper to check if a type is an acceptable value type /// (float/double/Kokkos::complex/Kokkos::complex) for Kokkos-FFT -/// When applied to Kokkos::View, then check if a value type is an -/// acceptable real/complex type. +/// When applied to Kokkos::View, then check if a value type is an acceptable +/// real/complex type. template inline constexpr bool is_admissible_value_type_v = is_admissible_value_type::value; @@ -83,7 +83,7 @@ template struct is_layout_left_or_right< ViewType, std::enable_if_t< - Kokkos::is_view::value && + Kokkos::is_view_v && (std::is_same_v || std::is_same_v)>> : std::true_type {}; @@ -99,7 +99,7 @@ struct is_admissible_view : std::false_type {}; template struct is_admissible_view< - ViewType, std::enable_if_t::value && + ViewType, std::enable_if_t && is_layout_left_or_right_v && is_admissible_value_type_v>> : std::true_type {}; @@ -117,14 +117,14 @@ template struct is_operatable_view< ExecutionSpace, ViewType, std::enable_if_t< + Kokkos::is_execution_space_v && is_admissible_view_v && Kokkos::SpaceAccessibility< ExecutionSpace, typename ViewType::memory_space>::accessible>> : std::true_type {}; /// \brief Helper to check if a View is an acceptable View for Kokkos-FFT and -/// memory space -/// is accessible from the ExecutionSpace +/// memory space is accessible from the ExecutionSpace template inline constexpr bool is_operatable_view_v = is_operatable_view::value; @@ -136,8 +136,7 @@ struct have_same_precision : std::false_type {}; template struct have_same_precision< T1, T2, - std::enable_if_t::value && - !Kokkos::is_view::value && + std::enable_if_t && !Kokkos::is_view_v && std::is_same_v, base_floating_point_type>>> : std::true_type {}; @@ -146,8 +145,7 @@ template struct have_same_precision< InViewType, OutViewType, std::enable_if_t< - Kokkos::is_view::value && - Kokkos::is_view::value && + Kokkos::is_view_v && Kokkos::is_view_v && std::is_same_v< base_floating_point_type, base_floating_point_type< @@ -155,8 +153,8 @@ struct have_same_precision< : std::true_type {}; /// \brief Helper to check if two value have the same base precision type. -/// When applied to Kokkos::View, then check if values of views have the -/// same base precision type. +/// When applied to Kokkos::View, then check if values of views have the same +/// base precision type. template inline constexpr bool have_same_precision_v = have_same_precision::value; @@ -167,8 +165,8 @@ struct have_same_layout : std::false_type {}; template struct have_same_layout< InViewType, OutViewType, - std::enable_if_t::value && - Kokkos::is_view::value && + std::enable_if_t && + Kokkos::is_view_v && std::is_same_v>> : std::true_type {}; @@ -184,8 +182,8 @@ struct have_same_rank : std::false_type {}; template struct have_same_rank< InViewType, OutViewType, - std::enable_if_t::value && - Kokkos::is_view::value && + std::enable_if_t && + Kokkos::is_view_v && InViewType::rank() == OutViewType::rank()>> : std::true_type {};