X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9631558b72f9b30b510f23a391d77c61c0541bd5..030c5083b33927e80495636eb15b88bf5246a54a:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 2aaa4d8a06..63ed844df1 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -27,6 +27,14 @@ set(EXTRA_DIST src/simdag/dax_dtd.c src/simdag/dax_dtd.h src/simdag/private.h + src/simix/simcalls.in + src/simix/simcalls.py + src/simix/simcalls_generated_enum.h + src/simix/simcalls_generated_string.c + src/simix/simcalls_generated_res_getter_setter.h + src/simix/simcalls_generated_args_getter_setter.h + src/simix/simcalls_generated_case.c + src/simix/simcalls_generated_body.c src/simix/smx_host_private.h src/simix/smx_io_private.h src/simix/smx_network_private.h @@ -35,19 +43,25 @@ set(EXTRA_DIST src/simix/smx_smurf_private.h src/simix/smx_synchro_private.h src/smpi/README - src/smpi/colls/COPYRIGHTS src/smpi/colls/colls.h src/smpi/colls/colls_private.h + src/smpi/colls/coll_tuned_topo.h src/smpi/private.h src/smpi/smpi_mpi_dt_private.h - src/surf/cpu_ti_private.h + src/surf/plugins/energy.hpp + src/surf/cpu_interface.hpp + src/surf/cpu_ti.hpp + src/surf/cpu_cas01.hpp src/surf/gtnets/gtnets_interface.h src/surf/gtnets/gtnets_simulator.h src/surf/gtnets/gtnets_topology.h - src/surf/maxmin_private.h - src/surf/network_gtnets_private.h + src/surf/maxmin_private.hpp + src/surf/network_interface.hpp + src/surf/network_gtnets.hpp src/surf/network_ns3_private.h - src/surf/network_private.h + src/surf/network_cm02.hpp + src/surf/network_smpi.hpp + src/surf/network_constant.hpp src/surf/ns3/my-point-to-point-helper.h src/surf/ns3/ns3_interface.h src/surf/ns3/ns3_simulator.h @@ -55,11 +69,27 @@ set(EXTRA_DIST src/surf/platf_generator_private.h src/surf/simgrid.dtd src/surf/simgrid_dtd.c - src/surf/storage_private.h + src/surf/storage_interface.hpp + src/surf/storage_n11.hpp + src/surf/surf_interface.hpp src/surf/surf_private.h - src/surf/surf_routing_private.h + src/surf/surf_routing_private.hpp + src/surf/surf_routing.hpp + src/surf/surf_routing_cluster.hpp + src/surf/surf_routing_cluster_torus.hpp + src/surf/surf_routing_dijkstra.hpp + src/surf/surf_routing_floyd.hpp + src/surf/surf_routing_full.hpp + src/surf/surf_routing_generic.hpp + src/surf/surf_routing_none.hpp + src/surf/surf_routing_vivaldi.hpp src/surf/surfxml_parse.c src/surf/trace_mgr_private.h + src/surf/vm_workstation_interface.hpp + src/surf/vm_workstation_hl13.hpp + src/surf/workstation_interface.hpp + src/surf/workstation_clm03.hpp + src/surf/workstation_ptask_L07.hpp src/win32/config.h src/xbt/automaton/automaton_lexer.yy.c src/xbt/automaton/parserPromela.lex @@ -104,6 +134,7 @@ set(SMPI_SRC src/smpi/smpi_c99.c src/smpi/smpi_coll.c src/smpi/smpi_comm.c + src/smpi/smpi_dvfs.c src/smpi/smpi_global.c src/smpi/smpi_group.c src/smpi/smpi_mpi.c @@ -111,13 +142,13 @@ set(SMPI_SRC src/smpi/smpi_pmpi.c src/smpi/smpi_replay.c src/smpi/colls/smpi_openmpi_selector.c + src/smpi/colls/smpi_mpich_selector.c src/smpi/colls/colls_global.c src/smpi/colls/allgather-2dmesh.c src/smpi/colls/allgather-3dmesh.c src/smpi/colls/allgather-bruck.c src/smpi/colls/allgather-GB.c src/smpi/colls/allgather-loosely-lr.c - src/smpi/colls/allgather-lr.c src/smpi/colls/allgather-NTSLR.c src/smpi/colls/allgather-NTSLR-NB.c src/smpi/colls/allgather-pair.c @@ -127,16 +158,18 @@ set(SMPI_SRC src/smpi/colls/allgather-SMP-NTS.c src/smpi/colls/allgather-smp-simple.c src/smpi/colls/allgather-spreading-simple.c + src/smpi/colls/allgather-ompi-neighborexchange.c src/smpi/colls/allgatherv-GB.c src/smpi/colls/allgatherv-pair.c src/smpi/colls/allgatherv-ring.c + src/smpi/colls/allgatherv-ompi-neighborexchange.c + src/smpi/colls/allgatherv-ompi-bruck.c + src/smpi/colls/allgatherv-mpich-rdb.c + src/smpi/colls/allgatherv-mpich-ring.c src/smpi/colls/allreduce-lr.c - src/smpi/colls/allreduce-NTS.c src/smpi/colls/allreduce-rab1.c src/smpi/colls/allreduce-rab2.c src/smpi/colls/allreduce-rab-rdb.c - #src/smpi/colls/allreduce-rab-reduce-scatter.c - src/smpi/colls/allreduce-rab-rsag.c src/smpi/colls/allreduce-rdb.c src/smpi/colls/allreduce-redbcast.c src/smpi/colls/allreduce-smp-binomial.c @@ -148,7 +181,7 @@ set(SMPI_SRC src/smpi/colls/allreduce-ompi-ring-segmented.c src/smpi/colls/alltoall-2dmesh.c src/smpi/colls/alltoall-3dmesh.c - #src/smpi/colls/alltoall-bruck.c +# src/smpi/colls/alltoall-bruck.c src/smpi/colls/alltoall-pair.c src/smpi/colls/alltoall-pair-light-barrier.c src/smpi/colls/alltoall-pair-mpi-barrier.c @@ -158,7 +191,6 @@ set(SMPI_SRC src/smpi/colls/alltoall-ring-light-barrier.c src/smpi/colls/alltoall-ring-mpi-barrier.c src/smpi/colls/alltoall-ring-one-barrier.c - src/smpi/colls/alltoall-simple.c src/smpi/colls/alltoallv-pair.c src/smpi/colls/alltoallv-pair-light-barrier.c src/smpi/colls/alltoallv-pair-mpi-barrier.c @@ -168,7 +200,7 @@ set(SMPI_SRC src/smpi/colls/alltoallv-ring-mpi-barrier.c src/smpi/colls/alltoallv-ring-one-barrier.c src/smpi/colls/alltoallv-bruck.c - src/smpi/colls/bcast-arrival-nb.c + src/smpi/colls/alltoallv-ompi-basic-linear.c src/smpi/colls/bcast-arrival-pattern-aware.c src/smpi/colls/bcast-arrival-pattern-aware-wait.c src/smpi/colls/bcast-arrival-scatter.c @@ -183,6 +215,7 @@ set(SMPI_SRC src/smpi/colls/bcast-SMP-binary.c src/smpi/colls/bcast-SMP-binomial.c src/smpi/colls/bcast-SMP-linear.c + src/smpi/colls/coll_tuned_topo.c src/smpi/colls/bcast-ompi-split-bintree.c src/smpi/colls/bcast-ompi-pipeline.c src/smpi/colls/reduce-arrival-pattern-aware.c @@ -190,6 +223,13 @@ set(SMPI_SRC src/smpi/colls/reduce-flat-tree.c src/smpi/colls/reduce-NTSL.c src/smpi/colls/reduce-scatter-gather.c + src/smpi/colls/reduce-ompi.c + src/smpi/colls/gather-ompi.c + src/smpi/colls/reduce_scatter-ompi.c + src/smpi/colls/reduce_scatter-mpich.c + src/smpi/colls/smpi_automatic_selector.c + src/smpi/colls/scatter-ompi.c + src/smpi/colls/barrier-ompi.c ) if(SMPI_F2C) @@ -246,7 +286,7 @@ set(XBT_SRC src/xbt_modinter.h ) -if(HAVE_MMAP) +if(HAVE_MMALLOC) set(XBT_SRC ${XBT_SRC} src/xbt/mmalloc/mm.c @@ -257,7 +297,7 @@ set(GTNETS_SRC src/surf/gtnets/gtnets_interface.cc src/surf/gtnets/gtnets_simulator.cc src/surf/gtnets/gtnets_topology.cc - src/surf/network_gtnets.c + src/surf/network_gtnets.cpp ) set(NS3_SRC @@ -269,35 +309,43 @@ set(NS3_SRC ) set(SURF_SRC - src/surf/cpu_cas01.c - src/surf/cpu_ti.c - src/surf/fair_bottleneck.c + src/surf/plugins/energy.cpp + src/surf/cpu_interface.cpp + src/surf/cpu_ti.cpp + src/surf/cpu_cas01.cpp + src/surf/fair_bottleneck.cpp src/surf/instr_routing.c src/surf/instr_surf.c - src/surf/lagrange.c - src/surf/maxmin.c - src/surf/network.c - src/surf/network_constant.c + src/surf/lagrange.cpp + src/surf/maxmin.cpp + src/surf/network_interface.cpp + src/surf/network_cm02.cpp + src/surf/network_smpi.cpp + src/surf/network_constant.cpp src/surf/platf_generator.c src/surf/random_mgr.c src/surf/sg_platf.c - src/surf/storage.c - src/surf/surf.c - src/surf/surf_action.c - src/surf/surf_model.c - src/surf/surf_routing.c - src/surf/surf_routing_cluster.c - src/surf/surf_routing_dijkstra.c - src/surf/surf_routing_floyd.c - src/surf/surf_routing_full.c - src/surf/surf_routing_generic.c - src/surf/surf_routing_none.c - src/surf/surf_routing_vivaldi.c + src/surf/storage_interface.cpp + src/surf/storage_n11.cpp + src/surf/surf_interface.cpp + src/surf/surf_c_bindings.cpp + src/surf/surf_routing.cpp + src/surf/surf_routing_cluster.cpp + src/surf/surf_routing_cluster_torus.cpp + src/surf/surf_routing_dijkstra.cpp + src/surf/surf_routing_floyd.cpp + src/surf/surf_routing_full.cpp + src/surf/surf_routing_generic.cpp + src/surf/surf_routing_none.cpp + src/surf/surf_routing_vivaldi.cpp src/surf/surfxml_parse.c src/surf/surfxml_parseplatf.c src/surf/trace_mgr.c - src/surf/workstation.c - src/surf/workstation_ptask_L07.c + src/surf/workstation_interface.cpp + src/surf/workstation_clm03.cpp + src/surf/workstation_ptask_L07.cpp + src/surf/vm_workstation_interface.cpp + src/surf/vm_workstation_hl13.cpp src/xbt/xbt_sg_stubs.c ) @@ -315,6 +363,7 @@ set(SIMIX_SRC src/simix/smx_smurf.c src/simix/smx_synchro.c src/simix/smx_user.c + src/simix/smx_vm.c ) set(SIMGRID_SRC @@ -356,19 +405,6 @@ set(SIMIX_SRC ) #* ****************************************************************************************** *# -#* ****************************************************************************************** *# -#* TUTORIAL: New Model *# - -set(SURF_SRC - ${SURF_SRC} - src/surf/new_model.c - ) -set(EXTRA_DIST - ${EXTRA_DIST} - src/surf/new_model_private.h - ) -#* ****************************************************************************************** *# - set(SIMDAG_SRC src/simdag/instr_sd_task.c src/simdag/sd_daxloader.c @@ -398,6 +434,8 @@ set(BINDINGS_SRC set(JMSG_C_SRC src/bindings/java/jmsg.c src/bindings/java/jmsg.h + src/bindings/java/jmsg_as.c + src/bindings/java/jmsg_as.h src/bindings/java/jmsg_comm.c src/bindings/java/jmsg_comm.h src/bindings/java/jmsg_file.c @@ -423,6 +461,7 @@ set(JMSG_C_SRC ) set(JMSG_JAVA_SRC + src/bindings/java/org/simgrid/msg/As.java src/bindings/java/org/simgrid/msg/Comm.java src/bindings/java/org/simgrid/msg/File.java src/bindings/java/org/simgrid/msg/Host.java @@ -477,7 +516,9 @@ set(TRACING_SRC src/instr/instr_config.c src/instr/instr_interface.c src/instr/instr_paje_containers.c + src/instr/instr_TI_trace.c src/instr/instr_paje_trace.c + src/instr/instr_trace.c src/instr/instr_paje_header.c src/instr/instr_paje_types.c src/instr/instr_paje_values.c @@ -511,17 +552,19 @@ set(MC_SRC ) set(headers_to_install + include/simgrid.h include/instr/instr.h include/msg/datatypes.h include/msg/msg.h include/simdag/datatypes.h include/simdag/simdag.h + include/simgrid/datatypes.h include/simgrid/modelchecker.h include/simgrid/platf.h include/simgrid/platf_generator.h + include/simgrid/plugins.h include/simgrid/simix.h include/smpi/mpi.h - include/smpi/mpif.h include/smpi/smpi.h include/smpi/smpi_cocci.h include/smpi/smpi_main.h @@ -567,6 +610,7 @@ set(headers_to_install ) set(source_of_generated_headers include/simgrid_config.h.in + include/smpi/mpif.h.in include/smpi/smpif.h.in src/context_sysv_config.h.in) @@ -691,7 +735,6 @@ else() endif() set(DOC_SOURCES - doc/AS_hierarchy.png doc/Doxyfile.in doc/Layout.xml doc/sg_thread_model.fig @@ -756,6 +799,8 @@ set(DOC_SOURCES doc/msg-tuto-src/platforms/griffon.xml doc/msg-tuto-src/platforms/peers.xml doc/msg-tuto-src/platforms/platform.xml + + CITATION.bib ) set(DOC_FIGS @@ -773,6 +818,7 @@ set(DOC_TOOLS set(DOC_IMG ${CMAKE_HOME_DIRECTORY}/doc/simgrid.css ${CMAKE_HOME_DIRECTORY}/doc/sc3-description.png + ${CMAKE_HOME_DIRECTORY}/doc/webcruft/AS_hierarchy.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot.jpg ${CMAKE_HOME_DIRECTORY}/doc/webcruft/Paje_MSG_screenshot_thn.jpg ${CMAKE_HOME_DIRECTORY}/doc/webcruft/SGicon.gif @@ -792,6 +838,8 @@ set(DOC_IMG ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_04.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_05.png ${CMAKE_HOME_DIRECTORY}/doc/webcruft/win_install_06.png + ${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 @@ -801,6 +849,7 @@ set(bin_files src/smpi/smpiff.in src/smpi/smpif90.in src/smpi/smpirun.in + src/smpi/smpitools.sh ) set(txt_files @@ -837,16 +886,16 @@ set(EXAMPLES_CMAKEFILES_TXT examples/java/startKillTime/CMakeLists.txt examples/java/suspend/CMakeLists.txt examples/java/tracing/CMakeLists.txt - examples/scala/CMakeLists.txt - examples/scala/masterslave/CMakeLists.txt - examples/scala/master_slave_bypass/CMakeLists.txt - examples/scala/master_slave_kill/CMakeLists.txt examples/lua/CMakeLists.txt examples/msg/CMakeLists.txt examples/msg/actions/CMakeLists.txt examples/msg/bittorrent/CMakeLists.txt + examples/msg/chainsend/CMakeLists.txt examples/msg/chord/CMakeLists.txt examples/msg/cloud/CMakeLists.txt + examples/msg/energy/e1/CMakeLists.txt + examples/msg/energy/e2/CMakeLists.txt + examples/msg/energy/e3/CMakeLists.txt examples/msg/gpu/CMakeLists.txt examples/msg/gtnets/CMakeLists.txt examples/msg/icomms/CMakeLists.txt @@ -857,46 +906,71 @@ set(EXAMPLES_CMAKEFILES_TXT examples/msg/migration/CMakeLists.txt examples/msg/ns3/CMakeLists.txt examples/msg/parallel_task/CMakeLists.txt + examples/msg/pastry/CMakeLists.txt examples/msg/pmm/CMakeLists.txt examples/msg/priority/CMakeLists.txt examples/msg/properties/CMakeLists.txt + examples/msg/semaphores/CMakeLists.txt examples/msg/sendrecv/CMakeLists.txt - examples/msg/chainsend/CMakeLists.txt examples/msg/start_kill_time/CMakeLists.txt examples/msg/suspend/CMakeLists.txt examples/msg/token_ring/CMakeLists.txt examples/msg/tracing/CMakeLists.txt + examples/scala/CMakeLists.txt + examples/scala/master_slave_bypass/CMakeLists.txt + examples/scala/master_slave_kill/CMakeLists.txt + examples/scala/masterslave/CMakeLists.txt examples/simdag/CMakeLists.txt examples/simdag/dax/CMakeLists.txt examples/simdag/dot/CMakeLists.txt examples/simdag/goal/CMakeLists.txt + examples/simdag/io/CMakeLists.txt examples/simdag/metaxml/CMakeLists.txt examples/simdag/properties/CMakeLists.txt examples/simdag/scheduling/CMakeLists.txt examples/smpi/CMakeLists.txt examples/smpi/MM/CMakeLists.txt + examples/smpi/energy/CMakeLists.txt + examples/smpi/energy/f77/CMakeLists.txt + examples/smpi/energy/f90/CMakeLists.txt examples/xbt/CMakeLists.txt ) set(TESHSUITE_CMAKEFILES_TXT - teshsuite/CMakeLists.txt teshsuite/msg/CMakeLists.txt + teshsuite/msg/storage/CMakeLists.txt teshsuite/msg/trace/CMakeLists.txt teshsuite/simdag/CMakeLists.txt + teshsuite/simdag/availability/CMakeLists.txt teshsuite/simdag/network/CMakeLists.txt teshsuite/simdag/network/mxn/CMakeLists.txt teshsuite/simdag/network/p2p/CMakeLists.txt teshsuite/simdag/partask/CMakeLists.txt teshsuite/simdag/platforms/CMakeLists.txt - teshsuite/simdag/availability/CMakeLists.txt - teshsuite/xbt/CMakeLists.txt + teshsuite/simix/CMakeLists.txt teshsuite/smpi/CMakeLists.txt - teshsuite/smpi/mpich-test/CMakeLists.txt - teshsuite/smpi/mpich-test/env/CMakeLists.txt - teshsuite/smpi/mpich-test/coll/CMakeLists.txt - teshsuite/smpi/mpich-test/context/CMakeLists.txt - teshsuite/smpi/mpich-test/profile/CMakeLists.txt - teshsuite/smpi/mpich-test/pt2pt/CMakeLists.txt + teshsuite/smpi/mpich3-test/CMakeLists.txt + teshsuite/smpi/mpich3-test/attr/CMakeLists.txt + teshsuite/smpi/mpich3-test/comm/CMakeLists.txt + teshsuite/smpi/mpich3-test/coll/CMakeLists.txt + teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt + teshsuite/smpi/mpich3-test/group/CMakeLists.txt + teshsuite/smpi/mpich3-test/init/CMakeLists.txt + teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt +# teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt + teshsuite/xbt/CMakeLists.txt ) set(TOOLS_CMAKEFILES_TXT @@ -927,8 +1001,10 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/MakeLib.cmake buildtools/Cmake/MakeLibWin.cmake buildtools/Cmake/Modules/FindF2c.cmake + buildtools/Cmake/Modules/FindGFortran.cmake buildtools/Cmake/Modules/FindGTnets.cmake buildtools/Cmake/Modules/FindGraphviz.cmake + buildtools/Cmake/Modules/FindLibSigc++.cmake buildtools/Cmake/Modules/FindLibunwind.cmake buildtools/Cmake/Modules/FindLua51Simgrid.cmake buildtools/Cmake/Modules/FindNS3.cmake @@ -983,7 +1059,9 @@ set(PLATFORMS_EXAMPLES examples/platforms/conf/lcg_sept2004_grid.xml examples/platforms/conf/transform_optorsim_platform.pl examples/platforms/config.xml + examples/platforms/content/small_content.txt examples/platforms/content/storage_content.txt + examples/platforms/content/win_storage_content.txt examples/platforms/data_center.xml examples/platforms/g5k.xml examples/platforms/generation_scripts/create_hierarchical_clusters.pl @@ -991,6 +1069,7 @@ set(PLATFORMS_EXAMPLES examples/platforms/generation_scripts/generate_g5k_platform.pl examples/platforms/generation_scripts/generate_g5k_platform_cabinets.pl examples/platforms/griffon.xml + examples/platforms/torus_cluster.xml examples/platforms/meta_cluster.xml examples/platforms/multicore_machine.xml examples/platforms/prop.xml