From c96614ec18f01c9b2614c5868545bfc57fa409cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Fri, 13 Jun 2014 16:37:28 +0200 Subject: [PATCH 01/18] Moving out ./eo/src/serial/ content -> ./eoserial/src/ --- {eo/src/serial => eoserial/src}/CMakeLists.txt | 0 {eo/src/serial => eoserial/src}/Entity.h | 0 {eo/src/serial => eoserial/src}/Parser.cpp | 0 {eo/src/serial => eoserial/src}/Parser.h | 0 {eo/src/serial => eoserial/src}/SerialArray.cpp | 0 {eo/src/serial => eoserial/src}/SerialArray.h | 0 {eo/src/serial => eoserial/src}/SerialObject.cpp | 0 {eo/src/serial => eoserial/src}/SerialObject.h | 0 {eo/src/serial => eoserial/src}/SerialString.cpp | 0 {eo/src/serial => eoserial/src}/SerialString.h | 0 {eo/src/serial => eoserial/src}/Serializable.h | 0 {eo/src/serial => eoserial/src}/Traits.h | 0 {eo/src/serial => eoserial/src}/Utils.h | 0 {eo/src/serial => eoserial/src}/eoSerial.h | 0 {eo/src/serial => eoserial/src}/json_example | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename {eo/src/serial => eoserial/src}/CMakeLists.txt (100%) rename {eo/src/serial => eoserial/src}/Entity.h (100%) rename {eo/src/serial => eoserial/src}/Parser.cpp (100%) rename {eo/src/serial => eoserial/src}/Parser.h (100%) rename {eo/src/serial => eoserial/src}/SerialArray.cpp (100%) rename {eo/src/serial => eoserial/src}/SerialArray.h (100%) rename {eo/src/serial => eoserial/src}/SerialObject.cpp (100%) rename {eo/src/serial => eoserial/src}/SerialObject.h (100%) rename {eo/src/serial => eoserial/src}/SerialString.cpp (100%) rename {eo/src/serial => eoserial/src}/SerialString.h (100%) rename {eo/src/serial => eoserial/src}/Serializable.h (100%) rename {eo/src/serial => eoserial/src}/Traits.h (100%) rename {eo/src/serial => eoserial/src}/Utils.h (100%) rename {eo/src/serial => eoserial/src}/eoSerial.h (100%) rename {eo/src/serial => eoserial/src}/json_example (100%) diff --git a/eo/src/serial/CMakeLists.txt b/eoserial/src/CMakeLists.txt similarity index 100% rename from eo/src/serial/CMakeLists.txt rename to eoserial/src/CMakeLists.txt diff --git a/eo/src/serial/Entity.h b/eoserial/src/Entity.h similarity index 100% rename from eo/src/serial/Entity.h rename to eoserial/src/Entity.h diff --git a/eo/src/serial/Parser.cpp b/eoserial/src/Parser.cpp similarity index 100% rename from eo/src/serial/Parser.cpp rename to eoserial/src/Parser.cpp diff --git a/eo/src/serial/Parser.h b/eoserial/src/Parser.h similarity index 100% rename from eo/src/serial/Parser.h rename to eoserial/src/Parser.h diff --git a/eo/src/serial/SerialArray.cpp b/eoserial/src/SerialArray.cpp similarity index 100% rename from eo/src/serial/SerialArray.cpp rename to eoserial/src/SerialArray.cpp diff --git a/eo/src/serial/SerialArray.h b/eoserial/src/SerialArray.h similarity index 100% rename from eo/src/serial/SerialArray.h rename to eoserial/src/SerialArray.h diff --git a/eo/src/serial/SerialObject.cpp b/eoserial/src/SerialObject.cpp similarity index 100% rename from eo/src/serial/SerialObject.cpp rename to eoserial/src/SerialObject.cpp diff --git a/eo/src/serial/SerialObject.h b/eoserial/src/SerialObject.h similarity index 100% rename from eo/src/serial/SerialObject.h rename to eoserial/src/SerialObject.h diff --git a/eo/src/serial/SerialString.cpp b/eoserial/src/SerialString.cpp similarity index 100% rename from eo/src/serial/SerialString.cpp rename to eoserial/src/SerialString.cpp diff --git a/eo/src/serial/SerialString.h b/eoserial/src/SerialString.h similarity index 100% rename from eo/src/serial/SerialString.h rename to eoserial/src/SerialString.h diff --git a/eo/src/serial/Serializable.h b/eoserial/src/Serializable.h similarity index 100% rename from eo/src/serial/Serializable.h rename to eoserial/src/Serializable.h diff --git a/eo/src/serial/Traits.h b/eoserial/src/Traits.h similarity index 100% rename from eo/src/serial/Traits.h rename to eoserial/src/Traits.h diff --git a/eo/src/serial/Utils.h b/eoserial/src/Utils.h similarity index 100% rename from eo/src/serial/Utils.h rename to eoserial/src/Utils.h diff --git a/eo/src/serial/eoSerial.h b/eoserial/src/eoSerial.h similarity index 100% rename from eo/src/serial/eoSerial.h rename to eoserial/src/eoSerial.h diff --git a/eo/src/serial/json_example b/eoserial/src/json_example similarity index 100% rename from eo/src/serial/json_example rename to eoserial/src/json_example From 9be0bd9711f8a88008356668f767d0d10279593e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Mon, 16 Jun 2014 14:38:02 +0200 Subject: [PATCH 02/18] Add a new CMakeLists.txt file for eoserial compilation. --- eoserial/CMakeLists.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 eoserial/CMakeLists.txt diff --git a/eoserial/CMakeLists.txt b/eoserial/CMakeLists.txt new file mode 100644 index 000000000..e69de29bb From dea830da01e571e978a60e23da6eb1260c6c013a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Mon, 16 Jun 2014 14:50:19 +0200 Subject: [PATCH 03/18] Define new paths to the module sources and the module library. --- CMakeLists.txt | 35 ++++++++++++++++++++++------------- eoserial/CMakeLists.txt | 6 ++++++ 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f279e5a3e..2da94d87a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,24 +56,26 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Target.cmake) ###################################################################################### ## Paths to sources of modules -set( EO_SRC_DIR "${CMAKE_SOURCE_DIR}/eo" CACHE INTERNAL "ParadisEO-EO source directory" FORCE) -set( EDO_SRC_DIR "${CMAKE_SOURCE_DIR}/edo" CACHE INTERNAL "ParadisEO-EDO source directory" FORCE) -set( MO_SRC_DIR "${CMAKE_SOURCE_DIR}/mo" CACHE INTERNAL "ParadisEO-MO source directory" FORCE) -set(MOEO_SRC_DIR "${CMAKE_SOURCE_DIR}/moeo" CACHE INTERNAL "ParadisEO-MOEO source directory" FORCE) -set( SMP_SRC_DIR "${CMAKE_SOURCE_DIR}/smp" CACHE INTERNAL "ParadisEO-SMP source directory" FORCE) -set( MPI_SRC_DIR "${CMAKE_SOURCE_DIR}/eo/src/mpi" CACHE INTERNAL "ParadisEO-MPI source directory" FORCE) +set( EO_SRC_DIR "${CMAKE_SOURCE_DIR}/eo" CACHE INTERNAL "ParadisEO-EO source directory" FORCE) +set( EDO_SRC_DIR "${CMAKE_SOURCE_DIR}/edo" CACHE INTERNAL "ParadisEO-EDO source directory" FORCE) +set( MO_SRC_DIR "${CMAKE_SOURCE_DIR}/mo" CACHE INTERNAL "ParadisEO-MO source directory" FORCE) +set( MOEO_SRC_DIR "${CMAKE_SOURCE_DIR}/moeo" CACHE INTERNAL "ParadisEO-MOEO source directory" FORCE) +set( SMP_SRC_DIR "${CMAKE_SOURCE_DIR}/smp" CACHE INTERNAL "ParadisEO-SMP source directory" FORCE) +set( MPI_SRC_DIR "${CMAKE_SOURCE_DIR}/eo/src/mpi" CACHE INTERNAL "ParadisEO-MPI source directory" FORCE) +set(EOSERIAL_SRC_DIR "${CMAKE_SOURCE_DIR}/eoserial" CACHE INTERNAL "ParadisEO-EOSERIAL 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}) # All libraries are built in /lib/ -set( EO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EO binary directory" FORCE) -set( EDO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EDO binary directory" FORCE) -set( MO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MO binary directory" FORCE) -set(MOEO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MOEO binary directory" FORCE) -set( SMP_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-SMP binary directory" FORCE) -set( MPI_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MPI binary directory" FORCE) +set( EO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EO binary directory" FORCE) +set( EDO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EDO binary directory" FORCE) +set( MO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MO binary directory" FORCE) +set( MOEO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MOEO binary directory" FORCE) +set( SMP_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-SMP binary directory" FORCE) +set( MPI_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MPI binary directory" FORCE) +set(EOSERIAL_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EOSERIAL binary directory" FORCE) set(EO_ONLY "false" CACHE BOOL "Only build EO and not the other modules") @@ -123,6 +125,13 @@ if(NOT EO_ONLY) include_directories(${MPI_INCLUDE_PATH}) add_subdirectory(${MPI_SRC_DIR}) endif() + + ## EOSERIAL Module + #if(EOSERIAL) + set(EOSERIAL_MODULE_NAME "Serialization Module") + set(CMAKE_SOURCE_DIR ${EOSERIAL_SRC_DIR}) + add_subdirectory(${EOSERIAL_SRC_DIR}) + #endif() endif() ###################################################################################### diff --git a/eoserial/CMakeLists.txt b/eoserial/CMakeLists.txt index e69de29bb..f596760a5 100644 --- a/eoserial/CMakeLists.txt +++ b/eoserial/CMakeLists.txt @@ -0,0 +1,6 @@ +###################################################################################### +### Include subdirectories +###################################################################################### + +#add_subdirectory(doc) +add_subdirectory(src) \ No newline at end of file From d4dd1b52ef1f6c673e6c9d07977748ebfbedc331 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Mon, 16 Jun 2014 15:04:44 +0200 Subject: [PATCH 04/18] Modifications on eoserial/src/CMakeLists.txt file (most of the time for module paths). --- eoserial/src/CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eoserial/src/CMakeLists.txt b/eoserial/src/CMakeLists.txt index efc9f42e2..a3c6ff19a 100644 --- a/eoserial/src/CMakeLists.txt +++ b/eoserial/src/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) ### 2) Define the eoserial target ###################################################################################### -set(EOSERIAL_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib) +set(EOSERIAL_LIB_OUTPUT_PATH ${EOSERIAL_BIN_DIR}/lib) set(LIBRARY_OUTPUT_PATH ${EOSERIAL_LIB_OUTPUT_PATH}) set(EOSERIAL_SOURCES @@ -20,13 +20,17 @@ set(EOSERIAL_SOURCES ) add_library(eoserial STATIC ${EOSERIAL_SOURCES}) -install(TARGETS eoserial ARCHIVE DESTINATION lib COMPONENT libraries) - -file(GLOB HDRS *.h) -install(FILES ${HDRS} DESTINATION include/eo/serial COMPONENT headers) +install(TARGETS eoserial ARCHIVE DESTINATION ${LIB} COMPONENT libraries) ###################################################################################### -### 3) Optionnal +### 4) Look for headers +###################################################################################### + +file(GLOB HDRS *.h) +install(FILES ${HDRS} DESTINATION ${INSTALL_SUB_DIR}/eoserial COMPONENT headers) + +###################################################################################### +### 5) Optionnal ###################################################################################### set(EOSERIAL_VERSION ${GLOBAL_VERSION}) From 9a75fb113e300bee30e17f16f40b2be03b04936f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Mon, 16 Jun 2014 16:05:18 +0200 Subject: [PATCH 05/18] Modification on eo/src/CMakeLists.txt : comment the line which adds serial subdirectory for cmake compilation (subfolder now out of the eo module). --- eo/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eo/src/CMakeLists.txt b/eo/src/CMakeLists.txt index d38543098..b2b445a93 100644 --- a/eo/src/CMakeLists.txt +++ b/eo/src/CMakeLists.txt @@ -47,7 +47,7 @@ install(DIRECTORY do es ga gp other utils add_subdirectory(es) add_subdirectory(ga) add_subdirectory(utils) -add_subdirectory(serial) +#add_subdirectory(serial) if(ENABLE_PYEO) add_subdirectory(pyeo) From 11a40c56843dba45354f7c95f44e0e45b47ad409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Mon, 16 Jun 2014 16:56:00 +0200 Subject: [PATCH 06/18] Modifications on MPI files (compilation requires some eoserial module files). --- eo/src/mpi/CMakeLists.txt | 1 + eo/src/mpi/implMpi.h | 2 +- eo/src/utils/eoTimer.h | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eo/src/mpi/CMakeLists.txt b/eo/src/mpi/CMakeLists.txt index ebf16335a..b33c19f6a 100644 --- a/eo/src/mpi/CMakeLists.txt +++ b/eo/src/mpi/CMakeLists.txt @@ -3,6 +3,7 @@ ###################################################################################### include_directories(${EO_SRC_DIR}/src) +include_directories(${EOSERIAL_SRC_DIR}/src) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) ###################################################################################### diff --git a/eo/src/mpi/implMpi.h b/eo/src/mpi/implMpi.h index b7c1cd4ba..8385938a2 100644 --- a/eo/src/mpi/implMpi.h +++ b/eo/src/mpi/implMpi.h @@ -23,7 +23,7 @@ Authors: # define __EO_IMPL_MPI_HPP__ # include -# include +# include /** * This namespace contains reimplementations of some parts of the Boost::MPI API in C++, so as to be used in diff --git a/eo/src/utils/eoTimer.h b/eo/src/utils/eoTimer.h index 8a1fbb1a8..e9d39affd 100644 --- a/eo/src/utils/eoTimer.h +++ b/eo/src/utils/eoTimer.h @@ -30,7 +30,7 @@ Authors: # include "utils/eoParallel.h" // eo::parallel -# include "serial/eoSerial.h" // eo::Persistent +# include "eoSerial.h" // eo::Persistent /** * @brief Timer allowing to measure time between a start point and a stop point. From a4f5fd80129321d22f48fe3fb8888c9d480ac081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Tue, 17 Jun 2014 09:38:11 +0200 Subject: [PATCH 07/18] Moving out ./eo/src/mpi/ content -> ./eompi/src/ --- {eo/src/mpi => eompi/src}/CMakeLists.txt | 0 {eo/src/mpi => eompi/src}/eoMpi.cpp | 0 {eo/src/mpi => eompi/src}/eoMpi.h | 0 {eo/src/mpi => eompi/src}/eoMpiAssignmentAlgorithm.cpp | 0 {eo/src/mpi => eompi/src}/eoMpiAssignmentAlgorithm.h | 0 {eo/src/mpi => eompi/src}/eoMpiNode.cpp | 0 {eo/src/mpi => eompi/src}/eoMpiNode.h | 0 {eo/src/mpi => eompi/src}/eoMultiStart.h | 0 {eo/src/mpi => eompi/src}/eoParallelApply.h | 0 {eo/src/mpi => eompi/src}/eoTerminateJob.h | 0 {eo/src/mpi => eompi/src}/implMpi.cpp | 0 {eo/src/mpi => eompi/src}/implMpi.h | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename {eo/src/mpi => eompi/src}/CMakeLists.txt (100%) rename {eo/src/mpi => eompi/src}/eoMpi.cpp (100%) rename {eo/src/mpi => eompi/src}/eoMpi.h (100%) rename {eo/src/mpi => eompi/src}/eoMpiAssignmentAlgorithm.cpp (100%) rename {eo/src/mpi => eompi/src}/eoMpiAssignmentAlgorithm.h (100%) rename {eo/src/mpi => eompi/src}/eoMpiNode.cpp (100%) rename {eo/src/mpi => eompi/src}/eoMpiNode.h (100%) rename {eo/src/mpi => eompi/src}/eoMultiStart.h (100%) rename {eo/src/mpi => eompi/src}/eoParallelApply.h (100%) rename {eo/src/mpi => eompi/src}/eoTerminateJob.h (100%) rename {eo/src/mpi => eompi/src}/implMpi.cpp (100%) rename {eo/src/mpi => eompi/src}/implMpi.h (100%) diff --git a/eo/src/mpi/CMakeLists.txt b/eompi/src/CMakeLists.txt similarity index 100% rename from eo/src/mpi/CMakeLists.txt rename to eompi/src/CMakeLists.txt diff --git a/eo/src/mpi/eoMpi.cpp b/eompi/src/eoMpi.cpp similarity index 100% rename from eo/src/mpi/eoMpi.cpp rename to eompi/src/eoMpi.cpp diff --git a/eo/src/mpi/eoMpi.h b/eompi/src/eoMpi.h similarity index 100% rename from eo/src/mpi/eoMpi.h rename to eompi/src/eoMpi.h diff --git a/eo/src/mpi/eoMpiAssignmentAlgorithm.cpp b/eompi/src/eoMpiAssignmentAlgorithm.cpp similarity index 100% rename from eo/src/mpi/eoMpiAssignmentAlgorithm.cpp rename to eompi/src/eoMpiAssignmentAlgorithm.cpp diff --git a/eo/src/mpi/eoMpiAssignmentAlgorithm.h b/eompi/src/eoMpiAssignmentAlgorithm.h similarity index 100% rename from eo/src/mpi/eoMpiAssignmentAlgorithm.h rename to eompi/src/eoMpiAssignmentAlgorithm.h diff --git a/eo/src/mpi/eoMpiNode.cpp b/eompi/src/eoMpiNode.cpp similarity index 100% rename from eo/src/mpi/eoMpiNode.cpp rename to eompi/src/eoMpiNode.cpp diff --git a/eo/src/mpi/eoMpiNode.h b/eompi/src/eoMpiNode.h similarity index 100% rename from eo/src/mpi/eoMpiNode.h rename to eompi/src/eoMpiNode.h diff --git a/eo/src/mpi/eoMultiStart.h b/eompi/src/eoMultiStart.h similarity index 100% rename from eo/src/mpi/eoMultiStart.h rename to eompi/src/eoMultiStart.h diff --git a/eo/src/mpi/eoParallelApply.h b/eompi/src/eoParallelApply.h similarity index 100% rename from eo/src/mpi/eoParallelApply.h rename to eompi/src/eoParallelApply.h diff --git a/eo/src/mpi/eoTerminateJob.h b/eompi/src/eoTerminateJob.h similarity index 100% rename from eo/src/mpi/eoTerminateJob.h rename to eompi/src/eoTerminateJob.h diff --git a/eo/src/mpi/implMpi.cpp b/eompi/src/implMpi.cpp similarity index 100% rename from eo/src/mpi/implMpi.cpp rename to eompi/src/implMpi.cpp diff --git a/eo/src/mpi/implMpi.h b/eompi/src/implMpi.h similarity index 100% rename from eo/src/mpi/implMpi.h rename to eompi/src/implMpi.h From 58b00ede5f7ab974c61eb919545ef263a130d3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Tue, 17 Jun 2014 09:41:01 +0200 Subject: [PATCH 08/18] Add a new CMakeLists.txt file for eompi compilation. --- eompi/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 eompi/CMakeLists.txt diff --git a/eompi/CMakeLists.txt b/eompi/CMakeLists.txt new file mode 100644 index 000000000..d1a7e3d87 --- /dev/null +++ b/eompi/CMakeLists.txt @@ -0,0 +1,5 @@ +###################################################################################### +### Include subdirectories +###################################################################################### +#add_subdirectory(doc) +add_subdirectory(src) \ No newline at end of file From 1f4d361a22968f2a86f534c1f50d004b45bfc231 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Tue, 17 Jun 2014 11:45:44 +0200 Subject: [PATCH 09/18] Add EOSERIAL component into cmake/module/FindParadiseo.cmake --- cmake/module/FindParadiseo.cmake | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/cmake/module/FindParadiseo.cmake b/cmake/module/FindParadiseo.cmake index 59b85a864..7737a89b3 100644 --- a/cmake/module/FindParadiseo.cmake +++ b/cmake/module/FindParadiseo.cmake @@ -21,6 +21,7 @@ # - moeo # - smp # - peo +# - eoserial # You can use find_package(Paradiseo COMPONENTS ... ) to enable one or several components. If you not specifie component, all components will be load except SMP for compatibility reasons. # # Output @@ -72,6 +73,10 @@ find_path(MOEO_INCLUDE_DIR moeo PATH_SUFFIXES include${INSTALL_SUB_DIR}/moeo moeo/src PATHS ${PARADISEO_SRC_PATHS}) +find_path(EOSERIAL_INCLUDE_DIR eoserial + PATH_SUFFIXES include${INSTALL_SUB_DIR}/eoserial eoserial/src + PATHS ${PARADISEO_SRC_PATHS}) + # Specific for SMP and PEO foreach(COMP ${PARADISEO_LIBRARIES_TO_FIND}) if(${COMP} STREQUAL "smp") @@ -127,6 +132,7 @@ set(PARADISEO_LIB_PATHS_SUFFIXES moeo/tutorial/examples/flowshop/lib #For flowshop library smp/lib peo/lib + eoserial/lib lib lib32 lib64 @@ -158,6 +164,7 @@ if(PARADISEO_FOUND) message(${EDO_INCLUDE_DIR}) message(${MO_INCLUDE_DIR}) message(${MOEO_INCLUDE_DIR}) + message(${EOSERIAL_INCLUDE_DIR}) if(SMP_FOUND) message(${SMP_INCLUDE_DIR}) endif() From 7f88653b1eeaec0e7639838dae221d2729eb5132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Tue, 17 Jun 2014 14:47:20 +0200 Subject: [PATCH 10/18] Redefine paths to the module sources and the module library and rename "mpi" module into "eompi". --- CMakeLists.txt | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f279e5a3e..c658a286c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,24 +56,25 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Target.cmake) ###################################################################################### ## Paths to sources of modules -set( EO_SRC_DIR "${CMAKE_SOURCE_DIR}/eo" CACHE INTERNAL "ParadisEO-EO source directory" FORCE) -set( EDO_SRC_DIR "${CMAKE_SOURCE_DIR}/edo" CACHE INTERNAL "ParadisEO-EDO source directory" FORCE) -set( MO_SRC_DIR "${CMAKE_SOURCE_DIR}/mo" CACHE INTERNAL "ParadisEO-MO source directory" FORCE) -set(MOEO_SRC_DIR "${CMAKE_SOURCE_DIR}/moeo" CACHE INTERNAL "ParadisEO-MOEO source directory" FORCE) -set( SMP_SRC_DIR "${CMAKE_SOURCE_DIR}/smp" CACHE INTERNAL "ParadisEO-SMP source directory" FORCE) -set( MPI_SRC_DIR "${CMAKE_SOURCE_DIR}/eo/src/mpi" CACHE INTERNAL "ParadisEO-MPI source directory" FORCE) +set( EO_SRC_DIR "${CMAKE_SOURCE_DIR}/eo" CACHE INTERNAL "ParadisEO-EO source directory" FORCE) +set( EDO_SRC_DIR "${CMAKE_SOURCE_DIR}/edo" CACHE INTERNAL "ParadisEO-EDO source directory" FORCE) +set( MO_SRC_DIR "${CMAKE_SOURCE_DIR}/mo" CACHE INTERNAL "ParadisEO-MO source directory" FORCE) +set( MOEO_SRC_DIR "${CMAKE_SOURCE_DIR}/moeo" CACHE INTERNAL "ParadisEO-MOEO source directory" FORCE) +set( SMP_SRC_DIR "${CMAKE_SOURCE_DIR}/smp" CACHE INTERNAL "ParadisEO-SMP source directory" FORCE) +set(EOMPI_SRC_DIR "${CMAKE_SOURCE_DIR}/eompi" CACHE INTERNAL "ParadisEO-EOMPI 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}) # All libraries are built in /lib/ -set( EO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EO binary directory" FORCE) -set( EDO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EDO binary directory" FORCE) -set( MO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MO binary directory" FORCE) -set(MOEO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MOEO binary directory" FORCE) -set( SMP_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-SMP binary directory" FORCE) -set( MPI_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MPI binary directory" FORCE) +set( EO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EO binary directory" FORCE) +set( EDO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EDO binary directory" FORCE) +set( MO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MO binary directory" FORCE) +set( MOEO_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MOEO binary directory" FORCE) +set( SMP_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-SMP binary directory" FORCE) +set(EOMPI_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EOMPI binary directory" FORCE) set(EO_ONLY "false" CACHE BOOL "Only build EO and not the other modules") @@ -82,7 +83,7 @@ set(ENABLE_GNUPLOT "false" CACHE BOOL "Build EO with the GNUplot support (real-t 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(SMP "false" CACHE BOOL "Build the SMP module") -set(MPI "false" CACHE BOOL "Build the MPI module") +set(EOMPI "false" CACHE BOOL "Build the MPI module") ## EO Module set(EO_MODULE_NAME "Evolving Object") @@ -114,14 +115,14 @@ if(NOT EO_ONLY) add_subdirectory(${SMP_SRC_DIR}) endif() - ## MPI Module - if(MPI) + ## EOMPI Module + if(EOMPI) find_package(MPI REQUIRED) add_definitions(-DWITH_MPI) set(CMAKE_CXX_COMPILE_FLAGS ${CMAKE_CXX_COMPILE_FLAGS} ${MPI_COMPILE_FLAGS}) set(CMAKE_CXX_LINK_FLAGS ${CMAKE_CXX_LINK_FLAGS} ${MPI_LINK_FLAGS}) - include_directories(${MPI_INCLUDE_PATH}) - add_subdirectory(${MPI_SRC_DIR}) + include_directories(${EOMPI_INCLUDE_PATH}) + add_subdirectory(${EOMPI_SRC_DIR}) endif() endif() From 0b6a519aafb77c0375c579615a6182e815f2c013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Tue, 17 Jun 2014 14:52:11 +0200 Subject: [PATCH 11/18] Add EOMPI component into cmake/module/FindParadiseo.cmake --- cmake/module/FindParadiseo.cmake | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/cmake/module/FindParadiseo.cmake b/cmake/module/FindParadiseo.cmake index 59b85a864..fd7b1d4ac 100644 --- a/cmake/module/FindParadiseo.cmake +++ b/cmake/module/FindParadiseo.cmake @@ -21,6 +21,7 @@ # - moeo # - smp # - peo +# - eompi # You can use find_package(Paradiseo COMPONENTS ... ) to enable one or several components. If you not specifie component, all components will be load except SMP for compatibility reasons. # # Output @@ -81,14 +82,19 @@ foreach(COMP ${PARADISEO_LIBRARIES_TO_FIND}) PATHS ${PARADISEO_SRC_PATHS}) elseif(${COMP} STREQUAL "peo") set(PEO_FOUND true) - find_path(EDO_INCLUDE_DIR edo - PATH_SUFFIXES include${INSTALL_SUB_DIR}/edo edo/src + find_path(EDO_INCLUDE_DIR peo + PATH_SUFFIXES include${INSTALL_SUB_DIR}/peo peo/src PATHS ${PARADISEO_SRC_PATHS}) elseif(${COMP} STREQUAL "edo") set(EDO_FOUND true) find_path(EDO_INCLUDE_DIR peo PATH_SUFFIXES include${INSTALL_SUB_DIR}/peo peo/src PATHS ${PARADISEO_SRC_PATHS}) + elseif(${COMP} STREQUAL "eompi") + set(EOMPI_FOUND true) + find_path(EOMPI_INCLUDE_DIR eompi + PATH_SUFFIXES include${INSTALL_SUB_DIR}/eompi eompi/src + PATHS ${PARADISEO_SRC_PATHS}) endif() endforeach() @@ -102,6 +108,10 @@ if(PEO_FOUND) set(PARADISEO_INCLUDE_DIR ${PARADISEO_INCLUDE_DIR} ${PEO_INCLUDE_DIR}) endif() +if(EOMPI_FOUND) + set(PARADISEO_INCLUDE_DIR ${PARADISEO_INCLUDE_DIR} ${EOMPI_INCLUDE_DIR}) +endif() + # find the requested modules set(PARADISEO_FOUND true) # will be set to false if one of the required modules is not found From b6ec15c91137be24e333a26a97db0fc94d6945c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Tue, 17 Jun 2014 14:53:23 +0200 Subject: [PATCH 12/18] Modifications on eompi/src/CMakeLists.txt file (module paths). --- eompi/src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eompi/src/CMakeLists.txt b/eompi/src/CMakeLists.txt index ebf16335a..592672760 100644 --- a/eompi/src/CMakeLists.txt +++ b/eompi/src/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) ### 2) Define the eompi target ###################################################################################### -set(EOMPI_LIB_OUTPUT_PATH ${EO_BIN_DIR}/lib) +set(EOMPI_LIB_OUTPUT_PATH ${EOMPI_BIN_DIR}/lib) set(LIBRARY_OUTPUT_PATH ${EOMPI_LIB_OUTPUT_PATH}) set(EOMPI_SOURCES @@ -23,7 +23,7 @@ add_library(eompi STATIC ${EOMPI_SOURCES}) install(TARGETS eompi ARCHIVE DESTINATION ${LIB} COMPONENT libraries) file(GLOB HDRS *.h) -install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/eo/mpi COMPONENT headers) +install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/eompi COMPONENT headers) ###################################################################################### ### 3) Optionnal From 95761470eb26d33c7b0f35d64940107fd4e376b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Tue, 17 Jun 2014 15:07:19 +0200 Subject: [PATCH 13/18] Missing if condition for EOMPI module in cmake/module/FindParadiseo.cmake file --- cmake/module/FindParadiseo.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/module/FindParadiseo.cmake b/cmake/module/FindParadiseo.cmake index fd7b1d4ac..d605b24e4 100644 --- a/cmake/module/FindParadiseo.cmake +++ b/cmake/module/FindParadiseo.cmake @@ -174,6 +174,9 @@ if(PARADISEO_FOUND) if(PEO_FOUND) message(${PEO_INCLUDE_DIR}) endif() + if(EOMPI_FOUND) + message(${EOMPI_INCLUDE_DIR}) + endif() else() # include directory or library not found message(FATAL_ERROR "Could NOT find ParadisEO (missing : ${FIND_PARADISEO_MISSING})") From 9aacf2184ff051e374154909ef4b5e743f722a46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Wed, 18 Jun 2014 09:38:15 +0200 Subject: [PATCH 14/18] Error in cmake/module/FindParadiseo.cmake --- cmake/module/FindParadiseo.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/module/FindParadiseo.cmake b/cmake/module/FindParadiseo.cmake index de8535349..4e62f07dd 100644 --- a/cmake/module/FindParadiseo.cmake +++ b/cmake/module/FindParadiseo.cmake @@ -87,7 +87,7 @@ foreach(COMP ${PARADISEO_LIBRARIES_TO_FIND}) PATHS ${PARADISEO_SRC_PATHS}) elseif(${COMP} STREQUAL "peo") set(PEO_FOUND true) - find_path(EDO_INCLUDE_DIR peo + find_path(PEO_INCLUDE_DIR peo PATH_SUFFIXES include${INSTALL_SUB_DIR}/peo peo/src PATHS ${PARADISEO_SRC_PATHS}) elseif(${COMP} STREQUAL "edo") From 4df7894ae1fd727af7710f7fd7e94e5fc53ba9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Wed, 18 Jun 2014 09:53:01 +0200 Subject: [PATCH 15/18] Include sources path to eompi module in eo/src/CMakeLists.txt file --- eo/src/CMakeLists.txt | 2 ++ eo/test/mpi/t-mpi-common.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/eo/src/CMakeLists.txt b/eo/src/CMakeLists.txt index b2b445a93..a06f59141 100644 --- a/eo/src/CMakeLists.txt +++ b/eo/src/CMakeLists.txt @@ -2,6 +2,8 @@ ### 1) Include the sources ###################################################################################### +include_directories(${EOMPI_SRC_DIR}/src) +include_directories(${EOSERIAL_SRC_DIR}/src) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) ###################################################################################### diff --git a/eo/test/mpi/t-mpi-common.h b/eo/test/mpi/t-mpi-common.h index c862a05c1..e525fe53e 100644 --- a/eo/test/mpi/t-mpi-common.h +++ b/eo/test/mpi/t-mpi-common.h @@ -1,7 +1,7 @@ # ifndef __T_MPI_COMMON_H__ # define __T_MPI_COMMON_H__ -#include +#include /** * @file t-mpi-common.h From f6d5ac3c6b50990e1337d0c9036ea702df05a9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Wed, 18 Jun 2014 10:07:59 +0200 Subject: [PATCH 16/18] Move out eompi test folder. --- eo/src/eoPopEvalFunc.h | 8 ++++---- {eo/test/mpi => eompi/test}/CMakeLists.txt | 0 {eo/test/mpi => eompi/test}/DISTRIB_XP_README.md | 0 {eo/test/mpi => eompi/test}/experiments.json | 0 {eo/test/mpi => eompi/test}/gen-xp.py | 0 {eo/test/mpi => eompi/test}/t-mpi-common.h | 0 {eo/test/mpi => eompi/test}/t-mpi-distrib-exp.cpp | 2 +- {eo/test/mpi => eompi/test}/t-mpi-eval.cpp | 2 +- {eo/test/mpi => eompi/test}/t-mpi-multipleRoles.cpp | 6 +++--- {eo/test/mpi => eompi/test}/t-mpi-multistart.cpp | 2 +- {eo/test/mpi => eompi/test}/t-mpi-parallelApply.cpp | 6 +++--- {eo/test/mpi => eompi/test}/t-mpi-wrapper.cpp | 6 +++--- {eo/test/mpi => eompi/test}/template-job.cpp | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) rename {eo/test/mpi => eompi/test}/CMakeLists.txt (100%) rename {eo/test/mpi => eompi/test}/DISTRIB_XP_README.md (100%) rename {eo/test/mpi => eompi/test}/experiments.json (100%) rename {eo/test/mpi => eompi/test}/gen-xp.py (100%) rename {eo/test/mpi => eompi/test}/t-mpi-common.h (100%) rename {eo/test/mpi => eompi/test}/t-mpi-distrib-exp.cpp (99%) rename {eo/test/mpi => eompi/test}/t-mpi-eval.cpp (99%) rename {eo/test/mpi => eompi/test}/t-mpi-multipleRoles.cpp (98%) rename {eo/test/mpi => eompi/test}/t-mpi-multistart.cpp (99%) rename {eo/test/mpi => eompi/test}/t-mpi-parallelApply.cpp (98%) rename {eo/test/mpi => eompi/test}/t-mpi-wrapper.cpp (97%) rename {eo/test/mpi => eompi/test}/template-job.cpp (98%) diff --git a/eo/src/eoPopEvalFunc.h b/eo/src/eoPopEvalFunc.h index 7fcad1467..d9bc77750 100644 --- a/eo/src/eoPopEvalFunc.h +++ b/eo/src/eoPopEvalFunc.h @@ -31,10 +31,10 @@ #include # ifdef WITH_MPI -#include -#include -#include -#include +#include +#include +#include +#include #include #include // ceil diff --git a/eo/test/mpi/CMakeLists.txt b/eompi/test/CMakeLists.txt similarity index 100% rename from eo/test/mpi/CMakeLists.txt rename to eompi/test/CMakeLists.txt diff --git a/eo/test/mpi/DISTRIB_XP_README.md b/eompi/test/DISTRIB_XP_README.md similarity index 100% rename from eo/test/mpi/DISTRIB_XP_README.md rename to eompi/test/DISTRIB_XP_README.md diff --git a/eo/test/mpi/experiments.json b/eompi/test/experiments.json similarity index 100% rename from eo/test/mpi/experiments.json rename to eompi/test/experiments.json diff --git a/eo/test/mpi/gen-xp.py b/eompi/test/gen-xp.py similarity index 100% rename from eo/test/mpi/gen-xp.py rename to eompi/test/gen-xp.py diff --git a/eo/test/mpi/t-mpi-common.h b/eompi/test/t-mpi-common.h similarity index 100% rename from eo/test/mpi/t-mpi-common.h rename to eompi/test/t-mpi-common.h diff --git a/eo/test/mpi/t-mpi-distrib-exp.cpp b/eompi/test/t-mpi-distrib-exp.cpp similarity index 99% rename from eo/test/mpi/t-mpi-distrib-exp.cpp rename to eompi/test/t-mpi-distrib-exp.cpp index 46a4efa57..db65344e8 100644 --- a/eo/test/mpi/t-mpi-distrib-exp.cpp +++ b/eompi/test/t-mpi-distrib-exp.cpp @@ -39,7 +39,7 @@ # include -# include +# include # include "t-mpi-common.h" using namespace eo::mpi; diff --git a/eo/test/mpi/t-mpi-eval.cpp b/eompi/test/t-mpi-eval.cpp similarity index 99% rename from eo/test/mpi/t-mpi-eval.cpp rename to eompi/test/t-mpi-eval.cpp index fb97701d2..c34ab1aab 100644 --- a/eo/test/mpi/t-mpi-eval.cpp +++ b/eompi/test/t-mpi-eval.cpp @@ -32,7 +32,7 @@ Authors: #include #include "../real_value.h" -#include +#include #include using namespace std; diff --git a/eo/test/mpi/t-mpi-multipleRoles.cpp b/eompi/test/t-mpi-multipleRoles.cpp similarity index 98% rename from eo/test/mpi/t-mpi-multipleRoles.cpp rename to eompi/test/t-mpi-multipleRoles.cpp index 3a525126b..7f10d9453 100644 --- a/eo/test/mpi/t-mpi-multipleRoles.cpp +++ b/eompi/test/t-mpi-multipleRoles.cpp @@ -37,9 +37,9 @@ Authors: * This test requires exactly 7 hosts. If the size is bigger, an exception will be thrown at the beginning. **/ -# include -# include -# include +# include +# include +# include # include "t-mpi-common.h" diff --git a/eo/test/mpi/t-mpi-multistart.cpp b/eompi/test/t-mpi-multistart.cpp similarity index 99% rename from eo/test/mpi/t-mpi-multistart.cpp rename to eompi/test/t-mpi-multistart.cpp index fb614e8ee..e58091601 100644 --- a/eo/test/mpi/t-mpi-multistart.cpp +++ b/eompi/test/t-mpi-multistart.cpp @@ -1,4 +1,4 @@ -# include +# include using namespace eo::mpi; #include diff --git a/eo/test/mpi/t-mpi-parallelApply.cpp b/eompi/test/t-mpi-parallelApply.cpp similarity index 98% rename from eo/test/mpi/t-mpi-parallelApply.cpp rename to eompi/test/t-mpi-parallelApply.cpp index 559505bd1..6b49c1b84 100644 --- a/eo/test/mpi/t-mpi-parallelApply.cpp +++ b/eompi/test/t-mpi-parallelApply.cpp @@ -39,9 +39,9 @@ Authors: * beginning; */ -# include -# include -# include +# include +# include +# include # include "t-mpi-common.h" diff --git a/eo/test/mpi/t-mpi-wrapper.cpp b/eompi/test/t-mpi-wrapper.cpp similarity index 97% rename from eo/test/mpi/t-mpi-wrapper.cpp rename to eompi/test/t-mpi-wrapper.cpp index 7e5fa4d2f..dd64b50d4 100644 --- a/eo/test/mpi/t-mpi-wrapper.cpp +++ b/eompi/test/t-mpi-wrapper.cpp @@ -29,9 +29,9 @@ Authors: * instanciating the store. */ -# include -# include -# include +# include +# include +# include # include "t-mpi-common.h" diff --git a/eo/test/mpi/template-job.cpp b/eompi/test/template-job.cpp similarity index 98% rename from eo/test/mpi/template-job.cpp rename to eompi/test/template-job.cpp index 3d25e9736..949f2325d 100644 --- a/eo/test/mpi/template-job.cpp +++ b/eompi/test/template-job.cpp @@ -1,4 +1,4 @@ -# include +# include using namespace eo::mpi; From b282bb823323c26c917803834670913d8fa85d05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Wed, 18 Jun 2014 10:16:27 +0200 Subject: [PATCH 17/18] Add eompi test folder for compilation. --- eompi/CMakeLists.txt | 6 +++++- eompi/test/CMakeLists.txt | 7 +++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/eompi/CMakeLists.txt b/eompi/CMakeLists.txt index d1a7e3d87..3810af37c 100644 --- a/eompi/CMakeLists.txt +++ b/eompi/CMakeLists.txt @@ -2,4 +2,8 @@ ### Include subdirectories ###################################################################################### #add_subdirectory(doc) -add_subdirectory(src) \ No newline at end of file +add_subdirectory(src) + +if(ENABLE_CMAKE_TESTING) + add_subdirectory(test) +endif(ENABLE_CMAKE_TESTING) \ No newline at end of file diff --git a/eompi/test/CMakeLists.txt b/eompi/test/CMakeLists.txt index 325056da7..9a0f9656c 100644 --- a/eompi/test/CMakeLists.txt +++ b/eompi/test/CMakeLists.txt @@ -8,10 +8,9 @@ ### 1) Include the sources ###################################################################################### -message("EO SOURCE DIR: ${EO_SRC_DIR}") -message("OMPI: ${MPI_DIR}") +message("EOMPI: ${EOMPI_DIR}") -include_directories(${MPI_DIR}/include) +include_directories(${EOMPI_SRC_DIR}/src) include_directories(${EO_SRC_DIR}/src) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -20,7 +19,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) ###################################################################################### link_directories(${EO_BIN_DIR}/lib) -link_directories(${MPI_DIR}/lib) +link_directories(${EOMPI_BIN_DIR}/lib) ###################################################################################### ### 3) Define your targets and link the librairies From 90d7931329f89da6b3f675c55c4b9f13281f7bcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Wed, 23 Jul 2014 15:18:53 +0200 Subject: [PATCH 18/18] Compilation problems solved. --- eo/src/utils/eoTimer.h | 2 +- eompi/test/CMakeLists.txt | 2 ++ eompi/test/t-mpi-eval.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eo/src/utils/eoTimer.h b/eo/src/utils/eoTimer.h index e9d39affd..7ba28c931 100644 --- a/eo/src/utils/eoTimer.h +++ b/eo/src/utils/eoTimer.h @@ -30,7 +30,7 @@ Authors: # include "utils/eoParallel.h" // eo::parallel -# include "eoSerial.h" // eo::Persistent +# include // eo::Persistent /** * @brief Timer allowing to measure time between a start point and a stop point. diff --git a/eompi/test/CMakeLists.txt b/eompi/test/CMakeLists.txt index 9a0f9656c..0a55d05d5 100644 --- a/eompi/test/CMakeLists.txt +++ b/eompi/test/CMakeLists.txt @@ -11,6 +11,7 @@ message("EOMPI: ${EOMPI_DIR}") include_directories(${EOMPI_SRC_DIR}/src) +include_directories(${EOSERIAL_SRC_DIR}/src) include_directories(${EO_SRC_DIR}/src) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) @@ -20,6 +21,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) link_directories(${EO_BIN_DIR}/lib) link_directories(${EOMPI_BIN_DIR}/lib) +link_directories(${EOSERIAL_BIN_DIR}/lib) ###################################################################################### ### 3) Define your targets and link the librairies diff --git a/eompi/test/t-mpi-eval.cpp b/eompi/test/t-mpi-eval.cpp index c34ab1aab..d90bbd3c2 100644 --- a/eompi/test/t-mpi-eval.cpp +++ b/eompi/test/t-mpi-eval.cpp @@ -30,7 +30,7 @@ Authors: #include #include -#include "../real_value.h" +#include "../../eo/test/real_value.h" #include