From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 3 Aug 2018 21:38:32 +0000 (+0200)
Subject: Merge branch 'master' of framagit.org:simgrid/simgrid
X-Git-Tag: v3_21~302
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/50ddfe2f5b5035e0ed9556b334d6977ee81ff83a?hp=-c

Merge branch 'master' of framagit.org:simgrid/simgrid
---

50ddfe2f5b5035e0ed9556b334d6977ee81ff83a
diff --combined tools/cmake/DefinePackages.cmake
index 5313525cdb,f05744b917..c9974ce8cf
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@@ -238,28 -238,22 +238,28 @@@ set(SMPI_SR
    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_actor.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
    )
@@@ -435,6 -429,7 +435,7 @@@ set(S4U_SR
    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
@@@ -665,6 -660,7 +666,6 @@@ set(MC_SR
  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
@@@ -700,6 -696,7 +701,7 @@@
    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
@@@ -726,7 -723,6 +728,7 @@@
    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
@@@ -1008,7 -1004,6 +1010,7 @@@ set(CMAKEFILES_TX
      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