From 00fff4b96fbfd3efd68516acd6c4e28df666aacc Mon Sep 17 00:00:00 2001
From: Andrew Corrigan <andrew.corrigan@gmail.com>
Date: Mon, 12 Oct 2020 09:16:19 -0400
Subject: [PATCH 1/8] Prepares raw_reference_cast for variadic tuple

---
 thrust/detail/raw_reference_cast.h | 125 +++++++----------------------
 1 file changed, 30 insertions(+), 95 deletions(-)

diff --git a/thrust/detail/raw_reference_cast.h b/thrust/detail/raw_reference_cast.h
index a678144e2..aea317c52 100644
--- a/thrust/detail/raw_reference_cast.h
+++ b/thrust/detail/raw_reference_cast.h
@@ -48,26 +48,12 @@ template<typename T>
 
 // specialize is_unwrappable
 // a tuple is_unwrappable if any of its elements is_unwrappable
-template<
-  typename T0, typename T1, typename T2,
-  typename T3, typename T4, typename T5,
-  typename T6, typename T7, typename T8,
-  typename T9
->
+template<typename... Ts>
   struct is_unwrappable<
-    thrust::tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>
+    thrust::tuple<Ts...>
   >
     : or_<
-        is_unwrappable<T0>,
-        is_unwrappable<T1>,
-        is_unwrappable<T2>,
-        is_unwrappable<T3>,
-        is_unwrappable<T4>,
-        is_unwrappable<T5>,
-        is_unwrappable<T6>,
-        is_unwrappable<T7>,
-        is_unwrappable<T8>,
-        is_unwrappable<T9>
+        is_unwrappable<Ts>...
       >
 {};
 
@@ -75,25 +61,13 @@ template<
 // specialize is_unwrappable
 // a tuple_of_iterator_references is_unwrappable if any of its elements is_unwrappable
 template<
-  typename T0, typename T1, typename T2,
-  typename T3, typename T4, typename T5,
-  typename T6, typename T7, typename T8,
-  typename T9
+  typename... Ts
 >
   struct is_unwrappable<
-    thrust::detail::tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>
+    thrust::detail::tuple_of_iterator_references<Ts...>
   >
     : or_<
-        is_unwrappable<T0>,
-        is_unwrappable<T1>,
-        is_unwrappable<T2>,
-        is_unwrappable<T3>,
-        is_unwrappable<T4>,
-        is_unwrappable<T5>,
-        is_unwrappable<T6>,
-        is_unwrappable<T7>,
-        is_unwrappable<T8>,
-        is_unwrappable<T9>
+        is_unwrappable<Ts>...
       >
 {};
 
@@ -173,51 +147,27 @@ template<typename T>
 
 // recurse on tuples
 template <
-  typename T0, typename T1, typename T2,
-  typename T3, typename T4, typename T5,
-  typename T6, typename T7, typename T8,
-  typename T9
+  typename... Ts
 >
   struct raw_reference_tuple_helper<
-    thrust::tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>
+    thrust::tuple<Ts...>
   >
 {
   typedef thrust::tuple<
-    typename raw_reference_tuple_helper<T0>::type,
-    typename raw_reference_tuple_helper<T1>::type,
-    typename raw_reference_tuple_helper<T2>::type,
-    typename raw_reference_tuple_helper<T3>::type,
-    typename raw_reference_tuple_helper<T4>::type,
-    typename raw_reference_tuple_helper<T5>::type,
-    typename raw_reference_tuple_helper<T6>::type,
-    typename raw_reference_tuple_helper<T7>::type,
-    typename raw_reference_tuple_helper<T8>::type,
-    typename raw_reference_tuple_helper<T9>::type
+    typename raw_reference_tuple_helper<Ts>::type...
   > type;
 };
 
 
 template <
-  typename T0, typename T1, typename T2,
-  typename T3, typename T4, typename T5,
-  typename T6, typename T7, typename T8,
-  typename T9
+  typename... Ts
 >
   struct raw_reference_tuple_helper<
-    thrust::detail::tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>
+    thrust::detail::tuple_of_iterator_references<Ts...>
   >
 {
   typedef thrust::detail::tuple_of_iterator_references<
-    typename raw_reference_tuple_helper<T0>::type,
-    typename raw_reference_tuple_helper<T1>::type,
-    typename raw_reference_tuple_helper<T2>::type,
-    typename raw_reference_tuple_helper<T3>::type,
-    typename raw_reference_tuple_helper<T4>::type,
-    typename raw_reference_tuple_helper<T5>::type,
-    typename raw_reference_tuple_helper<T6>::type,
-    typename raw_reference_tuple_helper<T7>::type,
-    typename raw_reference_tuple_helper<T8>::type,
-    typename raw_reference_tuple_helper<T9>::type
+    typename raw_reference_tuple_helper<Ts>::type...
   > type;
 };
 
