Thrust CMake conversion:

 * Various changes to make the doxygen generated API reference make
 sense.
 * WIP.

Author: griwes

.gitignore

@@ -2,3 +2,4 @@ thrust/system/cuda/detail/.gitignore
 .p4config
 run
 build
+doc/html

doc/thrust.dox

@@ -15,6 +15,8 @@ THRUST_BEGIN_NS
 
 ///////////////////////////////////////////////////////////////////////////////
 
+/*! Obtains the actual address of the object or function arg, even in presence of overloaded operator&.
+ */
 template <typename T>
 __host__ __device__
 T* addressof(T& arg) 

thrust/addressof.h

@@ -361,7 +361,11 @@ struct complex
   operator std::complex<T>() const { return std::complex<T>(real(), imag()); }
 
 private:
+  /*! \cond
+   */
   struct generic_storage_type { T x; T y; };
+  /*! \endcond
+   */
 
 #if THRUST_DEVICE_COMPILER == THRUST_DEVICE_COMPILER_NVCC
   typedef typename detail::conditional<

thrust/complex.h

@@ -15,7 +15,7 @@
  */
 
 
-/*! \file copy.h
+/*! \file thrust/copy.h
  *  \brief Copies elements from one range to another
  */
 

thrust/copy.h

@@ -32,10 +32,8 @@
 namespace thrust
 {
 
-/*! \addtogroup memory_management Memory Management
- *  \addtogroup memory_management_classes Memory Management Classes
- *  \addtogroup memory_resources Memory Resources
- *  \ingroup memory_management
+/** \addtogroup memory_resources Memory Resources
+ *  \ingroup memory_management_classes
  *  \{
  */
 

thrust/device_allocator.h

@@ -32,8 +32,7 @@
 namespace thrust
 {
 
-/*! \addtogroup memory_management Memory Management
- *  \addtogroup memory_management_classes Memory Management Classes
+/*! \addtogroup memory_management_classes Memory Management Classes
  *  \ingroup memory_management
  *  \{
  */
@@ -137,7 +136,7 @@ template<typename T>
      *        allocated with \p allocate.
      */
     __host__
-    inline void deallocate(pointer p, size_type)
+    inline void deallocate(pointer p, size_type cnt)
     {
       // use "::operator delete" rather than keyword delete
       device_delete(p);

thrust/device_new_allocator.h

@@ -73,7 +73,7 @@ template<typename T, typename Alloc = thrust::device_allocator<T> >
       :Parent() {}
 
     /*! This constructor creates an empty \p device_vector.
-     *  \param alloc The allocator to use by this vector_base.
+     *  \param alloc The allocator to use by this device_vector.
      */
     __host__
     device_vector(const Alloc &alloc)
@@ -97,7 +97,7 @@ template<typename T, typename Alloc = thrust::device_allocator<T> >
     /*! This constructor creates a \p device_vector with the given
      *  size.
      *  \param n The number of elements to initially create.
-     *  \param alloc The allocator to use by this vector_base.
+     *  \param alloc The allocator to use by this device_vector.
      */
     __host__
     explicit device_vector(size_type n, const Alloc &alloc)
@@ -116,7 +116,7 @@ template<typename T, typename Alloc = thrust::device_allocator<T> >
      *  of an exemplar element.
      *  \param n The number of elements to initially create.
      *  \param value An element to copy.
-     *  \param alloc The allocator to use by this vector_base.
+     *  \param alloc The allocator to use by this device_vector.
      */
     __host__
     explicit device_vector(size_type n, const value_type &value, const Alloc &alloc)
@@ -131,7 +131,7 @@ template<typename T, typename Alloc = thrust::device_allocator<T> >
 
     /*! Copy constructor copies from an exemplar \p device_vector.
      *  \param v The \p device_vector to copy.
-     *  \param alloc The allocator to use by this vector_base.
+     *  \param alloc The allocator to use by this device_vector.
      */
     __host__
     device_vector(const device_vector &v, const Alloc &alloc)
@@ -147,7 +147,7 @@ template<typename T, typename Alloc = thrust::device_allocator<T> >
 
     /*! Move constructor moves from another \p device_vector.
      *  \param v The device_vector to move.
-     *  \param alloc The allocator to use by this vector_base.
+     *  \param alloc The allocator to use by this device_vector.
      */
     __host__
     device_vector(device_vector &&v, const Alloc &alloc)
@@ -230,7 +230,7 @@ template<typename T, typename Alloc = thrust::device_allocator<T> >
     /*! This constructor builds a \p device_vector from a range.
      *  \param first The beginning of the range.
      *  \param last The end of the range.
-     *  \param alloc The allocator to use by this vector_base.
+     *  \param alloc The allocator to use by this device_vector.
      */
     template<typename InputIterator>
     __host__
@@ -427,7 +427,7 @@ template<typename T, typename Alloc = thrust::device_allocator<T> >
      */
     void pop_back(void);
 
-    /*! This method swaps the contents of this vector_base with another vector.
+    /*! This method swaps the contents of this device_vector with another vector.
      *  \param v The vector with which to swap.
      */
     void swap(device_vector &v);
@@ -498,6 +498,10 @@ template<typename T, typename Alloc = thrust::device_allocator<T> >
 #endif // end doxygen-only members
 }; // end device_vector
 
+/*! Exchanges the values of two vectors.
+ *  \p x The first \p device_vector of interest.
+ *  \p y The second \p device_vector of interest.
+ */
 template<typename T, typename Alloc>
   void swap(device_vector<T,Alloc> &a, device_vector<T,Alloc> &b)
 {

thrust/device_vector.h

@@ -25,6 +25,8 @@
 #include <thrust/detail/execute_with_allocator.h>
 #include <thrust/detail/seq.h>
 
+//! \cond
+
 // #include the host system's execution_policy header
 #define __THRUST_HOST_SYSTEM_EXECUTION_POLICY_HEADER <__THRUST_HOST_SYSTEM_ROOT/execution_policy.h>
 #include __THRUST_HOST_SYSTEM_EXECUTION_POLICY_HEADER
@@ -35,6 +37,8 @@
 #include __THRUST_DEVICE_SYSTEM_EXECUTION_POLICY_HEADER
 #undef __THRUST_DEVICE_SYSTEM_EXECUTION_POLICY_HEADER
 
+//! \endcond
+
 namespace thrust
 {
 

thrust/execution_policy.h

@@ -14,7 +14,7 @@
  */
 
 
-/*! \file for_each.h
+/*! \file thrust/for_each.h
  *  \brief Applies a function to each element in a range
  */