From 2d18a86e802379460fd584f40633c72263e99b52 Mon Sep 17 00:00:00 2001 From: boufaras Date: Thu, 29 Sep 2011 14:34:04 +0000 Subject: [PATCH] git-svn-id: svn://scm.gforge.inria.fr/svnroot/paradiseo@2445 331e1502-861f-0410-8da2-ba01fb791d7f --- .../tutoriel/Kswap-OneMax/CMakeLists.txt | 50 ---- .../tutoriel/Kswap-OneMax/moGPUConfig.h | 50 ---- .../tutoriel/Kswap-OneMax/testKswapHCByCpy.cu | 210 ----------------- .../Kswap-OneMax/testKswapHCByModif.cu | 220 ------------------ 4 files changed, 530 deletions(-) delete mode 100644 branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/CMakeLists.txt delete mode 100644 branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/moGPUConfig.h delete mode 100644 branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByCpy.cu delete mode 100644 branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByModif.cu diff --git a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/CMakeLists.txt b/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/CMakeLists.txt deleted file mode 100644 index 170f43cfa..000000000 --- a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/CMakeLists.txt +++ /dev/null @@ -1,50 +0,0 @@ -############################################################################### -## -## CMakeLists file for OneMax Example/application -## -############################################################################### - - -###################################################################################### -### 1) Include the sources -###################################################################################### - -INCLUDE_DIRECTORIES( - - # include CUDA source directory - ${CUDA_SRC_DIR} - # include EO source directory - ${PARADISEO_EO_SRC_DIR}/src - # include MO source directory - ${PARADISEO_MO_SRC_DIR}/src - # include problems directory - ${PARADISEO_PROBLEMS_SRC_DIR} - # include GPU directory - ${PARADISEO_GPU_SRC_DIR} - # include your source directory - ${CMAKE_CURRENT_SOURCE_DIR}/../src - ) - -###################################################################################### - -###################################################################################### -### 2) Specify where CMake can find the libraries -###################################################################################### - -LINK_DIRECTORIES(${PARADISEO_EO_BIN_DIR}/lib ${CUDA_LIB_DIR} ) - -###################################################################################### - -###################################################################################### -### 3) Define your targets and link the librairies -###################################################################################### - -CUDA_ADD_EXECUTABLE(GPUtestKswapHCByModif testKswapHCByModif.cu) -CUDA_ADD_EXECUTABLE(GPUtestKswapHCByCpy testKswapHCByCpy.cu) - -TARGET_LINK_LIBRARIES(GPUtestKswapHCByModif eoutils ga eo) -TARGET_LINK_LIBRARIES(GPUtestKswapHCByCpy eoutils ga eo) - - - -###################################################################################### diff --git a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/moGPUConfig.h b/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/moGPUConfig.h deleted file mode 100644 index 8cbc8ed2a..000000000 --- a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/moGPUConfig.h +++ /dev/null @@ -1,50 +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 - */ - -#ifndef __moGPUConfig_H -#define __moGPUConfig_H - -#define BLOCK_SIZE 8 -#ifndef NB_POS -#define NB_POS 2 -#endif -#ifndef SIZE -#define SIZE 60 -#endif -#endif - - - - - diff --git a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByCpy.cu b/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByCpy.cu deleted file mode 100644 index 72affd32b..000000000 --- a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByCpy.cu +++ /dev/null @@ -1,210 +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 -*/ - -#include -#include -using namespace std; - -//Include GPU Config File -#include "moGPUConfig.h" -// The general include for eo -#include -#include -// OneMax full eval function -#include -// OneMax incremental eval function -#include -#include -// One Max solution -#include -// One Max neighbor -#include -//To compute execution time -#include -//Utils to compute size Mapping of x-change position -#include -// Use an ordered neighborhood without mapping, with local copy of solution -#include -// The Solution and neighbor comparator -#include -#include -// The continuator -#include -// Local search algorithm -#include -// The simple HC algorithm explorer -#include - -// REPRESENTATION -typedef moGPUBitVector solution; -typedef moGPUXBitFlippingNeighbor Neighbor; -typedef moGPUXChangeNeighborhoodByCpy 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(); - - // 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(SIZE); - - /* ========================================================= - * - * Eval fitness function - * - * ========================================================= */ - - EvalOneMax eval; - - /* ========================================================= - * - * Evaluation of a solution neighbor's - * - * ========================================================= */ - - unsigned long int sizeMap=sizeMapping(SIZE,NB_POS); - OneMaxIncrEval incr_eval; - moGPUMappingEvalByCpy > cueval(sizeMap,incr_eval); - - /* ========================================================= - * - * Comparator of solutions and neighbors - * - * ========================================================= */ - - moNeighborComparator comparator; - moSolNeighborComparator solComparator; - - /* ========================================================= - * - * a solution neighborhood - * - * ========================================================= */ - - Neighborhood neighborhood(sizeMap,NB_POS,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 - moGPUTimer timer; - timer.start(); - localSearch(sol); - timer.stop(); - std::cout << "final: " << sol<< std::endl; - printf("Execution time = %f ms\n",timer.getTime()); -} - -// 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/testKswapHCByModif.cu b/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByModif.cu deleted file mode 100644 index 4a00f7c92..000000000 --- a/branches/ParadisEO-GPU/tutoriel/Kswap-OneMax/testKswapHCByModif.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 -*/ - -#include -#include -using namespace std; - -//Include GPU Config File -#include "moGPUConfig.h" -// The general include for eo -#include -#include -// OneMax full eval function -#include -// OneMax incremental eval function -#include -#include -// One Max solution -#include -// One Max neighbor -#include -//To compute execution time -#include -//Utils to compute size Mapping of x-change position -#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 moGPUBitVector solution; -typedef moGPUXBitFlippingNeighbor Neighbor; -typedef moGPUXChangeNeighborhoodByModif 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(100, "vecSize", "Genotype size", 'V'); - parser.processParam( vecSizeParam, "Representation" ); - unsigned vecSize = vecSizeParam.value();*/ - - //Number of position to change - /* eoValueParam nbPosParam(1, "nbPos", "X Change", 'N'); - parser.processParam( nbPosParam, "Exchange" ); - 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 - 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(SIZE); - - /* ========================================================= - * - * Eval fitness function - * - * ========================================================= */ - - EvalOneMax eval; - - /* ========================================================= - * - * Evaluation of a solution neighbor's - * - * ========================================================= */ - - unsigned long int sizeMap=sizeMapping(SIZE,NB_POS); - OneMaxIncrEval incr_eval; - moGPUMappingEvalByModif > cueval(sizeMap,incr_eval); - - /* ========================================================= - * - * Comparator of solutions and neighbors - * - * ========================================================= */ - - moNeighborComparator comparator; - moSolNeighborComparator solComparator; - - /* ========================================================= - * - * a solution neighborhood - * - * ========================================================= */ - - Neighborhood neighborhood(sizeMap,NB_POS,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 - moGPUTimer timer; - timer.start(); - localSearch(sol); - timer.stop(); - std::cout << "final: " << sol<< std::endl; - printf("Execution time = %f ms\n",timer.getTime()); -} - -// 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; -}