@@ -232,17 +182,14 @@ template <
 //   then the raw_reference of tuple_type is a tuple of its members' raw_references
 //   else the raw_reference of tuple_type is tuple_type &
 template <
-  typename T0, typename T1, typename T2,
-  typename T3, typename T4, typename T5,
-  typename T6, typename T7, typename T8,
-  typename T9
+  typename... Ts
 >
   struct raw_reference<
-    thrust::tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>
+    thrust::tuple<Ts...>
   >
 {
   private:
-    typedef thrust::tuple<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9> tuple_type;
+    typedef thrust::tuple<Ts...> tuple_type;
 
   public:
     typedef typename eval_if<
@@ -254,17 +201,14 @@ template <
 
 
 template <
-  typename T0, typename T1, typename T2,
-  typename T3, typename T4, typename T5,
-  typename T6, typename T7, typename T8,
-  typename T9
+  typename... Ts
 >
   struct raw_reference<
-    thrust::detail::tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>
+    thrust::detail::tuple_of_iterator_references<Ts...>
   >
 {
   private:
-    typedef detail::tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9> tuple_type;
+    typedef detail::tuple_of_iterator_references<Ts...> tuple_type;
 
   public:
     typedef typename raw_reference_detail::raw_reference_tuple_helper<tuple_type>::type type;
@@ -295,19 +239,16 @@ typename detail::raw_reference<const T>::type
 
 
 template<
-  typename T0, typename T1, typename T2,
-  typename T3, typename T4, typename T5,
-  typename T6, typename T7, typename T8,
-  typename T9
+  typename... Ts
 >
 __host__ __device__
 typename detail::enable_if_unwrappable<
-  thrust::detail::tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>,
+  thrust::detail::tuple_of_iterator_references<Ts...>,
   typename detail::raw_reference<
-    thrust::detail::tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>
+    thrust::detail::tuple_of_iterator_references<Ts...>
   >::type
 >::type
-raw_reference_cast(thrust::detail::tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9> t);
+raw_reference_cast(thrust::detail::tuple_of_iterator_references<Ts...> t);
 
 
 namespace detail
@@ -331,18 +272,15 @@ struct raw_reference_caster
   }
 
   template<
-    typename T0, typename T1, typename T2,
-    typename T3, typename T4, typename T5,
-    typename T6, typename T7, typename T8,
-    typename T9
+    typename... Ts
   >
   __host__ __device__
   typename detail::raw_reference<
-    thrust::detail::tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>
+    thrust::detail::tuple_of_iterator_references<Ts...>
   >::type
-  operator()(thrust::detail::tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9> t,
+  operator()(thrust::detail::tuple_of_iterator_references<Ts...> t,
              typename enable_if<
-               is_unwrappable<thrust::detail::tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9> >::value
+               is_unwrappable<thrust::detail::tuple_of_iterator_references<Ts...> >::value
              >::type * = 0)
   {
     return thrust::raw_reference_cast(t);
@@ -372,19 +310,16 @@ typename detail::raw_reference<const T>::type
 
 
 template<
-  typename T0, typename T1, typename T2,
-  typename T3, typename T4, typename T5,
-  typename T6, typename T7, typename T8,
-  typename T9
+  typename... Ts
 >
 __host__ __device__
 typename detail::enable_if_unwrappable<
-  thrust::detail::tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>,
+  thrust::detail::tuple_of_iterator_references<Ts...>,
   typename detail::raw_reference<
-    thrust::detail::tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9>
+    thrust::detail::tuple_of_iterator_references<Ts...>
   >::type
 >::type
-raw_reference_cast(thrust::detail::tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9> t)
+raw_reference_cast(thrust::detail::tuple_of_iterator_references<Ts...> t)
 {
   thrust::detail::raw_reference_caster f;
 

From a526da1150f3f693691e05b51ccf77b4c85912ce Mon Sep 17 00:00:00 2001
From: Andrew Corrigan <andrew.corrigan@gmail.com>
Date: Mon, 12 Oct 2020 09:59:36 -0400
Subject: [PATCH 2/8] Prepares swap(tuple_of_iterator_references,
 tuple_of_iterator_references) for variadic tuple

---
 thrust/iterator/detail/tuple_of_iterator_references.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/thrust/iterator/detail/tuple_of_iterator_references.h b/thrust/iterator/detail/tuple_of_iterator_references.h
index 93d7e05e4..8576c673d 100644
--- a/thrust/iterator/detail/tuple_of_iterator_references.h
+++ b/thrust/iterator/detail/tuple_of_iterator_references.h
@@ -247,12 +247,12 @@ template<
 // this overload of swap() permits swapping tuple_of_iterator_references returned as temporaries from
 // iterator dereferences
 template<
-  typename T0, typename T1, typename T2, typename T3, typename T4, typename T5, typename T6, typename T7, typename T8, typename T9,
-  typename U0, typename U1, typename U2, typename U3, typename U4, typename U5, typename U6, typename U7, typename U8, typename U9
+  typename... Ts,
+  typename... Us
 >
 inline __host__ __device__
-void swap(tuple_of_iterator_references<T0,T1,T2,T3,T4,T5,T6,T7,T8,T9> x,
-          tuple_of_iterator_references<U0,U1,U2,U3,U4,U5,U6,U7,U8,U9> y)
+void swap(tuple_of_iterator_references<Ts...> x,
+          tuple_of_iterator_references<Us...> y)
 {
   x.swap(y);
 }

From 22023d34797e6c9295394d032aee5a759eef9933 Mon Sep 17 00:00:00 2001
From: Andrew Corrigan <andrew.corrigan@gmail.com>
Date: Mon, 12 Oct 2020 10:03:03 -0400
Subject: [PATCH 3/8] Prepares is_tuple_of_iterator_references for variadic
 tuple

---
 thrust/detail/internal_functional.h | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/thrust/detail/internal_functional.h b/thrust/detail/internal_functional.h
index 9ae6634b7..dba2f8f79 100644
--- a/thrust/detail/internal_functional.h
+++ b/thrust/detail/internal_functional.h
@@ -281,13 +281,10 @@ template<typename T>
 
 template<typename T> struct is_tuple_of_iterator_references : thrust::detail::false_type {};
 
-template<typename T1, typename T2, typename T3,
-         typename T4, typename T5, typename T6,
-         typename T7, typename T8, typename T9,
-         typename T10>
+template<typename... Ts>
   struct is_tuple_of_iterator_references<
     thrust::detail::tuple_of_iterator_references<
-      T1,T2,T3,T4,T5,T6,T7,T8,T9,T10
+      Ts...
     >
   >
     : thrust::detail::true_type

From 3eba25f2ceee72b5c90913b92e5e1ff274935a3a Mon Sep 17 00:00:00 2001
From: Andrew Corrigan <andrew.corrigan@gmail.com>
Date: Mon, 12 Oct 2020 10:56:32 -0400
Subject: [PATCH 4/8] variadic or_ and_

---
 thrust/detail/type_traits.h | 40 ++++++++++++++++++++++++++++---------
 1 file changed, 31 insertions(+), 9 deletions(-)

diff --git a/thrust/detail/type_traits.h b/thrust/detail/type_traits.h
index 9bfe60d31..c663cffb0 100644
--- a/thrust/detail/type_traits.h
+++ b/thrust/detail/type_traits.h
@@ -391,22 +391,44 @@ template<typename T1, typename T2>
 
 
 // mpl stuff
+template<typename... Conditions>
+  struct or_;
 
-template <typename Condition1,               typename Condition2,              typename Condition3 = false_type,
-          typename Condition4  = false_type, typename Condition5 = false_type, typename Condition6 = false_type,
-          typename Condition7  = false_type, typename Condition8 = false_type, typename Condition9 = false_type,
-          typename Condition10 = false_type>
-  struct or_
+template <>
+  struct or_<>
     : public integral_constant<
         bool,
-        Condition1::value || Condition2::value || Condition3::value || Condition4::value || Condition5::value || Condition6::value || Condition7::value || Condition8::value || Condition9::value || Condition10::value
+        false_type::value  // identity for or_
       >
 {
 }; // end or_
 
-template <typename Condition1, typename Condition2, typename Condition3 = true_type>
-  struct and_
-    : public integral_constant<bool, Condition1::value && Condition2::value && Condition3::value>
+template <typename Condition, typename... Conditions>
+  struct or_<Condition, Conditions...>
+    : public integral_constant<
+        bool,
+        Condition::value || or_<Conditions...>::value
+      >
+{
+}; // end or_
+
+template <typename... Conditions>
+  struct and_;
+
+template<>
+  struct and_<>
+    : public integral_constant<
+        bool,
+        true_type::value // identity for and_
+      >
+{
+}; // end and_
+
+template <typename Condition, typename... Conditions>
+  struct and_<Condition, Conditions...>
+    : public integral_constant<
+        bool,
+        Condition::value && and_<Conditions...>::value>
 {
 }; // end and_
 

From 53a1d25ea421e4a0cc5af6a5fe43f42ce5295b37 Mon Sep 17 00:00:00 2001
From: Andrew Corrigan <andrew.corrigan@gmail.com>
Date: Mon, 12 Oct 2020 10:59:05 -0400
Subject: [PATCH 5/8] variadic tuple_meta_transform

---
 thrust/detail/tuple_meta_transform.h | 143 ++-------------------------
 1 file changed, 6 insertions(+), 137 deletions(-)

diff --git a/thrust/detail/tuple_meta_transform.h b/thrust/detail/tuple_meta_transform.h
index 4aca1a91b..176834d30 100644
--- a/thrust/detail/tuple_meta_transform.h
+++ b/thrust/detail/tuple_meta_transform.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <thrust/tuple.h>
+#include <thrust/type_traits/integer_sequence.h>
 
 namespace thrust
 {
@@ -26,148 +27,16 @@ namespace detail
 
 template<typename Tuple,
          template<typename> class UnaryMetaFunction,
-         unsigned int sz = thrust::tuple_size<Tuple>::value>
+         typename IndexSequence = thrust::make_index_sequence<thrust::tuple_size<Tuple>::value>>
   struct tuple_meta_transform;
 
 template<typename Tuple,
-         template<typename> class UnaryMetaFunction>
-  struct tuple_meta_transform<Tuple,UnaryMetaFunction,0>
-{
-  typedef null_type type;
-};
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction>
-  struct tuple_meta_transform<Tuple,UnaryMetaFunction,1>
-{
-  typedef thrust::tuple<
-    typename UnaryMetaFunction<typename thrust::tuple_element<0,Tuple>::type>::type
-  > type;
-};
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction>
-  struct tuple_meta_transform<Tuple,UnaryMetaFunction,2>
-{
-  typedef thrust::tuple<
-    typename UnaryMetaFunction<typename thrust::tuple_element<0,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<1,Tuple>::type>::type
-  > type;
-};
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction>
-  struct tuple_meta_transform<Tuple,UnaryMetaFunction,3>
-{
-  typedef thrust::tuple<
-    typename UnaryMetaFunction<typename thrust::tuple_element<0,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<1,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<2,Tuple>::type>::type
-  > type;
-};
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction>
-  struct tuple_meta_transform<Tuple,UnaryMetaFunction,4>
-{
-  typedef thrust::tuple<
-    typename UnaryMetaFunction<typename thrust::tuple_element<0,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<1,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<2,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<3,Tuple>::type>::type
-  > type;
-};
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction>
-  struct tuple_meta_transform<Tuple,UnaryMetaFunction,5>
-{
-  typedef thrust::tuple<
-    typename UnaryMetaFunction<typename thrust::tuple_element<0,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<1,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<2,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<3,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<4,Tuple>::type>::type
-  > type;
-};
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction>
-  struct tuple_meta_transform<Tuple,UnaryMetaFunction,6>
-{
-  typedef thrust::tuple<
-    typename UnaryMetaFunction<typename thrust::tuple_element<0,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<1,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<2,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<3,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<4,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<5,Tuple>::type>::type
-  > type;
-};
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction>
-  struct tuple_meta_transform<Tuple,UnaryMetaFunction,7>
-{
-  typedef thrust::tuple<
-    typename UnaryMetaFunction<typename thrust::tuple_element<0,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<1,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<2,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<3,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<4,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<5,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<6,Tuple>::type>::type
-  > type;
-};
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction>
-  struct tuple_meta_transform<Tuple,UnaryMetaFunction,8>
-{
-  typedef thrust::tuple<
-    typename UnaryMetaFunction<typename thrust::tuple_element<0,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<1,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<2,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<3,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<4,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<5,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<6,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<7,Tuple>::type>::type
-  > type;
-};
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction>
-  struct tuple_meta_transform<Tuple,UnaryMetaFunction,9>
-{
-  typedef thrust::tuple<
-    typename UnaryMetaFunction<typename thrust::tuple_element<0,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<1,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<2,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<3,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<4,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<5,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<6,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<7,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<8,Tuple>::type>::type
-  > type;
-};
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction>
-  struct tuple_meta_transform<Tuple,UnaryMetaFunction,10>
+         template<typename> class UnaryMetaFunction,
+         size_t... Is>
+  struct tuple_meta_transform<Tuple, UnaryMetaFunction, thrust::index_sequence<Is...>>
 {
   typedef thrust::tuple<
-    typename UnaryMetaFunction<typename thrust::tuple_element<0,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<1,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<2,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<3,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<4,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<5,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<6,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<7,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<8,Tuple>::type>::type,
-    typename UnaryMetaFunction<typename thrust::tuple_element<9,Tuple>::type>::type
+    typename UnaryMetaFunction<typename thrust::tuple_element<Is,Tuple>::type>::type...
   > type;
 };
 

From 22e6dd1a8514690fdb935b33b9042d2c56f005bc Mon Sep 17 00:00:00 2001
From: Andrew Corrigan <andrew.corrigan@gmail.com>
Date: Mon, 12 Oct 2020 11:22:46 -0400
Subject: [PATCH 6/8] variadic tuple_transform

---
 thrust/detail/tuple_transform.h | 347 +-------------------------------
 1 file changed, 6 insertions(+), 341 deletions(-)

diff --git a/thrust/detail/tuple_transform.h b/thrust/detail/tuple_transform.h
index 166fab3cb..1de2402b0 100644
--- a/thrust/detail/tuple_transform.h
+++ b/thrust/detail/tuple_transform.h
@@ -28,332 +28,15 @@ namespace detail
 template<typename Tuple,
          template<typename> class UnaryMetaFunction,
          typename UnaryFunction,
-         unsigned int sz = thrust::tuple_size<Tuple>::value>
+         typename IndexSequence = thrust::make_index_sequence<thrust::tuple_size<Tuple>::value>>
   struct tuple_transform_functor;
 
 
 template<typename Tuple,
          template<typename> class UnaryMetaFunction,
-         typename UnaryFunction>
-  struct tuple_transform_functor<Tuple,UnaryMetaFunction,UnaryFunction,0>
-{
-  static __host__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host(const Tuple &, UnaryFunction)
-  {
-    return thrust::null_type();
-  }
-
-  static __host__ __device__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host_or_device(const Tuple &, UnaryFunction)
-  {
-    return thrust::null_type();
-  }
-};
-
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction,
-         typename UnaryFunction>
-  struct tuple_transform_functor<Tuple,UnaryMetaFunction,UnaryFunction,1>
-{
-  static __host__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)));
-  }
-
-  static __host__ __device__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host_or_device(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)));
-  }
-};
-
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction,
-         typename UnaryFunction>
-  struct tuple_transform_functor<Tuple,UnaryMetaFunction,UnaryFunction,2>
-{
-  static __host__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)));
-  }
-
-  static __host__ __device__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host_or_device(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)));
-  }
-};
-
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction,
-         typename UnaryFunction>
-  struct tuple_transform_functor<Tuple,UnaryMetaFunction,UnaryFunction,3>
-{
-  static __host__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)));
-  }
-
-  static __host__ __device__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host_or_device(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)));
-  }
-};
-
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction,
-         typename UnaryFunction>
-  struct tuple_transform_functor<Tuple,UnaryMetaFunction,UnaryFunction,4>
-{
-  static __host__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)));
-  }
-
-  static __host__ __device__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host_or_device(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)));
-  }
-};
-
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction,
-         typename UnaryFunction>
-  struct tuple_transform_functor<Tuple,UnaryMetaFunction,UnaryFunction,5>
-{
-  static __host__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)),
-                     f(thrust::get<4>(t)));
-  }
-
-  static __host__ __device__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host_or_device(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)),
-                     f(thrust::get<4>(t)));
-  }
-};
-
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction,
-         typename UnaryFunction>
-  struct tuple_transform_functor<Tuple,UnaryMetaFunction,UnaryFunction,6>
-{
-  static __host__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)),
-                     f(thrust::get<4>(t)),
-                     f(thrust::get<5>(t)));
-  }
-
-  static __host__ __device__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host_or_device(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)),
-                     f(thrust::get<4>(t)),
-                     f(thrust::get<5>(t)));
-  }
-};
-
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction,
-         typename UnaryFunction>
-  struct tuple_transform_functor<Tuple,UnaryMetaFunction,UnaryFunction,7>
-{
-  static __host__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)),
-                     f(thrust::get<4>(t)),
-                     f(thrust::get<5>(t)),
-                     f(thrust::get<6>(t)));
-  }
-
-  static __host__ __device__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host_or_device(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)),
-                     f(thrust::get<4>(t)),
-                     f(thrust::get<5>(t)),
-                     f(thrust::get<6>(t)));
-  }
-};
-
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction,
-         typename UnaryFunction>
-  struct tuple_transform_functor<Tuple,UnaryMetaFunction,UnaryFunction,8>
-{
-  static __host__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)),
-                     f(thrust::get<4>(t)),
-                     f(thrust::get<5>(t)),
-                     f(thrust::get<6>(t)),
-                     f(thrust::get<7>(t)));
-  }
-
-  static __host__ __device__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host_or_device(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)),
-                     f(thrust::get<4>(t)),
-                     f(thrust::get<5>(t)),
-                     f(thrust::get<6>(t)),
-                     f(thrust::get<7>(t)));
-  }
-};
-
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction,
-         typename UnaryFunction>
-  struct tuple_transform_functor<Tuple,UnaryMetaFunction,UnaryFunction,9>
-{
-  static __host__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)),
-                     f(thrust::get<4>(t)),
-                     f(thrust::get<5>(t)),
-                     f(thrust::get<6>(t)),
-                     f(thrust::get<7>(t)),
-                     f(thrust::get<8>(t)));
-  }
-
-  static __host__ __device__
-  typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
-  do_it_on_the_host_or_device(const Tuple &t, UnaryFunction f)
-  {
-    typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
-
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)),
-                     f(thrust::get<4>(t)),
-                     f(thrust::get<5>(t)),
-                     f(thrust::get<6>(t)),
-                     f(thrust::get<7>(t)),
-                     f(thrust::get<8>(t)));
-  }
-};
-
-
-template<typename Tuple,
-         template<typename> class UnaryMetaFunction,
-         typename UnaryFunction>
-  struct tuple_transform_functor<Tuple,UnaryMetaFunction,UnaryFunction,10>
+         typename UnaryFunction,
+         size_t... Is>
+  struct tuple_transform_functor<Tuple,UnaryMetaFunction,UnaryFunction,thrust::index_sequence<Is...>>
 {
   static __host__
   typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type
@@ -361,16 +44,7 @@ template<typename Tuple,
   {
     typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
 
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)),
-                     f(thrust::get<4>(t)),
-                     f(thrust::get<5>(t)),
-                     f(thrust::get<6>(t)),
-                     f(thrust::get<7>(t)),
-                     f(thrust::get<8>(t)),
-                     f(thrust::get<9>(t)));
+    return XfrmTuple(f(thrust::get<Is>(t))...);
   }
 
   static __host__ __device__
