From 0edc30e822e328c304ec0d915e4f4e046e703689 Mon Sep 17 00:00:00 2001 From: boufaras Date: Wed, 11 May 2011 15:21:14 +0000 Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2220 331e1502-861f-0410-8da2-ba01fb791d7f --- .../src/cudaType/moCudaBitVector.h | 100 ----------- .../src/cudaType/moCudaIntVector.h | 102 ----------- .../ParadisEO-GPU/src/cudaType/moCudaVector.h | 165 ------------------ 3 files changed, 367 deletions(-) delete mode 100644 branches/ParadisEO-GPU/src/cudaType/moCudaBitVector.h delete mode 100644 branches/ParadisEO-GPU/src/cudaType/moCudaIntVector.h delete mode 100644 branches/ParadisEO-GPU/src/cudaType/moCudaVector.h diff --git a/branches/ParadisEO-GPU/src/cudaType/moCudaBitVector.h b/branches/ParadisEO-GPU/src/cudaType/moCudaBitVector.h deleted file mode 100644 index ac75919c9..000000000 --- a/branches/ParadisEO-GPU/src/cudaType/moCudaBitVector.h +++ /dev/null @@ -1,100 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Karima Boufaras, 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 _moCudaBitVector_H_ -#define _moCudaBitVector_H_ - -#include - -/** - * Implementation of Bit vector representation on CUDA. - */ - -template - -class moCudaBitVector: public moCudaVector { - -public: - - using moCudaVector::vect; - using moCudaVector::N; - - /** - * Default constructor. - */ - - moCudaBitVector() : - moCudaVector () { - - } - - /** - *Constructor. - *@param _size The neighborhood size. - */ - - moCudaBitVector(unsigned _size) : - moCudaVector (_size) { - create(); - } - - /** - *Constructor. - *@param _size The neighborhood size. - *@param _b Value to assign to vector. - */ - - moCudaBitVector(unsigned _size, bool _b) : - moCudaVector (_size) { - - for (unsigned i = 0; i < _size; i++) - vect[i] = _b; - } - - /** - *Initializer of random bit vector. - */ - - void create() { - - for (unsigned i = 0; i < N; i++) { - - vect[i] = (bool) round((float) rng.rand() / RAND_MAX); - - } - } - -}; - -#endif diff --git a/branches/ParadisEO-GPU/src/cudaType/moCudaIntVector.h b/branches/ParadisEO-GPU/src/cudaType/moCudaIntVector.h deleted file mode 100644 index 59d8d1030..000000000 --- a/branches/ParadisEO-GPU/src/cudaType/moCudaIntVector.h +++ /dev/null @@ -1,102 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Karima Boufaras, 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 _moCudaIntVector_H_ -#define _moCudaIntVector_H_ - -#include - -/** - * Implementation of integer vector representation on CUDA. - */ - -template - -class moCudaIntVector: public moCudaVector { - -public: - - using moCudaVector::vect; - using moCudaVector::N; - - /** - * Default constructor. - */ - - moCudaIntVector() : - moCudaVector () { - - } - - /** - *Constructor. - *@param _size The neighborhood size. - */ - - moCudaIntVector(unsigned _size): - moCudaVector (_size) { - create(); - } - - /** - *Assignment operator - *@param _vector The vector passed to the function determine the new content. - *@return a new vector. - */ - - moCudaIntVector& operator=(const moCudaIntVector & _vector) { - moCudaVector :: operator=(_vector); - } - - /** - *Initializer of random integer vector. - */ - void create() { - - unsigned random; - int tmp; - for (unsigned i = 0; i < N; i++) - vect[i] = i; - // we want a random permutation so we shuffle - for (unsigned i = 0; i < N; i++) { - random = rng.rand() % (N - i) + i; - tmp = vect[i]; - vect[i] = vect[random]; - vect[random] = tmp; - } - } - -}; - -#endif diff --git a/branches/ParadisEO-GPU/src/cudaType/moCudaVector.h b/branches/ParadisEO-GPU/src/cudaType/moCudaVector.h deleted file mode 100644 index 263bead5a..000000000 --- a/branches/ParadisEO-GPU/src/cudaType/moCudaVector.h +++ /dev/null @@ -1,165 +0,0 @@ -/* - - Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 - - Karima Boufaras, 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 _moCudaVector_H_ -#define _moCudaVector_H_ - -#include - -/** - * Implementation of vector representation on CUDA. - */ - -template - -class moCudaVector: public EO { - -public: - - typedef ElemT ElemType; - - /** - * Default constructor. - */ - - moCudaVector() : - N(0) { - } - - /** - *Constructor. - *@param _size The neighborhood size. - */ - - moCudaVector(unsigned _size): N (_size){ - - vect = new ElemType[N]; - - } - - /** - * Destructor. - */ - - ~moCudaVector() { - if (N >= 1) - delete[] vect; - } - - /** - *How to fill the vector. - */ - - virtual void create() =0; - - /** - *Assignment operator - *@param _vector The vector passed to the function determine the new content. - *@return a new vector. - */ - - virtual moCudaVector& operator=(const moCudaVector & _vector) { - - if (N >= 1) - delete[] vect; - N = _vector.N; - vect = new ElemType[N]; - for (unsigned i = 0; i < N; i++) - vect[i] = _vector.vect[i]; - fitness(_vector.fitness()); - return (*this); - - } - - /** - *An accessor read only on the i'th element of the vector (function inline can be called from host or device). - *@param _i The i'th element of vector. - *@return The i'th element of the vector for read only - */ - - inline __host__ __device__ const ElemType & operator[](unsigned _i) const { - - return vect[_i]; - - } - - /** - *An accessor read-write on the i'th element of the vector(function inline can be called from host or device). - *@param _i The i'th element of the vector. - *@return The i'th element of the vector for read-write - */ - - inline __host__ __device__ ElemType & operator[](unsigned _i) { - - return vect[_i]; - - } - - /** - *Function inline to get the size of vector, called from host and device. - *@return The vector size's - */ - - inline __host__ __device__ unsigned size() { - - return N; - - } - - /** - *Function inline to set the size of vector, called from host and device. - *@param _size the vector size - */ - - inline __host__ __device__ void setSize(unsigned _size) { - - N=_size; - - } - - /** - * Print the solution - */ - - virtual void printOn(std::ostream& os) const=0; - -protected: - - ElemType * vect; - unsigned N; - - -}; - -#endif