diff --git a/ParadisEO-GPU/tutoriel/k-OneMax/CMakeLists.txt b/ParadisEO-GPU/tutoriel/k-OneMax/CMakeLists.txt deleted file mode 100644 index edc8d7977..000000000 --- a/ParadisEO-GPU/tutoriel/k-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 NVIDIA source directory - ${NVIDIA_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 ${NVIDIA_LIB_DIR} ${CUDA_LIB_DIR} ) - -###################################################################################### - -###################################################################################### -### 3) Define your targets and link the librairies -###################################################################################### - -CUDA_ADD_EXECUTABLE(CutestKswapHC testKswapHC.cu) - - -TARGET_LINK_LIBRARIES(CutestKswapHC eoutils ga eo libcutil.a) - - - -###################################################################################### diff --git a/ParadisEO-GPU/tutoriel/k-OneMax/testKswapHC.cu b/ParadisEO-GPU/tutoriel/k-OneMax/testKswapHC.cu deleted file mode 100644 index 42a4c3a05..000000000 --- a/ParadisEO-GPU/tutoriel/k-OneMax/testKswapHC.cu +++ /dev/null @@ -1,228 +0,0 @@ -//Init the number of threads per block -#define BLOCK_SIZE 128 -#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 -// Simple HC algorithm -#include -// The simple HC algorithm explorer -#include - -// REPRESENTATION -typedef moCudaBitVector solution; -typedef moBitFlippingNeighbor Neighbor; -typedef moCudaKswapNeighborhood 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); - if(vecSize<64) - for(unsigned i=0;i eval; - - /* ========================================================= - * - * Evaluation of a solution neighbor's - * - * ========================================================= */ - unsigned 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); - - /* ========================================================= - * - * The simple Hill Climbing algorithm - * - * ========================================================= */ - - moSimpleHC simpleHC(neighborhood,eval,cueval); - - /* ========================================================= - * - * 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.fitness()<< std::endl; - // Create timer for timing CUDA calculation - moCudaTimer timer; - timer.start(); - localSearch(sol); - timer.stop(); - printf("CUDA execution time = %f ms\n",timer.getTime()); - timer.deleteTimer(); - std::cout << "final: " << sol.fitness() << std::endl; - - /* ========================================================= - * - * Execute the Simple Hill climbing from random sollution - * - * ========================================================= */ - /*solution sol1(vecSize); - if(vecSize<64) - for(unsigned i=0;i