@@ -379,16 +53,7 @@ template<typename Tuple,
   {
     typedef typename tuple_meta_transform<Tuple,UnaryMetaFunction>::type XfrmTuple;
 
-    return XfrmTuple(f(thrust::get<0>(t)),
-                     f(thrust::get<1>(t)),
-                     f(thrust::get<2>(t)),
-                     f(thrust::get<3>(t)),
-                     f(thrust::get<4>(t)),
-                     f(thrust::get<5>(t)),
-                     f(thrust::get<6>(t)),
-                     f(thrust::get<7>(t)),
-                     f(thrust::get<8>(t)),
-                     f(thrust::get<9>(t)));
+    return XfrmTuple(f(thrust::get<Is>(t))...);
   }
 };
 

From 6ff6c6d0b5301e3e55cdf77542bc3d3ef541fc09 Mon Sep 17 00:00:00 2001
From: Andrew Corrigan <andrew.corrigan@gmail.com>
Date: Mon, 12 Oct 2020 12:19:46 -0400
Subject: [PATCH 7/8] variadic type_list

---
 testing/unittest/meta.h | 138 ++++++++--------------------------------
 1 file changed, 26 insertions(+), 112 deletions(-)

diff --git a/testing/unittest/meta.h b/testing/unittest/meta.h
index 39c62edb6..ed492634b 100644
--- a/testing/unittest/meta.h
+++ b/testing/unittest/meta.h
@@ -13,49 +13,10 @@ namespace unittest
 struct null_type {}; 
 
 // this type encapsulates a list of
