Tried solving codezonediitj#10

Author: bits2zbytes

adaboost/core/data_structures_impl.cpp

@@ -1,8 +1,8 @@
 #ifndef ADABOOST_CORE_DATA_STRUCTURES_IMPL_CPP
 #define ADABOOST_CORE_DATA_STRUCTURES_IMPL_CPP
 
-#include<adaboost/core/data_structures.hpp>
-#include<adaboost/utils/utils.hpp>
+//#include<adaboost/core/data_structures.hpp>
+//#include<adaboost/utils/utils.hpp>
 #include<iostream>
 
 namespace adaboost

adaboost/core/operations.hpp

@@ -16,6 +16,21 @@ namespace adaboost
         template <class data_type_vector>
         void fill(data_type_vector value);
 
+        /*
+        * Used for filling the vector with a given value.
+        * If block size is passed 0 then the values are
+        * filled on the CPU otherwise they are filled on
+        * GPU.
+        *
+        * @param value The value with which the vector is
+        *    to be populated.
+        * @param block_size The number of threads to be
+        *    launched per block on GPU.
+        */
+        template <class data_type_vector>
+        void fill(data_type_vector value,
+                  unsigned block_size=0);
+
         /* @overload
         * Used for filling the matrix with a given value.
         *
@@ -25,6 +40,20 @@ namespace adaboost
         template <class data_type_matrix>
         void fill(data_type_matrix value);
 
+        /*
+        * Used for filling the matrix with a given value.
+        * If block size x and block size y is passed 0 and 0 then the values are
+        * filled on the CPU otherwise they are filled on
+        * GPU.
+        *
+        * @param value The value with which the matrix is
+        *    to be populated.
+        */
+        template <class data_type_matrix>
+        void fill(data_type_matrix value,
+                  unsigned block_size_x=0,
+                  unsigned block_size_y=0);
+
         /*
         * This function computes the sum of
         * elements of the given vector and the

adaboost/core/operations_impl.cpp

@@ -48,7 +48,7 @@ namespace adaboost
         }
 
         template <class data_type_vector>
-        void fill(data_type_vector value);
+        void fill(data_type_vector value)
         {
             for(unsigned int i = 0; i < this->size; i++)
             {
@@ -58,7 +58,7 @@ namespace adaboost
 
 
         template <class data_type_matrix>
-        void fill(data_type_matrix value);
+        void fill(data_type_matrix value)
         {
             for(unsigned int i = 0; i < this->rows; i++)
             {
@@ -69,6 +69,44 @@ namespace adaboost
             }
         }
 
+        template <class data_type_matrix>
+        void fill(data_type_matrix value,
+                              unsigned block_size_x=0,
+                              unsigned block_size_y=0);{
+                if(block_size_x == 0 || block_size_y == 0)
+                {
+                    this->adaboost::core::Matrix<data_type_matrix>::fill(value);
+                }
+                else
+                {
+                    dim3 gridDim((this->cols_gpu + block_size_x - 1)/block_size_x,
+                                  (this->rows_gpu + block_size_y - 1)/block_size_y);
+                    dim3 blockDim(block_size_x, block_size_y);
+                    fill_matrix_kernel<data_type_matrix>
+                    <<<gridDim, blockDim>>>
+                    (this->data_gpu,
+                     this->cols_gpu,
+                     value);
+                }
+            }
+
+        template <class data_type_vector>
+        void fill(data_type_vector value,
+                  unsigned block_size=0){
+                if(block_size == 0)
+                {
+                    this->adaboost::core::Vector<data_type_vector>::fill(value);
+                }
+                else
+                {
+                    fill_vector_kernel<data_type_vector>
+                    <<<
+                    (this->size_gpu + block_size - 1)/block_size,
+                    block_size
+                    >>>(this->data_gpu, this->size_gpu, value);
+                }
+            }
+
 
         template <class data_type_vector, class data_type_matrix>
         void multiply(const Vector<data_type_vector>& vec,

adaboost/cuda/cuda_data_structures.hpp

@@ -1,3 +1,5 @@
+
+
 #ifndef CUDA_ADABOOST_CORE_DATA_STRUCTURES_HPP
 #define CUDA_ADABOOST_CORE_DATA_STRUCTURES_HPP
 
@@ -54,20 +56,6 @@ namespace adaboost
                     */
                     VectorGPU(unsigned _size);
 
-                    /*
-                    * Used for filling the vector with a given value.
-                    * If block size is passed 0 then the values are
-                    * filled on the CPU otherwise they are filled on
-                    * GPU.
-                    *
-                    * @param value The value with which the vector is
-                    *    to be populated.
-                    * @param block_size The number of threads to be
-                    *    launched per block on GPU.
-                    */
-                    void fill(data_type_vector value,
-                              unsigned block_size=0);
-
                     /*
                     * Copies the data from GPU to CPU.
                     */
@@ -129,10 +117,6 @@ namespace adaboost
 
                     MatrixGPU(unsigned _rows, unsigned _cols);
 
-                    void fill(data_type_matrix value,
-                              unsigned block_size_x=0,
-                              unsigned block_size_y=0);
-
                     void copy_to_host();
 
                     void copy_to_device();

adaboost/cuda/cuda_data_structures_impl.hpp

@@ -61,25 +61,6 @@ namespace adaboost
                 }
             }
 
-            template <class data_type_vector>
-            void VectorGPU<data_type_vector>::
-            fill(data_type_vector value,
-                 unsigned block_size)
-            {
-                if(block_size == 0)
-                {
-                    this->adaboost::core::Vector<data_type_vector>::fill(value);
-                }
-                else
-                {
-                    fill_vector_kernel<data_type_vector>
-                    <<<
-                    (this->size_gpu + block_size - 1)/block_size,
-                    block_size
-                    >>>(this->data_gpu, this->size_gpu, value);
-                }
-            }
-
             template <class data_type_vector>
             void
             VectorGPU<data_type_vector>::copy_to_host()
@@ -250,29 +231,6 @@ namespace adaboost
                 data[row*cols + col] = value;
             }
 
-            template <class data_type_matrix>
-            void MatrixGPU<data_type_matrix>::
-            fill(data_type_matrix value,
-                 unsigned block_size_x,
-                 unsigned block_size_y)
-            {
-                if(block_size_x == 0 || block_size_y == 0)
-                {
-                    this->adaboost::core::Matrix<data_type_matrix>::fill(value);
-                }
-                else
-                {
-                    dim3 gridDim((this->cols_gpu + block_size_x - 1)/block_size_x,
-                                  (this->rows_gpu + block_size_y - 1)/block_size_y);
-                    dim3 blockDim(block_size_x, block_size_y);
-                    fill_matrix_kernel<data_type_matrix>
-                    <<<gridDim, blockDim>>>
-                    (this->data_gpu,
-                     this->cols_gpu,
-                     value);
-                }
-            }
-
             template <class data_type_matrix>
             void MatrixGPU<data_type_matrix>::
             copy_to_host()