X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8715d453f6b075d4f267d1d9d189fa87a2e983af..e521712573f6927c1843bf4418e418f80425690b:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index a8402e22d2..9615b35717 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -173,6 +173,7 @@ set(SMPI_SRC src/smpi/colls/alltoallv/alltoallv-ring.cpp src/smpi/colls/barrier/barrier-ompi.cpp src/smpi/colls/barrier/barrier-mvapich2-pair.cpp + src/smpi/colls/barrier/barrier-mpich-smp.cpp src/smpi/colls/bcast/bcast-NTSB.cpp src/smpi/colls/bcast/bcast-NTSL-Isend.cpp src/smpi/colls/bcast/bcast-NTSL.cpp @@ -254,8 +255,12 @@ set(SMPI_SRC src/smpi/include/smpi_topo.hpp src/smpi/include/smpi_win.hpp src/smpi/plugins/sampi_loadbalancer.cpp - src/smpi/plugins/sampi_pampi.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 ) @@ -271,7 +276,6 @@ set(XBT_SRC src/xbt/dict_cursor.c src/xbt/dict_elm.c src/xbt/dynar.cpp - src/xbt/ex.cpp src/xbt/exception.cpp src/xbt/graph.c src/xbt/log.c @@ -431,6 +435,7 @@ set(S4U_SRC 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 @@ -661,11 +666,11 @@ 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/Exception.hpp include/simgrid/chrono.hpp include/simgrid/plugins/dvfs.h include/simgrid/plugins/energy.h @@ -674,7 +679,6 @@ set(headers_to_install include/simgrid/plugins/load.h include/simgrid/plugins/load_balancer.h include/simgrid/smpi/replay.hpp - include/simgrid/smpi/sampi.h include/simgrid/instr.h include/simgrid/mailbox.h include/simgrid/msg.h @@ -698,6 +702,7 @@ set(headers_to_install 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 @@ -724,6 +729,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 @@ -744,8 +750,6 @@ set(headers_to_install include/xbt/dict.h include/xbt/dynar.h include/xbt/ex.h - include/xbt/ex.hpp - include/xbt/exception.hpp include/xbt/Extendable.hpp include/xbt/file.hpp include/xbt/functional.hpp @@ -869,12 +873,9 @@ set(DOC_SOURCES doc/triva-time_interval.svg doc/doxygen/FAQ.doc - 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 doc/doxygen/howtos.doc doc/doxygen/index.doc @@ -887,10 +888,7 @@ set(DOC_SOURCES doc/doxygen/install.doc doc/doxygen/install_yours.doc doc/doxygen/java.doc - doc/tuto-msg/tuto-msg.doc - doc/tuto-msg/overview.svg doc/doxygen/tutorial_smpi.doc - doc/doxygen/models.doc doc/doxygen/module-msg.doc doc/doxygen/module-s4u.doc doc/doxygen/module-sd.doc @@ -908,7 +906,6 @@ set(DOC_SOURCES doc/doxygen/outcomes_vizu.doc doc/doxygen/platform.doc doc/doxygen/platform_lua.doc - doc/doxygen/scenario.doc doc/doxygen/stylesheet.css doc/doxygen/uhood.doc doc/doxygen/uhood_switch.doc @@ -921,17 +918,50 @@ set(DOC_SOURCES doc/manpage/smpirun.1 doc/manpage/tesh.pod - doc/tuto-msg/deployment0.xml - doc/tuto-msg/deployment1.xml - doc/tuto-msg/deployment2.xml - doc/tuto-msg/deployment3.xml - doc/tuto-msg/deployment_general.xml - doc/tuto-msg/Makefile - doc/tuto-msg/masterworker.c - doc/tuto-msg/masterworker-sol1.c - doc/tuto-msg/masterworker-sol2.c - doc/tuto-msg/masterworker-sol3.c - doc/tuto-msg/masterworker-sol4.c + docs/Build.sh + docs/requirements.txt + docs/source/conf.py + docs/source/Doxyfile + docs/source/_ext/hidden_code_block.py + + docs/source/img/eclipseScreenShot.png + docs/source/img/extlink.png + docs/source/img/extlink.svg + docs/source/img/graphical-toc.svg + + docs/source/application.rst + docs/source/app_s4u.rst + docs/source/index.rst + docs/source/intro_concepts.rst + docs/source/introduction.rst + docs/source/intro_install.rst + docs/source/intro_yours.rst + docs/source/main_concepts.rst + docs/source/models.rst + docs/source/platform.rst + docs/source/scenar_config.rst + docs/source/scenario.rst + + docs/source/tuto_s4u.rst + docs/source/tuto_s4u/deployment1.xml + docs/source/tuto_s4u/deployment2.xml + docs/source/tuto_s4u/deployment3.xml + docs/source/tuto_s4u/deployment4.xml + docs/source/tuto_s4u/draw_gantt.R + docs/source/tuto_s4u/img/intro.svg + docs/source/tuto_s4u/img/question.svg + docs/source/tuto_s4u/img/result.png + docs/source/tuto_s4u/img/Rscript-screenshot.png + docs/source/tuto_s4u/img/vite-screenshot.png + docs/source/tuto_s4u/master-workers-lab1.cpp + docs/source/tuto_s4u/master-workers-lab2.cpp + docs/source/tuto_s4u/master-workers-lab3.cpp + docs/source/tuto_s4u/master-workers-lab4.cpp + + docs/source/tuto_smpi/3hosts.png + docs/source/tuto_smpi/3hosts.xml + docs/source/tuto_smpi/img/big-picture.svg + docs/source/tuto_smpi.rst CITATION.bib ) @@ -949,7 +979,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 @@ -1111,13 +1140,15 @@ set(PLATFORMS_EXAMPLES examples/platforms/bypassASroute.xml examples/platforms/bypassRoute.xml examples/platforms/cloud.xml - examples/platforms/cluster.xml examples/platforms/cluster_backbone.xml + examples/platforms/cluster_multi.xml examples/platforms/cluster_and_one_host.xml examples/platforms/cluster_prototype.lua - examples/platforms/cluster_no_backbone.xml - examples/platforms/cluster_torus.xml + examples/platforms/cluster_crossbar.xml examples/platforms/cluster_fat_tree.xml + examples/platforms/cluster_fat_tree.svg + examples/platforms/cluster_torus.xml + examples/platforms/cluster_torus.svg examples/platforms/cluster_dragonfly.xml examples/platforms/crosstraffic.xml examples/platforms/optorsim/gridpp_grid_2004.conf