feedc0de/boost_mp11
1
0
Fork 0
forked from boostorg/mp11
Code Pull Requests Activity

Merge branch 'workaround-nvcc-cuda' of https://github.com/theZiz/mp11 into feature/nvcc-9

Browse Source
This commit is contained in:
Peter Dimov
2018-04-26 21:44:55 +03:00
parent a42587e252 b78e808fc1
commit fda3fb23e6
3 changed files with 89 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
include/boost/mp11/algorithm.hpp
View File

@@ -95,6 +95,15 @@ struct list_size_mismatch
{ {
}; };
#if BOOST_WORKAROUND( BOOST_CUDA_VERSION, / 1000000 == 9 )
template<template<class...> class F, class... L> struct mp_transform_cuda_workaround
{
using type = mp_if<mp_same<mp_size<L>...>, detail::mp_transform_impl<F, L...>, detail::list_size_mismatch>;
};
#endif
} // namespace detail } // namespace detail
#if BOOST_WORKAROUND( BOOST_MSVC, == 1900 ) || BOOST_WORKAROUND( BOOST_GCC, < 40800 ) #if BOOST_WORKAROUND( BOOST_MSVC, == 1900 ) || BOOST_WORKAROUND( BOOST_GCC, < 40800 )
@@ -103,10 +112,18 @@ template<template<class...> class F, class... L> using mp_transform = typename m
#else #else
#if BOOST_WORKAROUND( BOOST_CUDA_VERSION, / 1000000 == 9 )
template<template<class...> class F, class... L> using mp_transform = typename detail::mp_transform_cuda_workaround< F, L...>::type::type;
#else
template<template<class...> class F, class... L> using mp_transform = typename mp_if<mp_same<mp_size<L>...>, detail::mp_transform_impl<F, L...>, detail::list_size_mismatch>::type; template<template<class...> class F, class... L> using mp_transform = typename mp_if<mp_same<mp_size<L>...>, detail::mp_transform_impl<F, L...>, detail::list_size_mismatch>::type;
#endif #endif
#endif
template<class Q, class... L> using mp_transform_q = mp_transform<Q::template fn, L...>; template<class Q, class... L> using mp_transform_q = mp_transform<Q::template fn, L...>;
namespace detail namespace detail
@@ -303,9 +320,27 @@ template<class L, std::size_t I> struct mp_at_c_impl
#endif #endif
#if BOOST_WORKAROUND( BOOST_CUDA_VERSION, / 1000000 == 9 )
template<class L, std::size_t I> struct mp_at_c_cuda_workaround
{
using type = mp_if_c<(I < mp_size<L>::value), detail::mp_at_c_impl<L, I>, void>;
};
#endif
} // namespace detail } // namespace detail
#if BOOST_WORKAROUND( BOOST_CUDA_VERSION, / 1000000 == 9 )
template<class L, std::size_t I> using mp_at_c = typename detail::mp_at_c_cuda_workaround< L, I >::type::type;
#else
template<class L, std::size_t I> using mp_at_c = typename mp_if_c<(I < mp_size<L>::value), detail::mp_at_c_impl<L, I>, void>::type; template<class L, std::size_t I> using mp_at_c = typename mp_if_c<(I < mp_size<L>::value), detail::mp_at_c_impl<L, I>, void>::type;
#endif
template<class L, class I> using mp_at = mp_at_c<L, std::size_t{ I::value }>; template<class L, class I> using mp_at = mp_at_c<L, std::size_t{ I::value }>;
// mp_take(_c)<L, N> // mp_take(_c)<L, N>
@@ -543,6 +578,25 @@ template<template<class...> class L, class T1, class... T, std::size_t I, templa
using L2 = mp_second<part>; using L2 = mp_second<part>;
#if BOOST_WORKAROUND( BOOST_CUDA_VERSION, / 1000000 == 9 )
struct detail
{
struct mp_nth_element_impl_cuda_workaround
{
using type = mp_cond<
mp_bool<(I < N1)>, mp_nth_element_impl<L1, I, P>,
mp_bool<(I == N1)>, mp_identity<T1>,
mp_true, mp_nth_element_impl<L2, I - N1 - 1, P>
>;
};
};
using type = typename detail::mp_nth_element_impl_cuda_workaround::type::type;
#else
using type = typename mp_cond< using type = typename mp_cond<
mp_bool<(I < N1)>, mp_nth_element_impl<L1, I, P>, mp_bool<(I < N1)>, mp_nth_element_impl<L1, I, P>,
@@ -550,6 +604,8 @@ template<template<class...> class L, class T1, class... T, std::size_t I, templa
mp_true, mp_nth_element_impl<L2, I - N1 - 1, P> mp_true, mp_nth_element_impl<L2, I - N1 - 1, P>
>::type; >::type;
#endif
}; };
} // namespace detail } // namespace detail

16
include/boost/mp11/detail/mp_append.hpp
View File

@@ -133,12 +133,28 @@ template<
using type = typename mp_append_impl<prefix, Lr...>::type; using type = typename mp_append_impl<prefix, Lr...>::type;
}; };
#if BOOST_WORKAROUND( BOOST_CUDA_VERSION, / 1000000 == 9 )
template<class... L>
struct mp_append_impl_cuda_workaround
{
using type = mp_if_c<(sizeof...(L) > 111), mp_quote<append_inf_impl>, mp_if_c<(sizeof...(L) > 11), mp_quote<append_111_impl>, mp_quote<append_11_impl> > >;
};
template<class... L> struct mp_append_impl: mp_append_impl_cuda_workaround<L...>::type::template fn<L...>
{
};
#else
template<class... L> struct mp_append_impl: mp_if_c<(sizeof...(L) > 111), mp_quote<append_inf_impl>, mp_if_c<(sizeof...(L) > 11), mp_quote<append_111_impl>, mp_quote<append_11_impl> > >::template fn<L...> template<class... L> struct mp_append_impl: mp_if_c<(sizeof...(L) > 111), mp_quote<append_inf_impl>, mp_if_c<(sizeof...(L) > 11), mp_quote<append_111_impl>, mp_quote<append_11_impl> > >::template fn<L...>
{ {
}; };
#endif #endif
#endif
} // namespace detail } // namespace detail
template<class... L> using mp_append = typename detail::mp_append_impl<L...>::type; template<class... L> using mp_append = typename detail::mp_append_impl<L...>::type;

17
include/boost/mp11/utility.hpp
View File

@@ -106,10 +106,27 @@ struct mp_no_type
{ {
}; };
#if BOOST_WORKAROUND( BOOST_CUDA_VERSION, / 1000000 == 9 )
template<template<class...> class F, class... T> struct mp_defer_cuda_workaround
{
using type = mp_if<mp_valid<F, T...>, detail::mp_defer_impl<F, T...>, detail::mp_no_type>;
};
#endif
} // namespace detail } // namespace detail
#if BOOST_WORKAROUND( BOOST_CUDA_VERSION, / 1000000 == 9 )
template<template<class...> class F, class... T> using mp_defer = typename detail::mp_defer_cuda_workaround< F, T...>::type;
#else
template<template<class...> class F, class... T> using mp_defer = mp_if<mp_valid<F, T...>, detail::mp_defer_impl<F, T...>, detail::mp_no_type>; template<template<class...> class F, class... T> using mp_defer = mp_if<mp_valid<F, T...>, detail::mp_defer_impl<F, T...>, detail::mp_no_type>;
#endif
// mp_eval_if, mp_eval_if_c // mp_eval_if, mp_eval_if_c
namespace detail namespace detail
{ {