From eac4584eb73f1adb4081bd9e084bd2b82d212273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Fri, 13 Jun 2014 11:40:38 +0200 Subject: [PATCH 1/4] Contradiction between ./cmake/Target.cmake (make doc command) and ./CMakeLists.txt (if condition). Error when executing "make doc" command with DEO_ONLY=true flag : Built target doc-eo make[4]: *** No rule to make target `doc-edo'. Stop. make[3]: *** [CMakeFiles/doc] Error 2 make[2]: *** [CMakeFiles/doc.dir/all] Error 2 make[1]: *** [CMakeFiles/doc.dir/rule] Error 2 make: *** [doc] Error 2 Now resolved. --- cmake/Target.cmake | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/cmake/Target.cmake b/cmake/Target.cmake index 06fc26162..96c548a27 100644 --- a/cmake/Target.cmake +++ b/cmake/Target.cmake @@ -11,22 +11,28 @@ endif(UNIX) ###################################################################################### if(DOXYGEN_FOUND AND DOXYGEN_EXECUTABLE) - if(SMP) - add_custom_target(doc - COMMAND make doc-eo - COMMAND make doc-edo - COMMAND make doc-mo - COMMAND make doc-moeo - COMMAND make doc-smp - ) + if(NOT EO_ONLY) + if(SMP) + add_custom_target(doc + COMMAND make doc-eo + COMMAND make doc-edo + COMMAND make doc-mo + COMMAND make doc-moeo + COMMAND make doc-smp + ) + else() + add_custom_target(doc + COMMAND make doc-eo + COMMAND make doc-edo + COMMAND make doc-mo + COMMAND make doc-moeo + ) + endif(SMP) else() add_custom_target(doc COMMAND make doc-eo - COMMAND make doc-edo - COMMAND make doc-mo - COMMAND make doc-moeo ) - endif() + endif(NOT EO_ONLY) endif(DOXYGEN_FOUND AND DOXYGEN_EXECUTABLE) ###################################################################################### From 004c63fe8296efdea223f00807ef381eede72eff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Fri, 13 Jun 2014 11:59:46 +0200 Subject: [PATCH 2/4] Contradiction between ./cmake/Target.cmake (make doc command) and ./CMakeLists.txt (if condition). Error when executing "make doc" command with -DEO_ONLY=false flag : make[4]: *** No rule to make target `doc-edo'. Stop. make[3]: *** [CMakeFiles/doc] Error 2 make[2]: *** [CMakeFiles/doc.dir/all] Error 2 make[1]: *** [CMakeFiles/doc.dir/rule] Error 2 make: *** [doc] Error 2 Now resolved. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f279e5a3e..1e68baf9c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,11 +96,11 @@ if(NOT EO_ONLY) add_subdirectory(${MO_SRC_DIR}) ## EDO Module - if(EDO) + #if(EDO) set(EDO_MODULE_NAME "Evolving Distribution Objects") set(CMAKE_SOURCE_DIR ${EDO_SRC_DIR}) add_subdirectory(${EDO_SRC_DIR}) - endif() + #endif() ## MOEO Module set(MOEO_MODULE_NAME "Multi-Objectives EO") From 8ee0745b075ff7013f67a3514179cbe56da0255b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Fri, 13 Jun 2014 15:46:13 +0200 Subject: [PATCH 3/4] Error and problems with smp documentation compilation ("make doc" or "make doc-smp" command with -DSMP=true flag). Here the error : error: Tag file `/home/aharrissart/workspace/thales/paradiseo/build/doc/smp.doxytag' does not exist or is not a file. Skipping it... Some other problems with undocumented parameters... Now resolved. --- smp/doc/CMakeLists.txt | 9 ++++++--- smp/src/MWModel.h | 4 ++-- smp/src/bimap.h | 8 ++++---- smp/src/island.h | 4 ++-- smp/src/topology/abstractTopology.h | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/smp/doc/CMakeLists.txt b/smp/doc/CMakeLists.txt index 3fa4481eb..c735832cb 100644 --- a/smp/doc/CMakeLists.txt +++ b/smp/doc/CMakeLists.txt @@ -7,12 +7,15 @@ if(DOXYGEN_FOUND) set(SMP_DOC_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE INTERNAL "Documentation directory" FORCE) # Name of the doxygene configuration file set(SMP_DOC_CONFIG_FILE "smp.doxyfile" CACHE INTERNAL "Documentation configuration file") + + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/index.h ${EO_DOC_DIR}/index.h COPYONLY) + if(DOXYGEN_EXECUTABLE) # Creating the custom target if(UNIX AND NOT ${CMAKE_VERBOSE_MAKEFILE}) add_custom_target(doc-smp - COMMAND ${DOXYGEN_EXECUTABLE} ${SMP_DOC_CONFIG_FILE} - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) + COMMAND ${DOXYGEN_EXECUTABLE} ${SMP_DOC_CONFIG_FILE} 2> /dev/null > /dev/null + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) else(UNIX AND NOT ${CMAKE_VERBOSE_MAKEFILE}) add_custom_target(doc-smp COMMAND ${DOXYGEN_EXECUTABLE} ${SMP_DOC_CONFIG_FILE} @@ -20,7 +23,7 @@ if(DOXYGEN_FOUND) endif(UNIX AND NOT ${CMAKE_VERBOSE_MAKEFILE}) endif(DOXYGEN_EXECUTABLE) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/${SMP_DOC_CONFIG_FILE}.cmake" - "${SMP_DOC_DIR}/${SMP_DOC_CONFIG_FILE}") + "${CMAKE_CURRENT_BINARY_DIR}/${SMP_DOC_CONFIG_FILE}") install( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} DESTINATION share${INSTALL_SUB_DIR}/smp COMPONENT doc diff --git a/smp/src/MWModel.h b/smp/src/MWModel.h index cad614851..c3183f06b 100644 --- a/smp/src/MWModel.h +++ b/smp/src/MWModel.h @@ -59,14 +59,14 @@ public: /** * Constructor * @param workersNb the number of workers - * @param args... list of parameters according to the constructor of your algorithm + * @param args list of parameters according to the constructor of your algorithm */ template MWModel(unsigned workersNb, Args&... args); /** * Constructor - * @param args... list of parameters according to the constructor of your algorithm + * @param args list of parameters according to the constructor of your algorithm */ template MWModel(Args&... args); diff --git a/smp/src/bimap.h b/smp/src/bimap.h index caf17f25e..024f4d12c 100644 --- a/smp/src/bimap.h +++ b/smp/src/bimap.h @@ -50,8 +50,8 @@ class Bimap public: /** * Add a relation - * @param A right key - * @param B left key + * @param a Right key + * @param b Left key */ void add(A& a, B& b); @@ -69,13 +69,13 @@ public: /** * Remove an association from a right key. - * @param Right key of the association to be removed. + * @param a Right key of the association to be removed. */ void removeFromRight(const A& a); /** * Remove an association from a left key. - * @param Left key of the association to be removed. + * @param b Left key of the association to be removed. */ void removeFromLeft(const B& b); diff --git a/smp/src/island.h b/smp/src/island.h index 752b671ef..546a69efa 100644 --- a/smp/src/island.h +++ b/smp/src/island.h @@ -77,7 +77,7 @@ public: * @param args Parameters to construct the algorithm. */ template - Island(std::function _convertFromBase, std::function _convertToBase, eoPop& pop, IntPolicy& _intPolicy, MigPolicy& _migPolicy, Args&... args); + Island(std::function _convertFromBase, std::function _convertToBase, eoPop& _pop, IntPolicy& _intPolicy, MigPolicy& _migPolicy, Args&... args); /** * Constructor * @param _pop Population of the island @@ -86,7 +86,7 @@ public: * @param args Parameters to construct the algorithm. */ template - Island(eoPop& pop, IntPolicy& _intPolicy, MigPolicy& _migPolicy, Args&... args); + Island(eoPop& _pop, IntPolicy& _intPolicy, MigPolicy& _migPolicy, Args&... args); /** * Start the island. diff --git a/smp/src/topology/abstractTopology.h b/smp/src/topology/abstractTopology.h index fcd311441..061e3aea1 100644 --- a/smp/src/topology/abstractTopology.h +++ b/smp/src/topology/abstractTopology.h @@ -52,7 +52,7 @@ public : * Return a vector containing the index of nearby nodes according to the topology * @param idNode index of the node of which you want the neighbors. */ - virtual std::vector getIdNeighbors(unsigned idIsland) const = 0; + virtual std::vector getIdNeighbors(unsigned idNode) const = 0; /** * Construct or re-construct a topology with the given number of nodes. From 10d8587378ca7f31ee4e1b4b46c74adf0e30f8e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ad=C3=A8le=20Harrissart?= Date: Mon, 16 Jun 2014 11:34:32 +0200 Subject: [PATCH 4/4] Comment unused EDO flag (declared in ../CMakeLists.txt file) --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e68baf9c..e89200e3a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,7 +79,7 @@ set( MPI_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-MPI binary dir 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_GNUPLOT "false" CACHE BOOL "Build EO with the GNUplot support (real-time convergence plotting)") -set(EDO "false" 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(SMP "false" CACHE BOOL "Build the SMP module") set(MPI "false" CACHE BOOL "Build the MPI module")