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@2639 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2012-01-12 10:30:22 +00:00
commit 68f978d469
3 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,6 +33,10 @@ LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${CUDA_DIR}/lib )
CUDA_ADD_EXECUTABLE(GPUtestKswapHCByModif testKswapHCByModif.cu) CUDA_ADD_EXECUTABLE(GPUtestKswapHCByModif testKswapHCByModif.cu)
CUDA_ADD_EXECUTABLE(GPUtestKswapHCByCpy testKswapHCByCpy.cu) CUDA_ADD_EXECUTABLE(GPUtestKswapHCByCpy testKswapHCByCpy.cu)
######################################################################################
### 4) Link the librairies for your target(s)
######################################################################################
TARGET_LINK_LIBRARIES(GPUtestKswapHCByModif eoutils ga eo) TARGET_LINK_LIBRARIES(GPUtestKswapHCByModif eoutils ga eo)
TARGET_LINK_LIBRARIES(GPUtestKswapHCByCpy eoutils ga eo) TARGET_LINK_LIBRARIES(GPUtestKswapHCByCpy eoutils ga eo)

12
branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByCpy.cu
View file

@ -42,10 +42,10 @@ using namespace std;
#include <eo> #include <eo>
#include <ga.h> #include <ga.h>
// OneMax full eval function // OneMax full eval function
#include <problems/eval/EvalOneMax.h> #include <problems/eval/moGPUEvalOneMax.h>
// OneMax incremental eval function // OneMax incremental eval function
#include <eval/moGPUMappingEvalByCpy.h> #include <eval/moGPUMappingEvalByCpy.h>
#include <problems/eval/OneMaxIncrEval.h> #include <problems/eval/moGPUOneMaxIncrEval.h>
// One Max solution // One Max solution
#include <GPUType/moGPUBitVector.h> #include <GPUType/moGPUBitVector.h>
// One Max neighbor // One Max neighbor
@ -53,7 +53,7 @@ using namespace std;
//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
@ -129,7 +129,7 @@ void main_function(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
EvalOneMax<solution> eval; moGPUEvalOneMax<solution> eval;
/* ========================================================= /* =========================================================
* *
@ -138,8 +138,8 @@ void main_function(int argc, char **argv)
* ========================================================= */ * ========================================================= */
unsigned long int sizeMap=sizeMapping(SIZE,NB_POS); unsigned long int sizeMap=sizeMapping(SIZE,NB_POS);
OneMaxIncrEval<Neighbor> incr_eval; moGPUOneMaxIncrEval<Neighbor> incr_eval;
moGPUMappingEvalByCpy<Neighbor,OneMaxIncrEval<Neighbor> > cueval(sizeMap,incr_eval); moGPUMappingEvalByCpy<Neighbor,moGPUOneMaxIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
/* ========================================================= /* =========================================================
* *

12
branches/ParadisEO-GPU/paradiseo-gpu/tutorial/Kswap-OneMax/testKswapHCByModif.cu
View file

@ -42,10 +42,10 @@ using namespace std;
#include <eo> #include <eo>
#include <ga.h> #include <ga.h>
// OneMax full eval function // OneMax full eval function
#include <problems/eval/EvalOneMax.h> #include <problems/eval/moGPUEvalOneMax.h>
// OneMax incremental eval function // OneMax incremental eval function
#include <eval/moGPUMappingEvalByModif.h> #include <eval/moGPUMappingEvalByModif.h>
#include <problems/eval/OneMaxIncrEval.h> #include <problems/eval/moGPUOneMaxIncrEval.h>
// One Max solution // One Max solution
#include <GPUType/moGPUBitVector.h> #include <GPUType/moGPUBitVector.h>
// One Max neighbor // One Max neighbor
@ -53,7 +53,7 @@ using namespace std;
//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>
// One Max ordered neighborhood // One Max ordered neighborhood
#include <neighborhood/moGPUXChangeNeighborhoodByModif.h> #include <neighborhood/moGPUXChangeNeighborhoodByModif.h>
// The Solution and neighbor comparator // The Solution and neighbor comparator
@ -139,7 +139,7 @@ void main_function(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
EvalOneMax<solution> eval; moGPUEvalOneMax<solution> eval;
/* ========================================================= /* =========================================================
* *
@ -148,8 +148,8 @@ void main_function(int argc, char **argv)
* ========================================================= */ * ========================================================= */
unsigned long int sizeMap=sizeMapping(SIZE,NB_POS); unsigned long int sizeMap=sizeMapping(SIZE,NB_POS);
OneMaxIncrEval<Neighbor> incr_eval; moGPUOneMaxIncrEval<Neighbor> incr_eval;
moGPUMappingEvalByModif<Neighbor,OneMaxIncrEval<Neighbor> > cueval(sizeMap,incr_eval); moGPUMappingEvalByModif<Neighbor,moGPUOneMaxIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
/* ========================================================= /* =========================================================
* *