-// up to 10 types
-template<typename T0 = null_type,
-         typename T1 = null_type,
-         typename T2 = null_type,
-         typename T3 = null_type,
-         typename T4 = null_type,
-         typename T5 = null_type,
-         typename T6 = null_type,
-         typename T7 = null_type,
-         typename T8 = null_type,
-         typename T9 = null_type,
-         typename T10 = null_type,
-         typename T11 = null_type,
-         typename T12 = null_type,
-         typename T13 = null_type,
-         typename T14 = null_type,
-         typename T15 = null_type,
-         typename T16 = null_type,
-         typename T17 = null_type,
-         typename T18 = null_type,
-         typename T19 = null_type>
+// types
+template<typename... Ts>
   struct type_list
 {
-  typedef T0 type_0;
-  typedef T1 type_1;
-  typedef T2 type_2;
-  typedef T3 type_3;
-  typedef T4 type_4;
-  typedef T5 type_5;
-  typedef T6 type_6;
-  typedef T7 type_7;
-  typedef T8 type_8;
-  typedef T9 type_9;
-  typedef T10 type_10;
-  typedef T11 type_11;
-  typedef T12 type_12;
-  typedef T13 type_13;
-  typedef T14 type_14;
-  typedef T15 type_15;
-  typedef T16 type_16;
-  typedef T17 type_17;
-  typedef T18 type_18;
-  typedef T19 type_19;
 };
 
 // this type provides a way of indexing
