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@2641 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2012-01-12 10:31:52 +00:00
commit e683adbb71
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

6
branches/ParadisEO-GPU/paradiseo-gpu/tutorial/PPP_GPU/CMakeLists.txt
View file

@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(
### 2) Specify where CMake can find the libraries ### 2) Specify where CMake can find the libraries
###################################################################################### ######################################################################################
LINK_DIRECTORIES(${PARADISEO_EO_BIN_DIR}/lib ${CUDA_DIR}/lib ) LINK_DIRECTORIES(${EO_BIN_DIR}/lib ${CUDA_DIR}/lib )
###################################################################################### ######################################################################################
@ -32,6 +32,10 @@ LINK_DIRECTORIES(${PARADISEO_EO_BIN_DIR}/lib ${CUDA_DIR}/lib )
CUDA_ADD_EXECUTABLE(GPUtestSimpleTS_PPP testSimpleTS_PPP.cu) CUDA_ADD_EXECUTABLE(GPUtestSimpleTS_PPP testSimpleTS_PPP.cu)
######################################################################################
### 4) Link the librairies for your target(s)
######################################################################################
TARGET_LINK_LIBRARIES(GPUtestSimpleTS_PPP eoutils ga eo) TARGET_LINK_LIBRARIES(GPUtestSimpleTS_PPP eoutils ga eo)

24
branches/ParadisEO-GPU/paradiseo-gpu/tutorial/PPP_GPU/testSimpleTS_PPP.cu
View file

@ -45,20 +45,20 @@ __device__ int * dev_h;
#include <eo> #include <eo>
#include <ga.h> #include <ga.h>
// Fitness function // Fitness function
#include <problems/eval/PPPEval.h> #include <problems/eval/moGPUPPPEval.h>
// GPU Fitness function // GPU Fitness function
#include <eval/moGPUMappingEvalByModif.h> #include <eval/moGPUMappingEvalByModif.h>
#include <problems/eval/PPPIncrEval.h> #include <problems/eval/moGPUPPPIncrEval.h>
//Specific data to PPP problem //Specific data to PPP problem
#include <problems/data/PPPData.h> #include <problems/data/moGPUPPPData.h>
// PPP solution // PPP solution
#include <problems/types/PPPSolution.h> #include <problems/types/moGPUPPPSolution.h>
// PPP neighbor // PPP neighbor
#include <problems/neighborhood/PPPNeighbor.h> #include <problems/neighborhood/moGPUPPPNeighbor.h>
//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>
//x-Change neighborhood //x-Change neighborhood
#include <neighborhood/moGPUXChangeNeighborhoodByModif.h> #include <neighborhood/moGPUXChangeNeighborhoodByModif.h>
// The Solution and neighbor comparator // The Solution and neighbor comparator
@ -75,8 +75,8 @@ __device__ int * dev_h;
#include <memory/moDummyDiversification.h> #include <memory/moDummyDiversification.h>
#include <memory/moBestImprAspiration.h> #include <memory/moBestImprAspiration.h>
typedef PPPSolution<eoMinimizingFitness> solution; typedef moGPUPPPSolution<eoMinimizingFitness> solution;
typedef PPPNeighbor<solution> Neighbor; typedef moGPUPPPNeighbor<solution> Neighbor;
typedef moGPUXChangeNeighborhoodByModif<Neighbor> Neighborhood; typedef moGPUXChangeNeighborhoodByModif<Neighbor> Neighborhood;
@ -139,7 +139,7 @@ int main(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
PPPData<int> _data; moGPUPPPData<int> _data;
_data.load(); _data.load();
/* ========================================================= /* =========================================================
@ -158,10 +158,10 @@ int main(int argc, char **argv)
* *
* ========================================================= */ * ========================================================= */
PPPEval<solution> eval(_data); moGPUPPPEval<solution> eval(_data);
unsigned long int sizeMap=sizeMapping(Nd,NB_POS); unsigned long int sizeMap=sizeMapping(Nd,NB_POS);
PPPIncrEval<Neighbor> incr_eval; moGPUPPPIncrEval<Neighbor> incr_eval;
moGPUMappingEvalByModif<Neighbor,PPPIncrEval<Neighbor> > cueval(sizeMap,incr_eval); moGPUMappingEvalByModif<Neighbor,moGPUPPPIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
/* ========================================================= /* =========================================================
* *