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

Test & Update for new version

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

2
branches/ParadisEO-GPU/paradiseo-gpu/tutorial/QAP_GPU/moGPUConfig.h
View file

@ -1,6 +1,6 @@
/* /*
<moGPUConfig.h> <moGPUConfig.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
Karima Boufaras, Thé Van LUONG Karima Boufaras, Thé Van LUONG

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

@ -1,6 +1,6 @@
/* /*
<testSimpleHC.cu> <testSimpleHC.cu>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
Karima Boufaras, Thé Van LUONG Karima Boufaras, Thé Van LUONG
@ -156,7 +156,7 @@ int main(int argc, char **argv)
moGPUQAPEval<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);
moGPUQAPIncrEval<Neighbor> incr_eval; moGPUQAPIncrEval<Neighbor> incr_eval;
moGPUMappingEvalByCpy<Neighbor,moGPUQAPIncrEval<Neighbor> > cueval(sizeMap,incr_eval); moGPUMappingEvalByCpy<Neighbor,moGPUQAPIncrEval<Neighbor> > gpueval(sizeMap,incr_eval);
/* ========================================================= /* =========================================================
* *
@ -173,7 +173,7 @@ int main(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
Neighborhood neighborhood(sizeMap,NB_POS,cueval); Neighborhood neighborhood(sizeMap,NB_POS,gpueval);
/* ========================================================= /* =========================================================
* *
@ -181,7 +181,7 @@ int main(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
moSimpleHCexplorer<Neighbor> explorer(neighborhood, cueval, moSimpleHCexplorer<Neighbor> explorer(neighborhood, gpueval,
comparator, solComparator); comparator, solComparator);
/* ========================================================= /* =========================================================
@ -201,7 +201,7 @@ int main(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
moSimpleHC<Neighbor> simpleHC(neighborhood,eval,cueval); moSimpleHC<Neighbor> simpleHC(neighborhood,eval,gpueval);
/* ========================================================= /* =========================================================
* *

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

@ -1,6 +1,6 @@
/* /*
<testSimpleTS.cu> <testSimpleTS.cu>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2012
Karima Boufaras, Thé Van LUONG Karima Boufaras, Thé Van LUONG
@ -163,7 +163,7 @@ int main(int argc, char **argv)
moGPUQAPEval<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);
moGPUQAPIncrEval<Neighbor> incr_eval; moGPUQAPIncrEval<Neighbor> incr_eval;
moGPUMappingEvalByCpy<Neighbor,moGPUQAPIncrEval<Neighbor> > cueval(sizeMap,incr_eval); moGPUMappingEvalByCpy<Neighbor,moGPUQAPIncrEval<Neighbor> > gpueval(sizeMap,incr_eval);
/* ========================================================= /* =========================================================
* *
@ -180,7 +180,7 @@ int main(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
Neighborhood neighborhood(sizeMap,NB_POS,cueval); Neighborhood neighborhood(sizeMap,NB_POS,gpueval);
/* ========================================================= /* =========================================================
* *
@ -214,7 +214,7 @@ int main(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
moTS<Neighbor> tabuSearch(neighborhood, eval, cueval, comparator, solComparator, continuator, tl, inten, div, asp); moTS<Neighbor> tabuSearch(neighborhood, eval, gpueval, comparator, solComparator, continuator, tl, inten, div, asp);
/* ========================================================= /* =========================================================
* *