@@ -66,26 +27,17 @@ template<typename List, unsigned int i>
   typedef null_type type;
 };
 
-template<typename List>  struct get_type<List,0> { typedef typename List::type_0 type; };
-template<typename List>  struct get_type<List,1> { typedef typename List::type_1 type; };
-template<typename List>  struct get_type<List,2> { typedef typename List::type_2 type; };
-template<typename List>  struct get_type<List,3> { typedef typename List::type_3 type; };
-template<typename List>  struct get_type<List,4> { typedef typename List::type_4 type; };
-template<typename List>  struct get_type<List,5> { typedef typename List::type_5 type; };
-template<typename List>  struct get_type<List,6> { typedef typename List::type_6 type; };
-template<typename List>  struct get_type<List,7> { typedef typename List::type_7 type; };
-template<typename List>  struct get_type<List,8> { typedef typename List::type_8 type; };
-template<typename List>  struct get_type<List,9> { typedef typename List::type_9 type; };
-template<typename List>  struct get_type<List,10> { typedef typename List::type_10 type; };
-template<typename List>  struct get_type<List,11> { typedef typename List::type_11 type; };
-template<typename List>  struct get_type<List,12> { typedef typename List::type_12 type; };
-template<typename List>  struct get_type<List,13> { typedef typename List::type_13 type; };
-template<typename List>  struct get_type<List,14> { typedef typename List::type_14 type; };
-template<typename List>  struct get_type<List,15> { typedef typename List::type_15 type; };
-template<typename List>  struct get_type<List,16> { typedef typename List::type_16 type; };
-template<typename List>  struct get_type<List,17> { typedef typename List::type_17 type; };
-template<typename List>  struct get_type<List,18> { typedef typename List::type_18 type; };
-template<typename List>  struct get_type<List,19> { typedef typename List::type_19 type; };
+template<typename T, typename... Ts>
+  struct get_type<type_list<T, Ts...>, 0>
+{
+  typedef T type;
+};
+
+template<typename T, typename... Ts, unsigned int i>
+  struct get_type<type_list<T, Ts...>, i>
+{
+  typedef typename get_type<type_list<Ts...>, i - 1>::type type;
+};
 
 // this type and its specialization provides a way to
 // iterate over a type_list, and
