From: degomme Date: Mon, 17 Jul 2017 13:14:13 +0000 (+0200) Subject: Big move of all SMPI files in subfolders because it was a mess. X-Git-Tag: v3_17~378 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4d140762b2b9c8746cdd3b0680a7167867ba0ad9?ds=sidebyside Big move of all SMPI files in subfolders because it was a mess. bindings : all C/F77 bindings + PMPI_* entry functions, which will be split up into several files next mpi : all MPI structures (Request, Op, Info, Datatype, ...) implementation. colls : untouched, collective comms folder internals : all SMPI specifics (sharing, dvfs, instr, privatization, processes...) include : all *.hpp and .h files (should it be moved ? it's added by default in the include path now) --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7dea4f7bd7..19a9267fe4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -167,6 +167,10 @@ set(INCLUDES ${CMAKE_HOME_DIRECTORY}/src/include ) +if(enable_smpi) + set (INCLUDES ${INCLUDES} ${CMAKE_HOME_DIRECTORY}/src/smpi/include) +endif() + if(NOT CMAKE_CROSSCOMPILING AND EXISTS /usr/include/) set(INCLUDES ${INCLUDES} /usr/include/) endif() diff --git a/src/instr/instr_paje_trace.cpp b/src/instr/instr_paje_trace.cpp index a9761ba768..c63641cd0e 100644 --- a/src/instr/instr_paje_trace.cpp +++ b/src/instr/instr_paje_trace.cpp @@ -6,7 +6,7 @@ #include "src/instr/instr_private.h" #include "src/instr/instr_smpi.h" -#include "src/smpi/private.hpp" +#include "src/smpi/include/private.hpp" #include "typeinfo" #include "xbt/virtu.h" /* sg_cmdline */ #include "simgrid/sg_config.h" diff --git a/src/mc/ObjectInformation.hpp b/src/mc/ObjectInformation.hpp index 21ed47157a..019e75baf5 100644 --- a/src/mc/ObjectInformation.hpp +++ b/src/mc/ObjectInformation.hpp @@ -19,7 +19,7 @@ #include "src/mc/Type.hpp" #include "src/mc/Frame.hpp" -#include "src/smpi/private.h" +#include "src/smpi/include/private.h" namespace simgrid { namespace mc { diff --git a/src/mc/Session.cpp b/src/mc/Session.cpp index 566858b8ad..d38c528217 100644 --- a/src/mc/Session.cpp +++ b/src/mc/Session.cpp @@ -20,7 +20,7 @@ #include "src/mc/mc_private.h" #include "src/mc/checker/Checker.hpp" -#include "src/smpi/private.hpp" +#include "src/smpi/include/private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_Session, mc, "Model-checker session"); diff --git a/src/mc/checker/CommunicationDeterminismChecker.cpp b/src/mc/checker/CommunicationDeterminismChecker.cpp index cb723fb60e..fad3f3ade6 100644 --- a/src/mc/checker/CommunicationDeterminismChecker.cpp +++ b/src/mc/checker/CommunicationDeterminismChecker.cpp @@ -21,7 +21,7 @@ #include "src/mc/mc_state.h" #include "src/mc/remote/Client.hpp" -#include "src/smpi/smpi_request.hpp" +#include "smpi_request.hpp" using simgrid::mc::remote; diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index 1fe48f4e3a..fabd66bd2f 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -25,8 +25,8 @@ #include "src/xbt/mmalloc/mmprivate.h" #if HAVE_SMPI -#include "src/smpi/private.h" -#include "src/smpi/private.hpp" +#include "src/smpi/include/private.h" +#include "src/smpi/include/private.hpp" #endif #include "src/mc/mc_forward.hpp" diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index be90588f20..9f7775c812 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -17,7 +17,7 @@ #include "src/internal_config.h" #include "src/mc/mc_private.h" -#include "src/smpi/private.h" +#include "src/smpi/include/private.h" #include "xbt/mmalloc.h" #include "xbt/module.h" diff --git a/src/mc/mc_snapshot.cpp b/src/mc/mc_snapshot.cpp index a79de0e12c..e365f98543 100644 --- a/src/mc/mc_snapshot.cpp +++ b/src/mc/mc_snapshot.cpp @@ -13,7 +13,7 @@ #include "xbt/sysdep.h" #include "src/internal_config.h" -#include "src/smpi/private.h" +#include "src/smpi/include/private.h" #include "src/mc/mc_snapshot.h" #include "src/mc/mc_private.h" diff --git a/src/mc/remote/Client.cpp b/src/mc/remote/Client.cpp index dae03e7076..e82f14209f 100644 --- a/src/mc/remote/Client.cpp +++ b/src/mc/remote/Client.cpp @@ -23,7 +23,7 @@ #include "src/mc/remote/Client.hpp" #include "src/mc/remote/mc_protocol.h" -#include "src/smpi/private.hpp" +#include "src/smpi/include/private.hpp" // We won't need those once the separation MCer/MCed is complete: #include "src/mc/mc_smx.h" diff --git a/src/simix/ActorImpl.cpp b/src/simix/ActorImpl.cpp index 4d2b7ba979..f9b0f73f6b 100644 --- a/src/simix/ActorImpl.cpp +++ b/src/simix/ActorImpl.cpp @@ -31,7 +31,7 @@ #include "src/surf/surf_interface.hpp" #ifdef HAVE_SMPI -#include "src/smpi/private.hpp" +#include "src/smpi/include/private.hpp" #endif XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_process, simix, "Logging specific to SIMIX (process)"); diff --git a/src/simix/smx_global.cpp b/src/simix/smx_global.cpp index 68d64655d5..f0f826872f 100644 --- a/src/simix/smx_global.cpp +++ b/src/simix/smx_global.cpp @@ -25,7 +25,7 @@ #include "src/mc/mc_replay.h" #include "src/surf/StorageImpl.hpp" -#include "src/smpi/smpi_process.hpp" +#include "src/smpi/include/smpi_process.hpp" #include "src/kernel/activity/CommImpl.hpp" #include "src/kernel/activity/ExecImpl.hpp" @@ -43,8 +43,8 @@ #include "src/mc/mc_record.h" #if HAVE_SMPI -#include "src/smpi/private.h" -#include "src/smpi/private.hpp" +#include "src/smpi/include/private.h" +#include "src/smpi/include/private.hpp" #endif XBT_LOG_NEW_CATEGORY(simix, "All SIMIX categories"); diff --git a/src/smpi/smpi_f77.cpp b/src/smpi/bindings/smpi_f77.cpp similarity index 99% rename from src/smpi/smpi_f77.cpp rename to src/smpi/bindings/smpi_f77.cpp index ffaad7c8f1..c0e6559b58 100644 --- a/src/smpi/smpi_f77.cpp +++ b/src/smpi/bindings/smpi_f77.cpp @@ -3,13 +3,13 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/smpi/private.h" -#include "src/smpi/smpi_comm.hpp" -#include "src/smpi/smpi_datatype.hpp" -#include "src/smpi/smpi_op.hpp" -#include "src/smpi/smpi_process.hpp" -#include "src/smpi/smpi_request.hpp" -#include "src/smpi/smpi_win.hpp" +#include "private.h" +#include "smpi_comm.hpp" +#include "smpi_datatype.hpp" +#include "smpi_op.hpp" +#include "smpi_process.hpp" +#include "smpi_request.hpp" +#include "smpi_win.hpp" static int running_processes = 0; diff --git a/src/smpi/smpi_mpi.cpp b/src/smpi/bindings/smpi_mpi.cpp similarity index 100% rename from src/smpi/smpi_mpi.cpp rename to src/smpi/bindings/smpi_mpi.cpp diff --git a/src/smpi/smpi_pmpi.cpp b/src/smpi/bindings/smpi_pmpi.cpp similarity index 99% rename from src/smpi/smpi_pmpi.cpp rename to src/smpi/bindings/smpi_pmpi.cpp index c48bdcf59e..fd2a84001f 100644 --- a/src/smpi/smpi_pmpi.cpp +++ b/src/smpi/bindings/smpi_pmpi.cpp @@ -7,15 +7,15 @@ #include "simgrid/s4u/Engine.hpp" #include "simgrid/s4u/Host.hpp" -#include "src/smpi/private.h" -#include "src/smpi/smpi_comm.hpp" -#include "src/smpi/smpi_coll.hpp" -#include "src/smpi/smpi_datatype_derived.hpp" -#include "src/smpi/smpi_op.hpp" -#include "src/smpi/smpi_process.hpp" -#include "src/smpi/smpi_request.hpp" -#include "src/smpi/smpi_status.hpp" -#include "src/smpi/smpi_win.hpp" +#include "private.h" +#include "smpi_comm.hpp" +#include "smpi_coll.hpp" +#include "smpi_datatype_derived.hpp" +#include "smpi_op.hpp" +#include "smpi_process.hpp" +#include "smpi_request.hpp" +#include "smpi_status.hpp" +#include "smpi_win.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_pmpi, smpi, "Logging specific to SMPI (pmpi)"); diff --git a/src/smpi/colls/allgather/allgather-rdb.cpp b/src/smpi/colls/allgather/allgather-rdb.cpp index 1c028e8178..5e1d47b398 100644 --- a/src/smpi/colls/allgather/allgather-rdb.cpp +++ b/src/smpi/colls/allgather/allgather-rdb.cpp @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "../colls_private.h" -#include "src/smpi/smpi_status.hpp" +#include "smpi_status.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/allgatherv/allgatherv-mpich-rdb.cpp b/src/smpi/colls/allgatherv/allgatherv-mpich-rdb.cpp index fb374b9073..9226be163e 100644 --- a/src/smpi/colls/allgatherv/allgatherv-mpich-rdb.cpp +++ b/src/smpi/colls/allgatherv/allgatherv-mpich-rdb.cpp @@ -7,7 +7,7 @@ * recursive doubling algorithm */ #include "../colls_private.h" -#include "src/smpi/smpi_status.hpp" +#include "smpi_status.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/alltoall/alltoall-pair.cpp b/src/smpi/colls/alltoall/alltoall-pair.cpp index 24b1a75eaf..2dd6e00c81 100644 --- a/src/smpi/colls/alltoall/alltoall-pair.cpp +++ b/src/smpi/colls/alltoall/alltoall-pair.cpp @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "../colls_private.h" -#include "src/smpi/smpi_win.hpp" +#include "smpi_win.hpp" /***************************************************************************** diff --git a/src/smpi/colls/alltoall/alltoall-rdb.cpp b/src/smpi/colls/alltoall/alltoall-rdb.cpp index be4860d8d1..5067aa75ff 100644 --- a/src/smpi/colls/alltoall/alltoall-rdb.cpp +++ b/src/smpi/colls/alltoall/alltoall-rdb.cpp @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "../colls_private.h" -#include "src/smpi/smpi_status.hpp" +#include "smpi_status.hpp" /***************************************************************************** diff --git a/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp b/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp index 3466fdf996..6b304ade5f 100644 --- a/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp +++ b/src/smpi/colls/bcast/bcast-scatter-LR-allgather.cpp @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "../colls_private.h" -#include "src/smpi/smpi_status.hpp" +#include "smpi_status.hpp" /***************************************************************************** diff --git a/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp b/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp index f81694d4d1..f48e31a536 100644 --- a/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp +++ b/src/smpi/colls/bcast/bcast-scatter-rdb-allgather.cpp @@ -4,7 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "../colls_private.h" -#include "src/smpi/smpi_status.hpp" +#include "smpi_status.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/colls/colls_private.h b/src/smpi/colls/colls_private.h index c621957823..fc28459fbd 100644 --- a/src/smpi/colls/colls_private.h +++ b/src/smpi/colls/colls_private.h @@ -8,12 +8,12 @@ #include #include "smpi/mpi.h" -#include "src/smpi/private.h" -#include "src/smpi/smpi_coll.hpp" -#include "src/smpi/smpi_comm.hpp" -#include "src/smpi/smpi_datatype.hpp" -#include "src/smpi/smpi_op.hpp" -#include "src/smpi/smpi_request.hpp" +#include "private.h" +#include "smpi_coll.hpp" +#include "smpi_comm.hpp" +#include "smpi_datatype.hpp" +#include "smpi_op.hpp" +#include "smpi_request.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(smpi_colls); diff --git a/src/smpi/colls/smpi_automatic_selector.cpp b/src/smpi/colls/smpi_automatic_selector.cpp index 9afee1433c..b69b56ccba 100644 --- a/src/smpi/colls/smpi_automatic_selector.cpp +++ b/src/smpi/colls/smpi_automatic_selector.cpp @@ -9,7 +9,7 @@ #include #include "colls_private.h" -#include "src/smpi/smpi_process.hpp" +#include "smpi_process.hpp" //attempt to do a quick autotuning version of the collective, diff --git a/src/smpi/smpi_coll.cpp b/src/smpi/colls/smpi_coll.cpp similarity index 98% rename from src/smpi/smpi_coll.cpp rename to src/smpi/colls/smpi_coll.cpp index a26b1f7ed0..a0760feabf 100644 --- a/src/smpi/smpi_coll.cpp +++ b/src/smpi/colls/smpi_coll.cpp @@ -5,12 +5,12 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/smpi/private.h" -#include "src/smpi/smpi_coll.hpp" -#include "src/smpi/smpi_comm.hpp" -#include "src/smpi/smpi_datatype.hpp" -#include "src/smpi/smpi_op.hpp" -#include "src/smpi/smpi_request.hpp" +#include "private.h" +#include "smpi_coll.hpp" +#include "smpi_comm.hpp" +#include "smpi_datatype.hpp" +#include "smpi_op.hpp" +#include "smpi_request.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_coll, smpi, "Logging specific to SMPI (coll)"); diff --git a/src/smpi/colls/smpi_default_selector.cpp b/src/smpi/colls/smpi_default_selector.cpp index d674e4ad56..d3736cc81b 100644 --- a/src/smpi/colls/smpi_default_selector.cpp +++ b/src/smpi/colls/smpi_default_selector.cpp @@ -7,7 +7,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "colls_private.h" -#include "src/smpi/smpi_process.hpp" +#include "smpi_process.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/SmpiHost.hpp b/src/smpi/include/SmpiHost.hpp similarity index 100% rename from src/smpi/SmpiHost.hpp rename to src/smpi/include/SmpiHost.hpp diff --git a/src/smpi/private.h b/src/smpi/include/private.h similarity index 100% rename from src/smpi/private.h rename to src/smpi/include/private.h diff --git a/src/smpi/private.hpp b/src/smpi/include/private.hpp similarity index 100% rename from src/smpi/private.hpp rename to src/smpi/include/private.hpp diff --git a/src/smpi/smpi_coll.hpp b/src/smpi/include/smpi_coll.hpp similarity index 100% rename from src/smpi/smpi_coll.hpp rename to src/smpi/include/smpi_coll.hpp diff --git a/src/smpi/smpi_comm.hpp b/src/smpi/include/smpi_comm.hpp similarity index 95% rename from src/smpi/smpi_comm.hpp rename to src/smpi/include/smpi_comm.hpp index d31a50ad61..ed621f1a98 100644 --- a/src/smpi/smpi_comm.hpp +++ b/src/smpi/include/smpi_comm.hpp @@ -7,9 +7,9 @@ #define SMPI_COMM_HPP_INCLUDED #include -#include "src/smpi/smpi_keyvals.hpp" -#include "src/smpi/smpi_group.hpp" -#include "src/smpi/smpi_topo.hpp" +#include "smpi_keyvals.hpp" +#include "smpi_group.hpp" +#include "smpi_topo.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/smpi_datatype.hpp b/src/smpi/include/smpi_datatype.hpp similarity index 98% rename from src/smpi/smpi_datatype.hpp rename to src/smpi/include/smpi_datatype.hpp index 51978b5c71..3b1fd7dab9 100644 --- a/src/smpi/smpi_datatype.hpp +++ b/src/smpi/include/smpi_datatype.hpp @@ -6,8 +6,8 @@ #ifndef SMPI_DATATYPE_HPP #define SMPI_DATATYPE_HPP -#include "src/smpi/smpi_f2c.hpp" -#include "src/smpi/smpi_keyvals.hpp" +#include "smpi_f2c.hpp" +#include "smpi_keyvals.hpp" #define DT_FLAG_DESTROYED 0x0001 /**< user destroyed but some other layers still have a reference */ #define DT_FLAG_COMMITED 0x0002 /**< ready to be used for a send/recv operation */ diff --git a/src/smpi/smpi_datatype_derived.hpp b/src/smpi/include/smpi_datatype_derived.hpp similarity index 98% rename from src/smpi/smpi_datatype_derived.hpp rename to src/smpi/include/smpi_datatype_derived.hpp index 4ed9f738f5..b450bd9f98 100644 --- a/src/smpi/smpi_datatype_derived.hpp +++ b/src/smpi/include/smpi_datatype_derived.hpp @@ -7,7 +7,7 @@ #ifndef SMPI_DATATYPE_DERIVED_HPP #define SMPI_DATATYPE_DERIVED_HPP -#include "src/smpi/smpi_datatype.hpp" +#include "smpi_datatype.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/smpi_f2c.hpp b/src/smpi/include/smpi_f2c.hpp similarity index 100% rename from src/smpi/smpi_f2c.hpp rename to src/smpi/include/smpi_f2c.hpp diff --git a/src/smpi/smpi_group.hpp b/src/smpi/include/smpi_group.hpp similarity index 97% rename from src/smpi/smpi_group.hpp rename to src/smpi/include/smpi_group.hpp index 9c40f5e530..64812ca7e6 100644 --- a/src/smpi/smpi_group.hpp +++ b/src/smpi/include/smpi_group.hpp @@ -7,7 +7,7 @@ #ifndef SMPI_GROUP_HPP_INCLUDED #define SMPI_GROUP_HPP_INCLUDED -#include "src/smpi/smpi_f2c.hpp" +#include "smpi_f2c.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/smpi_info.hpp b/src/smpi/include/smpi_info.hpp similarity index 96% rename from src/smpi/smpi_info.hpp rename to src/smpi/include/smpi_info.hpp index 5eb096d34e..c8f049be73 100644 --- a/src/smpi/smpi_info.hpp +++ b/src/smpi/include/smpi_info.hpp @@ -7,7 +7,7 @@ #ifndef SMPI_INFO_HPP #define SMPI_INFO_HPP -#include "src/smpi/smpi_f2c.hpp" +#include "smpi_f2c.hpp" #include "smpi/smpi.h" #include "xbt/dict.h" diff --git a/src/smpi/smpi_keyvals.hpp b/src/smpi/include/smpi_keyvals.hpp similarity index 100% rename from src/smpi/smpi_keyvals.hpp rename to src/smpi/include/smpi_keyvals.hpp diff --git a/src/smpi/smpi_op.hpp b/src/smpi/include/smpi_op.hpp similarity index 95% rename from src/smpi/smpi_op.hpp rename to src/smpi/include/smpi_op.hpp index 167a346bac..f884189ebf 100644 --- a/src/smpi/smpi_op.hpp +++ b/src/smpi/include/smpi_op.hpp @@ -7,7 +7,7 @@ #ifndef SMPI_OP_HPP #define SMPI_OP_HPP -#include "src/smpi/smpi_info.hpp" +#include "smpi_info.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/smpi_process.hpp b/src/smpi/include/smpi_process.hpp similarity index 100% rename from src/smpi/smpi_process.hpp rename to src/smpi/include/smpi_process.hpp diff --git a/src/smpi/smpi_request.hpp b/src/smpi/include/smpi_request.hpp similarity index 99% rename from src/smpi/smpi_request.hpp rename to src/smpi/include/smpi_request.hpp index 535ebab307..5a11b2d009 100644 --- a/src/smpi/smpi_request.hpp +++ b/src/smpi/include/smpi_request.hpp @@ -7,7 +7,7 @@ #define SMPI_REQUEST_HPP_INCLUDED #include "smpi/smpi.h" -#include "src/smpi/smpi_f2c.hpp" +#include "smpi_f2c.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/smpi_status.hpp b/src/smpi/include/smpi_status.hpp similarity index 100% rename from src/smpi/smpi_status.hpp rename to src/smpi/include/smpi_status.hpp diff --git a/src/smpi/smpi_topo.hpp b/src/smpi/include/smpi_topo.hpp similarity index 95% rename from src/smpi/smpi_topo.hpp rename to src/smpi/include/smpi_topo.hpp index a884931201..d0cb5709ea 100644 --- a/src/smpi/smpi_topo.hpp +++ b/src/smpi/include/smpi_topo.hpp @@ -6,8 +6,8 @@ #ifndef SMPI_TOPO_HPP_INCLUDED #define SMPI_TOPO_HPP_INCLUDED -#include "src/smpi/smpi_comm.hpp" -#include "src/smpi/smpi_status.hpp" +#include "smpi_comm.hpp" +#include "smpi_status.hpp" typedef SMPI_Topology *MPI_Topology; diff --git a/src/smpi/smpi_win.hpp b/src/smpi/include/smpi_win.hpp similarity index 98% rename from src/smpi/smpi_win.hpp rename to src/smpi/include/smpi_win.hpp index e219be5588..ea49c1238f 100644 --- a/src/smpi/smpi_win.hpp +++ b/src/smpi/include/smpi_win.hpp @@ -7,7 +7,7 @@ #ifndef SMPI_WIN_HPP_INCLUDED #define SMPI_WIN_HPP_INCLUDED -#include "src/smpi/smpi_keyvals.hpp" +#include "smpi_keyvals.hpp" #include "xbt/synchro.h" #include diff --git a/src/smpi/SmpiHost.cpp b/src/smpi/internals/SmpiHost.cpp similarity index 99% rename from src/smpi/SmpiHost.cpp rename to src/smpi/internals/SmpiHost.cpp index cc9a814877..6f7139162d 100644 --- a/src/smpi/SmpiHost.cpp +++ b/src/smpi/internals/SmpiHost.cpp @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/smpi/SmpiHost.hpp" +#include "SmpiHost.hpp" #include "simgrid/s4u/VirtualMachine.hpp" #include "smpi/smpi_utils.hpp" diff --git a/src/smpi/instr_smpi.cpp b/src/smpi/internals/instr_smpi.cpp similarity index 100% rename from src/smpi/instr_smpi.cpp rename to src/smpi/internals/instr_smpi.cpp diff --git a/src/smpi/smpi_bench.cpp b/src/smpi/internals/smpi_bench.cpp similarity index 99% rename from src/smpi/smpi_bench.cpp rename to src/smpi/internals/smpi_bench.cpp index ce3502d56c..b570e7b1ea 100644 --- a/src/smpi/smpi_bench.cpp +++ b/src/smpi/internals/smpi_bench.cpp @@ -8,8 +8,8 @@ #include "private.hpp" #include "simgrid/modelchecker.h" #include "src/mc/mc_replay.h" -#include "src/smpi/smpi_process.hpp" -#include "src/smpi/smpi_comm.hpp" +#include "smpi_process.hpp" +#include "smpi_comm.hpp" #ifndef WIN32 #include diff --git a/src/smpi/smpi_deployment.cpp b/src/smpi/internals/smpi_deployment.cpp similarity index 97% rename from src/smpi/smpi_deployment.cpp rename to src/smpi/internals/smpi_deployment.cpp index 1abaa45278..3d88598f98 100644 --- a/src/smpi/smpi_deployment.cpp +++ b/src/smpi/internals/smpi_deployment.cpp @@ -5,9 +5,9 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/msg.h" /* barrier */ -#include "src/smpi/SmpiHost.hpp" -#include "src/smpi/private.h" -#include "src/smpi/smpi_comm.hpp" +#include "SmpiHost.hpp" +#include "private.h" +#include "smpi_comm.hpp" #include namespace simgrid { diff --git a/src/smpi/smpi_dvfs.cpp b/src/smpi/internals/smpi_dvfs.cpp similarity index 100% rename from src/smpi/smpi_dvfs.cpp rename to src/smpi/internals/smpi_dvfs.cpp diff --git a/src/smpi/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp similarity index 98% rename from src/smpi/smpi_global.cpp rename to src/smpi/internals/smpi_global.cpp index afa8e584d0..1504bd2d35 100644 --- a/src/smpi/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -9,15 +9,15 @@ #include "src/msg/msg_private.h" #include "src/simix/smx_private.h" #include "src/surf/surf_interface.hpp" -#include "src/smpi/SmpiHost.hpp" +#include "SmpiHost.hpp" #include "xbt/config.hpp" -#include "src/smpi/private.h" -#include "src/smpi/private.hpp" -#include "src/smpi/smpi_coll.hpp" -#include "src/smpi/smpi_comm.hpp" -#include "src/smpi/smpi_group.hpp" -#include "src/smpi/smpi_info.hpp" -#include "src/smpi/smpi_process.hpp" +#include "private.h" +#include "private.hpp" +#include "smpi_coll.hpp" +#include "smpi_comm.hpp" +#include "smpi_group.hpp" +#include "smpi_info.hpp" +#include "smpi_process.hpp" #include #include diff --git a/src/smpi/smpi_memory.cpp b/src/smpi/internals/smpi_memory.cpp similarity index 99% rename from src/smpi/smpi_memory.cpp rename to src/smpi/internals/smpi_memory.cpp index e071be307e..719b28b63b 100644 --- a/src/smpi/smpi_memory.cpp +++ b/src/smpi/internals/smpi_memory.cpp @@ -23,8 +23,8 @@ #include "src/xbt/memory_map.hpp" -#include "src/smpi/private.h" -#include "src/smpi/private.hpp" +#include "private.h" +#include "private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_memory, smpi, "Memory layout support for SMPI"); diff --git a/src/smpi/smpi_process.cpp b/src/smpi/internals/smpi_process.cpp similarity index 97% rename from src/smpi/smpi_process.cpp rename to src/smpi/internals/smpi_process.cpp index a7da2c8d9d..451f3cf9d8 100644 --- a/src/smpi/smpi_process.cpp +++ b/src/smpi/internals/smpi_process.cpp @@ -7,11 +7,11 @@ #include "src/mc/mc_replay.h" #include "src/msg/msg_private.h" #include "src/simix/smx_private.h" -#include "src/smpi/private.h" -#include "src/smpi/private.hpp" -#include "src/smpi/smpi_process.hpp" -#include "src/smpi/smpi_group.hpp" -#include "src/smpi/smpi_comm.hpp" +#include "private.h" +#include "private.hpp" +#include "smpi_process.hpp" +#include "smpi_group.hpp" +#include "smpi_comm.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (kernel)"); diff --git a/src/smpi/smpi_replay.cpp b/src/smpi/internals/smpi_replay.cpp similarity index 99% rename from src/smpi/smpi_replay.cpp rename to src/smpi/internals/smpi_replay.cpp index 9ba7295206..c41904ef8b 100644 --- a/src/smpi/smpi_replay.cpp +++ b/src/smpi/internals/smpi_replay.cpp @@ -3,13 +3,13 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/smpi/private.h" -#include "src/smpi/smpi_coll.hpp" -#include "src/smpi/smpi_comm.hpp" -#include "src/smpi/smpi_datatype.hpp" -#include "src/smpi/smpi_group.hpp" -#include "src/smpi/smpi_process.hpp" -#include "src/smpi/smpi_request.hpp" +#include "private.h" +#include "smpi_coll.hpp" +#include "smpi_comm.hpp" +#include "smpi_datatype.hpp" +#include "smpi_group.hpp" +#include "smpi_process.hpp" +#include "smpi_request.hpp" #include "xbt/replay.hpp" #include diff --git a/src/smpi/smpi_shared.cpp b/src/smpi/internals/smpi_shared.cpp similarity index 100% rename from src/smpi/smpi_shared.cpp rename to src/smpi/internals/smpi_shared.cpp diff --git a/src/smpi/smpi_static_variables.cpp b/src/smpi/internals/smpi_static_variables.cpp similarity index 100% rename from src/smpi/smpi_static_variables.cpp rename to src/smpi/internals/smpi_static_variables.cpp diff --git a/src/smpi/smpi_utils.cpp b/src/smpi/internals/smpi_utils.cpp similarity index 100% rename from src/smpi/smpi_utils.cpp rename to src/smpi/internals/smpi_utils.cpp diff --git a/src/smpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp similarity index 97% rename from src/smpi/smpi_comm.cpp rename to src/smpi/mpi/smpi_comm.cpp index 23de66f493..ee0747f8d6 100644 --- a/src/smpi/smpi_comm.cpp +++ b/src/smpi/mpi/smpi_comm.cpp @@ -7,15 +7,15 @@ #include #include "src/simix/smx_private.h" -#include "src/smpi/private.h" -#include "src/smpi/private.hpp" -#include "src/smpi/smpi_comm.hpp" -#include "src/smpi/smpi_coll.hpp" -#include "src/smpi/smpi_datatype.hpp" -#include "src/smpi/smpi_process.hpp" -#include "src/smpi/smpi_request.hpp" -#include "src/smpi/smpi_status.hpp" -#include "src/smpi/smpi_win.hpp" +#include "private.h" +#include "private.hpp" +#include "smpi_comm.hpp" +#include "smpi_coll.hpp" +#include "smpi_datatype.hpp" +#include "smpi_process.hpp" +#include "smpi_request.hpp" +#include "smpi_status.hpp" +#include "smpi_win.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_comm, smpi, "Logging specific to SMPI (comm)"); diff --git a/src/smpi/smpi_datatype.cpp b/src/smpi/mpi/smpi_datatype.cpp similarity index 98% rename from src/smpi/smpi_datatype.cpp rename to src/smpi/mpi/smpi_datatype.cpp index de74190462..565ec99448 100644 --- a/src/smpi/smpi_datatype.cpp +++ b/src/smpi/mpi/smpi_datatype.cpp @@ -5,11 +5,11 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/modelchecker.h" -#include "src/smpi/private.h" -#include "src/smpi/private.hpp" -#include "src/smpi/smpi_datatype_derived.hpp" -#include "src/smpi/smpi_op.hpp" -#include "src/smpi/smpi_process.hpp" +#include "private.h" +#include "private.hpp" +#include "smpi_datatype_derived.hpp" +#include "smpi_op.hpp" +#include "smpi_process.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_datatype, smpi, "Logging specific to SMPI (datatype)"); diff --git a/src/smpi/smpi_datatype_derived.cpp b/src/smpi/mpi/smpi_datatype_derived.cpp similarity index 99% rename from src/smpi/smpi_datatype_derived.cpp rename to src/smpi/mpi/smpi_datatype_derived.cpp index 4551048a74..ba77e82eef 100644 --- a/src/smpi/smpi_datatype_derived.cpp +++ b/src/smpi/mpi/smpi_datatype_derived.cpp @@ -4,8 +4,8 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/smpi/smpi_datatype_derived.hpp" -#include "src/smpi/smpi_op.hpp" +#include "smpi_datatype_derived.hpp" +#include "smpi_op.hpp" XBT_LOG_EXTERNAL_CATEGORY(smpi_datatype); diff --git a/src/smpi/smpi_f2c.cpp b/src/smpi/mpi/smpi_f2c.cpp similarity index 94% rename from src/smpi/smpi_f2c.cpp rename to src/smpi/mpi/smpi_f2c.cpp index df584b4f5e..e5a5706bcc 100644 --- a/src/smpi/smpi_f2c.cpp +++ b/src/smpi/mpi/smpi_f2c.cpp @@ -3,9 +3,9 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/smpi/private.h" -#include "src/smpi/smpi_f2c.hpp" -#include "src/smpi/smpi_process.hpp" +#include "private.h" +#include "smpi_f2c.hpp" +#include "smpi_process.hpp" #include diff --git a/src/smpi/smpi_group.cpp b/src/smpi/mpi/smpi_group.cpp similarity index 99% rename from src/smpi/smpi_group.cpp rename to src/smpi/mpi/smpi_group.cpp index a7e56babcb..115cf49a17 100644 --- a/src/smpi/smpi_group.cpp +++ b/src/smpi/mpi/smpi_group.cpp @@ -3,8 +3,8 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/smpi/smpi_comm.hpp" -#include "src/smpi/smpi_group.hpp" +#include "smpi_comm.hpp" +#include "smpi_group.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_group, smpi, "Logging specific to SMPI (group)"); diff --git a/src/smpi/smpi_info.cpp b/src/smpi/mpi/smpi_info.cpp similarity index 98% rename from src/smpi/smpi_info.cpp rename to src/smpi/mpi/smpi_info.cpp index 584ab1f08d..093da595f1 100644 --- a/src/smpi/smpi_info.cpp +++ b/src/smpi/mpi/smpi_info.cpp @@ -4,7 +4,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/smpi/smpi_info.hpp" +#include "smpi_info.hpp" #include "xbt/ex.hpp" #include "xbt/sysdep.h" diff --git a/src/smpi/smpi_keyvals.cpp b/src/smpi/mpi/smpi_keyvals.cpp similarity index 97% rename from src/smpi/smpi_keyvals.cpp rename to src/smpi/mpi/smpi_keyvals.cpp index 25aafe45d3..559ef5c3c9 100644 --- a/src/smpi/smpi_keyvals.cpp +++ b/src/smpi/mpi/smpi_keyvals.cpp @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ //#include "private.h" -#include "src/smpi/smpi_keyvals.hpp" +#include "smpi_keyvals.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/smpi_op.cpp b/src/smpi/mpi/smpi_op.cpp similarity index 97% rename from src/smpi/smpi_op.cpp rename to src/smpi/mpi/smpi_op.cpp index 4f52efedcd..67d6ae8a1c 100644 --- a/src/smpi/smpi_op.cpp +++ b/src/smpi/mpi/smpi_op.cpp @@ -3,11 +3,11 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/smpi/private.h" -#include "src/smpi/private.hpp" -#include "src/smpi/smpi_datatype.hpp" -#include "src/smpi/smpi_op.hpp" -#include "src/smpi/smpi_process.hpp" +#include "private.h" +#include "private.hpp" +#include "smpi_datatype.hpp" +#include "smpi_op.hpp" +#include "smpi_process.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_op, smpi, "Logging specific to SMPI (op)"); diff --git a/src/smpi/smpi_request.cpp b/src/smpi/mpi/smpi_request.cpp similarity index 99% rename from src/smpi/smpi_request.cpp rename to src/smpi/mpi/smpi_request.cpp index 19c5497096..a4c0a36e11 100644 --- a/src/smpi/smpi_request.cpp +++ b/src/smpi/mpi/smpi_request.cpp @@ -3,18 +3,18 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/smpi/smpi_request.hpp" +#include "smpi_request.hpp" #include "mc/mc.h" #include "src/kernel/activity/CommImpl.hpp" #include "src/mc/mc_replay.h" -#include "src/smpi/SmpiHost.hpp" -#include "src/smpi/private.h" -#include "src/smpi/private.hpp" -#include "src/smpi/smpi_comm.hpp" -#include "src/smpi/smpi_datatype.hpp" -#include "src/smpi/smpi_op.hpp" -#include "src/smpi/smpi_process.hpp" +#include "SmpiHost.hpp" +#include "private.h" +#include "private.hpp" +#include "smpi_comm.hpp" +#include "smpi_datatype.hpp" +#include "smpi_op.hpp" +#include "smpi_process.hpp" #include diff --git a/src/smpi/smpi_status.cpp b/src/smpi/mpi/smpi_status.cpp similarity index 89% rename from src/smpi/smpi_status.cpp rename to src/smpi/mpi/smpi_status.cpp index 22c84bbf2f..575046580d 100644 --- a/src/smpi/smpi_status.cpp +++ b/src/smpi/mpi/smpi_status.cpp @@ -5,8 +5,8 @@ #include "private.h" #include "src/simix/smx_private.h" -#include "src/smpi/smpi_datatype.hpp" -#include "src/smpi/smpi_status.hpp" +#include "smpi_datatype.hpp" +#include "smpi_status.hpp" namespace simgrid{ namespace smpi{ diff --git a/src/smpi/smpi_topo.cpp b/src/smpi/mpi/smpi_topo.cpp similarity index 99% rename from src/smpi/smpi_topo.cpp rename to src/smpi/mpi/smpi_topo.cpp index 432174ed2b..fa3701d3b8 100644 --- a/src/smpi/smpi_topo.cpp +++ b/src/smpi/mpi/smpi_topo.cpp @@ -8,8 +8,8 @@ #include "private.h" #include #include -#include "src/smpi/smpi_comm.hpp" -#include "src/smpi/smpi_topo.hpp" +#include "smpi_comm.hpp" +#include "smpi_topo.hpp" /* static functions */ static int assignnodes(int ndim, int nfactor, int *pfacts,int **pdims); diff --git a/src/smpi/smpi_win.cpp b/src/smpi/mpi/smpi_win.cpp similarity index 98% rename from src/smpi/smpi_win.cpp rename to src/smpi/mpi/smpi_win.cpp index 5d83d8cd41..f2782d153e 100644 --- a/src/smpi/smpi_win.cpp +++ b/src/smpi/mpi/smpi_win.cpp @@ -3,15 +3,15 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "src/smpi/private.h" -#include "src/smpi/smpi_coll.hpp" -#include "src/smpi/smpi_comm.hpp" -#include "src/smpi/smpi_datatype.hpp" -#include "src/smpi/smpi_info.hpp" -#include "src/smpi/smpi_keyvals.hpp" -#include "src/smpi/smpi_process.hpp" -#include "src/smpi/smpi_request.hpp" -#include "src/smpi/smpi_win.hpp" +#include "private.h" +#include "smpi_coll.hpp" +#include "smpi_comm.hpp" +#include "smpi_datatype.hpp" +#include "smpi_info.hpp" +#include "smpi_keyvals.hpp" +#include "smpi_process.hpp" +#include "smpi_request.hpp" +#include "smpi_win.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_rma, smpi, "Logging specific to SMPI (RMA operations)"); diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index ca88375580..bc9f005dd2 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -33,8 +33,8 @@ set(EXTRA_DIST src/smpi/colls/coll_tuned_topo.h src/smpi/colls/colls_private.h src/smpi/colls/smpi_mvapich2_selector_stampede.h - src/smpi/private.h - src/smpi/private.hpp + src/smpi/include/private.h + src/smpi/include/private.hpp src/surf/cpu_cas01.hpp src/surf/cpu_interface.hpp src/surf/cpu_ti.hpp @@ -96,6 +96,10 @@ set(EXTRA_DIST ) set(SMPI_SRC + src/smpi/smpi_main.c + src/smpi/bindings/smpi_mpi.cpp + src/smpi/bindings/smpi_pmpi.cpp + src/smpi/bindings/smpi_f77.cpp src/smpi/colls/allgather/allgather-2dmesh.cpp src/smpi/colls/allgather/allgather-3dmesh.cpp src/smpi/colls/allgather/allgather-GB.cpp @@ -200,51 +204,46 @@ set(SMPI_SRC src/smpi/colls/smpi_intel_mpi_selector.cpp src/smpi/colls/smpi_openmpi_selector.cpp src/smpi/colls/smpi_mvapich2_selector.cpp - src/smpi/instr_smpi.cpp - src/smpi/smpi_bench.cpp - src/smpi/smpi_memory.cpp - src/smpi/smpi_shared.cpp - src/smpi/smpi_static_variables.cpp - src/smpi/smpi_coll.cpp - src/smpi/smpi_coll.hpp - src/smpi/smpi_comm.cpp - src/smpi/smpi_comm.hpp - src/smpi/smpi_deployment.cpp - src/smpi/smpi_dvfs.cpp - src/smpi/smpi_global.cpp - src/smpi/smpi_f2c.cpp - src/smpi/smpi_f2c.hpp - src/smpi/smpi_group.cpp - src/smpi/smpi_group.hpp - src/smpi/SmpiHost.cpp - src/smpi/SmpiHost.hpp - src/smpi/smpi_mpi.cpp - src/smpi/smpi_datatype.cpp - src/smpi/smpi_datatype.hpp - src/smpi/smpi_info.cpp - src/smpi/smpi_info.hpp - src/smpi/smpi_keyvals.cpp - src/smpi/smpi_keyvals.hpp - src/smpi/smpi_datatype_derived.cpp - src/smpi/smpi_datatype_derived.hpp - src/smpi/smpi_main.c - src/smpi/smpi_op.cpp - src/smpi/smpi_op.hpp - src/smpi/smpi_process.cpp - src/smpi/smpi_process.hpp - src/smpi/smpi_pmpi.cpp - src/smpi/smpi_replay.cpp - src/smpi/smpi_request.cpp - src/smpi/smpi_request.hpp - src/smpi/smpi_status.cpp - src/smpi/smpi_status.hpp - src/smpi/smpi_win.cpp - src/smpi/smpi_win.hpp - src/smpi/smpi_topo.cpp - src/smpi/smpi_topo.hpp - src/smpi/smpi_utils.cpp - src/smpi/smpi_f77.cpp - + src/smpi/colls/smpi_coll.cpp + src/smpi/internals/instr_smpi.cpp + src/smpi/internals/smpi_bench.cpp + src/smpi/internals/smpi_memory.cpp + src/smpi/internals/smpi_shared.cpp + src/smpi/internals/smpi_static_variables.cpp + src/smpi/internals/smpi_deployment.cpp + src/smpi/internals/smpi_dvfs.cpp + src/smpi/internals/smpi_global.cpp + src/smpi/internals/SmpiHost.cpp + src/smpi/internals/smpi_replay.cpp + src/smpi/internals/smpi_process.cpp + src/smpi/internals/smpi_utils.cpp + src/smpi/mpi/smpi_comm.cpp + src/smpi/mpi/smpi_datatype.cpp + src/smpi/mpi/smpi_datatype_derived.cpp + src/smpi/mpi/smpi_f2c.cpp + src/smpi/mpi/smpi_group.cpp + src/smpi/mpi/smpi_info.cpp + src/smpi/mpi/smpi_keyvals.cpp + src/smpi/mpi/smpi_op.cpp + src/smpi/mpi/smpi_request.cpp + src/smpi/mpi/smpi_status.cpp + src/smpi/mpi/smpi_topo.cpp + src/smpi/mpi/smpi_win.cpp + src/smpi/include/smpi_coll.hpp + src/smpi/include/smpi_comm.hpp + src/smpi/include/smpi_f2c.hpp + src/smpi/include/smpi_group.hpp + src/smpi/include/SmpiHost.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_process.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/surf/network_smpi.cpp src/surf/network_ib.cpp )