X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/71d215251ec3eeb3e4192c0e14ec6dea8fd97007..5fc13f8c8319f852fbcd8ba136c28d0ce0b7f976:/tools/cmake/DefinePackages.cmake diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index d674ddc7a7..f580465713 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 @@ -669,7 +670,7 @@ set(headers_to_install include/simgrid/actor.h include/simgrid/barrier.h include/simgrid/engine.h - include/simgrid/exception.hpp + include/simgrid/Exception.hpp include/simgrid/chrono.hpp include/simgrid/plugins/dvfs.h include/simgrid/plugins/energy.h @@ -749,7 +750,6 @@ set(headers_to_install include/xbt/dict.h include/xbt/dynar.h include/xbt/ex.h - include/xbt/exception.hpp include/xbt/Extendable.hpp include/xbt/file.hpp include/xbt/functional.hpp @@ -857,23 +857,8 @@ endif() set(DOC_SOURCES doc/Doxyfile.in doc/Layout.xml - doc/graphical-toc.svg - doc/sg_thread_model.fig - doc/simix.fig - doc/surf_nutshell.fig - doc/surf++.png - doc/surf++.pdf - doc/surf++.graphml - doc/surf++.uml - doc/triva-graph_configuration.png - doc/triva-graph_configuration.svg - doc/triva-graph_visualization.png - doc/triva-graph_visualization.svg - doc/triva-time_interval.png - doc/triva-time_interval.svg doc/doxygen/FAQ.doc - doc/doxygen/application.doc doc/doxygen/community.doc doc/doxygen/deployment.doc doc/doxygen/footer.html @@ -886,21 +871,12 @@ set(DOC_SOURCES doc/doxygen/inside_doxygen.doc doc/doxygen/inside_extending.doc doc/doxygen/inside_release.doc - doc/doxygen/install.doc - doc/doxygen/install_yours.doc - doc/doxygen/java.doc - doc/doxygen/tutorial_smpi.doc - doc/doxygen/module-msg.doc - doc/doxygen/module-s4u.doc doc/doxygen/module-sd.doc - doc/doxygen/module-simix.doc - doc/doxygen/module-smpi.doc doc/doxygen/module-surf.doc doc/doxygen/module-trace.doc doc/doxygen/module-xbt.doc doc/doxygen/module-index.doc doc/doxygen/ns3.doc - doc/doxygen/options.doc doc/doxygen/outcomes.doc doc/doxygen/outcomes_logs.doc doc/doxygen/outcomes_MC.doc @@ -912,30 +888,37 @@ set(DOC_SOURCES doc/doxygen/uhood_switch.doc doc/doxygen/uhood_arch.doc - doc/manpage/smpicc.1 - doc/manpage/smpicxx.1 - doc/manpage/smpif90.1 - doc/manpage/smpiff.1 - doc/manpage/smpirun.1 - doc/manpage/tesh.pod + docs/manpages/smpicc.1 + docs/manpages/smpicxx.1 + docs/manpages/smpif90.1 + docs/manpages/smpiff.1 + docs/manpages/smpirun.1 + docs/manpages/tesh.pod 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/img/smpi_simgrid_alltoall_pair_16.png + docs/source/img/smpi_simgrid_alltoall_ring_16.png + docs/ignored_symbols docs/source/application.rst + docs/source/app_java.rst + docs/source/app_msg.rst + docs/source/app_s4u.rst + docs/source/app_smpi.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 @@ -957,6 +940,13 @@ set(DOC_SOURCES 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/img/lu.S.4.png + docs/source/tuto_smpi/roundtrip.c + docs/source/tuto_smpi.rst + CITATION.bib ) @@ -987,10 +977,6 @@ set(DOC_IMG ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.gif ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_2011_small.png - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win.bmp - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/simgrid_logo_win_2011.bmp - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/smpi_simgrid_alltoall_pair_16.png - ${CMAKE_HOME_DIRECTORY}/doc/webcruft/smpi_simgrid_alltoall_ring_16.png ) set(bin_files @@ -1048,7 +1034,7 @@ set(CMAKEFILES_TXT teshsuite/smpi/mpich3-test/coll/CMakeLists.txt teshsuite/smpi/mpich3-test/comm/CMakeLists.txt teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt -# teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt @@ -1134,13 +1120,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