nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2039 331e1502-861f-0410-8da2-ba01fb791d7f

Browse source
This commit is contained in:
boufaras 2010-12-22 09:14:01 +00:00
commit 4fc042af27
1 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ParadisEO-GPU/src/problems/data/QAPData.h
View file

@ -34,13 +34,14 @@
#ifndef _QAPData_H_ #ifndef _QAPData_H_
#define _QAPData_H_ #define _QAPData_H_
#include <moCudaSpecificData.h>
template<class T> #include <memory/moCudaSpecificData.h>
template<class ElemType>
class QAPData: public moCudaSpecificData<T> { class QAPData: public moCudaSpecificData<T> {
using moCudaSpecificData<T>::sizeData; using moCudaSpecificData<ElemType>::sizeData;
using moCudaSpecificData<T>::cudaObject; using moCudaSpecificData<ElemType>::cudaObject;
public: public:
@ -106,7 +107,6 @@ public:
b_h[i * sizeData + j] = _qapData.b_h[i * sizeData + j]; b_h[i * sizeData + j] = _qapData.b_h[i * sizeData + j];
} }
cudaObject.memCopy(a_d, a_h, sizeData * sizeData); cudaObject.memCopy(a_d, a_h, sizeData * sizeData);
cudaObject.memCopy(b_d, b_h, sizeData * sizeData); cudaObject.memCopy(b_d, b_h, sizeData * sizeData);
return (*this); return (*this);
@ -117,7 +117,6 @@ public:
*/ */
~QAPData() { ~QAPData() {
cudaObject.memFree(a_d); cudaObject.memFree(a_d);
cudaObject.memFree(b_d); cudaObject.memFree(b_d);
delete[] a_h; delete[] a_h;
@ -139,8 +138,8 @@ public:
else else
printf("Le Fichier est vide\n"); printf("Le Fichier est vide\n");
a_h = new T[sizeData * sizeData]; a_h = new ElemType[sizeData * sizeData];
b_h = new T[sizeData * sizeData]; b_h = new ElemType[sizeData * sizeData];
for (int i = 0; i < sizeData; i++) for (int i = 0; i < sizeData; i++)
for (int j = 0; j < sizeData; j++) for (int j = 0; j < sizeData; j++)
@ -156,10 +155,10 @@ public:
} }
T* a_h; ElemType* a_h;
T* b_h; ElemType* b_h;
T* a_d; ElemType* a_d;
T* b_d; ElemType* b_d;
}; };
#endif #endif