Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conflicting headers #35

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open

Conflicting headers #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
eac4584
Contradiction between ./cmake/Target.cmake (make doc command) and ./C…
AdeleH Jun 13, 2014
004c63f
Contradiction between ./cmake/Target.cmake (make doc command) and ./C…
AdeleH Jun 13, 2014
8ee0745
Error and problems with smp documentation compilation ("make doc" or …
AdeleH Jun 13, 2014
c96614e
Moving out ./eo/src/serial/ content -> ./eoserial/src/
AdeleH Jun 13, 2014
10d8587
Comment unused EDO flag (declared in ../CMakeLists.txt file)
AdeleH Jun 16, 2014
9be0bd9
Add a new CMakeLists.txt file for eoserial compilation.
AdeleH Jun 16, 2014
dea830d
Define new paths to the module sources and the module library.
AdeleH Jun 16, 2014
d4dd1b5
Modifications on eoserial/src/CMakeLists.txt file (most of the time f…
AdeleH Jun 16, 2014
9a75fb1
Modification on eo/src/CMakeLists.txt : comment the line which adds s…
AdeleH Jun 16, 2014
11a40c5
Modifications on MPI files (compilation requires some eoserial module…
AdeleH Jun 16, 2014
a4f5fd8
Moving out ./eo/src/mpi/ content -> ./eompi/src/
AdeleH Jun 17, 2014
58b00ed
Add a new CMakeLists.txt file for eompi compilation.
AdeleH Jun 17, 2014
1f4d361
Add EOSERIAL component into cmake/module/FindParadiseo.cmake
AdeleH Jun 17, 2014
7f88653
Redefine paths to the module sources and the module library and renam…
AdeleH Jun 17, 2014
0b6a519
Add EOMPI component into cmake/module/FindParadiseo.cmake
AdeleH Jun 17, 2014
b6ec15c
Modifications on eompi/src/CMakeLists.txt file (module paths).
AdeleH Jun 17, 2014
9576147
Missing if condition for EOMPI module in cmake/module/FindParadiseo.c…
AdeleH Jun 17, 2014
651e722
Merge branch 'moving-eompi' into 'moving-eoserial'
AdeleH Jun 17, 2014
9aacf21
Error in cmake/module/FindParadiseo.cmake
AdeleH Jun 18, 2014
4df7894
Include sources path to eompi module in eo/src/CMakeLists.txt file
AdeleH Jun 18, 2014
f6d5ac3
Move out eompi test folder.
AdeleH Jun 18, 2014
b282bb8
Add eompi test folder for compilation.
AdeleH Jun 18, 2014
91bba00
Contradiction between ./cmake/Target.cmake (make doc command) and ./C…
AdeleH Jun 13, 2014
63b690d
Merge branch 'make-doc-bug-branchcopy' into make-doc-bug
AdeleH Jul 22, 2014
90d7931
Compilation problems solved.
AdeleH Jul 23, 2014
515bd59
Merge branch 'moving-eompi-eoserial' into conflicting-headers
AdeleH Aug 4, 2014
490e837
* New tree configuration of the project:
AdeleH Aug 4, 2014
516a4c5
Minor error on CMakeLists.
AdeleH Sep 8, 2014
1353157
Using library <random> in order to re-implement the methods of the cl…
AdeleH Sep 28, 2014
6b464f7
Deprecated "eo/contrib/boost/" folder + minor errors on several
AdeleH Oct 4, 2014
34be39f
Minor modifications (eoRng function increment_position(), tests file and
AdeleH Oct 4, 2014
8c078b6
Parsing correction (issue #4) using Boost_Program_Options.
AdeleH Oct 5, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Empty file modified .gitignore
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified AUTHORS
100644 → 100755
View file
Open in desktop
Empty file.
118 changes: 51 additions & 67 deletions CMakeLists.txt
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,85 +50,69 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Macro.cmake)

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

set(CMAKE_BASE_SOURCE_DIR ${CMAKE_SOURCE_DIR})

# All libraries are built in <build_dir>/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( 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)

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

## 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_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(PROBLEMS_SRC_DIR "${CMAKE_SOURCE_DIR}/problems" CACHE INTERNAL "Problems dependant source directory" FORCE)
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_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)

set(CMAKE_BASE_SOURCE_DIR ${CMAKE_SOURCE_DIR})
######################################################################################
### 5) Add sources
######################################################################################

# All libraries are built in <build_dir>/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)
add_subdirectory(src)
add_subdirectory(doc)

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

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_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")

## 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()

## MPI Module
if(MPI)
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})
endif()
endif()
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")
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Package.cmake)
endif()
endif()
Empty file modified CTestConfig.cmake
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified ForRelease
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified INSTALL
100644 → 100755
View file
Open in desktop
Empty file.
Empty file modified LICENSE
100644 → 100755
View file
Open in desktop
Empty file.
70 changes: 62 additions & 8 deletions README
100644 → 100755
View file
Open in desktop
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
Open in desktop
File renamed without changes.
0 edo/build_gcc_linux_eigen_debug → build_gcc_linux_eigen_debug
View file
Open in desktop
File renamed without changes.
Loading