@@ -196,64 +148,26 @@ template<template <typename,typename> class Template>
 // the Type_list's types
 template<typename TypeList,
          template <typename> class Template>
-  struct transform1
-{
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,0>::type>::type type_0;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,1>::type>::type type_1;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,2>::type>::type type_2;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,3>::type>::type type_3;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,4>::type>::type type_4;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,5>::type>::type type_5;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,6>::type>::type type_6;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,7>::type>::type type_7;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,8>::type>::type type_8;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,9>::type>::type type_9;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,10>::type>::type type_10;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,11>::type>::type type_11;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,12>::type>::type type_12;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,13>::type>::type type_13;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,14>::type>::type type_14;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,15>::type>::type type_15;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,16>::type>::type type_16;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,17>::type>::type type_17;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,18>::type>::type type_18;
-  typedef typename ApplyTemplate1<Template, typename get_type<TypeList,19>::type>::type type_19;
+  struct transform1;
 
-  typedef type_list<type_0, type_1, type_2, type_3, type_4, type_5, type_6, type_7, type_8, type_9,
-                    type_10, type_11, type_12, type_13, type_14, type_15, type_16, type_17, type_18, type_19> type;
+template<typename... Ts,
+         template <typename> class Template>
+  struct transform1<type_list<Ts...>, Template>
+{
+  typedef type_list<typename ApplyTemplate1<Template, Ts>::type...> type;
 };
 
-// this type creates a new type_list by applying a Template to each of
-// two type_list's types
 template<typename TypeList1,
          typename TypeList2,
          template <typename,typename> class Template>
-  struct transform2
-{
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,0>::type, typename get_type<TypeList2,0>::type>::type type_0;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,1>::type, typename get_type<TypeList2,1>::type>::type type_1;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,2>::type, typename get_type<TypeList2,2>::type>::type type_2;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,3>::type, typename get_type<TypeList2,3>::type>::type type_3;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,4>::type, typename get_type<TypeList2,4>::type>::type type_4;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,5>::type, typename get_type<TypeList2,5>::type>::type type_5;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,6>::type, typename get_type<TypeList2,6>::type>::type type_6;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,7>::type, typename get_type<TypeList2,7>::type>::type type_7;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,8>::type, typename get_type<TypeList2,8>::type>::type type_8;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,9>::type, typename get_type<TypeList2,9>::type>::type type_9;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,10>::type, typename get_type<TypeList2,10>::type>::type type_10;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,11>::type, typename get_type<TypeList2,11>::type>::type type_11;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,12>::type, typename get_type<TypeList2,12>::type>::type type_12;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,13>::type, typename get_type<TypeList2,13>::type>::type type_13;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,14>::type, typename get_type<TypeList2,14>::type>::type type_14;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,15>::type, typename get_type<TypeList2,15>::type>::type type_15;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,16>::type, typename get_type<TypeList2,16>::type>::type type_16;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,17>::type, typename get_type<TypeList2,17>::type>::type type_17;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,18>::type, typename get_type<TypeList2,18>::type>::type type_18;
-  typedef typename ApplyTemplate2<Template, typename get_type<TypeList1,19>::type, typename get_type<TypeList2,19>::type>::type type_19;
-  
+  struct transform2;
 
-  typedef type_list<type_0, type_1, type_2, type_3, type_4, type_5, type_6, type_7, type_8, type_9,
-                    type_10, type_11, type_12, type_13, type_14, type_15, type_16, type_17, type_18, type_19> type;
+template<typename... T1s,
+         typename... T2s,
+         template <typename,typename> class Template>
+  struct transform2<type_list<T1s...>, type_list<T2s...>, Template>
+{
+  typedef type_list<typename ApplyTemplate2<Template, T1s, T2s>::type...> type;
 };
 
 } // end unittest

From 1f8c50839f5efb8d356d886db2099626a1c3d9ce Mon Sep 17 00:00:00 2001
From: Andrew Corrigan <andrew.corrigan@gmail.com>
Date: Wed, 14 Oct 2020 19:27:29 -0400
Subject: [PATCH 8/8] tuple_meta_transform workaround for nvcc 11.0

---
 thrust/detail/tuple_meta_transform.h | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/thrust/detail/tuple_meta_transform.h b/thrust/detail/tuple_meta_transform.h
index 176834d30..ebf0b9bf0 100644
--- a/thrust/detail/tuple_meta_transform.h
+++ b/thrust/detail/tuple_meta_transform.h
@@ -25,21 +25,32 @@ namespace thrust
 namespace detail
 {
 
+// introduce an intermediate type tuple_meta_transform_WAR_NVCC
+// rather than directly specializing tuple_meta_transform with
+// default argument IndexSequence = thrust::make_index_sequence<thrust::tuple_size<Tuple>::value>
+// to workaround nvcc 11.0 compiler bug
 template<typename Tuple,
          template<typename> class UnaryMetaFunction,
-         typename IndexSequence = thrust::make_index_sequence<thrust::tuple_size<Tuple>::value>>
-  struct tuple_meta_transform;
+         typename IndexSequence>
+  struct tuple_meta_transform_WAR_NVCC;
 
 template<typename Tuple,
          template<typename> class UnaryMetaFunction,
          size_t... Is>
-  struct tuple_meta_transform<Tuple, UnaryMetaFunction, thrust::index_sequence<Is...>>
+  struct tuple_meta_transform_WAR_NVCC<Tuple, UnaryMetaFunction, thrust::index_sequence<Is...>>
 {
   typedef thrust::tuple<
     typename UnaryMetaFunction<typename thrust::tuple_element<Is,Tuple>::type>::type...
   > type;
 };
 
+template<typename Tuple,
+         template<typename> class UnaryMetaFunction>
+  struct tuple_meta_transform
+{
+  typedef typename tuple_meta_transform_WAR_NVCC<Tuple, UnaryMetaFunction, thrust::make_index_sequence<thrust::tuple_size<Tuple>::value>>::type type;
+};
+
 } // end detail
 
 } // end thrust