nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

regression: edo

Browse source
This commit is contained in:
canape 2013-01-03 09:29:48 +01:00
commit 8b0f31c7eb
2 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
CMakeLists.txt
View file

@ -70,9 +70,6 @@ set(MOEO_BIN_DIR "${CMAKE_BINARY_DIR}/moeo" CACHE INTERNAL "ParadisEO-MOEO binar
set( SMP_SRC_DIR "${CMAKE_SOURCE_DIR}/smp" CACHE INTERNAL "ParadisEO-SMP source directory" FORCE) set( SMP_SRC_DIR "${CMAKE_SOURCE_DIR}/smp" CACHE INTERNAL "ParadisEO-SMP source directory" FORCE)
set( SMP_BIN_DIR "${CMAKE_BINARY_DIR}/smp" CACHE INTERNAL "ParadisEO-SMP binary directory" FORCE) set( SMP_BIN_DIR "${CMAKE_BINARY_DIR}/smp" CACHE INTERNAL "ParadisEO-SMP binary directory" FORCE)
#set( PEO_SRC_DIR "${CMAKE_SOURCE_DIR}/peo" CACHE INTERNAL "ParadisEO-PEO source directory" FORCE)
#set( PEO_BIN_DIR "${CMAKE_BINARY_DIR}/peo" CACHE INTERNAL "ParadisEO-PEO binary directory" FORCE)
set(PROBLEMS_SRC_DIR "${CMAKE_SOURCE_DIR}/problems" CACHE INTERNAL "Problems dependant source directory" FORCE) set(PROBLEMS_SRC_DIR "${CMAKE_SOURCE_DIR}/problems" CACHE INTERNAL "Problems dependant source directory" FORCE)
set(CMAKE_BASE_SOURCE_DIR ${CMAKE_SOURCE_DIR}) set(CMAKE_BASE_SOURCE_DIR ${CMAKE_SOURCE_DIR})
@ -80,10 +77,9 @@ set(CMAKE_BASE_SOURCE_DIR ${CMAKE_SOURCE_DIR})
set(EO_ONLY "false" CACHE BOOL "Only build EO and not the other modules") set(EO_ONLY "false" CACHE BOOL "Only build EO and not the other modules")
set(ENABLE_OPENMP "false" CACHE BOOL "Build EO with the OpenMP support (shared-memory parallel evaluators on multi-core)") set(ENABLE_OPENMP "false" CACHE BOOL "Build EO with the OpenMP support (shared-memory parallel evaluators on multi-core)")
set(ENABLE_GNUPLOT "false" CACHE BOOL "Build EO with the GNUplot support (real-time convergence plotting)") set(ENABLE_GNUPLOT "false" CACHE BOOL "Build EO with the GNUplot support (real-time convergence plotting)")
set(EDO "true" CACHE BOOL "Build the EDO module") set(EDO "false" CACHE BOOL "Build the EDO module")
set(EDO_USE_LIB "Eigen3" CACHE STRING "Which linear algebra library to use to build EDO ('UBlas' or 'Eigen3', Eigen3 is recommended)") set(EDO_USE_LIB "Eigen3" CACHE STRING "Which linear algebra library to use to build EDO ('UBlas' or 'Eigen3', Eigen3 is recommended)")
set(SMP "false" CACHE BOOL "Build the SMP module") set(SMP "false" CACHE BOOL "Build the SMP module")
#set(PEO "true" CACHE BOOL "Build the PEO module")
## EO Module ## EO Module
set(EO_MODULE_NAME "Evolving Object") set(EO_MODULE_NAME "Evolving Object")
@ -114,13 +110,7 @@ if(NOT EO_ONLY)
set(CMAKE_SOURCE_DIR ${SMP_SRC_DIR}) set(CMAKE_SOURCE_DIR ${SMP_SRC_DIR})
add_subdirectory(${SMP_SRC_DIR}) add_subdirectory(${SMP_SRC_DIR})
endif() endif()
## PEO Module
# if(PEO)
# set(PEO_MODULE_NAME "Parallel-EO")
# set(CMAKE_SOURCE_DIR ${PEO_SRC_DIR})
# add_subdirectory(${PEO_SRC_DIR})
#endif()
endif() endif()
###################################################################################### ######################################################################################

9
eo/test/t-eoParallel.cpp
View file

@ -42,15 +42,20 @@ int main(int ac, char** av)
eo::log << eo::quiet << "DONE!" << std::endl; eo::log << eo::quiet << "DONE!" << std::endl;
#ifdef ENABLE_OPENMP
#pragma omp parallel #pragma omp parallel
{ {
if ( 0 == omp_get_thread_num() ) if ( 0 == omp_get_thread_num() ) //Warning: omp_get_thread_num doestn't work with pragma and required openMP
{ {
eo::log << "num of threads: " << omp_get_num_threads() << std::endl; eo::log << "num of threads: " << omp_get_num_threads() << std::endl; //Warning: omp_get_num_threads doestn't work with pragma and required openMP
} }
} }
return 0; return 0;
#endif
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------