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

clear and update srcs with # change

Browse source 
git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2643 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2012-01-12 10:32:24 +00:00
commit 2f18c31aac
3 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/CMakeLists.txt
View file

@ -33,5 +33,9 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${CUDA_DIR}/lib )
CUDA_ADD_EXECUTABLE(GPU_testSimpleHC testSimpleHC.cu) CUDA_ADD_EXECUTABLE(GPU_testSimpleHC testSimpleHC.cu)
CUDA_ADD_EXECUTABLE(GPU_testSimpleTS testSimpleTS.cu) CUDA_ADD_EXECUTABLE(GPU_testSimpleTS testSimpleTS.cu)
######################################################################################
### 4) Link the librairies for your target(s)
######################################################################################
TARGET_LINK_LIBRARIES(GPU_testSimpleHC eoutils ga eo) TARGET_LINK_LIBRARIES(GPU_testSimpleHC eoutils ga eo)
TARGET_LINK_LIBRARIES(GPU_testSimpleTS eoutils ga eo) TARGET_LINK_LIBRARIES(GPU_testSimpleTS eoutils ga eo)

16
branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/testSimpleHC.cu
View file

@ -48,12 +48,12 @@ __device__ int * dev_b;
#include <eo> #include <eo>
#include <ga.h> #include <ga.h>
// Fitness function // Fitness function
#include <problems/eval/QAPEval.h> #include <problems/eval/moGPUQAPEval.h>
// Cuda Fitness function // Cuda Fitness function
#include <eval/moGPUMappingEvalByCpy.h> #include <eval/moGPUMappingEvalByCpy.h>
#include <problems/eval/QAPIncrEval.h> #include <problems/eval/moGPUQAPIncrEval.h>
//Specific data to QAP problem //Specific data to QAP problem
#include <problems/data/QAPData.h> #include <problems/data/moGPUQAPData.h>
// QAP solution // QAP solution
#include <GPUType/moGPUPermutationVector.h> #include <GPUType/moGPUPermutationVector.h>
// Swap neighbor // Swap neighbor
@ -61,7 +61,7 @@ __device__ int * dev_b;
//To compute execution time //To compute execution time
#include <performance/moGPUTimer.h> #include <performance/moGPUTimer.h>
//Utils to compute size Mapping of x-change position //Utils to compute size Mapping of x-change position
#include <neighborhood/moNeighborhoodSizeUtils.h> #include <neighborhood/moGPUNeighborhoodSizeUtils.h>
// Use an ordered neighborhood without mapping, with local copy of solution // Use an ordered neighborhood without mapping, with local copy of solution
#include <neighborhood/moGPUXChangeNeighborhoodByCpy.h> #include <neighborhood/moGPUXChangeNeighborhoodByCpy.h>
// The Solution and neighbor comparator // The Solution and neighbor comparator
@ -136,7 +136,7 @@ int main(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
QAPData<int> _data(argv[1]); moGPUQAPData<int> _data(argv[1]);
/* ========================================================= /* =========================================================
* *
@ -153,10 +153,10 @@ int main(int argc, char **argv)
* Evaluation of a solution neighbor's * Evaluation of a solution neighbor's
* *
* ========================================================= */ * ========================================================= */
QAPEval<solution> eval(_data); moGPUQAPEval<solution> eval(_data);
unsigned long int sizeMap=sizeMapping(_data.sizeData,NB_POS); unsigned long int sizeMap=sizeMapping(_data.sizeData,NB_POS);
QAPIncrEval<Neighbor> incr_eval; moGPUQAPIncrEval<Neighbor> incr_eval;
moGPUMappingEvalByCpy<Neighbor,QAPIncrEval<Neighbor> > cueval(sizeMap,incr_eval); moGPUMappingEvalByCpy<Neighbor,moGPUQAPIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
/* ========================================================= /* =========================================================
* *

16
branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/testSimpleTS.cu
View file

@ -47,12 +47,12 @@ __device__ int * dev_b;
#include <eo> #include <eo>
#include <ga.h> #include <ga.h>
// Fitness function // Fitness function
#include <problems/eval/QAPEval.h> #include <problems/eval/moGPUQAPEval.h>
// Cuda Fitness function // Cuda Fitness function
#include <eval/moGPUMappingEvalByCpy.h> #include <eval/moGPUMappingEvalByCpy.h>
#include <problems/eval/QAPIncrEval.h> #include <problems/eval/moGPUQAPIncrEval.h>
//Specific data to QAP problem //Specific data to QAP problem
#include <problems/data/QAPData.h> #include <problems/data/moGPUQAPData.h>
// QAP solution // QAP solution
#include <GPUType/moGPUPermutationVector.h> #include <GPUType/moGPUPermutationVector.h>
// Swap neighbor // Swap neighbor
@ -60,7 +60,7 @@ __device__ int * dev_b;
//To compute execution time //To compute execution time
#include <performance/moGPUTimer.h> #include <performance/moGPUTimer.h>
//Utils to compute size Mapping of x-change position //Utils to compute size Mapping of x-change position
#include <neighborhood/moNeighborhoodSizeUtils.h> #include <neighborhood/moGPUNeighborhoodSizeUtils.h>
// Use an ordered neighborhood without mapping, with local copy of solution // Use an ordered neighborhood without mapping, with local copy of solution
#include <neighborhood/moGPUXChangeNeighborhoodByCpy.h> #include <neighborhood/moGPUXChangeNeighborhoodByCpy.h>
// The Solution and neighbor comparator // The Solution and neighbor comparator
@ -142,7 +142,7 @@ int main(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
QAPData<int> _data(argv[1]); moGPUQAPData<int> _data(argv[1]);
/* ========================================================= /* =========================================================
* *
@ -160,10 +160,10 @@ int main(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
QAPEval<solution> eval(_data); moGPUQAPEval<solution> eval(_data);
unsigned long int sizeMap=sizeMapping(_data.sizeData,NB_POS); unsigned long int sizeMap=sizeMapping(_data.sizeData,NB_POS);
QAPIncrEval<Neighbor> incr_eval; moGPUQAPIncrEval<Neighbor> incr_eval;
moGPUMappingEvalByCpy<Neighbor,QAPIncrEval<Neighbor> > cueval(sizeMap,incr_eval); moGPUMappingEvalByCpy<Neighbor,moGPUQAPIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
/* ========================================================= /* =========================================================
* *