X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/895710d49f77179d9893bc76b3e31b69fae638af..16dfaaadf3875cfbad8847ae4a52af1034b77b69:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index be8804daef..bd9de442b3 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -10,7 +10,6 @@ set(EXTRA_DIST src/include/xbt/mmalloc.h src/mc/mc_mmu.hpp src/mc/mc_record.hpp - src/mc/PageStore.hpp src/msg/msg_private.hpp src/simdag/dax.dtd src/simdag/dax_dtd.c @@ -44,6 +43,8 @@ set(EXTRA_DIST src/surf/network_ib.hpp src/surf/ns3/ns3_simulator.hpp src/surf/trace_mgr_test.cpp + src/mc/sosp/mc_snapshot_test.cpp + src/mc/sosp/PageStore_test.cpp src/surf/xml/simgrid.dtd src/surf/xml/simgrid_dtd.h src/surf/xml/simgrid_dtd.c @@ -223,7 +224,7 @@ set(SMPI_SRC src/smpi/internals/smpi_global.cpp src/smpi/internals/smpi_host.cpp src/smpi/internals/smpi_replay.cpp - src/smpi/internals/smpi_process.cpp + src/smpi/internals/smpi_actor.cpp src/smpi/internals/smpi_utils.cpp src/smpi/mpi/smpi_comm.cpp src/smpi/mpi/smpi_datatype.cpp @@ -237,22 +238,28 @@ set(SMPI_SRC src/smpi/mpi/smpi_status.cpp src/smpi/mpi/smpi_topo.cpp src/smpi/mpi/smpi_win.cpp + src/smpi/include/smpi_actor.hpp src/smpi/include/smpi_coll.hpp src/smpi/include/smpi_comm.hpp + src/smpi/include/smpi_datatype_derived.hpp + src/smpi/include/smpi_datatype.hpp src/smpi/include/smpi_f2c.hpp src/smpi/include/smpi_group.hpp src/smpi/include/smpi_host.hpp - src/smpi/include/smpi_datatype.hpp src/smpi/include/smpi_info.hpp src/smpi/include/smpi_keyvals.hpp - src/smpi/include/smpi_datatype_derived.hpp src/smpi/include/smpi_op.hpp - src/smpi/include/smpi_process.hpp src/smpi/include/smpi_request.hpp src/smpi/include/smpi_status.hpp - src/smpi/include/smpi_win.hpp src/smpi/include/smpi_topo.hpp + src/smpi/include/smpi_win.hpp src/smpi/plugins/sampi_loadbalancer.cpp + src/smpi/plugins/ampi/ampi.cpp + src/smpi/plugins/ampi/ampi.hpp + src/smpi/plugins/ampi/instr_ampi.cpp + src/smpi/plugins/ampi/instr_ampi.hpp + src/smpi/plugins/load_balancer/LoadBalancer.cpp + src/smpi/plugins/load_balancer/load_balancer.hpp src/surf/network_smpi.cpp src/surf/network_ib.cpp ) @@ -422,11 +429,13 @@ endif() set(S4U_SRC src/s4u/s4u_Actor.cpp src/s4u/s4u_Activity.cpp + src/s4u/s4u_Barrier.cpp src/s4u/s4u_ConditionVariable.cpp src/s4u/s4u_Comm.cpp src/s4u/s4u_Engine.cpp src/s4u/s4u_Exec.cpp src/s4u/s4u_Host.cpp + src/s4u/s4u_Io.cpp src/s4u/s4u_Link.cpp src/s4u/s4u_Mailbox.cpp src/s4u/s4u_Mutex.cpp @@ -594,6 +603,17 @@ set(MC_SRC src/mc/remote/mc_protocol.h src/mc/remote/mc_protocol.cpp + src/mc/sosp/PageStore.hpp + src/mc/sosp/PageStore.cpp + src/mc/sosp/ChunkedData.hpp + src/mc/sosp/ChunkedData.cpp + src/mc/sosp/RegionSnapshot.cpp + src/mc/sosp/RegionSnapshot.hpp + src/mc/sosp/mc_checkpoint.cpp + src/mc/sosp/mc_snapshot.hpp + src/mc/sosp/mc_snapshot.cpp + src/mc/sosp/mc_page_snapshot.cpp + src/mc/AddressSpace.hpp src/mc/Frame.hpp src/mc/Frame.cpp @@ -601,12 +621,6 @@ set(MC_SRC src/mc/ModelChecker.cpp src/mc/ObjectInformation.hpp src/mc/ObjectInformation.cpp - src/mc/PageStore.hpp - src/mc/PageStore.cpp - src/mc/ChunkedData.hpp - src/mc/ChunkedData.cpp - src/mc/RegionSnapshot.cpp - src/mc/RegionSnapshot.hpp src/mc/Type.hpp src/mc/Variable.hpp src/mc/mc_forward.hpp @@ -615,10 +629,6 @@ set(MC_SRC src/mc/mc_unw.hpp src/mc/mc_unw.cpp src/mc/mc_unw_vmread.cpp - src/mc/mc_checkpoint.cpp - src/mc/mc_snapshot.hpp - src/mc/mc_snapshot.cpp - src/mc/mc_page_snapshot.cpp src/mc/mc_comm_pattern.cpp src/mc/mc_comm_pattern.hpp src/mc/compare.cpp @@ -656,9 +666,9 @@ set(MC_SRC set(MC_SIMGRID_MC_SRC src/mc/checker/simgrid_mc.cpp) set(headers_to_install - include/simgrid_config.h include/simgrid/actor.h + include/simgrid/barrier.h include/simgrid/engine.h include/simgrid/chrono.hpp include/simgrid/plugins/dvfs.h @@ -685,11 +695,13 @@ set(headers_to_install include/simgrid/zone.h include/simgrid/s4u/Activity.hpp include/simgrid/s4u/Actor.hpp + include/simgrid/s4u/Barrier.hpp include/simgrid/s4u/Comm.hpp include/simgrid/s4u/ConditionVariable.hpp include/simgrid/s4u/Engine.hpp include/simgrid/s4u/Exec.hpp include/simgrid/s4u/Host.hpp + include/simgrid/s4u/Io.hpp include/simgrid/s4u/Link.hpp include/simgrid/s4u/Mailbox.hpp include/simgrid/s4u/Mutex.hpp @@ -716,6 +728,7 @@ set(headers_to_install include/simgrid/kernel/routing/VivaldiZone.hpp include/smpi/mpi.h + include/smpi/sampi.h include/smpi/smpi.h include/smpi/smpi_main.h include/smpi/smpi_helpers.h @@ -795,17 +808,17 @@ endif() ### Simgrid Lib sources set(simgrid_sources - ${PLUGINS_SRC} - ${BINDINGS_SRC} - ${MC_SRC_BASE} - ${MSG_SRC} ${S4U_SRC} - ${SIMDAG_SRC} ${SIMGRID_SRC} + ${MC_SRC_BASE} ${SIMIX_SRC} ${SURF_SRC} ${TRACING_SRC} ${XBT_SRC} + ${PLUGINS_SRC} + ${BINDINGS_SRC} + ${MSG_SRC} + ${SIMDAG_SRC} ) if(${SIMGRID_HAVE_JEDULE}) @@ -864,7 +877,6 @@ set(DOC_SOURCES doc/doxygen/application.doc doc/doxygen/community.doc doc/doxygen/deployment.doc - doc/doxygen/examples.doc doc/doxygen/footer.html doc/doxygen/getting_started.doc doc/doxygen/header.html @@ -941,7 +953,6 @@ set(DOC_TOOLS # these files get copied automatically to the html documentation set(DOC_IMG - ${CMAKE_HOME_DIRECTORY}/doc/sc3-description.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/AS_hierarchy.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/eclipseScreenShot.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg @@ -996,6 +1007,8 @@ set(CMAKEFILES_TXT examples/smpi/NAS/CMakeLists.txt examples/smpi/smpi_msg_masterslave/CMakeLists.txt examples/smpi/replay_multiple/CMakeLists.txt + examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt + examples/smpi/load_balancer_replay/CMakeLists.txt examples/smpi/energy/f77/CMakeLists.txt examples/smpi/energy/f90/CMakeLists.txt @@ -1085,7 +1098,6 @@ set(CMAKE_SOURCE_FILES tools/cmake/test_prog/prog_snprintf.c tools/cmake/test_prog/prog_stackgrowth.c tools/cmake/test_prog/prog_stacksetup.c - tools/cmake/test_prog/prog_thread_storage.c tools/cmake/test_prog/prog_vsnprintf.c tools/cmake/cross-mingw.cmake tools/smpi/generate_smpi_defines.pl