Skip to content

Commit

Permalink
* New tree configuration of the project:
Browse files Browse the repository at this point in the history 
.../
   ...           + -- EO
   |             |
   |             |
   +-- src ----- + -- EDO
   |             |
   |             |
   +-- test      + -- MO
   |             |
   |             |
   +-- tutorial  + -- MOEO
   |             |
   |             |
   +-- doc       + -- SMP
   |             |
   |             |
   ...           + -- EOMPI
                 |
                 |
                 + -- EOSERIAL

Question for current maintainers: ./README: new release?

Also:

* Moving out eompi & eoserial modules (issue nojhan#2).

* Correction of the errors when executing "make doc" command.

* Adding a solution for the conflicting headers problem (see the two CMake Cache
 Values: PROJECT_TAG & PROJECT_HRS_INSTALL_SUBPATH) (issue nojhan#1)

* Header inclusions:
        ** src: changing absolute paths into relative paths ('#include <...>' -> '#include "..."')
        ** test, tutorial: changing relative paths into absolute paths ('#include "..."' -> '#include <...>')

* Moving out some scripts from EDO -> to the root

* Add a new script for compilation and installation (see build_gcc_linux_install)

* Compilation with uBLAS library or EDO module: now ok

* Minor modifications on README & INSTALL files

* Comment eompi failed tests with no end

*** TODO: CPack (debian (DEB) & RedHat (RPM) packages) (issues nojhan#6 & nojhan#7) ***
  • Loading branch information
@AdeleH
AdeleH committed Sep 6, 2014
1 parent 515bd59 commit 490e837
Show file tree
Hide file tree
Showing 2,359 changed files with 7,688 additions and 16,329 deletions.
Empty file modified .gitignore
100644 → 100755
View file
Empty file.
Empty file modified AUTHORS
100644 → 100755
View file
Empty file.
117 changes: 47 additions & 70 deletions CMakeLists.txt
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,6 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Macro.cmake)

## Custom Targets file
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Target.cmake)

######################################################################################
### 4) Define and add module paths : EO, MO, MOEO
######################################################################################

## 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( EOMPI_SRC_DIR "${CMAKE_SOURCE_DIR}/eompi" CACHE INTERNAL "ParadisEO-EOMPI 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})

Expand All @@ -77,64 +62,56 @@ set( SMP_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-SMP bi
set( EOMPI_BIN_DIR "${CMAKE_BINARY_DIR}" CACHE INTERNAL "ParadisEO-EOMPI 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")
set(ENABLE_OPENMP "false" CACHE BOOL "Build EO with the OpenMP support (shared-memory parallel evaluators on multi-core)")
######################################################################################
### 4) Choose module(s)
######################################################################################

set(EO_ONLY "false" CACHE BOOL "Only build EO and not the other modules")
set(MO "false" CACHE BOOL "Build the MO module")
set(EDO "false" CACHE BOOL "Build the EDO module")
set(MOEO "false" CACHE BOOL "Build the MOEO module")
set(SMP "false" CACHE BOOL "Build the SMP module")
set(EOMPI "false" CACHE BOOL "Build the EOMPI module")
set(EOSERIAL "false" CACHE BOOL "Build the EOSERIAL module")

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_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(EOMPI "false" CACHE BOOL "Build the MPI module")

## EO Module
set(EO_MODULE_NAME "Evolving Object")
set(CMAKE_SOURCE_DIR ${EO_SRC_DIR})
add_subdirectory(${EO_SRC_DIR})

if(NOT EO_ONLY)
## MO Module
set(MO_MODULE_NAME "Moving objects")
set(CMAKE_SOURCE_DIR ${MO_SRC_DIR})
add_subdirectory(${MO_SRC_DIR})

## EDO Module
#if(EDO)
set(EDO_MODULE_NAME "Evolving Distribution Objects")
set(CMAKE_SOURCE_DIR ${EDO_SRC_DIR})
add_subdirectory(${EDO_SRC_DIR})
#endif()

## MOEO Module
set(MOEO_MODULE_NAME "Multi-Objectives EO")
set(CMAKE_SOURCE_DIR ${MOEO_SRC_DIR})
add_subdirectory(${MOEO_SRC_DIR})

## SMP Module
if(SMP)
set(SMP_MODULE_NAME "Symmetric Multi-Processing")
set(CMAKE_SOURCE_DIR ${SMP_SRC_DIR})
add_subdirectory(${SMP_SRC_DIR})
endif()

## 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(${EOMPI_INCLUDE_PATH})
add_subdirectory(${EOMPI_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()
set(EDO_USE_LIB "Eigen3" CACHE STRING "Which linear algebra library to use to build EDO ('UBlas' or 'Eigen3', Eigen3 is recommended)")

set( EO_TEST_DIR "${CMAKE_SOURCE_DIR}/test/eo" CACHE INTERNAL "ParadisEO-EO test directory" FORCE)
set( EDO_TEST_DIR "${CMAKE_SOURCE_DIR}/test/edo" CACHE INTERNAL "ParadisEO-EDO test directory" FORCE)
set( MO_TEST_DIR "${CMAKE_SOURCE_DIR}/test/mo" CACHE INTERNAL "ParadisEO-MO test directory" FORCE)
set( MOEO_TEST_DIR "${CMAKE_SOURCE_DIR}/test/moeo" CACHE INTERNAL "ParadisEO-MOEO test directory" FORCE)
set( SMP_TEST_DIR "${CMAKE_SOURCE_DIR}/test/smp" CACHE INTERNAL "ParadisEO-SMP test directory" FORCE)
set( EOMPI_TEST_DIR "${CMAKE_SOURCE_DIR}/test/eompi" CACHE INTERNAL "ParadisEO-EOMPI test directory" FORCE)
set(EOSERIAL_TEST_DIR "${CMAKE_SOURCE_DIR}/test/eoserial" CACHE INTERNAL "ParadisEO-EOSERIAL test directory" FORCE)

set( EO_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/eo" CACHE INTERNAL "ParadisEO-EO tutorial directory" FORCE)
set( EDO_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/edo" CACHE INTERNAL "ParadisEO-EDO tutorial directory" FORCE)
set( MO_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/mo" CACHE INTERNAL "ParadisEO-MO tutorial directory" FORCE)
set( MOEO_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/moeo" CACHE INTERNAL "ParadisEO-MOEO tutorial directory" FORCE)
set( SMP_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/smp" CACHE INTERNAL "ParadisEO-SMP tutorial directory" FORCE)
set( EOMPI_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/eompi" CACHE INTERNAL "ParadisEO-EOMPI tutorial directory" FORCE)
set(EOSERIAL_TUTORIAL_DIR "${CMAKE_SOURCE_DIR}/tutorial/eoserial" CACHE INTERNAL "ParadisEO-EOSERIAL tutorial directory" FORCE)

######################################################################################
### 5) Add sources
######################################################################################

add_subdirectory(src)
add_subdirectory(doc)

if(ENABLE_CMAKE_EXAMPLE)
add_subdirectory(tutorial)
endif(ENABLE_CMAKE_EXAMPLE)

if(ENABLE_CMAKE_TESTING)
add_subdirectory(test)
endif(ENABLE_CMAKE_TESTING)


######################################################################################
### 5) Packaging : only in release !
### 6) Packaging : only in release !
######################################################################################

if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
Expand Down
Empty file modified CTestConfig.cmake
100644 → 100755
View file
Empty file.
Empty file modified ForRelease
100644 → 100755
View file
Empty file.
Empty file modified INSTALL
100644 → 100755
View file
Empty file.
Empty file modified LICENSE
100644 → 100755
View file
Empty file.
70 changes: 62 additions & 8 deletions README
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ The current release is paradisEO-2.0
==========================================================================================
INSTALLATION
==========================================================================================

The basic installation procedure must be done in a separatly folder in order to keep
your file tree clean.

Expand All @@ -22,8 +23,9 @@ Please refer to paradisEO website or INSTALL file for further information about
installation types and options.

==========================================================================================
DIRECTORY STRUCTURE
DIRECTORY OLD STRUCTURE
==========================================================================================

After unpacking the archive file, you should end up with the following
structure:

Expand All @@ -36,32 +38,83 @@ structure:
+-- cmake/ CMake dir
|
|
+-- CMakeLists.txt For building process
+-- CMakeLists.txt For building process
|
|
+-- CTestConfig.cmake For testing process
+-- CTestConfig.cmake For testing process
|
|
+-- INSTALL INSTALL file
+-- INSTALL INSTALL file
|
|
+-- LICENCE Licence contents
|
|
+-- paradiseo-eo paradiseo-eo dir
+-- paradiseo-eo paradiseo-eo dir
|
|
+-- paradiseo-mo paradiseo-mo dir
+-- paradiseo-mo paradiseo-mo dir
|
|
+-- paradiseo-moeo paradiseo-moeo dir
+-- paradiseo-moeo paradiseo-moeo dir
|
|
+-- problems classical problems evaluation functions
+-- problems classical problems evaluation functions
|
|
+-- README README file

==========================================================================================
DIRECTORY NEW STRUCTURE
==========================================================================================

After unpacking the archive file, you should end up with the following
structure:

.../
|
|
+-- AUTHORS Author list
|
|
+-- cmake/ CMake dir
|
|
+-- CMakeLists.txt For building process
|
|
+-- CTestConfig.cmake For testing process
|
|
+-- INSTALL INSTALL file
|
|
+-- LICENCE Licence contents
|
|
+-- src src dir
|
|
+-- test tests dir
|
|
+-- tutorial tutorials dir
|
|
+-- doc documentation src
|
|
+-- deprecated deprecated module
|
|
+-- websites index of the paradiseo-website
|
|
+-- ForRelease how to create a new release
|
|
+-- README README file

==========================================================================================
NOTES
==========================================================================================
Expand All @@ -78,6 +131,7 @@ problems for the installation.
==========================================================================================
CONTACT
==========================================================================================

For further information about ParadisEO, help or to report any
problem : paradiseo-help@lists.gforge.inria.fr

0 edo/build_gcc_linux_debug → build_gcc_linux_debug
View file
File renamed without changes.
0 edo/build_gcc_linux_eigen_debug → build_gcc_linux_eigen_debug
View file
File renamed without changes.
Loading

0 comments on commit 490e837

Please sign in to comment.