X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40af9c2192a6454f202efff596f56ed2782192b0..c502e0d66a1c71f817190511d1f8271aff20dcc3:/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index dae34bc442..ca5ab2d733 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Build the version number set(SIMGRID_VERSION_MAJOR "3") -set(SIMGRID_VERSION_MINOR "26") +set(SIMGRID_VERSION_MINOR "31") set(SIMGRID_VERSION_PATCH "1") # odd => git branch; even => stable release or released snapshot if(${SIMGRID_VERSION_PATCH} EQUAL "0") @@ -31,16 +31,10 @@ project(simgrid C CXX) # customizable installation directories include(GNUInstallDirs) -## Save compiler flags preset with environment variables CFLAGS or CXXFLAGS; -## they will used within smpicc, smpicxx. -## Do it early so that we get their genuine values. The same will be done later for Fortran. -string(REGEX REPLACE " *-f[a-z]+-prefix-map=[^ ]*" "" SMPI_C_FLAGS "${CMAKE_C_FLAGS}") -string(REGEX REPLACE " *-f[a-z]+-prefix-map=[^ ]*" "" SMPI_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# # Check for the compiler # #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# -## +## ## Check the C/C++ standard that we need ## See also tools/cmake/Flags.cmake that sets our paranoid warning flags INCLUDE(CheckCCompilerFlag) @@ -50,16 +44,16 @@ CHECK_C_COMPILER_FLAG(-fstack-cleaner HAVE_C_STACK_CLEANER) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") -if (CMAKE_COMPILER_IS_GNUCC) - if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0") +if (CMAKE_COMPILER_IS_GNUCC) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "7.0") message(FATAL_ERROR - "SimGrid needs at least g++ version 5.0 to compile but you have ${CMAKE_CXX_COMPILER_VERSION}." - "You need a sufficient support of c++14 to compile SimGrid.") + "SimGrid needs at least g++ version 7.0 to compile but you have ${CMAKE_CXX_COMPILER_VERSION}." + "You need a sufficient support of c++17 to compile SimGrid.") endif() endif() ## We need a decent support of the C++14 and C11 standards -set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_C_STANDARD 11) @@ -77,16 +71,16 @@ find_package(Threads) include(${CMAKE_HOME_DIRECTORY}/tools/cmake/Option.cmake) ### SMPI vs. Fortran -if ((NOT DEFINED enable_smpi) OR enable_smpi) +if ((NOT DEFINED enable_smpi) OR enable_smpi) # First unset the compiler in case we're re-running cmake over a previous # configuration where it was saved as smpiff unset(CMAKE_Fortran_COMPILER) - + SET(SMPI_FORTRAN 0) if(enable_fortran) enable_language(Fortran OPTIONAL) endif() - + if(CMAKE_Fortran_COMPILER) # Fortran compiler detected: save it, then replace by smpiff @@ -94,19 +88,19 @@ if ((NOT DEFINED enable_smpi) OR enable_smpi) # Set flags/libs to be used in smpiff if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU") - set(SMPI_Fortran_FLAGS "\"-fpic\" \"-ff2c\" \"-fno-second-underscore\"") + set(SMPI_Fortran_FLAGS_ "\"-fpic\" \"-ff2c\" \"-fno-second-underscore\"") set(SMPI_Fortran_LIBS "\"-lgfortran\"") set(SMPI_GFORTRAN 1) elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel") - set(SMPI_Fortran_FLAGS "\"-fPIC\" \"-nofor-main\"") + set(SMPI_Fortran_FLAGS_ "\"-fPIC\" \"-nofor-main\"") set(SMPI_Fortran_LIBS "\"-lifcore\"") set(SMPI_IFORT 1) elseif(CMAKE_Fortran_COMPILER_ID MATCHES "PGI|Flang") # flang - set(SMPI_Fortran_FLAGS "\"-fPIC\"") + set(SMPI_Fortran_FLAGS_ "\"-fPIC\"") set(SMPI_Fortran_LIBS "") set(SMPI_FLANG 1) endif() - string(REGEX REPLACE " *-f[a-z]+-prefix-map=[^ ]*" "" SMPI_Fortran_FLAGS "${SMPI_Fortran_FLAGS} ${CMAKE_Fortran_FLAGS}") + set(SMPI_Fortran_FLAGS "${SMPI_Fortran_FLAGS_} ${SMPI_Fortran_FLAGS}") ## Request debugging flags for Fortran too set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g") @@ -116,7 +110,7 @@ if ((NOT DEFINED enable_smpi) OR enable_smpi) endif() -### SET THE LIBRARY EXTENSION +### SET THE LIBRARY EXTENSION if(APPLE) set(LIB_EXE "dylib") elseif(WIN32) @@ -188,7 +182,7 @@ if(WIN32) endif() # library dependency cannot start with a space (CMP0004), so initialize it with something that is never deactivated. -set(SIMGRID_DEP "-lm") +set(SIMGRID_DEP "-lm") ### Determine the assembly flavor that we need today set(HAVE_RAW_CONTEXTS 0) @@ -223,20 +217,19 @@ include(CheckLibraryExists) include(CheckSymbolExists) set(HAVE_GRAPHVIZ 0) -set(SIMGRID_HAVE_LUA 0) if(minimal-bindings) - message(STATUS "Don't even look for graphviz nor lua, as we build minimal binding libraries.") + message(STATUS "Don't even look for graphviz, as we build minimal binding libraries.") else() include(FindGraphviz) - if(enable_lua) - include(FindLuaSimgrid) - endif() endif() set(SIMGRID_HAVE_NS3 0) if(enable_ns3) include(FindNS3) if (SIMGRID_HAVE_NS3) + if (NOT NS3_VERSION EQUAL "3-dev" AND NS3_VERSION VERSION_LESS "3.28") + message(FATAL_ERROR "SimGrid needs at least ns-3.28. Please upgrade or disable that cmake option.") + endif() set(SIMGRID_HAVE_NS3 1) foreach(lib core csma point-to-point internet network applications wifi) set(SIMGRID_DEP "${SIMGRID_DEP} -lns${NS3_VERSION}-${lib}${NS3_SUFFIX}") @@ -246,6 +239,22 @@ if(enable_ns3) endif() endif() +### Check for Eigen library +set(SIMGRID_HAVE_EIGEN3 0) +find_package (Eigen3 3.3 CONFIG + HINTS ${EIGEN3_HINT}) +if (Eigen3_FOUND) + set(SIMGRID_HAVE_EIGEN3 1) + message(STATUS "Found Eigen3: ${EIGEN3_INCLUDE_DIR}") + include_directories(${EIGEN3_INCLUDE_DIR}) + if ("3.3.4" VERSION_EQUAL EIGEN3_VERSION_STRING AND CMAKE_COMPILER_IS_GNUCC) + message(STATUS "Avoid build error of Eigen3 v3.3.4 using -Wno-error=int-in-bool-context") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=int-in-bool-context") + endif() +else() + message(STATUS "Disabling model BMF because Eigen3 was not found. If it's installed, use EIGEN3_HINT to hint cmake about the location of Eigen3Config.cmake") +endif() + set(SIMGRID_HAVE_MSG 0) if(enable_msg) set(SIMGRID_HAVE_MSG 1) @@ -317,7 +326,7 @@ set(_Boost_STACKTRACE_ADDR2LINE_HEADERS "boost/stacktrace.hpp") message(STATUS "Mandatory components found. SimGrid is compilable.") endif() endif() - endif() + endif() # Checks for header libraries functions. CHECK_LIBRARY_EXISTS(rt clock_gettime "" HAVE_POSIX_GETTIME) @@ -336,15 +345,11 @@ endif() CHECK_INCLUDE_FILE("valgrind/valgrind.h" HAVE_VALGRIND_H) CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H) -CHECK_INCLUDE_FILE("signal.h" HAVE_SIGNAL_H) -CHECK_INCLUDE_FILE("sys/param.h" HAVE_SYS_PARAM_H) -CHECK_INCLUDE_FILE("sys/sysctl.h" HAVE_SYS_SYSCTL_H) CHECK_INCLUDE_FILE("linux/futex.h" HAVE_FUTEX_H) CHECK_FUNCTION_EXISTS(dlfunc HAVE_DLFUNC) CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) CHECK_FUNCTION_EXISTS(nanosleep HAVE_NANOSLEEP) -CHECK_FUNCTION_EXISTS(getdtablesize HAVE_GETDTABLESIZE) CHECK_FUNCTION_EXISTS(sysconf HAVE_SYSCONF) CHECK_FUNCTION_EXISTS(process_vm_readv HAVE_PROCESS_VM_READV) CHECK_FUNCTION_EXISTS(mmap HAVE_MMAP) @@ -371,6 +376,10 @@ if(enable_model-checking AND NOT "${CMAKE_SYSTEM}" MATCHES "Linux|FreeBSD") set(enable_model-checking FALSE) endif() +if(enable_model-checking AND minimal-bindings) + message(FATAL_ERROR "Compile-time option 'minimal-bindings' cannot be enabled with 'model-checking'") +endif() + if(HAVE_MMAP) SET(HAVE_MMALLOC 1) else() @@ -381,35 +390,19 @@ else() SET(enable_model-checking 0) endif() -if(enable_jedule) - set(SIMGRID_HAVE_JEDULE 1) -else() - set(SIMGRID_HAVE_JEDULE 0) -endif() - if(enable_mallocators) SET(SIMGRID_HAVE_MALLOCATOR 1) else() SET(SIMGRID_HAVE_MALLOCATOR 0) endif() -if (minimal-bindings) - message(STATUS "Don't look for libunwind as we build minimal binding libraries.") - if(enable_model-checking) - message(FATAL_ERROR "You cannot enable model-checking and minimal-bindings at the same time.") - endif() -else() +if(enable_model-checking) include(FindLibunwind) if(HAVE_LIBUNWIND) SET(SIMGRID_DEP "${SIMGRID_DEP} ${LIBUNWIND_LIBRARIES}") else() - if(enable_model-checking) - message(FATAL_ERROR "Please install libunwind-dev libdw-dev libelf-dev libevent-dev if you want to compile the SimGrid model checker.") - endif() + message(FATAL_ERROR "Please install libunwind-dev libdw-dev libelf-dev libevent-dev if you want to compile the SimGrid model checker.") endif() -endif() - -if(enable_model-checking) find_package(Libdw REQUIRED) find_package(Libelf REQUIRED) find_package(Libevent REQUIRED) @@ -421,7 +414,7 @@ if(enable_model-checking) set(enable_java FALSE) endif() else() - SET(SIMGRID_HAVE_MC 0) + SET(SIMGRID_HAVE_MC 0) set(HAVE_MMALLOC 0) endif() mark_as_advanced(PATH_LIBDW_H) @@ -432,7 +425,7 @@ if(enable_java AND NOT enable_msg) endif() if (enable_model-checking AND enable_ns3) - message(FATAL_ERROR "Cannot activate both model-checking and ns-3 bindings: ns-3 pulls too much dependencies for the MC to work") + message(WARNING "Activating both model-checking and ns-3 bindings is considered experimental.") endif() if(enable_smpi) @@ -561,9 +554,9 @@ file(READ ${CMAKE_HOME_DIRECTORY}/src/smpi/smpitools.sh SMPITOOLS_SH) # Definiti ### SMPI script used when simgrid is installed set(exec_prefix ${CMAKE_INSTALL_PREFIX}) -set(includedir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") -set(libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") -set(includeflag "-I${includedir} -I${includedir}/smpi") +set(includedir "${CMAKE_INSTALL_FULL_INCLUDEDIR}") +set(libdir "${CMAKE_INSTALL_FULL_LIBDIR}") +set(includeflag "\"-I${includedir}\" \"-I${includedir}/smpi\"") set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=\"${libdir}") if(NS3_LIBRARY_PATH) set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:${NS3_LIBRARY_PATH}") @@ -587,12 +580,12 @@ foreach(script cc cxx ff f90 run) configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpi${script}.in ${CMAKE_BINARY_DIR}/bin/smpi${script} @ONLY) endforeach() -### SMPI scripts used when compiling simgrid +### SMPI scripts used when compiling simgrid set(exec_prefix "${CMAKE_BINARY_DIR}/smpi_script/") set(includedir "${CMAKE_HOME_DIRECTORY}/include") set(libdir "${CMAKE_BINARY_DIR}/lib") -set(includeflag "-I${includedir} -I${includedir}/smpi") -set(includeflag "${includeflag} -I${CMAKE_BINARY_DIR}/include -I${CMAKE_BINARY_DIR}/include/smpi") +set(includeflag "\"-I${includedir}\" \"-I${includedir}/smpi\"") +set(includeflag "${includeflag} \"-I${CMAKE_BINARY_DIR}/include\" \"-I${CMAKE_BINARY_DIR}/include/smpi\"") set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=\"${libdir}") if(NS3_LIBRARY_PATH) set(CMAKE_SMPI_COMMAND "${CMAKE_SMPI_COMMAND}:${NS3_LIBRARY_PATH}") @@ -648,7 +641,10 @@ if(NOT "${CMAKE_BINARY_DIR}" STREQUAL "${CMAKE_HOME_DIRECTORY}") configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/actions_allgatherv.txt ${CMAKE_BINARY_DIR}/examples/smpi/replay/actions_allgatherv.txt COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hostfile ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hostfile_cluster ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile_cluster COPYONLY) + configure_file(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hostfile_griffon ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile_griffon COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hostfile_coll ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile_coll COPYONLY) + configure_file(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hostfile_io ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile_io COPYONLY) + configure_file(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/hostfile_empty ${CMAKE_BINARY_DIR}/teshsuite/smpi/hostfile_empty COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple/description_file ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple/description_file COPYONLY) configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple/README ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple/README COPYONLY) @@ -783,7 +779,9 @@ endif() SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${generated_files_to_clean}") -add_custom_target(tests COMMENT "Recompiling the tests") +add_custom_target(tests COMMENT "Recompiling the tests") +add_custom_target(tests-mc COMMENT "Recompiling the MC tests and tools.") +add_dependencies(tests tests-mc) ### Build some Maintainer files include(${CMAKE_HOME_DIRECTORY}/tools/cmake/MaintainerMode.cmake) @@ -857,6 +855,16 @@ if(enable_python) add_dependencies(tests python-bindings) set_property(TARGET python-bindings APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}") + + if("${SIMGRID_PYTHON_LIBDIR}" STREQUAL "") # value not manually set + if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") + set(SIMGRID_PYTHON_LIBDIR ${Python3_SITEARCH}) + else("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") + string(REGEX REPLACE "^/usr/" "${CMAKE_INSTALL_PREFIX}/" SIMGRID_PYTHON_LIBDIR ${Python3_SITEARCH}) + endif("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr") + endif() + install(TARGETS python-bindings + LIBRARY DESTINATION "${SIMGRID_PYTHON_LIBDIR}") else() message(FATAL_ERROR "Please install pybind11-dev to build the Python bindings (or disable that option).") endif() @@ -961,13 +969,19 @@ endif() if(pybind11_FOUND) message(" Compile Python bindings .....: ${enable_python}") message(" module ....................: ${PYTHON_MODULE_PREFIX}simgrid${PYTHON_MODULE_EXTENSION}") + message(" install path ..............: ${SIMGRID_PYTHON_LIBDIR} (force another value with -DSIMGRID_PYTHON_LIBDIR)") else() message(" Compile Python bindings .....: OFF (disabled, or pybind11 not found)") endif() -message(" Compile Lua .................: ${SIMGRID_HAVE_LUA}") +if(Eigen3_FOUND) + message(" Eigen3 library ..............: ${EIGEN3_VERSION_STRING} in ${EIGEN3_INCLUDE_DIR}") +else() + message(" Eigen3 library ..............: not found (EIGEN3_HINT='${EIGEN3_HINT}').") +endif() message(" Compile Smpi ................: ${HAVE_SMPI}") message(" Smpi fortran ..............: ${SMPI_FORTRAN}") message(" MPICH3 testsuite ..........: ${enable_smpi_MPICH3_testsuite}") +message(" MBI testsuite .............: ${enable_smpi_MBI_testsuite}") message(" Privatization .............: ${HAVE_PRIVATIZATION}") message(" PAPI support...............: ${HAVE_PAPI}") message(" Compile Boost.Context support: ${HAVE_BOOST_CONTEXTS}") @@ -975,7 +989,6 @@ message("") message(" Maintainer mode .............: ${enable_maintainer_mode}") message(" Documentation................: ${enable_documentation}") message(" Model checking ..............: ${SIMGRID_HAVE_MC}") -message(" Jedule mode ................: ${SIMGRID_HAVE_JEDULE}") message(" Graphviz mode ...............: ${HAVE_GRAPHVIZ}") message(" Mallocators .................: ${enable_mallocators}") message("")