From 73fc646e4bf293590b59392c691bec4dd6b6f829 Mon Sep 17 00:00:00 2001 From: boufaras Date: Fri, 13 May 2011 08:40:23 +0000 Subject: [PATCH] New names git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2233 331e1502-861f-0410-8da2-ba01fb791d7f --- .../src/memory/moCudaAllocator.h | 81 ------------ .../ParadisEO-GPU/src/memory/moCudaCopy.h | 117 ------------------ .../src/memory/moCudaDesallocator.h | 77 ------------ .../ParadisEO-GPU/src/memory/moCudaObject.h | 91 -------------- .../src/memory/moCudaSpecificData.h | 85 ------------- 5 files changed, 451 deletions(-) delete mode 100644 branches/ParadisEO-GPU/src/memory/moCudaAllocator.h delete mode 100644 branches/ParadisEO-GPU/src/memory/moCudaCopy.h delete mode 100644 branches/ParadisEO-GPU/src/memory/moCudaDesallocator.h delete mode 100644 branches/ParadisEO-GPU/src/memory/moCudaObject.h delete mode 100644 branches/ParadisEO-GPU/src/memory/moCudaSpecificData.h diff --git a/branches/ParadisEO-GPU/src/memory/moCudaAllocator.h b/branches/ParadisEO-GPU/src/memory/moCudaAllocator.h deleted file mode 100644 index dc5bb4fa9..000000000 --- a/branches/ParadisEO-GPU/src/memory/moCudaAllocator.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Boufaras Karima, Thé Van Luong - - This software is governed by the CeCILL license under French law and - abiding by the rules of distribution of free software. You can use, - modify and/ or redistribute the software under the terms of the CeCILL - license as circulated by CEA, CNRS and INRIA at the following URL - "http://www.cecill.info". - - As a counterpart to the access to the source code and rights to copy, - modify and redistribute granted by the license, users are provided only - with a limited warranty and the software's author, the holder of the - economic rights, and the successive licensors have only limited liability. - - In this respect, the user's attention is drawn to the risks associated - with loading, using, modifying and/or developing or reproducing the - software by the user in light of its specific status of free software, - that may mean that it is complicated to manipulate, and that also - therefore means that it is reserved for developers and experienced - professionals having in-depth computer knowledge. Users are therefore - encouraged to load and test the software's suitability as regards their - requirements in conditions enabling the security of their systems and/or - data to be ensured and, more generally, to use and operate it in the - same conditions as regards security. - The fact that you are presently reading this means that you have had - knowledge of the CeCILL license and that you accept its terms. - - ParadisEO WebSite : http://paradiseo.gforge.inria.fr - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef _moCudaAllocator_H_ -#define _moCudaAllocator_H_ - -// CUDA includes -#include - -/** - * class for allocation data on GPU global memory - */ - -class moCudaAllocator { - - public: - - /** - * Constructor - */ - - moCudaAllocator() { - } - - /** - *Allocate data on GPU global memory - *@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 - CUDA_SAFE_CALL(cudaMalloc((void**) &_data, _dataSize * sizeof(T))); - - // Check if data allocation is failed - CUT_CHECK_ERROR("Allocation of data on GPU global memory failed"); - - } - - /** - * Destructor - */ - - ~moCudaAllocator() { - } - -}; - -#endif diff --git a/branches/ParadisEO-GPU/src/memory/moCudaCopy.h b/branches/ParadisEO-GPU/src/memory/moCudaCopy.h deleted file mode 100644 index f38a0096c..000000000 --- a/branches/ParadisEO-GPU/src/memory/moCudaCopy.h +++ /dev/null @@ -1,117 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Boufaras Karima, Thé Van Luong - - This software is governed by the CeCILL license under French law and - abiding by the rules of distribution of free software. You can use, - modify and/ or redistribute the software under the terms of the CeCILL - license as circulated by CEA, CNRS and INRIA at the following URL - "http://www.cecill.info". - - As a counterpart to the access to the source code and rights to copy, - modify and redistribute granted by the license, users are provided only - with a limited warranty and the software's author, the holder of the - economic rights, and the successive licensors have only limited liability. - - In this respect, the user's attention is drawn to the risks associated - with loading, using, modifying and/or developing or reproducing the - software by the user in light of its specific status of free software, - that may mean that it is complicated to manipulate, and that also - therefore means that it is reserved for developers and experienced - professionals having in-depth computer knowledge. Users are therefore - encouraged to load and test the software's suitability as regards their - requirements in conditions enabling the security of their systems and/or - data to be ensured and, more generally, to use and operate it in the - same conditions as regards security. - The fact that you are presently reading this means that you have had - knowledge of the CeCILL license and that you accept its terms. - - ParadisEO WebSite : http://paradiseo.gforge.inria.fr - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef _moCudaCopy_H_ -#define _moCudaCopy_H_ - -// CUDA includes -#include - -/** - * class to copy data from CPU memory to GPU global memory and vice versa - */ - -class moCudaCopy { - -public: - - /** - * Constructor - */ - - moCudaCopy() { - } - - /** - *Copy data from CPU memory to GPU global memory (default copy) - *@param _data the data representation where the data will be copied - *@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 - CUDA_SAFE_CALL(cudaMemcpy(_data, _dataTocpy, _dataSize * sizeof(T), - cudaMemcpyHostToDevice)); - - // Check if the copy of data is failed - CUT_CHECK_ERROR("Copy of data from CPU to GPU global memory failed"); - } - - /** - *Copy device data from GPU global memory to global variable declared in device - *@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 - - cudaMemcpyToSymbol(_dev_data, &_dataTocpy, sizeof(_dataTocpy)); - - } - - /** - *Copy data from CPU memory to GPU global memory and vice versa - *@param _data the data representation where the data will be copied - *@param _dataTocpy the data to copy from CPU memory to GPU memory and vice versa - *@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) { - - if (_HostToDevice) { - - //copy data from CPU memory to GPU global memory - CUDA_SAFE_CALL(cudaMemcpy(_data, _dataTocpy, _dataSize * sizeof(T), - cudaMemcpyHostToDevice)); - } - - else { - //copy data from GPU global memory to GPU memory - CUDA_SAFE_CALL(cudaMemcpy(_data, _dataTocpy, _dataSize * sizeof(T), - cudaMemcpyDeviceToHost)); - } - - } - - ~moCudaCopy() { - } - -}; -#endif diff --git a/branches/ParadisEO-GPU/src/memory/moCudaDesallocator.h b/branches/ParadisEO-GPU/src/memory/moCudaDesallocator.h deleted file mode 100644 index 9534afc15..000000000 --- a/branches/ParadisEO-GPU/src/memory/moCudaDesallocator.h +++ /dev/null @@ -1,77 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Boufaras Karima, Thé Van Luong - - This software is governed by the CeCILL license under French law and - abiding by the rules of distribution of free software. You can use, - modify and/ or redistribute the software under the terms of the CeCILL - license as circulated by CEA, CNRS and INRIA at the following URL - "http://www.cecill.info". - - As a counterpart to the access to the source code and rights to copy, - modify and redistribute granted by the license, users are provided only - with a limited warranty and the software's author, the holder of the - economic rights, and the successive licensors have only limited liability. - - In this respect, the user's attention is drawn to the risks associated - with loading, using, modifying and/or developing or reproducing the - software by the user in light of its specific status of free software, - that may mean that it is complicated to manipulate, and that also - therefore means that it is reserved for developers and experienced - professionals having in-depth computer knowledge. Users are therefore - encouraged to load and test the software's suitability as regards their - requirements in conditions enabling the security of their systems and/or - data to be ensured and, more generally, to use and operate it in the - same conditions as regards security. - The fact that you are presently reading this means that you have had - knowledge of the CeCILL license and that you accept its terms. - - ParadisEO WebSite : http://paradiseo.gforge.inria.fr - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef _moCudaDesallocator_H_ -#define _moCudaDesallocator_H_ - -// CUDA includes -#include - -/** - * class for Desallocation of data from GPU global memory - */ - -class moCudaDesallocator { - - public: - - /** - * Constructor - */ - - moCudaDesallocator() { - } - - /** - *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 - cudaFree(_data); - - } - - /** - * Destructor - */ - - ~moCudaDesallocator() { - } - -}; - -#endif diff --git a/branches/ParadisEO-GPU/src/memory/moCudaObject.h b/branches/ParadisEO-GPU/src/memory/moCudaObject.h deleted file mode 100644 index c6763feb1..000000000 --- a/branches/ParadisEO-GPU/src/memory/moCudaObject.h +++ /dev/null @@ -1,91 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Boufaras Karima, Thé Van Luong - - This software is governed by the CeCILL license under French law and - abiding by the rules of distribution of free software. You can use, - modify and/ or redistribute the software under the terms of the CeCILL - license as circulated by CEA, CNRS and INRIA at the following URL - "http://www.cecill.info". - - As a counterpart to the access to the source code and rights to copy, - modify and redistribute granted by the license, users are provided only - with a limited warranty and the software's author, the holder of the - economic rights, and the successive licensors have only limited liability. - - In this respect, the user's attention is drawn to the risks associated - with loading, using, modifying and/or developing or reproducing the - software by the user in light of its specific status of free software, - that may mean that it is complicated to manipulate, and that also - therefore means that it is reserved for developers and experienced - professionals having in-depth computer knowledge. Users are therefore - encouraged to load and test the software's suitability as regards their - requirements in conditions enabling the security of their systems and/or - data to be ensured and, more generally, to use and operate it in the - same conditions as regards security. - The fact that you are presently reading this means that you have had - knowledge of the CeCILL license and that you accept its terms. - - ParadisEO WebSite : http://paradiseo.gforge.inria.fr - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef _moCudaObject_H_ -#define _moCudaObject_H_ - -// CUDA includes -#include -#include -#include -#include - -/** - * class of managment of data on GPU global memory (allocation,desallocation & copy) - */ - -class moCudaObject { - -public: - - /** - *Copy data from CPU memory to GPU global memory (default copy) - *@param _data the data to allocate on GPU - *@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); - } - - /** - *Copy device data from GPU global memory to global variable declared in device - *@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); - } - - /** - *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; - -}; - -#endif diff --git a/branches/ParadisEO-GPU/src/memory/moCudaSpecificData.h b/branches/ParadisEO-GPU/src/memory/moCudaSpecificData.h deleted file mode 100644 index 02456b9c6..000000000 --- a/branches/ParadisEO-GPU/src/memory/moCudaSpecificData.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Boufaras Karima, Thé Van Luong - - This software is governed by the CeCILL license under French law and - abiding by the rules of distribution of free software. You can use, - modify and/ or redistribute the software under the terms of the CeCILL - license as circulated by CEA, CNRS and INRIA at the following URL - "http://www.cecill.info". - - As a counterpart to the access to the source code and rights to copy, - modify and redistribute granted by the license, users are provided only - with a limited warranty and the software's author, the holder of the - economic rights, and the successive licensors have only limited liability. - - In this respect, the user's attention is drawn to the risks associated - with loading, using, modifying and/or developing or reproducing the - software by the user in light of its specific status of free software, - that may mean that it is complicated to manipulate, and that also - therefore means that it is reserved for developers and experienced - professionals having in-depth computer knowledge. Users are therefore - encouraged to load and test the software's suitability as regards their - requirements in conditions enabling the security of their systems and/or - data to be ensured and, more generally, to use and operate it in the - same conditions as regards security. - The fact that you are presently reading this means that you have had - knowledge of the CeCILL license and that you accept its terms. - - ParadisEO WebSite : http://paradiseo.gforge.inria.fr - Contact: paradiseo-help@lists.gforge.inria.fr -*/ - -#ifndef _moCudaSpecificData_H_ -#define _moCudaSpecificData_H_ - -#include - -/** - * class of managment of specific data problem - */ - -class moCudaSpecificData { - - public: - - /* - * Default constructor - */ - - moCudaSpecificData() { - sizeData = 0; - } - - /* - * Load data from file given in argument - * @param _file the name of data file - */ - - virtual void load(char* _file)=0; - - /* - * Return the size - * @return the size of data to load - */ - - virtual unsigned int getSize() { - return sizeData; - } - - /* - * Set the size of data to load - */ - - virtual void setSize(unsigned int _size) { - sizeData = _size; - } - - public: - unsigned int sizeData; - moCudaObject cudaObject; - -}; -#endif