Use m_data_indices to store sizes of vector part

m_data_sizes turned out to be unnecessary since the
information about size of every part of vector can be
calculated from m_data_indices.

Author: jszuppe

include/boost/compute/distributed/vector.hpp

@@ -89,9 +89,9 @@ class vector
                 m_allocators.back()
                     .allocate(_minimum_capacity())
             );
-            m_data_sizes.push_back(0);
             m_data_indices.push_back(0);
         }
+        m_data_indices.push_back(0);
     }
 
     /// Creates a distributed vector with space for \p count elements
@@ -303,7 +303,6 @@ class vector
         : m_queue(std::move(m_queue)),
           m_size(other.m_size),
           m_data(std::move(other.m_data)),
-          m_data_sizes(std::move(other.m_data_sizes)),
           m_data_indices(std::move(other.m_data_indices)),
           m_allocators(std::move(other.m_allocators))
     {
@@ -315,14 +314,13 @@ class vector
     {
         if(m_size) {
             for(size_t i = 0; i < m_allocators.size(); i++) {
-                m_allocators[i].deallocate(m_data[i], m_data_sizes[i]);
+                m_allocators[i].deallocate(m_data[i], part_size(i));
             }
         }
 
         m_queue = std::move(other.m_queue);
         m_size = other.m_size;
         m_data = std::move(other.m_data);
-        m_data_sizes = std::move(other.m_data_sizes);
         m_data_indices = std::move(other.m_data_indices);
         m_allocators = std::move(other.m_allocators);
 
@@ -337,7 +335,7 @@ class vector
     {
         if(m_size) {
             for(size_t i = 0; i < m_allocators.size(); i++) {
-                m_allocators[i].deallocate(m_data[i], m_data_sizes[i]);
+                m_allocators[i].deallocate(m_data[i], part_size(i));
             }
         }
     }
@@ -355,12 +353,16 @@ class vector
 
     std::vector<size_type> parts_sizes() const
     {
-        return m_data_sizes;
+        std::vector<size_type> part_sizes(parts());
+        for(size_t i = 0; i < parts(); i++) {
+            part_sizes[i] = part_size(i);
+        }
+        return part_sizes;
     }
 
     size_type part_size(size_t n) const
     {
-        return m_data_sizes[n];
+        return m_data_indices[n+1] - m_data_indices[n];
     }
 
     std::vector<size_t> parts_starts() const
@@ -401,14 +403,14 @@ class vector
     iterator end(size_t n)
     {
         return ::boost::compute::make_buffer_iterator<T>(
-            m_data[n].get_buffer(), m_data_sizes[n]
+            m_data[n].get_buffer(), m_data_indices[n+1] - m_data_indices[n]
         );
     }
 
     const_iterator end(size_t n) const
     {
         return ::boost::compute::make_buffer_iterator<T>(
-            m_data[n].get_buffer(), m_data_sizes[n]
+            m_data[n].get_buffer(), m_data_indices[n+1] - m_data_indices[n]
         );
     }
 
@@ -507,7 +509,6 @@ class vector
     void swap(vector &other)
     {
         std::swap(m_data, other.m_data);
-        std::swap(m_data_sizes, other.m_data_sizes);
         std::swap(m_data_indices, other.m_data_indices);
         std::swap(m_size, other.m_size);
         std::swap(m_allocators, other.m_allocators);
@@ -562,13 +563,11 @@ class vector
     {
         m_allocators.clear();
         m_data.clear();
-        m_data_sizes.clear();
         m_data_indices.clear();
 
         m_allocators.reserve(m_queue.size());
         m_data.reserve(m_queue.size());
-        m_data_sizes.reserve(m_queue.size());
-        m_data_indices.reserve(m_queue.size());
+        m_data_indices.reserve(m_queue.size() + 1);
 
         std::vector<size_t> partition =
             detail::partition(m_queue, weight, count, _align());
@@ -580,16 +579,15 @@ class vector
                 m_allocators.back()
                     .allocate((std::max)(data_size, _minimum_capacity()))
                 );
-            m_data_sizes.push_back(data_size);
             m_data_indices.push_back(partition[i]);
         }
+        m_data_indices.push_back(partition[m_queue.size()]);
     }
 
 private:
     command_queue m_queue;
     size_type m_size;
 
-    std::vector<size_type> m_data_sizes;
     std::vector<size_t> m_data_indices;
     std::vector<pointer> m_data;
     std::vector<allocator_type> m_allocators;