X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ce37f6e9d775bdc13c270e14490c156c1f95f71f..e27975bc4e43d1cd38725a26323d766beedb0cd0:/buildtools/Cmake/DefinePackages.cmake diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 18b93c93b2..638ac0b3d4 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -5,6 +5,8 @@ set(EXTRA_DIST src/include/instr/instr_interface.h src/include/mc/datatypes.h src/include/mc/mc.h + src/mc/mc_mmu.h + src/mc/mc_page_store.h src/include/simgrid/platf_interface.h src/include/simgrid/sg_config.h src/include/smpi/smpi_interface.h @@ -18,7 +20,6 @@ set(EXTRA_DIST src/include/surf/trace_mgr.h src/include/xbt/win32_ucontext.h src/include/xbt/wine_dbghelp.h - src/include/xbt/xbt_os_time.h src/msg/msg_mailbox.h src/msg/msg_private.h src/portable.h @@ -28,23 +29,22 @@ set(EXTRA_DIST src/simdag/private.h src/simix/simcalls.in src/simix/simcalls.py - src/simix/simcalls_generated_args_getter_setter.h - src/simix/simcalls_generated_body.c - src/simix/simcalls_generated_case.c - src/simix/simcalls_generated_enum.h - src/simix/simcalls_generated_res_getter_setter.h - src/simix/simcalls_generated_string.c + src/simix/popping_private.h + src/simix/popping_bodies.c + src/simix/popping_generated.c + src/simix/popping_enum.h + src/simix/popping_accessors.h src/simix/smx_host_private.h src/simix/smx_io_private.h src/simix/smx_network_private.h src/simix/smx_private.h src/simix/smx_process_private.h - src/simix/smx_smurf_private.h src/simix/smx_synchro_private.h src/smpi/README src/smpi/colls/coll_tuned_topo.h src/smpi/colls/colls.h src/smpi/colls/colls_private.h + src/smpi/colls/smpi_mvapich2_selector_stampede.h src/smpi/private.h src/smpi/smpi_mpi_dt_private.h src/surf/cpu_cas01.hpp @@ -60,6 +60,7 @@ set(EXTRA_DIST src/surf/network_interface.hpp src/surf/network_ns3.hpp src/surf/network_smpi.hpp + src/surf/network_ib.hpp src/surf/ns3/my-point-to-point-helper.h src/surf/ns3/ns3_interface.h src/surf/ns3/ns3_simulator.h @@ -111,7 +112,6 @@ set(EXTRA_DIST src/xbt/mallocator_private.h src/xbt/mmalloc/mfree.c src/xbt/mmalloc/mm.c - src/xbt/mmalloc/mm_diff.c src/xbt/mmalloc/mm_legacy.c src/xbt/mmalloc/mm_module.c src/xbt/mmalloc/mmalloc.c @@ -125,6 +125,9 @@ set(EXTRA_DIST src/xbt/win32_ucontext.c tools/tesh/run_context.h tools/tesh/tesh.h + tools/tesh/generate_tesh + examples/smpi/mc/non_deterministic.tesh + examples/smpi/mc/send_deterministic.tesh ) set(SMPI_SRC @@ -138,6 +141,7 @@ set(SMPI_SRC src/smpi/colls/allgather-loosely-lr.c src/smpi/colls/allgather-ompi-neighborexchange.c src/smpi/colls/allgather-pair.c + src/smpi/colls/allgather-mvapich-smp.c src/smpi/colls/allgather-rdb.c src/smpi/colls/allgather-rhv.c src/smpi/colls/allgather-ring.c @@ -163,6 +167,8 @@ set(SMPI_SRC src/smpi/colls/allreduce-smp-rsag-lr.c src/smpi/colls/allreduce-smp-rsag-rab.c src/smpi/colls/allreduce-smp-rsag.c + src/smpi/colls/allreduce-mvapich-rs.c + src/smpi/colls/allreduce-mvapich-two-level.c src/smpi/colls/alltoall-2dmesh.c src/smpi/colls/alltoall-3dmesh.c # src/smpi/colls/alltoall-bruck.c @@ -175,6 +181,7 @@ set(SMPI_SRC src/smpi/colls/alltoall-ring-mpi-barrier.c src/smpi/colls/alltoall-ring-one-barrier.c src/smpi/colls/alltoall-ring.c + src/smpi/colls/alltoall-mvapich-scatter-dest.c src/smpi/colls/alltoallv-bruck.c src/smpi/colls/alltoallv-ompi-basic-linear.c src/smpi/colls/alltoallv-pair-light-barrier.c @@ -186,6 +193,7 @@ set(SMPI_SRC src/smpi/colls/alltoallv-ring-one-barrier.c src/smpi/colls/alltoallv-ring.c src/smpi/colls/barrier-ompi.c + src/smpi/colls/barrier-mvapich2-pair.c src/smpi/colls/bcast-NTSB.c src/smpi/colls/bcast-NTSL-Isend.c src/smpi/colls/bcast-NTSL.c @@ -200,11 +208,13 @@ set(SMPI_SRC src/smpi/colls/bcast-flattree.c src/smpi/colls/bcast-ompi-pipeline.c src/smpi/colls/bcast-ompi-split-bintree.c + src/smpi/colls/bcast-mvapich-smp.c src/smpi/colls/bcast-scatter-LR-allgather.c src/smpi/colls/bcast-scatter-rdb-allgather.c src/smpi/colls/coll_tuned_topo.c src/smpi/colls/colls_global.c src/smpi/colls/gather-ompi.c + src/smpi/colls/gather-mvapich.c src/smpi/colls/reduce-NTSL.c src/smpi/colls/reduce-arrival-pattern-aware.c src/smpi/colls/reduce-binomial.c @@ -213,10 +223,16 @@ set(SMPI_SRC src/smpi/colls/reduce-scatter-gather.c src/smpi/colls/reduce_scatter-mpich.c src/smpi/colls/reduce_scatter-ompi.c + src/smpi/colls/reduce-mvapich-knomial.c + src/smpi/colls/reduce-mvapich-two-level.c + src/smpi/colls/reduce-rab.c src/smpi/colls/scatter-ompi.c + src/smpi/colls/scatter-mvapich-two-level.c src/smpi/colls/smpi_automatic_selector.c src/smpi/colls/smpi_mpich_selector.c + src/smpi/colls/smpi_intel_mpi_selector.c src/smpi/colls/smpi_openmpi_selector.c + src/smpi/colls/smpi_mvapich2_selector.c src/smpi/instr_smpi.c src/smpi/smpi_base.c src/smpi/smpi_bench.c @@ -231,23 +247,11 @@ set(SMPI_SRC src/smpi/smpi_mpi_dt.c src/smpi/smpi_pmpi.c src/smpi/smpi_replay.c + src/smpi/smpi_rma.c src/smpi/smpi_topo.c - src/surf/surf_routing_cluster_fat_tree.cpp + src/smpi/smpi_f77.c ) -if(SMPI_F2C) - set(SMPI_SRC - ${SMPI_SRC} - src/smpi/smpi_f77.c - ) -else() - set(EXTRA_DIST - ${EXTRA_DIST} - src/smpi/smpi_f77.c - ) -endif() - - set(XBT_SRC src/xbt/RngStream.c src/xbt/automaton/automaton.c @@ -324,6 +328,7 @@ set(SURF_SRC src/surf/network_constant.cpp src/surf/network_interface.cpp src/surf/network_smpi.cpp + src/surf/network_ib.cpp src/surf/platf_generator.c src/surf/plugins/energy.cpp src/surf/random_mgr.c @@ -334,6 +339,7 @@ set(SURF_SRC src/surf/surf_interface.cpp src/surf/surf_routing.cpp src/surf/surf_routing_cluster.cpp + src/surf/surf_routing_cluster_fat_tree.cpp src/surf/surf_routing_cluster_torus.cpp src/surf/surf_routing_dijkstra.cpp src/surf/surf_routing_floyd.cpp @@ -352,7 +358,11 @@ set(SURF_SRC src/xbt/xbt_sg_stubs.c ) +set(SIMIX_GENERATED_SRC + src/simix/popping_generated.c + ) set(SIMIX_SRC + src/simix/libsmx.c src/simix/smx_context.c src/simix/smx_context_base.c src/simix/smx_context_raw.c @@ -363,10 +373,10 @@ set(SIMIX_SRC src/simix/smx_io.c src/simix/smx_network.c src/simix/smx_process.c - src/simix/smx_smurf.c src/simix/smx_synchro.c - src/simix/smx_user.c src/simix/smx_vm.c + src/simix/popping.c + ${SIMIX_GENERATED_SRC} ) set(SIMGRID_SRC @@ -391,23 +401,6 @@ set(MSG_SRC src/msg/msg_vm.c ) -#* ****************************************************************************************** *# -#* TUTORIAL: New API *# - -set(MSG_SRC - ${MSG_SRC} - src/msg/msg_new_api.c - ) -set(EXTRA_DIST - ${EXTRA_DIST} - src/simix/smx_new_api_private.h - ) -set(SIMIX_SRC - ${SIMIX_SRC} - src/simix/smx_new_api.c -) -#* ****************************************************************************************** *# - set(SIMDAG_SRC src/simdag/instr_sd_task.c src/simdag/sd_daxloader.c @@ -497,6 +490,8 @@ set(JMSG_C_SRC src/bindings/java/smx_context_cojava.h src/bindings/java/smx_context_java.c src/bindings/java/smx_context_java.h + src/bindings/java/jmsg_storage.c + src/bindings/java/jmsg_storage.h ) set(JSURF_C_SRC @@ -523,6 +518,8 @@ set(JMSG_JAVA_SRC src/bindings/java/org/simgrid/msg/ProcessNotFoundException.java src/bindings/java/org/simgrid/msg/RngStream.java src/bindings/java/org/simgrid/msg/Semaphore.java + src/bindings/java/org/simgrid/msg/Storage.java + src/bindings/java/org/simgrid/msg/StorageNotFoundException.java src/bindings/java/org/simgrid/msg/Task.java src/bindings/java/org/simgrid/msg/TaskCancelledException.java src/bindings/java/org/simgrid/msg/TimeoutException.java @@ -586,22 +583,31 @@ set(JEDULE_SRC set(MC_SRC src/mc/mc_checkpoint.c - src/mc/mc_compare.c - src/mc/mc_dpor.c + src/mc/mc_snapshot.c + src/mc/mc_page_store.cpp + src/mc/mc_page_snapshot.cpp + src/mc/mc_comm_determinism.c + src/mc/mc_compare.cpp + src/mc/mc_config.c + src/mc/mc_diff.c src/mc/mc_dwarf.c src/mc/mc_dwarf_attrnames.h src/mc/mc_dwarf_expression.c src/mc/mc_dwarf_tagnames.h src/mc/mc_global.c src/mc/mc_hash.c + src/mc/mc_ignore.c + src/mc/mc_interface.h src/mc/mc_liveness.c src/mc/mc_member.c src/mc/mc_memory.c src/mc/mc_pair.c src/mc/mc_private.h src/mc/mc_request.c + src/mc/mc_safety.c src/mc/mc_set.cpp src/mc/mc_state.c + src/mc/mc_visited.c src/mc/memory_map.c ) @@ -661,11 +667,11 @@ set(headers_to_install include/xbt/sysdep.h include/xbt/virtu.h include/xbt/xbt_os_thread.h + include/xbt/xbt_os_time.h ) 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) ### depend of some variables setted upper @@ -794,6 +800,10 @@ set(DOC_SOURCES 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 @@ -839,6 +849,9 @@ set(DOC_SOURCES doc/doxygen/use.doc doc/manpage/smpicc.1 + doc/manpage/smpicxx.1 + doc/manpage/smpif90.1 + doc/manpage/smpiff.1 doc/manpage/smpirun.1 doc/msg-tuto-src/deployment0.xml @@ -902,7 +915,7 @@ set(DOC_IMG set(bin_files ${bin_files} src/smpi/smpicc.in - src/smpi/smpif2c.in + src/smpi/smpicxx.in src/smpi/smpiff.in src/smpi/smpif90.in src/smpi/smpirun.in @@ -957,6 +970,7 @@ set(EXAMPLES_CMAKEFILES_TXT examples/msg/energy/e1/CMakeLists.txt examples/msg/energy/e2/CMakeLists.txt examples/msg/energy/e3/CMakeLists.txt + examples/msg/exception/CMakeLists.txt examples/msg/gpu/CMakeLists.txt examples/msg/gtnets/CMakeLists.txt examples/msg/icomms/CMakeLists.txt @@ -991,6 +1005,7 @@ set(EXAMPLES_CMAKEFILES_TXT examples/simdag/scheduling/CMakeLists.txt examples/smpi/CMakeLists.txt examples/smpi/smpi_msg_masterslave/CMakeLists.txt + examples/smpi/replay_multiple/CMakeLists.txt examples/smpi/MM/CMakeLists.txt examples/smpi/energy/CMakeLists.txt examples/smpi/energy/f77/CMakeLists.txt @@ -1000,26 +1015,50 @@ set(EXAMPLES_CMAKEFILES_TXT set(TESHSUITE_CMAKEFILES_TXT teshsuite/bug-17132/CMakeLists.txt + teshsuite/java/CMakeLists.txt + teshsuite/java/sleep_host_off/CMakeLists.txt + teshsuite/mc/CMakeLists.txt teshsuite/mc/dwarf/CMakeLists.txt teshsuite/mc/dwarf_expression/CMakeLists.txt teshsuite/msg/CMakeLists.txt teshsuite/msg/get_sender/CMakeLists.txt teshsuite/msg/host_on_off/CMakeLists.txt + teshsuite/msg/host_on_off_processes/CMakeLists.txt teshsuite/msg/pid/CMakeLists.txt teshsuite/msg/process/CMakeLists.txt teshsuite/msg/process_join/CMakeLists.txt teshsuite/msg/storage/CMakeLists.txt teshsuite/msg/task_destroy_cancel/CMakeLists.txt teshsuite/msg/trace/CMakeLists.txt - teshsuite/simdag/CMakeLists.txt teshsuite/simdag/availability/CMakeLists.txt + teshsuite/simdag/basic/CMakeLists.txt + teshsuite/simdag/incomplete/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/simix/CMakeLists.txt + teshsuite/simix/check_defaults/CMakeLists.txt + teshsuite/simix/stack_overflow/CMakeLists.txt teshsuite/smpi/CMakeLists.txt + teshsuite/smpi/allgather/CMakeLists.txt + teshsuite/smpi/allgatherv/CMakeLists.txt + teshsuite/smpi/allreduce/CMakeLists.txt + teshsuite/smpi/alltoall/CMakeLists.txt + teshsuite/smpi/alltoallv/CMakeLists.txt + teshsuite/smpi/barrier/CMakeLists.txt + teshsuite/smpi/bcast/CMakeLists.txt + teshsuite/smpi/compute/CMakeLists.txt + teshsuite/smpi/gather/CMakeLists.txt + teshsuite/smpi/hvector/CMakeLists.txt + teshsuite/smpi/indexed/CMakeLists.txt + teshsuite/smpi/pingpong/CMakeLists.txt + teshsuite/smpi/reduce/CMakeLists.txt + teshsuite/smpi/scatter/CMakeLists.txt + teshsuite/smpi/shared/CMakeLists.txt + teshsuite/smpi/struct/CMakeLists.txt + teshsuite/smpi/vector/CMakeLists.txt + teshsuite/smpi/isp/umpire/CMakeLists.txt teshsuite/smpi/mpich3-test/CMakeLists.txt teshsuite/smpi/mpich3-test/attr/CMakeLists.txt teshsuite/smpi/mpich3-test/coll/CMakeLists.txt @@ -1027,21 +1066,29 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/smpi/mpich3-test/datatype/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 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/f77/util/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt + teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt + teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt teshsuite/smpi/mpich3-test/group/CMakeLists.txt + teshsuite/smpi/mpich3-test/info/CMakeLists.txt teshsuite/smpi/mpich3-test/init/CMakeLists.txt teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt teshsuite/smpi/mpich3-test/topo/CMakeLists.txt + teshsuite/smpi/mpich3-test/rma/CMakeLists.txt + teshsuite/smpi/mpich3-test/perf/CMakeLists.txt teshsuite/surf/CMakeLists.txt teshsuite/surf/lmm_usage/CMakeLists.txt teshsuite/surf/maxmin_bench/CMakeLists.txt @@ -1051,6 +1098,7 @@ set(TESHSUITE_CMAKEFILES_TXT teshsuite/xbt/heap_bench/CMakeLists.txt teshsuite/xbt/log_large/CMakeLists.txt teshsuite/xbt/log_usage/CMakeLists.txt + teshsuite/xbt/mallocator/CMakeLists.txt teshsuite/xbt/mmalloc/CMakeLists.txt teshsuite/xbt/parallel_log/CMakeLists.txt teshsuite/xbt/parmap_bench/CMakeLists.txt @@ -1079,7 +1127,6 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/MakeJava.cmake 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 @@ -1100,7 +1147,6 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/Scripts/Makefile.default buildtools/Cmake/Scripts/SimGrid.packproj buildtools/Cmake/Scripts/generate_memcheck_tests.pl - buildtools/Cmake/Scripts/generate_new_tests.pl buildtools/Cmake/Scripts/java_bundle.sh buildtools/Cmake/Scripts/my_valgrind.pl buildtools/Cmake/Scripts/postinstall.sh @@ -1123,6 +1169,12 @@ set(CMAKE_SOURCE_FILES buildtools/Cmake/test_prog/prog_stacksetup.c buildtools/Cmake/test_prog/prog_thread_storage.c buildtools/Cmake/test_prog/prog_vsnprintf.c + tools/stack-cleaner/as + tools/stack-cleaner/cc + tools/stack-cleaner/c++ + tools/stack-cleaner/fortran + tools/stack-cleaner/clean-stack-filter + tools/stack-cleaner/README ) set(PLATFORMS_EXAMPLES @@ -1139,10 +1191,17 @@ set(PLATFORMS_EXAMPLES examples/platforms/conf/lcg_sept2004_grid.xml examples/platforms/conf/transform_optorsim_platform.pl examples/platforms/config.xml + examples/platforms/config_tracing.xml examples/platforms/content/small_content.txt examples/platforms/content/storage_content.txt examples/platforms/content/win_storage_content.txt + examples/platforms/trace/trace_A_failure.txt + examples/platforms/trace/trace_A.txt + examples/platforms/trace/trace_B.txt examples/platforms/data_center.xml + examples/platforms/deployment_remote_io.xml + examples/platforms/energy_platform.xml + examples/platforms/fat_tree_cluster.xml examples/platforms/g5k.xml examples/platforms/generation_scripts/create_hierarchical_clusters.pl examples/platforms/generation_scripts/enhancedDTDwithHierarchicalCluster.pl @@ -1151,9 +1210,16 @@ set(PLATFORMS_EXAMPLES examples/platforms/griffon.xml examples/platforms/meta_cluster.xml examples/platforms/multicore_machine.xml + examples/platforms/platform.xml examples/platforms/prop.xml + examples/platforms/remote_io.xml examples/platforms/routing_cluster.xml examples/platforms/storage.xml + examples/platforms/small_platform.xml + examples/platforms/small_platform_fatpipe.xml + examples/platforms/small_platform_one_link_routes.xml + examples/platforms/small_platform_with_failures.xml + examples/platforms/small_platform_with_routers.xml examples/platforms/syscoord/generate_peer_platform.pl examples/platforms/syscoord/median_harvard.syscoord examples/platforms/syscoord/median_harvard.xml @@ -1162,6 +1228,10 @@ set(PLATFORMS_EXAMPLES examples/platforms/syscoord/median_p2psim.syscoord examples/platforms/syscoord/median_p2psim.xml examples/platforms/torus_cluster.xml + examples/platforms/two_hosts_platform.xml + examples/platforms/two_hosts_platform_shared.xml + examples/platforms/two_hosts_platform_with_availability.xml + examples/platforms/two_hosts_platform_with_availability_included.xml examples/platforms/two_peers.xml examples/platforms/vivaldi.xml )