update+add config file

git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2272 331e1502-861f-0410-8da2-ba01fb791d7f
This commit is contained in:
boufaras 2011-05-25 21:54:03 +00:00
commit 0a8ddd65d0
2 changed files with 83 additions and 28 deletions

View file

@ -0,0 +1,56 @@
/*
<moGPUConfig.h>
Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010
Karima Boufaras, Thé Van LUONG
This software is governed by the CeCILL license under French law and
abiding by the rules of distribution of free software. You can use,
modify and/ or redistribute the software under the terms of the CeCILL
license as circulated by CEA, CNRS and INRIA at the following URL
"http://www.cecill.info".
As a counterpart to the access to the source code and rights to copy,
modify and redistribute granted by the license, users are provided only
with a limited warranty and the software's author, the holder of the
economic rights, and the successive licensors have only limited liability.
In this respect, the user's attention is drawn to the risks associated
with loading, using, modifying and/or developing or reproducing the
software by the user in light of its specific status of free software,
that may mean that it is complicated to manipulate, and that also
therefore means that it is reserved for developers and experienced
professionals having in-depth computer knowledge. Users are therefore
encouraged to load and test the software's suitability as regards their
requirements in conditions enabling the security of their systems and/or
data to be ensured and, more generally, to use and operate it in the
same conditions as regards security.
The fact that you are presently reading this means that you have had
knowledge of the CeCILL license and that you accept its terms.
ParadisEO WebSite : http://paradiseo.gforge.inria.fr
Contact: paradiseo-help@lists.gforge.inria.fr
*/
#ifndef __moGPUConfig_H
#define __moGPUConfig_H
#define BLOCK_SIZE 8
#ifndef NB_POS
#define NB_POS 3
#endif
#ifndef SIZE
#define SIZE 73
#define Nd 73
#define Md 73
#define ca 30
#define cb 1
#endif
#endif

View file

@ -32,12 +32,7 @@
Contact: paradiseo-help@lists.gforge.inria.fr
*/
//Init the number of threads per block
#define BLOCK_SIZE 256
#define Nd 101
#define Md 117
#define ca 30
#define cb 1
#include "moGPUConfig.h"
#include <iostream>
#include <stdlib.h>
#include <stdio.h>
@ -51,8 +46,8 @@ __device__ int * dev_h;
#include <ga.h>
// Fitness function
#include <problems/eval/PPPEval.h>
// Cuda Fitness function
#include <eval/moCudaKswapEval.h>
// GPU Fitness function
#include <eval/moGPUMappingEvalByModif.h>
#include <problems/eval/PPPIncrEval.h>
//Specific data to PPP problem
#include <problems/data/PPPData.h>
@ -61,9 +56,11 @@ __device__ int * dev_h;
// PPP neighbor
#include <problems/neighborhood/PPPNeighbor.h>
//To compute execution time
#include <performance/moCudaTimer.h>
//Kswap neighborhood
#include <neighborhood/moCudaKflipNeighborhood.h>
#include <performance/moGPUTimer.h>
//Utils to compute size Mapping of x-change position
#include <neighborhood/moNeighborhoodSizeUtils.h>
//x-Change neighborhood
#include <neighborhood/moGPUXChangeNeighborhoodByModif.h>
// The Solution and neighbor comparator
#include <comparator/moNeighborComparator.h>
#include <comparator/moSolNeighborComparator.h>
@ -80,7 +77,7 @@ __device__ int * dev_h;
typedef PPPSolution<eoMinimizingFitness> solution;
typedef PPPNeighbor<solution> Neighbor;
typedef moCudaKflipNeighborhood<Neighbor> Neighborhood;
typedef moGPUXChangeNeighborhoodByModif<Neighbor> Neighborhood;
int main(int argc, char **argv)
@ -103,10 +100,11 @@ int main(int argc, char **argv)
parser.processParam( seedParam );
unsigned seed = seedParam.value();
// Swap number
eoValueParam<unsigned int> KSwapParam(0, "KSwap", "swap number", 'N');
parser.processParam(KSwapParam, "KSwap" );
unsigned KSwap = KSwapParam.value();
//Number of position to change
eoValueParam<unsigned int> nbPosParam(1, "nbPos", "X Change", 'N');
parser.processParam( nbPosParam, "Exchange" );
unsigned nbPos = nbPosParam.value();
// Iteration number
eoValueParam<unsigned int> nbIterationParam(1, "nbIteration", "TS Iteration number", 'I');
@ -149,8 +147,8 @@ int main(int argc, char **argv)
//reproducible random seed: if you don't change SEED above,
// you'll aways get the same result, NOT a random run
rng.reseed(seed);
// rng.reseed(seed);
srand(0);
/* =========================================================
*
* Initilisation of QAP data
@ -158,6 +156,7 @@ int main(int argc, char **argv)
* ========================================================= */
PPPData<int> _data;
_data.load();
/* =========================================================
*
@ -166,8 +165,8 @@ int main(int argc, char **argv)
* ========================================================= */
solution sol(Nd);
_data.cudaObject.memCopyGlobalVariable(dev_a,_data.a_d);
_data.cudaObject.memCopyGlobalVariable(dev_h,_data.H_d);
_data.GPUObject.memCopyGlobalVariable(dev_a,_data.a_d);
_data.GPUObject.memCopyGlobalVariable(dev_h,_data.H_d);
/*=========================================================
*
@ -176,9 +175,9 @@ int main(int argc, char **argv)
* ========================================================= */
PPPEval<solution> eval(_data);
unsigned long int sizeMap=sizeMapping(Nd,KSwap);
unsigned long int sizeMap=sizeMapping(Nd,NB_POS);
PPPIncrEval<Neighbor> incr_eval;
moCudaKswapEval<Neighbor,PPPIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
moGPUMappingEvalByModif<Neighbor,PPPIncrEval<Neighbor> > cueval(sizeMap,incr_eval);
/* =========================================================
*
@ -195,7 +194,7 @@ int main(int argc, char **argv)
*
* ========================================================= */
Neighborhood neighborhood(Nd,KSwap,cueval);
Neighborhood neighborhood(sizeMap,NB_POS,cueval);
/* =========================================================
*
@ -211,7 +210,7 @@ int main(int argc, char **argv)
*
* ========================================================= */
sizeTabuList=(Nd*(Nd-1))/2;
sizeTabuList=sizeMap;
duration=sizeTabuList/8;
// tabu list
moIndexedVectorTabuList<Neighbor> tl(sizeTabuList,duration);
@ -245,8 +244,8 @@ int main(int argc, char **argv)
std::cout << "initial: " << sol<< std::endl;
// Create timer for timing CUDA calculation
cudaFuncSetCacheConfig(kernelPermutation<solution,eoMinimizingFitness, Neighbor , PPPIncrEval<Neighbor> >, cudaFuncCachePreferL1);
moCudaTimer timer;
/*cudaFuncSetCacheConfig(moGPUMappingKernelEvalByModif<int,eoMinimizingFitness,PPPIncrEval<Neighbor> >, cudaFuncCachePreferL1);*/
moGPUTimer timer;
timer.start();
tabuSearch(sol);
std::cout << "final: " << sol << std::endl;
@ -255,8 +254,8 @@ int main(int argc, char **argv)
timer.deleteTimer();
_data.cudaObject.free(dev_a);
_data.cudaObject.free(dev_h);
_data.GPUObject.free(dev_a);
_data.GPUObject.free(dev_h);
return 0;
}