diff --git a/ParadisEO-GPU/src/memory/moCudaAllocator.h b/ParadisEO-GPU/src/memory/moCudaAllocator.h index 008f65218..a712664b1 100644 --- a/ParadisEO-GPU/src/memory/moCudaAllocator.h +++ b/ParadisEO-GPU/src/memory/moCudaAllocator.h @@ -42,7 +42,7 @@ * class for allocation data on GPU global memory */ -template + class moCudaAllocator { public: @@ -59,7 +59,7 @@ public: *@param _data the data to allocate on GPU global memory *@param _dataSize the size of data to allocate on GPU memory */ - + template void operator()(T* & _data, unsigned _dataSize) { //Allocate data in GPU memory diff --git a/ParadisEO-GPU/src/memory/moCudaCopy.h b/ParadisEO-GPU/src/memory/moCudaCopy.h index 6af29c242..9fd68e584 100644 --- a/ParadisEO-GPU/src/memory/moCudaCopy.h +++ b/ParadisEO-GPU/src/memory/moCudaCopy.h @@ -42,7 +42,6 @@ * class to copy data from CPU memory to GPU global memory and vice versa */ -template class moCudaCopy { public: @@ -60,7 +59,7 @@ public: *@param _dataTocpy the data to copy from CPU memory to GPU memory *@param _dataSize the size of data to copy */ - + template void operator()(T* & _data, T * & _dataTocpy, unsigned _dataSize) { //copy data from CPU memory to GPU memory @@ -77,7 +76,7 @@ public: *@param _dev_data the device global variable *@param _dataTocpy the data to copy GPU global memory to GPU global variable */ - + template void operator()(T* & _dev_data, T * & _dataTocpy) { //Copy n bytes from the memory area pointed to by _dataTocpy to the memory area pointed to by offset bytes from the start of symbol _dev_data @@ -93,7 +92,7 @@ public: *@param _dataSize the size of data to copy *@param _HostToDevice the direction of copy(true if copy will be done from CPU memory to GPU memory) */ - + template void operator()(T* & _data, T * & _dataTocpy, unsigned _dataSize, bool _HostToDevice) { diff --git a/ParadisEO-GPU/src/memory/moCudaDesallocator.h b/ParadisEO-GPU/src/memory/moCudaDesallocator.h index af261528f..9d9bd8a60 100644 --- a/ParadisEO-GPU/src/memory/moCudaDesallocator.h +++ b/ParadisEO-GPU/src/memory/moCudaDesallocator.h @@ -42,7 +42,6 @@ * class for Desallocation of data from GPU global memory */ -template class moCudaDesallocator { public: @@ -58,7 +57,7 @@ public: *Desallocate data on GPU global memory *@param _data the data to desallocate from GPU global memory */ - + template void operator()(T* & _data) { //Desallocate data from GPU global memory diff --git a/ParadisEO-GPU/src/memory/moCudaObject.h b/ParadisEO-GPU/src/memory/moCudaObject.h index ef9e574d1..875584099 100644 --- a/ParadisEO-GPU/src/memory/moCudaObject.h +++ b/ParadisEO-GPU/src/memory/moCudaObject.h @@ -45,7 +45,6 @@ * class of managment of data on GPU global memory (allocation,desallocation & copy) */ -template class moCudaObject { public: @@ -56,7 +55,7 @@ public: *@param _dataTocpy the data to copy from CPU memory to _data on GPU memory *@param _dataSize the size of data to copy */ - + template void memCopy(T* & _data, T * & _dataTocpy, unsigned _dataSize) { malloc(_data, _dataSize); copy(_data, _dataTocpy, _dataSize); @@ -67,7 +66,7 @@ public: *@param _dev_data the device global variable *@param _dataTocpy the data to copy GPU global memory to GPU global variable */ - + template void memCopyGlobalVariable(T* & _dev_data, T * & _dataTocpy) { copy(_dev_data, _dataTocpy); } @@ -76,16 +75,16 @@ public: *Desallocate data on GPU global memory *@param _data the data to desallocate from GPU global memory */ - + template void memFree(T* & _data) { free(_data); } public: - moCudaAllocator malloc; - moCudaCopy copy; - moCudaDesallocator free; + moCudaAllocator malloc; + moCudaCopy copy; + moCudaDesallocator free; }; diff --git a/ParadisEO-GPU/src/memory/moCudaSpecificData.h b/ParadisEO-GPU/src/memory/moCudaSpecificData.h index b9a5529d1..e37ff2c27 100644 --- a/ParadisEO-GPU/src/memory/moCudaSpecificData.h +++ b/ParadisEO-GPU/src/memory/moCudaSpecificData.h @@ -41,7 +41,6 @@ * class of managment of specific data problem */ -template class moCudaSpecificData { public: @@ -78,10 +77,10 @@ public: sizeData = _size; } -public: + public: unsigned int sizeData; - moCudaObject cudaObject; + moCudaObject cudaObject; }; #endif