Thrust CMake conversion:

 * Disable a test that crashes NVCC in C++14 mode.
 * Make `thrust::complex` be actually trivially copyable whenever
 possible.

Author: griwes

CMakeLists.txt

@@ -386,6 +386,13 @@ set(THRUST_PARTIALLY_IMPLEMENTED
   ${THRUST_PARTIALLY_IMPLEMENTED_OMP}
 )
 
+if ("CUDA" STREQUAL "${THRUST_DEVICE_SYSTEM}")
+  if (14 EQUAL ${CMAKE_CXX_STANDARD})
+    # temporarily disable until NVBug 2492786 is fixed
+    list(APPEND THRUST_PARTIALLY_IMPLEMENTED tuple_algorithms)
+  endif()
+endif ()
+
 list(REMOVE_DUPLICATES THRUST_PARTIALLY_IMPLEMENTED)
 
 foreach (THRUST_TEST_SOURCE IN LISTS THRUST_TESTS)
@@ -474,6 +481,7 @@ endforeach ()
 
 # Handle examples
 
+option(THRUST_EXAMPLE_FILECHECK_PATH "Path to the LLVM FileCheck utility." "")
 option(THRUST_ENABLE_EXAMPLES_WITH_RDC "Also build all examples with RDC." OFF)
 
 list(APPEND THRUST_EXAMPLE_GLOBS examples/*.cu)

thrust/complex.h

@@ -68,11 +68,6 @@ struct complex
 
   /* --- Constructors --- */
 
-  /*! Default construct a complex number.
-   */
-  __host__ __device__
-  complex();
-
   /*! Construct a complex number with an imaginary part of 0.
    *
    *  \param re The real part of the number.
@@ -88,13 +83,31 @@ struct complex
   __host__ __device__
   complex(const T& re, const T& im);
 
+#if THRUST_CPP_DIALECT >= 2011
+  /*! Default construct a complex number.
+   */
+  complex() = default;
+
+  /*! This copy constructor copies from a \p complex with a type that is
+   *  convertible to this \p complex's \c value_type.
+   *
+   *  \param z The \p complex to copy from.
+   */
+  complex(const complex<T>& z) = default;
+#else
+  /*! Default construct a complex number.
+   */
+  __host__ __device__
+  complex();
+
   /*! This copy constructor copies from a \p complex with a type that is
    *  convertible to this \p complex's \c value_type.
    *
    *  \param z The \p complex to copy from.
    */
   __host__ __device__
   complex(const complex<T>& z);
+#endif
 
   /*! This converting copy constructor copies from a \p complex with a type
    *  that is convertible to this \p complex's \c value_type.
@@ -114,15 +127,15 @@ struct complex
    */
   __host__
   complex(const std::complex<T>& z);
-  
+
   /*! This converting copy constructor copies from a <tt>std::complex</tt> with
    *  a type that is convertible to this \p complex's \c value_type.
    *
    *  \param z The \p complex to copy from.
    *
    *  \tparam U is convertible to \c value_type.
    */
-  template <typename U> 
+  template <typename U>
   __host__
   complex(const std::complex<U>& z);
 
@@ -138,13 +151,22 @@ struct complex
   __host__ __device__
   complex& operator=(const T& re);
 
+#if THRUST_CPP_DIALECT >= 2011
+  /*! Assign `z.real()` and `z.imag()` to the real and imaginary parts of this
+   *  \p complex respectively.
+   *
+   *  \param z The \p complex to copy from.
+   */
+  complex& operator=(const complex<T>& z) = default;
+#else
   /*! Assign `z.real()` and `z.imag()` to the real and imaginary parts of this
    *  \p complex respectively.
    *
    *  \param z The \p complex to copy from.
    */
   __host__ __device__
   complex& operator=(const complex<T>& z);
+#endif
 
   /*! Assign `z.real()` and `z.imag()` to the real and imaginary parts of this
    *  \p complex respectively.
@@ -164,20 +186,19 @@ struct complex
    */
   __host__
   complex& operator=(const std::complex<T>& z);
-  
+
   /*! Assign `z.real()` and `z.imag()` to the real and imaginary parts of this
    *  \p complex respectively.
    *
    *  \param z The \p complex to copy from.
    *
    *  \tparam U is convertible to \c value_type.
    */
-  template <typename U> 
+  template <typename U>
   __host__
   complex& operator=(const std::complex<U>& z);
 
 
-
   /* --- Compound Assignment Operators --- */
 
   /*! Adds a \p complex to this \p complex and assigns the result to this

thrust/detail/complex/complex.inl

@@ -24,20 +24,14 @@ namespace thrust
 
 /* --- Constructors --- */
 
+#if THRUST_CPP_DIALECT < 2011
 template <typename T>
 __host__ __device__
 complex<T>::complex()
-#if THRUST_CPP_DIALECT >= 2011
-  // Initialize the storage in the member initializer list using C++ unicorn
-  // initialization. This allows `complex<T const>` to work.
-  // We do a functional-style cast here to suppress conversion warnings.
-  : data{T(), T()}
-{}
-#else
 {
   real(T());
   imag(T());
-} 
+}
 #endif
 
 template <typename T>
@@ -52,7 +46,7 @@ complex<T>::complex(const T& re)
 {
   real(re);
   imag(T());
-} 
+}
 #endif
 
 
@@ -69,25 +63,20 @@ complex<T>::complex(const T& re, const T& im)
   real(re);
   imag(im);
 }
-#endif 
+#endif
 
+#if THRUST_CPP_DIALECT < 2011
 template <typename T>
 __host__ __device__
 complex<T>::complex(const complex<T>& z)
-#if THRUST_CPP_DIALECT >= 2011
-  // Initialize the storage in the member initializer list using C++ unicorn
-  // initialization. This allows `complex<T const>` to work.
-  : data{z.real(), z.imag()}
-{}
-#else
 {
   real(z.real());
   imag(z.imag());
 }
-#endif 
+#endif
 
 template <typename T>
-template <typename U> 
+template <typename U>
 __host__ __device__
 complex<T>::complex(const complex<U>& z)
 #if THRUST_CPP_DIALECT >= 2011
@@ -101,7 +90,7 @@ complex<T>::complex(const complex<U>& z)
   real(T(z.real()));
   imag(T(z.imag()));
 }
-#endif 
+#endif
 
 template <typename T>
 __host__
@@ -132,7 +121,7 @@ complex<T>::complex(const std::complex<U>& z)
 {
   real(T(z.real()));
   imag(T(z.imag()));
-}  
+}
 #endif
 
 
@@ -148,6 +137,7 @@ complex<T>& complex<T>::operator=(const T& re)
   return *this;
 }
 
+#if THRUST_CPP_DIALECT < 2011
 template <typename T>
 __host__ __device__
 complex<T>& complex<T>::operator=(const complex<T>& z)
@@ -156,6 +146,7 @@ complex<T>& complex<T>::operator=(const complex<T>& z)
   imag(z.imag());
   return *this;
 }
+#endif
 
 template <typename T>
 template <typename U>