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