X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4bb73cb3914b5f7b77a9ec1f8abe728e637cc016..efa1f86e31adca3c57e9d0135b2f6ebdbabb0878:/src/smpi/include/smpi_coll.hpp diff --git a/src/smpi/include/smpi_coll.hpp b/src/smpi/include/smpi_coll.hpp index 9dfb2e3fb1..98df0b530c 100644 --- a/src/smpi/include/smpi_coll.hpp +++ b/src/smpi/include/smpi_coll.hpp @@ -1,5 +1,5 @@ /*High level handling of collective algorithms*/ -/* Copyright (c) 2009-2010, 2012-2018. The SimGrid Team. +/* Copyright (c) 2009-2019. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -11,27 +11,22 @@ #include "private.hpp" #include "xbt/base.h" -/** \brief MPI collective description */ +/** @brief MPI collective description */ #define COLL_DEFS(cat, ret, args, args2) \ - static void set_##cat(std::string name); \ - static s_mpi_coll_description_t mpi_coll_##cat##_description[]; \ - static int(*cat) args; + void _XBT_CONCAT(set_, cat)(const std::string& name); \ + extern int(*cat) args; -#define COLL_SIG(cat, ret, args, args2)\ - static int cat args; +#define COLL_SIG(cat, ret, args, args2) int cat args; +#define COLL_DESCRIPTION(cat, ret, args, name) \ + { \ + _XBT_STRINGIFY(name) \ + , _XBT_STRINGIFY(cat) " " _XBT_STRINGIFY(name) " collective", (void*)_XBT_CONCAT3(cat, __, name) \ + } -#define COLL_DESCRIPTION(cat, ret, args, name) \ - {# name,\ - # cat " " # name " collective",\ - (void*) Coll_ ## cat ## _ ## name::cat } - -#define COLL_PROTO(cat, ret, args, name) \ -class Coll_ ## cat ## _ ## name : public Coll { \ -public: \ -static ret cat (COLL_UNPAREN args); \ -}; +#define COLL_PROTO(cat, ret, args, name) \ + ret _XBT_CONCAT3(cat, __, name) args; #define COLL_UNPAREN(...) __VA_ARGS__ @@ -41,39 +36,39 @@ static ret cat (COLL_UNPAREN args); \ #define COLL_NOTHING(...) #define COLL_GATHER_SIG gather, int, \ - (void *send_buff, int send_count, MPI_Datatype send_type, \ + (const void *send_buff, int send_count, MPI_Datatype send_type, \ void *recv_buff, int recv_count, MPI_Datatype recv_type, \ int root, MPI_Comm comm) #define COLL_ALLGATHER_SIG allgather, int, \ - (void *send_buff, int send_count, MPI_Datatype send_type, \ + (const void *send_buff, int send_count, MPI_Datatype send_type, \ void *recv_buff, int recv_count, MPI_Datatype recv_type, \ MPI_Comm comm) #define COLL_ALLGATHERV_SIG allgatherv, int, \ - (void *send_buff, int send_count, MPI_Datatype send_type, \ - void *recv_buff, int *recv_count, int *recv_disps, \ + (const void *send_buff, int send_count, MPI_Datatype send_type, \ + void *recv_buff, const int *recv_count, const int *recv_disps, \ MPI_Datatype recv_type, MPI_Comm comm) #define COLL_ALLTOALL_SIG alltoall, int, \ - (void *send_buff, int send_count, MPI_Datatype send_type, \ + (const void *send_buff, int send_count, MPI_Datatype send_type, \ void *recv_buff, int recv_count, MPI_Datatype recv_type, \ MPI_Comm comm) #define COLL_ALLTOALLV_SIG alltoallv, int, \ - (void *send_buff, int *send_counts, int *send_disps, MPI_Datatype send_type, \ - void *recv_buff, int *recv_counts, int *recv_disps, MPI_Datatype recv_type, \ + (const void *send_buff, const int *send_counts, const int *send_disps, MPI_Datatype send_type, \ + void *recv_buff, const int *recv_counts, const int *recv_disps, MPI_Datatype recv_type, \ MPI_Comm comm) #define COLL_BCAST_SIG bcast, int, \ (void *buf, int count, MPI_Datatype datatype, \ int root, MPI_Comm comm) #define COLL_REDUCE_SIG reduce, int, \ - (void *buf, void *rbuf, int count, MPI_Datatype datatype, \ + (const void *buf, void *rbuf, int count, MPI_Datatype datatype, \ MPI_Op op, int root, MPI_Comm comm) #define COLL_ALLREDUCE_SIG allreduce, int, \ - (void *sbuf, void *rbuf, int rcount, \ + (const void *sbuf, void *rbuf, int rcount, \ MPI_Datatype dtype, MPI_Op op, MPI_Comm comm) #define COLL_REDUCE_SCATTER_SIG reduce_scatter, int, \ - (void *sbuf, void *rbuf, int *rcounts,\ + (const void *sbuf, void *rbuf, const int *rcounts,\ MPI_Datatype dtype,MPI_Op op,MPI_Comm comm) #define COLL_SCATTER_SIG scatter, int, \ - (void *sendbuf, int sendcount, MPI_Datatype sendtype,\ + (const void *sendbuf, int sendcount, MPI_Datatype sendtype,\ void *recvbuf, int recvcount, MPI_Datatype recvtype,\ int root, MPI_Comm comm) #define COLL_BARRIER_SIG barrier, int, \ @@ -83,58 +78,84 @@ namespace simgrid{ namespace smpi{ struct s_mpi_coll_description_t { - const char *name; - const char *description; + std::string name; + std::string description; void *coll; }; -class Colls{ - public: - static XBT_PUBLIC void coll_help(const char* category, s_mpi_coll_description_t* table); - static XBT_PUBLIC int find_coll_description(s_mpi_coll_description_t* table, std::string name, const char* desc); - static void set_collectives(); - - // for each collective type, create the set_* prototype, the description array and the function pointer - COLL_APPLY(COLL_DEFS, COLL_GATHER_SIG, ""); - COLL_APPLY(COLL_DEFS, COLL_ALLGATHER_SIG, ""); - COLL_APPLY(COLL_DEFS, COLL_ALLGATHERV_SIG, ""); - COLL_APPLY(COLL_DEFS, COLL_REDUCE_SIG, ""); - COLL_APPLY(COLL_DEFS, COLL_ALLREDUCE_SIG, ""); - COLL_APPLY(COLL_DEFS, COLL_REDUCE_SCATTER_SIG, ""); - COLL_APPLY(COLL_DEFS, COLL_SCATTER_SIG, ""); - COLL_APPLY(COLL_DEFS, COLL_BARRIER_SIG, ""); - COLL_APPLY(COLL_DEFS, COLL_BCAST_SIG, ""); - COLL_APPLY(COLL_DEFS, COLL_ALLTOALL_SIG, ""); - COLL_APPLY(COLL_DEFS, COLL_ALLTOALLV_SIG, ""); - - // These fairly unused collectives only have one implementation in SMPI - static int gatherv(void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int* recvcounts, int* displs, - MPI_Datatype recvtype, int root, MPI_Comm comm); - static int scatterv(void* sendbuf, int* sendcounts, int* displs, MPI_Datatype sendtype, void* recvbuf, - int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm); - static int scan(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm); - static int exscan(void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm); - - static void (*smpi_coll_cleanup_callback)(); +namespace colls { +XBT_PUBLIC void coll_help(const char* category, s_mpi_coll_description_t* table); +XBT_PUBLIC int find_coll_description(s_mpi_coll_description_t* table, const std::string& name, const char* desc); +void set_collectives(); +XBT_PUBLIC s_mpi_coll_description_t* get_smpi_coll_description(const char* name, int rank); + +// for each collective type, create the set_* prototype, the description array and the function pointer +// void set_gather(const std::string& name); +// extern int(*gather)(const void *send_buff, int send_count, MPI_Datatype send_type, void *recv_buff, int recv_count, +// MPI_Datatype recv_type, +// int root, MPI_Comm comm); +COLL_APPLY(COLL_DEFS, COLL_GATHER_SIG, "") +COLL_APPLY(COLL_DEFS, COLL_ALLGATHER_SIG, "") +COLL_APPLY(COLL_DEFS, COLL_ALLGATHERV_SIG, "") +COLL_APPLY(COLL_DEFS, COLL_REDUCE_SIG, "") +COLL_APPLY(COLL_DEFS, COLL_ALLREDUCE_SIG, "") +COLL_APPLY(COLL_DEFS, COLL_REDUCE_SCATTER_SIG, "") +COLL_APPLY(COLL_DEFS, COLL_SCATTER_SIG, "") +COLL_APPLY(COLL_DEFS, COLL_BARRIER_SIG, "") +COLL_APPLY(COLL_DEFS, COLL_BCAST_SIG, "") +COLL_APPLY(COLL_DEFS, COLL_ALLTOALL_SIG, "") +COLL_APPLY(COLL_DEFS, COLL_ALLTOALLV_SIG, "") + +// These fairly unused collectives only have one implementation in SMPI +int gatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int* recvcounts, + const int* displs, MPI_Datatype recvtype, int root, MPI_Comm comm); +int scatterv(const void* sendbuf, const int* sendcounts, const int* displs, MPI_Datatype sendtype, void* recvbuf, + int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm); +int scan(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm); +int exscan(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm); +int alltoallw(const void* sendbuf, const int* sendcounts, const int* senddisps, const MPI_Datatype* sendtypes, + void* recvbuf, const int* recvcounts, const int* recvdisps, const MPI_Datatype* recvtypes, MPI_Comm comm); + +// async collectives +int ibarrier(MPI_Comm comm, MPI_Request* request, int external = 1); +int ibcast(void* buf, int count, MPI_Datatype datatype, int root, MPI_Comm comm, MPI_Request* request, + int external = 1); +int igather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, + MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request* request, int external = 1); +int igatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int* recvcounts, + const int* displs, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request* request, int external = 1); +int iallgather(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, + MPI_Datatype recvtype, MPI_Comm comm, MPI_Request* request, int external = 1); +int iallgatherv(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, const int* recvcounts, + const int* displs, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request* request, int external = 1); +int iscatter(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, + MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request* request, int external = 1); +int iscatterv(const void* sendbuf, const int* sendcounts, const int* displs, MPI_Datatype sendtype, void* recvbuf, + int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request* request, int external = 1); +int ireduce(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm, + MPI_Request* request, int external = 1); +int iallreduce(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, + MPI_Request* request, int external = 1); +int iscan(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, + MPI_Request* request, int external = 1); +int iexscan(const void* sendbuf, void* recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, + MPI_Request* request, int external = 1); +int ireduce_scatter(const void* sendbuf, void* recvbuf, const int* recvcounts, MPI_Datatype datatype, MPI_Op op, + MPI_Comm comm, MPI_Request* request, int external = 1); +int ireduce_scatter_block(const void* sendbuf, void* recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, + MPI_Comm comm, MPI_Request* request, int external = 1); +int ialltoall(const void* sendbuf, int sendcount, MPI_Datatype sendtype, void* recvbuf, int recvcount, + MPI_Datatype recvtype, MPI_Comm comm, MPI_Request* request, int external = 1); +int ialltoallv(const void* sendbuf, const int* sendcounts, const int* senddisps, MPI_Datatype sendtype, void* recvbuf, + const int* recvcounts, const int* recvdisps, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request* request, + int external = 1); +int ialltoallw(const void* sendbuf, const int* sendcounts, const int* senddisps, const MPI_Datatype* sendtypes, + void* recvbuf, const int* recvcounts, const int* recvdisps, const MPI_Datatype* recvtypes, MPI_Comm comm, + MPI_Request* request, int external = 1); + +extern void (*smpi_coll_cleanup_callback)(); }; -class Coll { - public: - // for each collective type, create a function member - COLL_APPLY(COLL_SIG,COLL_GATHER_SIG,""); - COLL_APPLY(COLL_SIG,COLL_ALLGATHER_SIG,""); - COLL_APPLY(COLL_SIG,COLL_ALLGATHERV_SIG,""); - COLL_APPLY(COLL_SIG,COLL_REDUCE_SIG,""); - COLL_APPLY(COLL_SIG,COLL_ALLREDUCE_SIG,""); - COLL_APPLY(COLL_SIG,COLL_REDUCE_SCATTER_SIG,""); - COLL_APPLY(COLL_SIG,COLL_SCATTER_SIG,""); - COLL_APPLY(COLL_SIG,COLL_BARRIER_SIG,""); - COLL_APPLY(COLL_SIG,COLL_BCAST_SIG,""); - COLL_APPLY(COLL_SIG,COLL_ALLTOALL_SIG,""); - COLL_APPLY(COLL_SIG,COLL_ALLTOALLV_SIG,""); -}; - - /************* * GATHER * *************/ @@ -398,6 +419,7 @@ COLL_APPLY(action, COLL_BARRIER_SIG, ompi_tree) COLL_sep \ COLL_APPLY(action, COLL_BARRIER_SIG, ompi_bruck) COLL_sep \ COLL_APPLY(action, COLL_BARRIER_SIG, ompi_recursivedoubling) COLL_sep \ COLL_APPLY(action, COLL_BARRIER_SIG, ompi_doublering) COLL_sep \ +COLL_APPLY(action, COLL_BARRIER_SIG, mpich_smp) COLL_sep \ COLL_APPLY(action, COLL_BARRIER_SIG, mpich) COLL_sep \ COLL_APPLY(action, COLL_BARRIER_SIG, mvapich2_pair) COLL_sep \ COLL_APPLY(action, COLL_BARRIER_SIG, mvapich2) COLL_sep \