From 5b4e485cd6673262fc1ab1c0425dba7bcb53c7be Mon Sep 17 00:00:00 2001 From: boufaras Date: Wed, 14 Sep 2011 13:51:03 +0000 Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2377 331e1502-861f-0410-8da2-ba01fb791d7f --- .../ParadisEO-GPU/tutoriel/CMakeLists.txt | 2 +- .../tutoriel/Kswap-OneMax/CMakeLists.txt | 2 +- .../tutoriel/Kswap-OneMax/moGPUConfig.h | 2 +- .../tutoriel/Kswap-OneMax/testKswapHC.cu | 220 ------------------ .../tutoriel/Kswap-OneMax/testKswapHCByCpy.cu | 2 +- .../Kswap-OneMax/testKswapHCByModif.cu | 12 +- 6 files changed, 10 insertions(+), 230 deletions(-) delete mode 100644 branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHC.cu diff --git a/branches/ParadisEO-GPU/tutoriel/CMakeLists.txt b/branches/ParadisEO-GPU/tutoriel/CMakeLists.txt index 01a634f4e..a39605aa9 100644 --- a/branches/ParadisEO-GPU/tutoriel/CMakeLists.txt +++ b/branches/ParadisEO-GPU/tutoriel/CMakeLists.txt @@ -1,5 +1,5 @@ ADD_SUBDIRECTORY(OneMax) ADD_SUBDIRECTORY(Kswap-OneMax) -ADD_SUBDIRECTORY(QAP_CPU) +#ADD_SUBDIRECTORY(QAP_CPU) ADD_SUBDIRECTORY(QAP) ADD_SUBDIRECTORY(PPP_GPU) diff --git a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/CMakeLists.txt b/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/CMakeLists.txt index 5536e4125..903c7e22c 100644 --- a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/CMakeLists.txt +++ b/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/CMakeLists.txt @@ -41,7 +41,7 @@ LINK_DIRECTORIES(${PARADISEO_EO_BIN_DIR}/lib ${NVIDIA_LIB_DIR} ${CUDA_LIB_DIR} ### 3) Define your targets and link the librairies ###################################################################################### -CUDA_ADD_EXECUTABLE(GPUtestKswapHCByModif testKswapHCByCpy.cu) +CUDA_ADD_EXECUTABLE(GPUtestKswapHCByModif testKswapHCByModif.cu) CUDA_ADD_EXECUTABLE(GPUtestKswapHCByCpy testKswapHCByCpy.cu) TARGET_LINK_LIBRARIES(GPUtestKswapHCByModif eoutils ga eo ${cutil}) diff --git a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/moGPUConfig.h b/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/moGPUConfig.h index 9ddc10aa2..8cbc8ed2a 100644 --- a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/moGPUConfig.h +++ b/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/moGPUConfig.h @@ -40,7 +40,7 @@ #define NB_POS 2 #endif #ifndef SIZE -#define SIZE 100 +#define SIZE 60 #endif #endif diff --git a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHC.cu b/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHC.cu deleted file mode 100644 index 7b40a0bfb..000000000 --- a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHC.cu +++ /dev/null @@ -1,220 +0,0 @@ -/* - - 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 -*/ - -//Init the number of threads per block -#define BLOCK_SIZE 256 -#include -#include -using namespace std; - -// The general include for eo -#include -#include -// Fitness function -#include -// Cuda Fitness function -#include -#include -// One Max solution -#include -// One Max neighbor -#include -//To compute execution time -#include -// One Max ordered neighborhood -#include -// The Solution and neighbor comparator -#include -#include -// The continuator -#include -// Local search algorithm -#include -// The simple HC algorithm explorer -#include - -// REPRESENTATION -typedef moCudaBitVector solution; -typedef moBitFlippingNeighbor Neighbor; -typedef moCudaKflipNeighborhood Neighborhood; - -void main_function(int argc, char **argv) -{ - /* ========================================================= - * - * Parameters - * - * ========================================================= */ - - // First define a parser from the command-line arguments - eoParser parser(argc, argv); - - // For each parameter, define Parameter, read it through the parser, - // and assign the value to the variable - - // seed - eoValueParam seedParam(time(0), "seed", "Random number seed", 'S'); - parser.processParam( seedParam ); - unsigned seed = seedParam.value(); - - // description of genotype - eoValueParam vecSizeParam(6, "vecSize", "Genotype size", 'V'); - parser.processParam( vecSizeParam, "Representation" ); - unsigned vecSize = vecSizeParam.value(); - - // Swap number - eoValueParam KSwapParam(0, "KSwap", "swap number", 'N'); - parser.processParam(KSwapParam, "KSwap" ); - unsigned KSwap = KSwapParam.value(); - - // the name of the "status" file where all actual parameter values will be saved - string str_status = parser.ProgramName() + ".status"; // default value - eoValueParam statusParam(str_status.c_str(), "status", "Status file"); - parser.processParam( statusParam, "Persistence" ); - - // do the following AFTER ALL PARAMETERS HAVE BEEN PROCESSED - // i.e. in case you need parameters somewhere else, postpone these - if (parser.userNeedsHelp()) { - parser.printHelp(cout); - exit(1); - } - if (statusParam.value() != "") { - ofstream os(statusParam.value().c_str()); - os << parser;// and you can use that file as parameter file - } - /* ========================================================= - * - * Random seed - * - * ========================================================= */ - - //reproducible random seed: if you don't change SEED above, - // you'll aways get the same result, NOT a random run - rng.reseed(seed); - - /* ========================================================= - * - * Initilisation of the solution - * - * ========================================================= */ - - solution sol(vecSize); - - /* ========================================================= - * - * Eval fitness function - * - * ========================================================= */ - - EvalOneMax eval; - - /* ========================================================= - * - * Evaluation of a solution neighbor's - * - * ========================================================= */ - - unsigned long int sizeMap=sizeMapping(vecSize,KSwap); - std::cout<<"sizeMap : "< incr_eval; - moCudaKswapEval > cueval(sizeMap,incr_eval); - - /* ========================================================= - * - * Comparator of solutions and neighbors - * - * ========================================================= */ - - moNeighborComparator comparator; - moSolNeighborComparator solComparator; - - /* ========================================================= - * - * a solution neighborhood - * - * ========================================================= */ - - Neighborhood neighborhood(vecSize,KSwap,cueval); - - /* ========================================================= - * - * An explorer of solution neighborhood's - * - * ========================================================= */ - - moSimpleHCexplorer explorer(neighborhood, cueval, - comparator, solComparator); - - /* ========================================================= - * - * The local search algorithm - * - * ========================================================= */ - - //True continuator <=> Always continue - moTrueContinuator continuator; - moLocalSearch localSearch(explorer,continuator, eval); - - /* ========================================================= - * - * Execute the local search from random sollution - * - * ========================================================= */ - - //Can be eval here, else it will be done at the beginning of the localSearch - eval(sol); - - std::cout << "initial: " << sol<< std::endl; - // Create timer for timing CUDA calculation - moCudaTimer timer; - timer.start(); - localSearch(sol); - timer.stop(); - std::cout << "final: " << sol<< std::endl; - printf("CUDA execution time = %f ms\n",timer.getTime()); - timer.deleteTimer(); -} - -// A main that catches the exceptions - -int main(int argc, char **argv) -{ - try{ - main_function(argc, argv); - } - catch(exception& e){ - cout << "Exception: " << e.what() << '\n'; - } - return 1; -} diff --git a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByCpy.cu b/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByCpy.cu index a79da9fc7..83a9aba9e 100644 --- a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByCpy.cu +++ b/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByCpy.cu @@ -1,5 +1,5 @@ /* - + Copyright (C) DOLPHIN Project-Team, INRIA Lille - Nord Europe, 2006-2010 Karima Boufaras, Thé Van LUONG diff --git a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByModif.cu b/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByModif.cu index 9ca46d92b..e83d696b3 100644 --- a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByModif.cu +++ b/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByModif.cu @@ -91,14 +91,14 @@ void main_function(int argc, char **argv) unsigned seed = seedParam.value(); // description of genotype - eoValueParam vecSizeParam(100, "vecSize", "Genotype size", 'V'); + /*eoValueParam vecSizeParam(100, "vecSize", "Genotype size", 'V'); parser.processParam( vecSizeParam, "Representation" ); - unsigned vecSize = vecSizeParam.value(); + unsigned vecSize = vecSizeParam.value();*/ //Number of position to change - eoValueParam nbPosParam(1, "nbPos", "X Change", 'N'); + /* eoValueParam nbPosParam(1, "nbPos", "X Change", 'N'); parser.processParam( nbPosParam, "Exchange" ); - unsigned nbPos = nbPosParam.value(); + unsigned nbPos = nbPosParam.value();*/ // the name of the "status" file where all actual parameter values will be saved string str_status = parser.ProgramName() + ".status"; // default value @@ -131,7 +131,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - solution sol(vecSize); + solution sol(SIZE); /* ========================================================= * @@ -147,7 +147,7 @@ void main_function(int argc, char **argv) * * ========================================================= */ - unsigned long int sizeMap=sizeMapping(vecSize,NB_POS); + unsigned long int sizeMap=sizeMapping(SIZE,NB_POS); OneMaxIncrEval incr_eval; moGPUMappingEvalByModif > cueval(sizeMap,incr_eval);