September 2016 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.2-437-gc8ef14c
by noreply＠mpich.org 12 Sep '16

12 Sep '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via c8ef14c5e1b49e822b5170b8efcc9154a0907673 (commit) via c7d096dda2efe12f9b68adab5404cce76688e1a6 (commit) from e8f5d0b7f0441f55669024b45ca93870fecde385 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/c8ef14c5e1b49e822b5170b8efcc9154a… commit c8ef14c5e1b49e822b5170b8efcc9154a0907673 Author: Pavan Balaji <balaji(a)anl.gov> Date: Sun Sep 11 11:44:30 2016 -0500 Fixup old reference in OPA. No reviewer. diff --git a/src/openpa/src/opa_primitives.h b/src/openpa/src/opa_primitives.h index 8e5d40b..1e48845 100644 --- a/src/openpa/src/opa_primitives.h +++ b/src/openpa/src/opa_primitives.h @@ -123,7 +123,7 @@ #endif /* - This routine is needed because the MPIU_THREAD_XXX_CS_{ENTER,EXIT} macros do + This routine is needed because the MPID_THREAD_XXX_CS_{ENTER,EXIT} macros do not provide synchronization across multiple processes, only across multiple threads within a process. In order to safely emulate atomic operations on a shared memory region, we need a shared memory backed lock mechanism. http://git.mpich.org/mpich.git/commitdiff/c7d096dda2efe12f9b68adab5404cce76… commit c7d096dda2efe12f9b68adab5404cce76688e1a6 Author: Pavan Balaji <balaji(a)anl.gov> Date: Sun Sep 11 11:40:30 2016 -0500 Bug-fix: add MPID_Thread_yield. We had initially missed adding MPID_Thread_yield and instead defined MPID_Thread_same twice. It's surprising that the compiler did not catch the redefining. It's also weird that we do not use MPID_Thread_yield any where, but it's still exposed, though that part is not fixed in this commit. No reviewer. diff --git a/src/mpid/ch3/include/mpid_thread.h b/src/mpid/ch3/include/mpid_thread.h index c3f369d..b1285ee 100644 --- a/src/mpid/ch3/include/mpid_thread.h +++ b/src/mpid/ch3/include/mpid_thread.h @@ -26,7 +26,7 @@ typedef MPIDU_Thread_func_t MPID_Thread_func_t; #define MPID_Thread_exit MPIDU_Thread_exit #define MPID_Thread_self MPIDU_Thread_self #define MPID_Thread_same MPIDU_Thread_same -#define MPID_Thread_same MPIDU_Thread_same +#define MPID_Thread_yield MPIDU_Thread_yield #define MPID_Thread_mutex_create MPIDU_Thread_mutex_create #define MPID_Thread_mutex_destroy MPIDU_Thread_mutex_destroy ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpid_thread.h | 2 +- src/openpa/src/opa_primitives.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-435-ge8f5d0b
by noreply＠mpich.org 09 Sep '16

09 Sep '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via e8f5d0b7f0441f55669024b45ca93870fecde385 (commit) via 7217189afc2428ce45417523015e70cae4ddcc82 (commit) via 6370ba6ce11942523e944f324298b6fe5209b4f5 (commit) via 7adf2a94c124f6b5a5ecbd0f77c9ca70a8ed8451 (commit) from 5a604db4c16372bf67d3dabfaa049e4bdd774f0e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/e8f5d0b7f0441f55669024b45ca93870f… commit e8f5d0b7f0441f55669024b45ca93870fecde385 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Aug 30 13:56:40 2016 -0500 CH4: Replace __*_INLINE__ with MPL_STATIC_INLINE_PREFIX Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/ch4/include/mpid_ticketlock.h b/src/mpid/ch4/include/mpid_ticketlock.h index 0dc5567..6f7898e 100644 --- a/src/mpid/ch4/include/mpid_ticketlock.h +++ b/src/mpid/ch4/include/mpid_ticketlock.h @@ -10,8 +10,6 @@ #ifndef MPID_TICKETLOCK_H_INCLUDED #define MPID_TICKETLOCK_H_INCLUDED -#define __MUTEX_INLINE__ __attribute__((always_inline))static inline - #define MPIDI_CH4_CACHELINE_SIZE 64 typedef union MPIDI_CH4_Ticket_lock { @@ -23,20 +21,20 @@ typedef union MPIDI_CH4_Ticket_lock { } s; } MPIDI_CH4_Ticket_lock __attribute__ ((aligned(MPIDI_CH4_CACHELINE_SIZE))); -__MUTEX_INLINE__ void MPIDI_CH4I_Thread_mutex_acquire(MPIDI_CH4_Ticket_lock * m) +MPL_STATIC_INLINE_PREFIX void MPIDI_CH4I_Thread_mutex_acquire(MPIDI_CH4_Ticket_lock * m) { uint16_t u = __sync_fetch_and_add(&m->s.clients, 1); while (m->s.ticket != u) asm volatile ("pause\n":::"memory"); } -__MUTEX_INLINE__ void MPIDI_CH4I_Thread_mutex_release(MPIDI_CH4_Ticket_lock * m) +MPL_STATIC_INLINE_PREFIX void MPIDI_CH4I_Thread_mutex_release(MPIDI_CH4_Ticket_lock * m) { asm volatile ("":::"memory"); m->s.ticket++; } -__MUTEX_INLINE__ int MPIDI_CH4I_Thread_mutex_try_acquire(MPIDI_CH4_Ticket_lock * m) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4I_Thread_mutex_try_acquire(MPIDI_CH4_Ticket_lock * m) { uint16_t u = m->s.clients; uint16_t u2 = u + 1; @@ -49,25 +47,29 @@ __MUTEX_INLINE__ int MPIDI_CH4I_Thread_mutex_try_acquire(MPIDI_CH4_Ticket_lock * return EBUSY; } -__MUTEX_INLINE__ void MPIDI_CH4I_Thread_mutex_lock(MPIDI_CH4_Ticket_lock * m, int *mpi_error) +MPL_STATIC_INLINE_PREFIX void MPIDI_CH4I_Thread_mutex_lock(MPIDI_CH4_Ticket_lock * m, + int *mpi_error) { MPIDI_CH4I_Thread_mutex_acquire(m); *mpi_error = 0; } -__MUTEX_INLINE__ void MPIDI_CH4I_Thread_mutex_unlock(MPIDI_CH4_Ticket_lock * m, int *mpi_error) +MPL_STATIC_INLINE_PREFIX void MPIDI_CH4I_Thread_mutex_unlock(MPIDI_CH4_Ticket_lock * m, + int *mpi_error) { MPIDI_CH4I_Thread_mutex_release(m); *mpi_error = 0; } -__MUTEX_INLINE__ void MPIDI_CH4I_Thread_mutex_create(MPIDI_CH4_Ticket_lock * m, int *mpi_error) +MPL_STATIC_INLINE_PREFIX void MPIDI_CH4I_Thread_mutex_create(MPIDI_CH4_Ticket_lock * m, + int *mpi_error) { m->u = 0; *mpi_error = 0; } -__MUTEX_INLINE__ void MPIDI_CH4I_Thread_mutex_destroy(MPIDI_CH4_Ticket_lock * m, int *mpi_error) +MPL_STATIC_INLINE_PREFIX void MPIDI_CH4I_Thread_mutex_destroy(MPIDI_CH4_Ticket_lock * m, + int *mpi_error) { m->u = 0; *mpi_error = 0; @@ -78,7 +80,7 @@ __MUTEX_INLINE__ void MPIDI_CH4I_Thread_mutex_destroy(MPIDI_CH4_Ticket_lock * m, /* 2) Implement it from scratch */ /* Currently only async.c is using condition variables, so we should figure out what */ /* we really want from the cv implementations */ -__MUTEX_INLINE__ void +MPL_STATIC_INLINE_PREFIX void MPIDI_CH4I_Thread_cond_wait(MPIDU_Thread_cond_t * cond, MPIDI_CH4_Ticket_lock * m, int *mpi_error) { MPIR_Assert(0); diff --git a/src/mpid/ch4/include/mpidpost.h b/src/mpid/ch4/include/mpidpost.h index 43a9658..770c442 100644 --- a/src/mpid/ch4/include/mpidpost.h +++ b/src/mpid/ch4/include/mpidpost.h @@ -14,7 +14,7 @@ #include "mpidu_datatype.h" #include "mpidch4.h" -__ALWAYS_INLINE__ void MPID_Request_create_hook(MPIR_Request * req) +MPL_STATIC_INLINE_PREFIX void MPID_Request_create_hook(MPIR_Request * req) { MPIDI_CH4U_REQUEST(req, req) = NULL; #ifdef MPIDI_BUILD_CH4_SHM @@ -22,7 +22,7 @@ __ALWAYS_INLINE__ void MPID_Request_create_hook(MPIR_Request * req) #endif } -__ALWAYS_INLINE__ void MPID_Request_free_hook(MPIR_Request * req) +MPL_STATIC_INLINE_PREFIX void MPID_Request_free_hook(MPIR_Request * req) { return; } diff --git a/src/mpid/ch4/include/mpidpre.h b/src/mpid/ch4/include/mpidpre.h index 698cd4a..60f379b 100644 --- a/src/mpid/ch4/include/mpidpre.h +++ b/src/mpid/ch4/include/mpidpre.h @@ -33,8 +33,6 @@ typedef struct { typedef int MPID_Progress_state; #define HAVE_GPID_ROUTINES -#define __ALWAYS_INLINE__ __attribute__((always_inline)) static inline - #define CH4_COMPILE_TIME_ASSERT(expr_) \ do { switch(0) { case 0: case (expr_): default: break; } } while (0) @@ -198,9 +196,9 @@ typedef struct { #define MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(req) NULL #endif -__ALWAYS_INLINE__ void MPID_Request_create_hook(struct MPIR_Request *req); +MPL_STATIC_INLINE_PREFIX void MPID_Request_create_hook(struct MPIR_Request *req); -__ALWAYS_INLINE__ void MPID_Request_free_hook(struct MPIR_Request *req); +MPL_STATIC_INLINE_PREFIX void MPID_Request_free_hook(struct MPIR_Request *req); typedef struct MPIDI_CH4U_win_shared_info { uint32_t disp_unit; diff --git a/src/mpid/ch4/netmod/ofi/ofi_events.h b/src/mpid/ch4/netmod/ofi/ofi_events.h index 191bc51..74e5c9d 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_events.h +++ b/src/mpid/ch4/netmod/ofi/ofi_events.h @@ -16,9 +16,10 @@ #include "ofi_am_events.h" #include "ofi_control.h" -__ALWAYS_INLINE__ int MPIDI_OFI_get_huge_event(struct fi_cq_tagged_entry *wc, MPIR_Request * req); +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_get_huge_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * req); -__ALWAYS_INLINE__ int MPIDI_OFI_cqe_get_source(struct fi_cq_tagged_entry *wc, int do_data) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_cqe_get_source(struct fi_cq_tagged_entry *wc, int do_data) { if (do_data) return wc->data; @@ -30,7 +31,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_cqe_get_source(struct fi_cq_tagged_entry *wc, in #define FUNCNAME MPIDI_OFI_peek_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_peek_event(struct fi_cq_tagged_entry *wc, MPIR_Request * rreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_peek_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * rreq) { size_t count; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_NETMOD_PEEK_EVENT); @@ -49,7 +51,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_peek_event(struct fi_cq_tagged_entry *wc, MPIR_R #define FUNCNAME MPIDI_OFI_peek_empty_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_peek_empty_event(struct fi_cq_tagged_entry *wc, MPIR_Request * rreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_peek_empty_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * rreq) { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_NETMOD_PEEK_EMPTY_EVENT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_NETMOD_OFI_NETMOD_PEEK_EMPTY_EVENT); @@ -79,7 +82,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_peek_empty_event(struct fi_cq_tagged_entry *wc, #define FUNCNAME MPIDI_OFI_recv_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_recv_event(struct fi_cq_tagged_entry *wc, MPIR_Request * rreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_recv_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS; MPI_Aint last; @@ -162,7 +166,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_recv_event(struct fi_cq_tagged_entry *wc, MPIR_R #define FUNCNAME MPIDI_OFI_recv_huge_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_recv_huge_event(struct fi_cq_tagged_entry *wc, MPIR_Request * rreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_recv_huge_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * rreq) { MPIDI_OFI_huge_recv_t *recv; MPIR_Comm *comm_ptr; @@ -196,7 +201,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_recv_huge_event(struct fi_cq_tagged_entry *wc, M #define FUNCNAME MPIDI_OFI_send_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_send_event(struct fi_cq_tagged_entry *wc, MPIR_Request * sreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_send_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * sreq) { int c; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_SEND_EVENT); @@ -220,7 +226,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_send_event(struct fi_cq_tagged_entry *wc, MPIR_R #define FUNCNAME MPIDI_OFI_send_huge_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_send_huge_event(struct fi_cq_tagged_entry *wc, MPIR_Request * sreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_send_huge_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * sreq) { int mpi_errno = MPI_SUCCESS; int c; @@ -275,7 +282,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_send_huge_event(struct fi_cq_tagged_entry *wc, M #define FUNCNAME MPIDI_OFI_ssend_ack_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_ssend_ack_event(struct fi_cq_tagged_entry *wc, MPIR_Request * sreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_ssend_ack_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * sreq) { int mpi_errno; MPIDI_OFI_ssendack_request_t *req = (MPIDI_OFI_ssendack_request_t *) sreq; @@ -287,7 +295,7 @@ __ALWAYS_INLINE__ int MPIDI_OFI_ssend_ack_event(struct fi_cq_tagged_entry *wc, M return mpi_errno; } -__ALWAYS_INLINE__ uintptr_t MPIDI_OFI_recv_rbase(MPIDI_OFI_huge_recv_t * recv) +MPL_STATIC_INLINE_PREFIX uintptr_t MPIDI_OFI_recv_rbase(MPIDI_OFI_huge_recv_t * recv) { #ifdef USE_OFI_MR_SCALABLE return 0; @@ -300,7 +308,8 @@ __ALWAYS_INLINE__ uintptr_t MPIDI_OFI_recv_rbase(MPIDI_OFI_huge_recv_t * recv) #define FUNCNAME MPIDI_OFI_get_huge_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_get_huge_event(struct fi_cq_tagged_entry *wc, MPIR_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_get_huge_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * req) { int mpi_errno = MPI_SUCCESS; MPIDI_OFI_huge_recv_t *recv = (MPIDI_OFI_huge_recv_t *) req; @@ -355,7 +364,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_get_huge_event(struct fi_cq_tagged_entry *wc, MP #define FUNCNAME MPIDI_OFI_chunk_done_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_chunk_done_event(struct fi_cq_tagged_entry *wc, MPIR_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_chunk_done_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * req) { int c; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_CHUNK_DONE_EVENT); @@ -376,7 +386,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_chunk_done_event(struct fi_cq_tagged_entry *wc, #define FUNCNAME MPIDI_OFI_inject_emu_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_inject_emu_event(struct fi_cq_tagged_entry *wc, MPIR_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_inject_emu_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * req) { int incomplete; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_INJECT_EMU_EVENT); @@ -398,7 +409,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_inject_emu_event(struct fi_cq_tagged_entry *wc, #define FUNCNAME MPIDI_OFI_rma_done_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_rma_done_event(struct fi_cq_tagged_entry *wc, MPIR_Request * in_req) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_rma_done_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * in_req) { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_OFI_RMA_DONE_EVENT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_OFI_RMA_DONE_EVENT); @@ -414,8 +426,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_rma_done_event(struct fi_cq_tagged_entry *wc, MP #define FUNCNAME MPIDI_OFI_accept_probe_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_accept_probe_event(struct fi_cq_tagged_entry *wc, - MPIR_Request * rreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_accept_probe_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * rreq) { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_OFI_ACCEPT_PROBE_EVENT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_OFI_ACCEPT_PROBE_EVENT); @@ -432,8 +444,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_accept_probe_event(struct fi_cq_tagged_entry *wc #define FUNCNAME MPIDI_OFI_dynproc_done_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_dynproc_done_event(struct fi_cq_tagged_entry *wc, - MPIR_Request * rreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_dynproc_done_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * rreq) { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_OFI_DYNPROC_DONE_EVENT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_OFI_DYNPROC_DONE_EVENT); @@ -447,7 +459,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_dynproc_done_event(struct fi_cq_tagged_entry *wc #define FUNCNAME MPIDI_OFI_am_isend_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_am_isend_event(struct fi_cq_tagged_entry *wc, MPIR_Request * sreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_am_isend_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * sreq) { int mpi_errno = MPI_SUCCESS; MPIDI_OFI_am_header_t *msg_hdr; @@ -488,7 +501,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_am_isend_event(struct fi_cq_tagged_entry *wc, MP #define FUNCNAME MPIDI_OFI_am_recv_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_am_recv_event(struct fi_cq_tagged_entry *wc, MPIR_Request * rreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_am_recv_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS; MPIDI_OFI_am_header_t *am_hdr; @@ -545,8 +559,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_am_recv_event(struct fi_cq_tagged_entry *wc, MPI #define FUNCNAME MPIDI_OFI_am_read_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_am_read_event(struct fi_cq_tagged_entry *wc, - MPIR_Request * dont_use_me) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_am_read_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * dont_use_me) { int mpi_errno = MPI_SUCCESS; void *netmod_context = NULL; @@ -585,7 +599,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_am_read_event(struct fi_cq_tagged_entry *wc, #define FUNCNAME MPIDI_OFI_am_repost_event #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_am_repost_event(struct fi_cq_tagged_entry *wc, MPIR_Request * rreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_am_repost_event(struct fi_cq_tagged_entry *wc, + MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_REPOST_BUFFER); @@ -597,8 +612,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_am_repost_event(struct fi_cq_tagged_entry *wc, M return mpi_errno; } -__ALWAYS_INLINE__ int MPIDI_OFI_dispatch_function(struct fi_cq_tagged_entry *wc, - MPIR_Request * req, int buffered) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_dispatch_function(struct fi_cq_tagged_entry *wc, + MPIR_Request * req, int buffered) { int mpi_errno; @@ -688,7 +703,7 @@ __ALWAYS_INLINE__ int MPIDI_OFI_dispatch_function(struct fi_cq_tagged_entry *wc, #define FUNCNAME MPIDI_OFI_get_buffered #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_get_buffered(struct fi_cq_tagged_entry *wc, ssize_t num) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_get_buffered(struct fi_cq_tagged_entry *wc, ssize_t num) { int rc = 0; @@ -716,8 +731,8 @@ __ALWAYS_INLINE__ int MPIDI_OFI_get_buffered(struct fi_cq_tagged_entry *wc, ssiz #define FUNCNAME MPIDI_OFI_handle_cq_entries #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_handle_cq_entries(struct fi_cq_tagged_entry *wc, - ssize_t num, int buffered) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_handle_cq_entries(struct fi_cq_tagged_entry *wc, + ssize_t num, int buffered) { int i, mpi_errno = MPI_SUCCESS; MPIR_Request *req; @@ -740,7 +755,7 @@ __ALWAYS_INLINE__ int MPIDI_OFI_handle_cq_entries(struct fi_cq_tagged_entry *wc, #define FUNCNAME MPIDI_OFI_handle_cq_error #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_handle_cq_error(ssize_t ret) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_handle_cq_error(ssize_t ret) { int mpi_errno = MPI_SUCCESS; struct fi_cq_err_entry e; diff --git a/src/mpid/ch4/netmod/ofi/ofi_impl.h b/src/mpid/ch4/netmod/ofi/ofi_impl.h index 79aec52..ddbc9f9 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch4/netmod/ofi/ofi_impl.h @@ -226,7 +226,7 @@ #define WINFO(w,rank) MPIDI_CH4U_WINFO(w,rank) -__ALWAYS_INLINE__ uintptr_t MPIDI_OFI_winfo_base(MPIR_Win * w, int rank) +MPL_STATIC_INLINE_PREFIX uintptr_t MPIDI_OFI_winfo_base(MPIR_Win * w, int rank) { #if MPIDI_OFI_ENABLE_MR_SCALABLE return 0; @@ -235,7 +235,7 @@ __ALWAYS_INLINE__ uintptr_t MPIDI_OFI_winfo_base(MPIR_Win * w, int rank) #endif } -__ALWAYS_INLINE__ uint64_t MPIDI_OFI_winfo_mr_key(MPIR_Win * w, int rank) +MPL_STATIC_INLINE_PREFIX uint64_t MPIDI_OFI_winfo_mr_key(MPIR_Win * w, int rank) { #if MPIDI_OFI_ENABLE_MR_SCALABLE return MPIDI_OFI_WIN(w).mr_key; @@ -245,40 +245,40 @@ __ALWAYS_INLINE__ uint64_t MPIDI_OFI_winfo_mr_key(MPIR_Win * w, int rank) } #ifdef MPIDI_OFI_CONFIG_USE_SCALABLE_ENDPOINTS -__ALWAYS_INLINE__ void MPIDI_OFI_win_conditional_cntr_incr(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX void MPIDI_OFI_win_conditional_cntr_incr(MPIR_Win * win) { } -__ALWAYS_INLINE__ void MPIDI_OFI_win_cntr_incr(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX void MPIDI_OFI_win_cntr_incr(MPIR_Win * win) { (*MPIDI_OFI_WIN(win).issued_cntr)++; } -__ALWAYS_INLINE__ void MPIDI_OFI_conditional_cntr_incr() +MPL_STATIC_INLINE_PREFIX void MPIDI_OFI_conditional_cntr_incr() { } -__ALWAYS_INLINE__ void MPIDI_OFI_cntr_incr() +MPL_STATIC_INLINE_PREFIX void MPIDI_OFI_cntr_incr() { MPIDI_Global.rma_issued_cntr++; } #else -__ALWAYS_INLINE__ void MPIDI_OFI_win_conditional_cntr_incr(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX void MPIDI_OFI_win_conditional_cntr_incr(MPIR_Win * win) { (*MPIDI_OFI_WIN(win).issued_cntr)++; } -__ALWAYS_INLINE__ void MPIDI_OFI_win_cntr_incr(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX void MPIDI_OFI_win_cntr_incr(MPIR_Win * win) { (*MPIDI_OFI_WIN(win).issued_cntr)++; } -__ALWAYS_INLINE__ void MPIDI_OFI_conditional_cntr_incr() +MPL_STATIC_INLINE_PREFIX void MPIDI_OFI_conditional_cntr_incr() { MPIDI_Global.rma_issued_cntr++; } -__ALWAYS_INLINE__ void MPIDI_OFI_cntr_incr() +MPL_STATIC_INLINE_PREFIX void MPIDI_OFI_cntr_incr() { MPIDI_Global.rma_issued_cntr++; } @@ -306,7 +306,7 @@ extern void MPIDI_OFI_index_allocator_destroy(void *_indexmap); /* Common Utility functions used by the * C and C++ components */ -__ALWAYS_INLINE__ MPIDI_OFI_win_request_t *MPIDI_OFI_win_request_alloc_and_init(int extra) +MPL_STATIC_INLINE_PREFIX MPIDI_OFI_win_request_t *MPIDI_OFI_win_request_alloc_and_init(int extra) { MPIDI_OFI_win_request_t *req; req = (MPIDI_OFI_win_request_t *) MPIR_Request_create(MPIR_REQUEST_KIND__RMA); @@ -317,13 +317,13 @@ __ALWAYS_INLINE__ MPIDI_OFI_win_request_t *MPIDI_OFI_win_request_alloc_and_init( return req; } -__ALWAYS_INLINE__ void MPIDI_OFI_win_datatype_unmap(MPIDI_OFI_win_datatype_t * dt) +MPL_STATIC_INLINE_PREFIX void MPIDI_OFI_win_datatype_unmap(MPIDI_OFI_win_datatype_t * dt) { if (dt->map != &dt->__map) MPL_free(dt->map); } -__ALWAYS_INLINE__ void MPIDI_OFI_win_request_complete(MPIDI_OFI_win_request_t * req) +MPL_STATIC_INLINE_PREFIX void MPIDI_OFI_win_request_complete(MPIDI_OFI_win_request_t * req) { int count; MPIR_Assert(HANDLE_GET_MPI_KIND(req->handle) == MPIR_REQUEST); @@ -338,7 +338,7 @@ __ALWAYS_INLINE__ void MPIDI_OFI_win_request_complete(MPIDI_OFI_win_request_t * } } -__ALWAYS_INLINE__ fi_addr_t MPIDI_OFI_comm_to_phys(MPIR_Comm * comm, int rank, int ep_family) +MPL_STATIC_INLINE_PREFIX fi_addr_t MPIDI_OFI_comm_to_phys(MPIR_Comm * comm, int rank, int ep_family) { #ifdef MPIDI_OFI_CONFIG_USE_SCALABLE_ENDPOINTS int ep_num = MPIDI_OFI_COMM_TO_EP(comm, rank); @@ -350,7 +350,7 @@ __ALWAYS_INLINE__ fi_addr_t MPIDI_OFI_comm_to_phys(MPIR_Comm * comm, int rank, i #endif } -__ALWAYS_INLINE__ fi_addr_t MPIDI_OFI_to_phys(int rank, int ep_family) +MPL_STATIC_INLINE_PREFIX fi_addr_t MPIDI_OFI_to_phys(int rank, int ep_family) { #ifdef MPIDI_OFI_CONFIG_USE_SCALABLE_ENDPOINTS int ep_num = 0; @@ -362,13 +362,14 @@ __ALWAYS_INLINE__ fi_addr_t MPIDI_OFI_to_phys(int rank, int ep_family) #endif } -__ALWAYS_INLINE__ bool MPIDI_OFI_is_tag_sync(uint64_t match_bits) +MPL_STATIC_INLINE_PREFIX bool MPIDI_OFI_is_tag_sync(uint64_t match_bits) { return (0 != (MPIDI_OFI_SYNC_SEND & match_bits)); } -__ALWAYS_INLINE__ uint64_t MPIDI_OFI_init_sendtag(MPIR_Context_id_t contextid, - int source, int tag, uint64_t type, int do_data) +MPL_STATIC_INLINE_PREFIX uint64_t MPIDI_OFI_init_sendtag(MPIR_Context_id_t contextid, + int source, int tag, uint64_t type, + int do_data) { uint64_t match_bits; match_bits = contextid; @@ -384,9 +385,9 @@ __ALWAYS_INLINE__ uint64_t MPIDI_OFI_init_sendtag(MPIR_Context_id_t contextid, } /* receive posting */ -__ALWAYS_INLINE__ uint64_t MPIDI_OFI_init_recvtag(uint64_t * mask_bits, - MPIR_Context_id_t contextid, - int source, int tag, int do_data) +MPL_STATIC_INLINE_PREFIX uint64_t MPIDI_OFI_init_recvtag(uint64_t * mask_bits, + MPIR_Context_id_t contextid, + int source, int tag, int do_data) { uint64_t match_bits = 0; *mask_bits = MPIDI_OFI_PROTOCOL_MASK; @@ -416,17 +417,17 @@ __ALWAYS_INLINE__ uint64_t MPIDI_OFI_init_recvtag(uint64_t * mask_bits, return match_bits; } -__ALWAYS_INLINE__ int MPIDI_OFI_init_get_tag(uint64_t match_bits) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_init_get_tag(uint64_t match_bits) { return ((int) (match_bits & MPIDI_OFI_TAG_MASK)); } -__ALWAYS_INLINE__ int MPIDI_OFI_init_get_source(uint64_t match_bits) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_init_get_source(uint64_t match_bits) { return ((int) ((match_bits & MPIDI_OFI_SOURCE_MASK) >> MPIDI_OFI_TAG_SHIFT)); } -__ALWAYS_INLINE__ MPIR_Request *MPIDI_OFI_context_to_request(void *context) +MPL_STATIC_INLINE_PREFIX MPIR_Request *MPIDI_OFI_context_to_request(void *context) { char *base = (char *) context; return (MPIR_Request *) container_of(base, MPIR_Request, dev.ch4.netmod); @@ -436,10 +437,10 @@ __ALWAYS_INLINE__ MPIR_Request *MPIDI_OFI_context_to_request(void *context) #define FUNCNAME MPIDI_OFI_send_handler #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_send_handler(struct fid_ep *ep, const void *buf, size_t len, - void *desc, uint64_t dest, fi_addr_t dest_addr, - uint64_t tag, void *context, int is_inject, - int do_data, int do_lock) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_send_handler(struct fid_ep *ep, const void *buf, size_t len, + void *desc, uint64_t dest, fi_addr_t dest_addr, + uint64_t tag, void *context, int is_inject, + int do_data, int do_lock) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch4/netmod/ofi/ofi_progress.h b/src/mpid/ch4/netmod/ofi/ofi_progress.h index e5da34b..1d292b3 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_progress.h +++ b/src/mpid/ch4/netmod/ofi/ofi_progress.h @@ -15,7 +15,7 @@ #include "ofi_events.h" #include "ofi_am_events.h" -__ALWAYS_INLINE__ +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_progress_generic(void *netmod_context, int blocking, int do_am, int do_tagged) { int mpi_errno; diff --git a/src/mpid/ch4/netmod/ofi/ofi_recv.h b/src/mpid/ch4/netmod/ofi/ofi_recv.h index 375b73d..da88499 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_recv.h +++ b/src/mpid/ch4/netmod/ofi/ofi_recv.h @@ -20,14 +20,14 @@ #define FUNCNAME MPIDI_OFI_do_irecv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_do_irecv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, - MPIR_Request ** request, int mode, uint64_t flags) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_do_irecv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, + MPIR_Request ** request, int mode, uint64_t flags) { int mpi_errno = MPI_SUCCESS; MPIR_Request *rreq = NULL; @@ -120,14 +120,14 @@ __ALWAYS_INLINE__ int MPIDI_OFI_do_irecv(void *buf, #define FUNCNAME MPIDI_NM_mpi_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_recv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, - MPI_Status * status, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_recv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, + MPI_Status * status, MPIR_Request ** request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_RECV); @@ -142,13 +142,13 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_recv(void *buf, #define FUNCNAME MPIDI_NM_mpi_recv_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_recv_init(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_recv_init(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { MPIR_Request *rreq; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_RECV_INIT); @@ -187,10 +187,10 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_recv_init(void *buf, #define FUNCNAME MPIDI_NM_mpi_imrecv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_imrecv(void *buf, - int count, - MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_imrecv(void *buf, + int count, + MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp) { int mpi_errno = MPI_SUCCESS; MPIR_Request *rreq; @@ -223,13 +223,13 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_imrecv(void *buf, #define FUNCNAME MPIDI_NM_mpi_irecv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_irecv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_irecv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_IRECV); @@ -244,7 +244,7 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_irecv(void *buf, #define FUNCNAME MPIDI_NM_mpi_cancel_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_cancel_recv(MPIR_Request * rreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_cancel_recv(MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch4/netmod/ofi/ofi_rma.h b/src/mpid/ch4/netmod/ofi/ofi_rma.h index 531c96e..7d1b87a 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_rma.h +++ b/src/mpid/ch4/netmod/ofi/ofi_rma.h @@ -162,16 +162,16 @@ static inline void MPIDI_OFI_win_datatype_map(MPIDI_OFI_win_datatype_t * dt) MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_NETMOD_OFI_WIN_DATATYPE_MAP); } -__ALWAYS_INLINE__ int MPIDI_OFI_allocate_win_request_put_get(MPIR_Win * win, - int origin_count, - int target_count, - int target_rank, - MPI_Datatype origin_datatype, - MPI_Datatype target_datatype, - MPIDI_OFI_win_request_t ** winreq, - uint64_t * flags, - struct fid_ep **ep, - MPIR_Request ** sigreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_allocate_win_request_put_get(MPIR_Win * win, + int origin_count, + int target_count, + int target_rank, + MPI_Datatype origin_datatype, + MPI_Datatype target_datatype, + MPIDI_OFI_win_request_t ** + winreq, uint64_t * flags, + struct fid_ep **ep, + MPIR_Request ** sigreq) { int mpi_errno = MPI_SUCCESS; size_t o_size, t_size; @@ -200,16 +200,16 @@ __ALWAYS_INLINE__ int MPIDI_OFI_allocate_win_request_put_get(MPIR_Win * win, goto fn_exit; } -__ALWAYS_INLINE__ int MPIDI_OFI_allocate_win_request_accumulate(MPIR_Win * win, - int origin_count, - int target_count, - int target_rank, - MPI_Datatype origin_datatype, - MPI_Datatype target_datatype, - MPIDI_OFI_win_request_t ** winreq, - uint64_t * flags, - struct fid_ep **ep, - MPIR_Request ** sigreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_allocate_win_request_accumulate(MPIR_Win * win, + int origin_count, + int target_count, + int target_rank, + MPI_Datatype origin_datatype, + MPI_Datatype target_datatype, + MPIDI_OFI_win_request_t ** + winreq, uint64_t * flags, + struct fid_ep **ep, + MPIR_Request ** sigreq) { int mpi_errno = MPI_SUCCESS; size_t o_size, t_size; @@ -239,19 +239,23 @@ __ALWAYS_INLINE__ int MPIDI_OFI_allocate_win_request_accumulate(MPIR_Win * win, goto fn_exit; } -__ALWAYS_INLINE__ int MPIDI_OFI_allocate_win_request_get_accumulate(MPIR_Win * win, - int origin_count, - int target_count, - int result_count, - int target_rank, - MPI_Op op, - MPI_Datatype origin_datatype, - MPI_Datatype target_datatype, - MPI_Datatype result_datatype, - MPIDI_OFI_win_request_t ** - winreq, uint64_t * flags, - struct fid_ep **ep, - MPIR_Request ** sigreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_allocate_win_request_get_accumulate(MPIR_Win * win, + int origin_count, + int target_count, + int result_count, + int target_rank, + MPI_Op op, + MPI_Datatype + origin_datatype, + MPI_Datatype + target_datatype, + MPI_Datatype + result_datatype, + MPIDI_OFI_win_request_t + ** winreq, + uint64_t * flags, + struct fid_ep **ep, + MPIR_Request ** sigreq) { int mpi_errno = MPI_SUCCESS; size_t o_size, t_size, r_size; diff --git a/src/mpid/ch4/netmod/ofi/ofi_send.h b/src/mpid/ch4/netmod/ofi/ofi_send.h index 43a7e4c..3ad10f0 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_send.h +++ b/src/mpid/ch4/netmod/ofi/ofi_send.h @@ -25,10 +25,11 @@ #define FUNCNAME MPIDI_OFI_send_lightweight #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_send_lightweight(const void *buf, - size_t data_sz, - int rank, - int tag, MPIR_Comm * comm, int context_offset) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_send_lightweight(const void *buf, + size_t data_sz, + int rank, + int tag, MPIR_Comm * comm, + int context_offset) { int mpi_errno = MPI_SUCCESS; uint64_t match_bits; @@ -55,13 +56,13 @@ __ALWAYS_INLINE__ int MPIDI_OFI_send_lightweight(const void *buf, #define FUNCNAME MPIDI_OFI_send_lightweight_request #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_send_lightweight_request(const void *buf, - size_t data_sz, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_send_lightweight_request(const void *buf, + size_t data_sz, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; uint64_t match_bits; @@ -91,11 +92,11 @@ __ALWAYS_INLINE__ int MPIDI_OFI_send_lightweight_request(const void *buf, #define FUNCNAME MPIDI_OFI_send_normal #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_send_normal(MPIDI_OFI_SENDPARAMS, - int dt_contig, - size_t data_sz, - MPIR_Datatype * dt_ptr, - MPI_Aint dt_true_lb, uint64_t type) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_send_normal(MPIDI_OFI_SENDPARAMS, + int dt_contig, + size_t data_sz, + MPIR_Datatype * dt_ptr, + MPI_Aint dt_true_lb, uint64_t type) { int mpi_errno = MPI_SUCCESS; MPIR_Request *sreq = NULL; @@ -251,7 +252,7 @@ __ALWAYS_INLINE__ int MPIDI_OFI_send_normal(MPIDI_OFI_SENDPARAMS, #define FUNCNAME MPIDI_OFI_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_send(MPIDI_OFI_SENDPARAMS, int noreq, uint64_t syncflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_send(MPIDI_OFI_SENDPARAMS, int noreq, uint64_t syncflag) { int dt_contig, mpi_errno; size_t data_sz; @@ -284,7 +285,7 @@ __ALWAYS_INLINE__ int MPIDI_OFI_send(MPIDI_OFI_SENDPARAMS, int noreq, uint64_t s #define FUNCNAME MPIDI_OFI_persistent_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_OFI_persistent_send(MPIDI_OFI_SENDPARAMS) +MPL_STATIC_INLINE_PREFIX int MPIDI_OFI_persistent_send(MPIDI_OFI_SENDPARAMS) { MPIR_Request *sreq; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_NM_PSEND); @@ -334,7 +335,7 @@ __ALWAYS_INLINE__ int MPIDI_OFI_persistent_send(MPIDI_OFI_SENDPARAMS) #define FUNCNAME MPIDI_NM_mpi_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_send(MPIDI_OFI_SENDPARAMS) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_send(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_SEND); @@ -348,7 +349,7 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_send(MPIDI_OFI_SENDPARAMS) #define FUNCNAME MPIDI_NM_rsend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_rsend(MPIDI_OFI_SENDPARAMS) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_rsend(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_RSEND); @@ -363,7 +364,7 @@ __ALWAYS_INLINE__ int MPIDI_NM_rsend(MPIDI_OFI_SENDPARAMS) #define FUNCNAME MPIDI_NM_irsend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_irsend(MPIDI_OFI_SENDPARAMS) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_irsend(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_IRSEND); @@ -377,7 +378,7 @@ __ALWAYS_INLINE__ int MPIDI_NM_irsend(MPIDI_OFI_SENDPARAMS) #define FUNCNAME MPIDI_NM_mpi_ssend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_ssend(MPIDI_OFI_SENDPARAMS) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ssend(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_SSEND); @@ -392,7 +393,7 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_ssend(MPIDI_OFI_SENDPARAMS) #define FUNCNAME MPIDI_NM_mpi_isend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_isend(MPIDI_OFI_SENDPARAMS) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_isend(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_ISEND); @@ -406,7 +407,7 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_isend(MPIDI_OFI_SENDPARAMS) #define FUNCNAME MPIDI_NM_mpi_issend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_issend(MPIDI_OFI_SENDPARAMS) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_issend(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_ISSEND); @@ -421,7 +422,7 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_issend(MPIDI_OFI_SENDPARAMS) #define FUNCNAME MPIDI_NM_mpi_startall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_startall(int count, MPIR_Request * requests[]) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_startall(int count, MPIR_Request * requests[]) { int rc = MPI_SUCCESS, i; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_STARTALL); @@ -492,7 +493,7 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_startall(int count, MPIR_Request * requests[] #define FUNCNAME MPIDI_NM_mpi_send_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_send_init(MPIDI_OFI_SENDPARAMS) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_send_init(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_SEND_INIT); @@ -507,7 +508,7 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_send_init(MPIDI_OFI_SENDPARAMS) #define FUNCNAME MPIDI_NM_mpi_ssend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_ssend_init(MPIDI_OFI_SENDPARAMS) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ssend_init(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_SSEND_INIT); @@ -522,7 +523,7 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_ssend_init(MPIDI_OFI_SENDPARAMS) #define FUNCNAME MPIDI_NM_mpi_bsend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_bsend_init(MPIDI_OFI_SENDPARAMS) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_bsend_init(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_BSEND_INIT); @@ -537,7 +538,7 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_bsend_init(MPIDI_OFI_SENDPARAMS) #define FUNCNAME MPIDI_NM_mpi_rsend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_rsend_init(MPIDI_OFI_SENDPARAMS) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_rsend_init(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_RSEND_INIT); @@ -552,7 +553,7 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_rsend_init(MPIDI_OFI_SENDPARAMS) #define FUNCNAME MPIDI_NM_mpi_cancel_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_mpi_cancel_send(MPIR_Request * sreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_cancel_send(MPIR_Request * sreq) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_CANCEL_SEND); diff --git a/src/mpid/ch4/netmod/ucx/ucx_recv.h b/src/mpid/ch4/netmod/ucx/ucx_recv.h index e166096..4d762ad 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_recv.h +++ b/src/mpid/ch4/netmod/ucx/ucx_recv.h @@ -11,12 +11,12 @@ #include "ucx_impl.h" -__ALWAYS_INLINE__ int ucx_irecv_continous(void *buf, - size_t data_sz, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int ucx_irecv_continous(void *buf, + size_t data_sz, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; @@ -56,13 +56,13 @@ __ALWAYS_INLINE__ int ucx_irecv_continous(void *buf, goto fn_exit; } -__ALWAYS_INLINE__ int ucx_irecv_non_continous(void *buf, - size_t count, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request, - MPIR_Datatype * datatype) +MPL_STATIC_INLINE_PREFIX int ucx_irecv_non_continous(void *buf, + size_t count, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request, + MPIR_Datatype * datatype) { int mpi_errno = MPI_SUCCESS; @@ -134,34 +134,34 @@ static inline int do_irecv(void *buf, } -__ALWAYS_INLINE__ int MPIDI_NM_mpi_recv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, - MPI_Status * status, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_recv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, + MPI_Status * status, MPIR_Request ** request) { return do_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); } -__ALWAYS_INLINE__ int MPIDI_NM_mpi_recv_init(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_recv_init(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { return MPIDI_CH4U_mpi_recv_init(buf, count, datatype, rank, tag, comm, context_offset, request); } -__ALWAYS_INLINE__ int MPIDI_NM_mpi_imrecv(void *buf, - int count, - MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_imrecv(void *buf, + int count, + MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp) { ucp_tag_message_h message_handler; int mpi_errno = MPI_SUCCESS; @@ -218,13 +218,13 @@ __ALWAYS_INLINE__ int MPIDI_NM_mpi_imrecv(void *buf, goto fn_exit; } -__ALWAYS_INLINE__ int MPIDI_NM_mpi_irecv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_irecv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { diff --git a/src/mpid/ch4/netmod/ucx/ucx_send.h b/src/mpid/ch4/netmod/ucx/ucx_send.h index 0217ca4..5400320 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_send.h +++ b/src/mpid/ch4/netmod/ucx/ucx_send.h @@ -16,12 +16,12 @@ #define FUNCNAME ucx_send_continous #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int ucx_send_continous(const void *buf, - size_t data_sz, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request, int have_request) +MPL_STATIC_INLINE_PREFIX int ucx_send_continous(const void *buf, + size_t data_sz, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request, int have_request) { int mpi_errno = MPI_SUCCESS; MPIR_Request *req; @@ -73,12 +73,12 @@ __ALWAYS_INLINE__ int ucx_send_continous(const void *buf, } -__ALWAYS_INLINE__ int ucx_sync_send_continous(const void *buf, - size_t data_sz, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request, int have_request) +MPL_STATIC_INLINE_PREFIX int ucx_sync_send_continous(const void *buf, + size_t data_sz, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request, int have_request) { int mpi_errno = MPI_SUCCESS; MPIR_Request *req; @@ -122,13 +122,13 @@ __ALWAYS_INLINE__ int ucx_sync_send_continous(const void *buf, } -__ALWAYS_INLINE__ int ucx_sync_send_non_continous(const void *buf, - size_t count, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request, int have_request, - MPIR_Datatype * datatype) +MPL_STATIC_INLINE_PREFIX int ucx_sync_send_non_continous(const void *buf, + size_t count, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request, int have_request, + MPIR_Datatype * datatype) { int mpi_errno = MPI_SUCCESS; MPIR_Request *req; @@ -181,13 +181,13 @@ __ALWAYS_INLINE__ int ucx_sync_send_non_continous(const void *buf, #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int ucx_send_non_continous(const void *buf, - size_t count, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request, int have_request, - MPIR_Datatype * datatype) +MPL_STATIC_INLINE_PREFIX int ucx_send_non_continous(const void *buf, + size_t count, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request, int have_request, + MPIR_Datatype * datatype) { int mpi_errno = MPI_SUCCESS; MPIR_Request *req; http://git.mpich.org/mpich.git/commitdiff/7217189afc2428ce45417523015e70cae… commit 7217189afc2428ce45417523015e70cae4ddcc82 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Aug 30 10:42:55 2016 -0500 Namespace certain functions as hooks Some existing functions are more accurately described as hooks, providing functionality beyond what the upper-layer code is already doing. In this commit we rename the CH4 init/finalize routines and device layer request create/free routines. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/include/mpir_request.h b/src/include/mpir_request.h index af212ed..7085904 100644 --- a/src/include/mpir_request.h +++ b/src/include/mpir_request.h @@ -224,7 +224,7 @@ static inline MPIR_Request *MPIR_Request_create(MPIR_Request_kind_t kind) break; } - MPID_Request_init(req); + MPID_Request_create_hook(req); } else { @@ -281,7 +281,7 @@ static inline void MPIR_Request_free(MPIR_Request *req) MPL_free(req->u.ureq.greq_fns); } - MPID_Request_finalize(req); + MPID_Request_free_hook(req); MPIR_Handle_obj_free(&MPIR_Request_mem, req); } diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 926612e..edd7ec6 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -693,8 +693,8 @@ int MPID_Get_processor_name( char *name, int namelen, int *resultlen); int MPID_Get_universe_size(int * universe_size); int MPID_Comm_get_lpid(MPIR_Comm *comm_ptr, int idx, int * lpid_ptr, MPL_bool is_remote); -void MPID_Request_init(MPIR_Request *); -void MPID_Request_finalize(MPIR_Request *); +void MPID_Request_create_hook(MPIR_Request *); +void MPID_Request_free_hook(MPIR_Request *); int MPID_Request_complete(MPIR_Request *); void *MPID_Alloc_mem( size_t size, MPIR_Info *info ); diff --git a/src/mpid/ch3/src/ch3u_request.c b/src/mpid/ch3/src/ch3u_request.c index 2fec8f3..5176fc3 100644 --- a/src/mpid/ch3/src/ch3u_request.c +++ b/src/mpid/ch3/src/ch3u_request.c @@ -24,10 +24,10 @@ /* See the comments above about request creation. Some routines will use macros in mpidimpl.h *instead* of this routine */ #undef FUNCNAME -#define FUNCNAME MPID_Request_init +#define FUNCNAME MPID_Request_create_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -void MPID_Request_init(MPIR_Request *req) +void MPID_Request_create_hook(MPIR_Request *req) { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPID_REQUEST_INIT); @@ -588,7 +588,7 @@ int MPID_Request_complete(MPIR_Request *req) goto fn_exit; } -void MPID_Request_finalize(MPIR_Request *req) +void MPID_Request_free_hook(MPIR_Request *req) { if (req->dev.datatype_ptr != NULL) { MPIDU_Datatype_release(req->dev.datatype_ptr); diff --git a/src/mpid/ch4/include/mpidpost.h b/src/mpid/ch4/include/mpidpost.h index 40edeb7..43a9658 100644 --- a/src/mpid/ch4/include/mpidpost.h +++ b/src/mpid/ch4/include/mpidpost.h @@ -14,7 +14,7 @@ #include "mpidu_datatype.h" #include "mpidch4.h" -__ALWAYS_INLINE__ void MPID_Request_init(MPIR_Request * req) +__ALWAYS_INLINE__ void MPID_Request_create_hook(MPIR_Request * req) { MPIDI_CH4U_REQUEST(req, req) = NULL; #ifdef MPIDI_BUILD_CH4_SHM @@ -22,7 +22,7 @@ __ALWAYS_INLINE__ void MPID_Request_init(MPIR_Request * req) #endif } -__ALWAYS_INLINE__ void MPID_Request_finalize(MPIR_Request * req) +__ALWAYS_INLINE__ void MPID_Request_free_hook(MPIR_Request * req) { return; } diff --git a/src/mpid/ch4/include/mpidpre.h b/src/mpid/ch4/include/mpidpre.h index 1a045ca..698cd4a 100644 --- a/src/mpid/ch4/include/mpidpre.h +++ b/src/mpid/ch4/include/mpidpre.h @@ -198,9 +198,9 @@ typedef struct { #define MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(req) NULL #endif -__ALWAYS_INLINE__ void MPID_Request_init(struct MPIR_Request *req); +__ALWAYS_INLINE__ void MPID_Request_create_hook(struct MPIR_Request *req); -__ALWAYS_INLINE__ void MPID_Request_finalize(struct MPIR_Request *req); +__ALWAYS_INLINE__ void MPID_Request_free_hook(struct MPIR_Request *req); typedef struct MPIDI_CH4U_win_shared_info { uint32_t disp_unit; diff --git a/src/mpid/ch4/netmod/include/netmod.h b/src/mpid/ch4/netmod/include/netmod.h index 2a8f621..12b8ba2 100644 --- a/src/mpid/ch4/netmod/include/netmod.h +++ b/src/mpid/ch4/netmod/include/netmod.h @@ -504,11 +504,12 @@ extern MPIDI_NM_native_funcs_t *MPIDI_NM_native_func; extern int MPIDI_num_netmods; extern char MPIDI_NM_strings[][MPIDI_MAX_NETMOD_STRING_LEN]; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_init(int rank, int size, int appnum, int *tag_ub, - MPIR_Comm * comm_world, MPIR_Comm * comm_self, - int spawned, int num_contexts, - void **netmod_contexts) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_finalize(void) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_init_hook(int rank, int size, int appnum, int *tag_ub, + MPIR_Comm * comm_world, MPIR_Comm * comm_self, + int spawned, int num_contexts, + void **netmod_contexts) + MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_finalize_hook(void) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_progress(void *netmod_context, int blocking) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_am_reg_handler(int handler_id, diff --git a/src/mpid/ch4/netmod/include/netmod_impl.h b/src/mpid/ch4/netmod/include/netmod_impl.h index ad16dbc..e2f77ad 100644 --- a/src/mpid/ch4/netmod/include/netmod_impl.h +++ b/src/mpid/ch4/netmod/include/netmod_impl.h @@ -16,16 +16,16 @@ #ifndef NETMOD_DIRECT #ifndef NETMOD_DISABLE_INLINES -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_init(int rank, int size, int appnum, int *tag_ub, - MPIR_Comm * comm_world, MPIR_Comm * comm_self, - int spawned, int num_contexts, - void **netmod_contexts) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_init_hook(int rank, int size, int appnum, int *tag_ub, + MPIR_Comm * comm_world, MPIR_Comm * comm_self, + int spawned, int num_contexts, + void **netmod_contexts) { return MPIDI_NM_func->mpi_init(rank, size, appnum, tag_ub, comm_world, comm_self, spawned, num_contexts, netmod_contexts); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_finalize(void) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_finalize_hook(void) { return MPIDI_NM_func->mpi_finalize(); }; diff --git a/src/mpid/ch4/netmod/ofi/func_table.c b/src/mpid/ch4/netmod/ofi/func_table.c index f8789f2..bd524ed 100644 --- a/src/mpid/ch4/netmod/ofi/func_table.c +++ b/src/mpid/ch4/netmod/ofi/func_table.c @@ -14,8 +14,8 @@ #include <mpidimpl.h> #include "netmod_direct.h" MPIDI_NM_funcs_t MPIDI_NM_ofi_funcs = { - MPIDI_NM_mpi_init, - MPIDI_NM_mpi_finalize, + MPIDI_NM_mpi_init_hook, + MPIDI_NM_mpi_finalize_hook, MPIDI_NM_progress, MPIDI_NM_mpi_comm_connect, MPIDI_NM_mpi_comm_disconnect, diff --git a/src/mpid/ch4/netmod/ofi/ofi_init.h b/src/mpid/ch4/netmod/ofi/ofi_init.h index 9046bf2..be23ba0 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_init.h +++ b/src/mpid/ch4/netmod/ofi/ofi_init.h @@ -482,16 +482,16 @@ static inline int MPIDI_OFI_init_generic(int rank, #undef FUNCNAME -#define FUNCNAME MPIDI_NM_mpi_init +#define FUNCNAME MPIDI_NM_mpi_init_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_mpi_init(int rank, - int size, - int appnum, - int *tag_ub, - MPIR_Comm * comm_world, - MPIR_Comm * comm_self, - int spawned, int num_contexts, void **netmod_contexts) +static inline int MPIDI_NM_mpi_init_hook(int rank, + int size, + int appnum, + int *tag_ub, + MPIR_Comm * comm_world, + MPIR_Comm * comm_self, + int spawned, int num_contexts, void **netmod_contexts) { int mpi_errno; mpi_errno = MPIDI_OFI_init_generic(rank, size, appnum, tag_ub, comm_world, @@ -589,7 +589,7 @@ static inline int MPIDI_OFI_finalize_generic(int do_scalable_ep, int do_am, int goto fn_exit; } -static inline int MPIDI_NM_mpi_finalize(void) +static inline int MPIDI_NM_mpi_finalize_hook(void) { return MPIDI_OFI_finalize_generic(MPIDI_OFI_ENABLE_SCALABLE_ENDPOINTS, MPIDI_OFI_ENABLE_AM, MPIDI_OFI_ENABLE_STX_RMA); diff --git a/src/mpid/ch4/netmod/portals4/func_table.c b/src/mpid/ch4/netmod/portals4/func_table.c index e707315..5a4e501 100644 --- a/src/mpid/ch4/netmod/portals4/func_table.c +++ b/src/mpid/ch4/netmod/portals4/func_table.c @@ -14,8 +14,8 @@ #include "netmod_direct.h" MPIDI_NM_funcs_t MPIDI_NM_portals4_funcs = { - MPIDI_NM_mpi_init, - MPIDI_NM_mpi_finalize, + MPIDI_NM_mpi_init_hook, + MPIDI_NM_mpi_finalize_hook, MPIDI_NM_progress, MPIDI_NM_mpi_comm_connect, MPIDI_NM_mpi_comm_disconnect, diff --git a/src/mpid/ch4/netmod/portals4/ptl_init.h b/src/mpid/ch4/netmod/portals4/ptl_init.h index 06b1f51..5766515 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_init.h +++ b/src/mpid/ch4/netmod/portals4/ptl_init.h @@ -40,16 +40,16 @@ static inline int MPIDI_PTL_append_overflow(size_t i) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_mpi_init +#define FUNCNAME MPIDI_NM_mpi_init_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_mpi_init(int rank, - int size, - int appnum, - int *tag_ub, - MPIR_Comm * comm_world, - MPIR_Comm * comm_self, - int spawned, int num_contexts, void **netmod_contexts) +static inline int MPIDI_NM_mpi_init_hook(int rank, + int size, + int appnum, + int *tag_ub, + MPIR_Comm * comm_world, + MPIR_Comm * comm_self, + int spawned, int num_contexts, void **netmod_contexts) { int mpi_errno = MPI_SUCCESS; int ret; @@ -183,7 +183,7 @@ static inline int MPIDI_NM_mpi_init(int rank, goto fn_exit; } -static inline int MPIDI_NM_mpi_finalize(void) +static inline int MPIDI_NM_mpi_finalize_hook(void) { int mpi_errno = MPI_SUCCESS; int ret, i; diff --git a/src/mpid/ch4/netmod/stubnm/globals.c b/src/mpid/ch4/netmod/stubnm/globals.c index f87b80b..bfb95c2 100644 --- a/src/mpid/ch4/netmod/stubnm/globals.c +++ b/src/mpid/ch4/netmod/stubnm/globals.c @@ -14,8 +14,8 @@ #include <mpidimpl.h> #include "netmod_direct.h" MPIDI_NM_funcs_t MPIDI_NM_stubnm_funcs = { - MPIDI_NM_mpi_init, - MPIDI_NM_mpi_finalize, + MPIDI_NM_mpi_init_hook, + MPIDI_NM_mpi_finalize_hook, MPIDI_NM_progress, MPIDI_NM_mpi_comm_connect, MPIDI_NM_mpi_comm_disconnect, diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_init.h b/src/mpid/ch4/netmod/stubnm/stubnm_init.h index fbe2d18..ca58e7e 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_init.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_init.h @@ -13,13 +13,13 @@ #include "stubnm_impl.h" -static inline int MPIDI_NM_mpi_init(int rank, - int size, - int appnum, - int *tag_ub, - MPIR_Comm * comm_world, - MPIR_Comm * comm_self, - int spawned, int num_contexts, void **netmod_contexts) +static inline int MPIDI_NM_mpi_init_hook(int rank, + int size, + int appnum, + int *tag_ub, + MPIR_Comm * comm_world, + MPIR_Comm * comm_self, + int spawned, int num_contexts, void **netmod_contexts) { int mpi_errno = MPI_SUCCESS; @@ -28,7 +28,7 @@ static inline int MPIDI_NM_mpi_init(int rank, return mpi_errno; } -static inline int MPIDI_NM_mpi_finalize(void) +static inline int MPIDI_NM_mpi_finalize_hook(void) { int mpi_errno = MPI_SUCCESS; MPIR_Assert(0); diff --git a/src/mpid/ch4/netmod/ucx/func_table.c b/src/mpid/ch4/netmod/ucx/func_table.c index aa2a904..404b891 100644 --- a/src/mpid/ch4/netmod/ucx/func_table.c +++ b/src/mpid/ch4/netmod/ucx/func_table.c @@ -12,8 +12,8 @@ #include <mpidimpl.h> #include "netmod_direct.h" MPIDI_NM_funcs_t MPIDI_NM_ucx_funcs = { - MPIDI_NM_mpi_init, - MPIDI_NM_mpi_finalize, + MPIDI_NM_mpi_init_hook, + MPIDI_NM_mpi_finalize_hook, MPIDI_NM_progress, MPIDI_NM_mpi_comm_connect, MPIDI_NM_mpi_comm_disconnect, diff --git a/src/mpid/ch4/netmod/ucx/ucx_init.h b/src/mpid/ch4/netmod/ucx/ucx_init.h index acbd31f..23354ef 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_init.h +++ b/src/mpid/ch4/netmod/ucx/ucx_init.h @@ -15,16 +15,16 @@ #include "pmi.h" #include <ucp/api/ucp.h> #undef FUNCNAME -#define FUNCNAME MPIDI_NM_mpi_init +#define FUNCNAME MPIDI_NM_mpi_init_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_mpi_init(int rank, - int size, - int appnum, - int *tag_ub, - MPIR_Comm * comm_world, - MPIR_Comm * comm_self, - int spawned, int num_contexts, void **netmod_contexts) +static inline int MPIDI_NM_mpi_init_hook(int rank, + int size, + int appnum, + int *tag_ub, + MPIR_Comm * comm_world, + MPIR_Comm * comm_self, + int spawned, int num_contexts, void **netmod_contexts) { int mpi_errno = MPI_SUCCESS, thr_err, pmi_errno; int str_errno = MPL_STR_SUCCESS; @@ -127,7 +127,7 @@ static inline int MPIDI_NM_mpi_init(int rank, } -static inline int MPIDI_NM_mpi_finalize(void) +static inline int MPIDI_NM_mpi_finalize_hook(void) { int mpi_errno = MPI_SUCCESS, thr_err, pmi_errno; int i, j, max_n_avts; diff --git a/src/mpid/ch4/shm/include/shm.h b/src/mpid/ch4/shm/include/shm.h index 597922e..a87940e 100644 --- a/src/mpid/ch4/shm/include/shm.h +++ b/src/mpid/ch4/shm/include/shm.h @@ -527,8 +527,8 @@ extern MPIDI_SHM_native_funcs_t *MPIDI_SHM_native_func; extern int MPIDI_num_shms; extern char MPIDI_SHM_strings[][MPIDI_MAX_SHM_STRING_LEN]; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_init(int rank, int size) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_finalize(void) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_init_hook(int rank, int size) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_finalize_hook(void) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_progress(int blocking) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_am_reg_handler(int handler_id, MPIDI_SHM_am_origin_handler_fn diff --git a/src/mpid/ch4/shm/include/shm_impl.h b/src/mpid/ch4/shm/include/shm_impl.h index ad23af0..a15f4d4 100644 --- a/src/mpid/ch4/shm/include/shm_impl.h +++ b/src/mpid/ch4/shm/include/shm_impl.h @@ -15,12 +15,12 @@ #ifndef SHM_DIRECT #ifndef SHM_DISABLE_INLINES -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_init(int rank, int size) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_init_hook(int rank, int size) { return MPIDI_SHM_func->mpi_init(rank, size); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_finalize(void) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_finalize_hook(void) { return MPIDI_SHM_func->mpi_finalize(); }; diff --git a/src/mpid/ch4/shm/posix/func_table.c b/src/mpid/ch4/shm/posix/func_table.c index 24e9709..6e0e1f4 100644 --- a/src/mpid/ch4/shm/posix/func_table.c +++ b/src/mpid/ch4/shm/posix/func_table.c @@ -13,8 +13,8 @@ #include <mpidimpl.h> #include "shm_direct.h" MPIDI_SHM_funcs_t MPIDI_SHM_posix_funcs = { - MPIDI_SHM_mpi_init, - MPIDI_SHM_mpi_finalize, + MPIDI_SHM_mpi_init_hook, + MPIDI_SHM_mpi_finalize_hook, MPIDI_SHM_progress, MPIDI_SHM_am_reg_handler, MPIDI_SHM_mpi_comm_connect, diff --git a/src/mpid/ch4/shm/posix/posix_init.h b/src/mpid/ch4/shm/posix/posix_init.h index 1f2754b..eb47bb6 100644 --- a/src/mpid/ch4/shm/posix/posix_init.h +++ b/src/mpid/ch4/shm/posix/posix_init.h @@ -22,8 +22,8 @@ extern MPIDI_POSIX_mem_region_t MPIDI_POSIX_mem_region; extern char *MPIDI_POSIX_asym_base_addr; #undef FCNAME -#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_init) -static inline int MPIDI_SHM_mpi_init(int rank, int size) +#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_init_hook) +static inline int MPIDI_SHM_mpi_init_hook(int rank, int size) { int mpi_errno = MPI_SUCCESS; int num_local = 0; @@ -229,8 +229,8 @@ static inline int MPIDI_SHM_mpi_init(int rank, int size) } #undef FCNAME -#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_finalize) -static inline int MPIDI_SHM_mpi_finalize(void) +#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_finalize_hook) +static inline int MPIDI_SHM_mpi_finalize_hook(void) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_SHM_FINALIZE); diff --git a/src/mpid/ch4/shm/stubshm/func_table.c b/src/mpid/ch4/shm/stubshm/func_table.c index acb9672..7e4e2c1 100644 --- a/src/mpid/ch4/shm/stubshm/func_table.c +++ b/src/mpid/ch4/shm/stubshm/func_table.c @@ -13,8 +13,8 @@ #include <mpidimpl.h> #include "shm_direct.h" MPIDI_SHM_funcs_t MPIDI_SHM_stubshm_funcs = { - MPIDI_SHM_mpi_init, - MPIDI_SHM_mpi_finalize, + MPIDI_SHM_mpi_init_hook, + MPIDI_SHM_mpi_finalize_hook, MPIDI_SHM_progress, MPIDI_SHM_am_reg_handler, MPIDI_SHM_mpi_comm_connect, diff --git a/src/mpid/ch4/shm/stubshm/stubshm_init.h b/src/mpid/ch4/shm/stubshm/stubshm_init.h index 6b61d99..f4e8da8 100644 --- a/src/mpid/ch4/shm/stubshm/stubshm_init.h +++ b/src/mpid/ch4/shm/stubshm/stubshm_init.h @@ -13,13 +13,13 @@ #include "stubshm_impl.h" -static inline int MPIDI_SHM_mpi_init(int rank, int size) +static inline int MPIDI_SHM_mpi_init_hook(int rank, int size) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_mpi_finalize(void) +static inline int MPIDI_SHM_mpi_finalize_hook(void) { MPIR_Assert(0); return MPI_SUCCESS; diff --git a/src/mpid/ch4/src/ch4_init.h b/src/mpid/ch4/src/ch4_init.h index 6613e82..9b40821 100644 --- a/src/mpid/ch4/src/ch4_init.h +++ b/src/mpid/ch4/src/ch4_init.h @@ -248,9 +248,9 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Init(int *argc, MPIR_Process.attrs.tag_ub = (1ULL << MPIDI_CH4U_TAG_SHIFT) - 1; /* discuss */ - mpi_errno = MPIDI_NM_mpi_init(rank, size, appnum, &MPIR_Process.attrs.tag_ub, - MPIR_Process.comm_world, - MPIR_Process.comm_self, has_parent, 1, &netmod_contexts); + mpi_errno = MPIDI_NM_mpi_init_hook(rank, size, appnum, &MPIR_Process.attrs.tag_ub, + MPIR_Process.comm_world, + MPIR_Process.comm_self, has_parent, 1, &netmod_contexts); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POPFATAL(mpi_errno); } @@ -279,7 +279,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Init(int *argc, #endif #ifdef MPIDI_BUILD_CH4_SHM - mpi_errno = MPIDI_SHM_mpi_init(rank, size); + mpi_errno = MPIDI_SHM_mpi_init_hook(rank, size); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POPFATAL(mpi_errno); @@ -346,11 +346,11 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Finalize(void) MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_FINALIZE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_FINALIZE); - mpi_errno = MPIDI_NM_mpi_finalize(); + mpi_errno = MPIDI_NM_mpi_finalize_hook(); if (mpi_errno) MPIR_ERR_POP(mpi_errno); #ifdef MPIDI_BUILD_CH4_SHM - mpi_errno = MPIDI_SHM_mpi_finalize(); + mpi_errno = MPIDI_SHM_mpi_finalize_hook(); if (mpi_errno) MPIR_ERR_POP(mpi_errno); #endif http://git.mpich.org/mpich.git/commitdiff/6370ba6ce11942523e944f324298b6fe5… commit 6370ba6ce11942523e944f324298b6fe5209b4f5 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Aug 30 10:42:55 2016 -0500 CH4: Namespace MPI-level functionality used by the netmod/shmmod Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/ch4/netmod/include/netmod.h b/src/mpid/ch4/netmod/include/netmod.h index e9d4e58..2a8f621 100644 --- a/src/mpid/ch4/netmod/include/netmod.h +++ b/src/mpid/ch4/netmod/include/netmod.h @@ -26,21 +26,21 @@ typedef int (*MPIDI_NM_am_target_handler_fn) size_t * data_sz, int *is_contig, MPIDI_NM_am_completion_handler_fn * cmpl_handler_fn, /* completion handler */ MPIR_Request ** req); /* if allocated, need pointer to completion function */ -typedef int (*MPIDI_NM_init_t) (int rank, int size, int appnum, int *tag_ub, MPIR_Comm * comm_world, - MPIR_Comm * comm_self, int spawned, int num_contexts, - void **netmod_contexts); -typedef int (*MPIDI_NM_finalize_t) (void); +typedef int (*MPIDI_NM_mpi_init_t) (int rank, int size, int appnum, int *tag_ub, + MPIR_Comm * comm_world, MPIR_Comm * comm_self, int spawned, + int num_contexts, void **netmod_contexts); +typedef int (*MPIDI_NM_mpi_finalize_t) (void); typedef int (*MPIDI_NM_progress_t) (void *netmod_context, int blocking); typedef int (*MPIDI_NM_am_reg_handler_t) (int handler_id, MPIDI_NM_am_origin_handler_fn origin_handler_fn, MPIDI_NM_am_target_handler_fn target_handler_fn); -typedef int (*MPIDI_NM_comm_connect_t) (const char *port_name, MPIR_Info * info, int root, - MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr); -typedef int (*MPIDI_NM_comm_disconnect_t) (MPIR_Comm * comm_ptr); -typedef int (*MPIDI_NM_open_port_t) (MPIR_Info * info_ptr, char *port_name); -typedef int (*MPIDI_NM_close_port_t) (const char *port_name); -typedef int (*MPIDI_NM_comm_accept_t) (const char *port_name, MPIR_Info * info, int root, - MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr); +typedef int (*MPIDI_NM_mpi_comm_connect_t) (const char *port_name, MPIR_Info * info, int root, + MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr); +typedef int (*MPIDI_NM_mpi_comm_disconnect_t) (MPIR_Comm * comm_ptr); +typedef int (*MPIDI_NM_mpi_open_port_t) (MPIR_Info * info_ptr, char *port_name); +typedef int (*MPIDI_NM_mpi_close_port_t) (const char *port_name); +typedef int (*MPIDI_NM_mpi_comm_accept_t) (const char *port_name, MPIR_Info * info, int root, + MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr); typedef int (*MPIDI_NM_am_send_hdr_t) (int rank, MPIR_Comm * comm, int handler_id, const void *am_hdr, size_t am_hdr_sz, void *netmod_context); typedef int (*MPIDI_NM_am_isend_t) (int rank, MPIR_Comm * comm, int handler_id, const void *am_hdr, @@ -67,296 +67,313 @@ typedef int (*MPIDI_NM_getallincomm_t) (MPIR_Comm * comm_ptr, int local_size, typedef int (*MPIDI_NM_gpid_tolpidarray_t) (int size, MPIR_Gpid gpid[], int lpid[]); typedef int (*MPIDI_NM_create_intercomm_from_lpids_t) (MPIR_Comm * newcomm_ptr, int size, const int lpids[]); -typedef int (*MPIDI_NM_comm_create_hook_t) (MPIR_Comm * comm); -typedef int (*MPIDI_NM_comm_free_hook_t) (MPIR_Comm * comm); +typedef int (*MPIDI_NM_mpi_comm_create_hook_t) (MPIR_Comm * comm); +typedef int (*MPIDI_NM_mpi_comm_free_hook_t) (MPIR_Comm * comm); typedef void (*MPIDI_NM_am_request_init_t) (MPIR_Request * req); typedef void (*MPIDI_NM_am_request_finalize_t) (MPIR_Request * req); -typedef int (*MPIDI_NM_send_t) (const void *buf, int count, MPI_Datatype datatype, int rank, - int tag, MPIR_Comm * comm, int context_offset, - MPIR_Request ** request); -typedef int (*MPIDI_NM_ssend_t) (const void *buf, int count, MPI_Datatype datatype, int rank, - int tag, MPIR_Comm * comm, int context_offset, - MPIR_Request ** request); -typedef int (*MPIDI_NM_startall_t) (int count, MPIR_Request * requests[]); -typedef int (*MPIDI_NM_send_init_t) (const void *buf, int count, MPI_Datatype datatype, int rank, +typedef int (*MPIDI_NM_mpi_send_t) (const void *buf, int count, MPI_Datatype datatype, int rank, + int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_NM_mpi_ssend_t) (const void *buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPIR_Request ** request); -typedef int (*MPIDI_NM_ssend_init_t) (const void *buf, int count, MPI_Datatype datatype, int rank, - int tag, MPIR_Comm * comm, int context_offset, - MPIR_Request ** request); -typedef int (*MPIDI_NM_rsend_init_t) (const void *buf, int count, MPI_Datatype datatype, int rank, - int tag, MPIR_Comm * comm, int context_offset, - MPIR_Request ** request); -typedef int (*MPIDI_NM_bsend_init_t) (const void *buf, int count, MPI_Datatype datatype, int rank, +typedef int (*MPIDI_NM_mpi_startall_t) (int count, MPIR_Request * requests[]); +typedef int (*MPIDI_NM_mpi_send_init_t) (const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_NM_mpi_ssend_init_t) (const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_NM_mpi_rsend_init_t) (const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_NM_mpi_bsend_init_t) (const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_NM_mpi_isend_t) (const void *buf, int count, MPI_Datatype datatype, int rank, + int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_NM_mpi_issend_t) (const void *buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPIR_Request ** request); -typedef int (*MPIDI_NM_isend_t) (const void *buf, int count, MPI_Datatype datatype, int rank, - int tag, MPIR_Comm * comm, int context_offset, - MPIR_Request ** request); -typedef int (*MPIDI_NM_issend_t) (const void *buf, int count, MPI_Datatype datatype, int rank, - int tag, MPIR_Comm * comm, int context_offset, - MPIR_Request ** request); -typedef int (*MPIDI_NM_cancel_send_t) (MPIR_Request * sreq); -typedef int (*MPIDI_NM_recv_init_t) (void *buf, int count, MPI_Datatype datatype, int rank, int tag, +typedef int (*MPIDI_NM_mpi_cancel_send_t) (MPIR_Request * sreq); +typedef int (*MPIDI_NM_mpi_recv_init_t) (void *buf, int count, MPI_Datatype datatype, int rank, + int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_NM_mpi_recv_t) (void *buf, int count, MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, MPI_Status * status, + MPIR_Request ** request); +typedef int (*MPIDI_NM_mpi_irecv_t) (void *buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPIR_Request ** request); -typedef int (*MPIDI_NM_recv_t) (void *buf, int count, MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, MPI_Status * status, - MPIR_Request ** request); -typedef int (*MPIDI_NM_irecv_t) (void *buf, int count, MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request); -typedef int (*MPIDI_NM_imrecv_t) (void *buf, int count, MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp); -typedef int (*MPIDI_NM_cancel_recv_t) (MPIR_Request * rreq); -typedef void *(*MPIDI_NM_alloc_mem_t) (size_t size, MPIR_Info * info_ptr); -typedef int (*MPIDI_NM_free_mem_t) (void *ptr); -typedef int (*MPIDI_NM_improbe_t) (int source, int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPIR_Request ** message, MPI_Status * status); -typedef int (*MPIDI_NM_iprobe_t) (int source, int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPI_Status * status); -typedef int (*MPIDI_NM_win_set_info_t) (MPIR_Win * win, MPIR_Info * info); -typedef int (*MPIDI_NM_win_shared_query_t) (MPIR_Win * win, int rank, MPI_Aint * size, - int *disp_unit, void *baseptr); -typedef int (*MPIDI_NM_put_t) (const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win); -typedef int (*MPIDI_NM_win_start_t) (MPIR_Group * group, int assert, MPIR_Win * win); -typedef int (*MPIDI_NM_win_complete_t) (MPIR_Win * win); -typedef int (*MPIDI_NM_win_post_t) (MPIR_Group * group, int assert, MPIR_Win * win); -typedef int (*MPIDI_NM_win_wait_t) (MPIR_Win * win); -typedef int (*MPIDI_NM_win_test_t) (MPIR_Win * win, int *flag); -typedef int (*MPIDI_NM_win_lock_t) (int lock_type, int rank, int assert, MPIR_Win * win); -typedef int (*MPIDI_NM_win_unlock_t) (int rank, MPIR_Win * win); -typedef int (*MPIDI_NM_win_get_info_t) (MPIR_Win * win, MPIR_Info ** info_p_p); -typedef int (*MPIDI_NM_get_t) (void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - int target_rank, MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win); -typedef int (*MPIDI_NM_win_free_t) (MPIR_Win ** win_ptr); -typedef int (*MPIDI_NM_win_fence_t) (int assert, MPIR_Win * win); -typedef int (*MPIDI_NM_win_create_t) (void *base, MPI_Aint length, int disp_unit, MPIR_Info * info, - MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr); -typedef int (*MPIDI_NM_accumulate_t) (const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win); -typedef int (*MPIDI_NM_win_attach_t) (MPIR_Win * win, void *base, MPI_Aint size); -typedef int (*MPIDI_NM_win_allocate_shared_t) (MPI_Aint size, int disp_unit, MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, void **base_ptr, - MPIR_Win ** win_ptr); -typedef int (*MPIDI_NM_rput_t) (const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win, - MPIR_Request ** request); -typedef int (*MPIDI_NM_win_flush_local_t) (int rank, MPIR_Win * win); -typedef int (*MPIDI_NM_win_detach_t) (MPIR_Win * win, const void *base); -typedef int (*MPIDI_NM_compare_and_swap_t) (const void *origin_addr, const void *compare_addr, - void *result_addr, MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, MPIR_Win * win); -typedef int (*MPIDI_NM_raccumulate_t) (const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win, - MPIR_Request ** request); -typedef int (*MPIDI_NM_rget_accumulate_t) (const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, void *result_addr, - int result_count, MPI_Datatype result_datatype, - int target_rank, MPI_Aint target_disp, int target_count, +typedef int (*MPIDI_NM_mpi_imrecv_t) (void *buf, int count, MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp); +typedef int (*MPIDI_NM_mpi_cancel_recv_t) (MPIR_Request * rreq); +typedef void *(*MPIDI_NM_mpi_alloc_mem_t) (size_t size, MPIR_Info * info_ptr); +typedef int (*MPIDI_NM_mpi_free_mem_t) (void *ptr); +typedef int (*MPIDI_NM_mpi_improbe_t) (int source, int tag, MPIR_Comm * comm, int context_offset, + int *flag, MPIR_Request ** message, MPI_Status * status); +typedef int (*MPIDI_NM_mpi_iprobe_t) (int source, int tag, MPIR_Comm * comm, int context_offset, + int *flag, MPI_Status * status); +typedef int (*MPIDI_NM_mpi_win_set_info_t) (MPIR_Win * win, MPIR_Info * info); +typedef int (*MPIDI_NM_mpi_win_shared_query_t) (MPIR_Win * win, int rank, MPI_Aint * size, + int *disp_unit, void *baseptr); +typedef int (*MPIDI_NM_mpi_put_t) (const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_start_t) (MPIR_Group * group, int assert, MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_complete_t) (MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_post_t) (MPIR_Group * group, int assert, MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_wait_t) (MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_test_t) (MPIR_Win * win, int *flag); +typedef int (*MPIDI_NM_mpi_win_lock_t) (int lock_type, int rank, int assert, MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_unlock_t) (int rank, MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_get_info_t) (MPIR_Win * win, MPIR_Info ** info_p_p); +typedef int (*MPIDI_NM_mpi_get_t) (void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_free_t) (MPIR_Win ** win_ptr); +typedef int (*MPIDI_NM_mpi_win_fence_t) (int assert, MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_create_t) (void *base, MPI_Aint length, int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr); +typedef int (*MPIDI_NM_mpi_accumulate_t) (const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_attach_t) (MPIR_Win * win, void *base, MPI_Aint size); +typedef int (*MPIDI_NM_mpi_win_allocate_shared_t) (MPI_Aint size, int disp_unit, + MPIR_Info * info_ptr, MPIR_Comm * comm_ptr, + void **base_ptr, MPIR_Win ** win_ptr); +typedef int (*MPIDI_NM_mpi_rput_t) (const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win, + MPIR_Request ** request); +typedef int (*MPIDI_NM_mpi_win_flush_local_t) (int rank, MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_detach_t) (MPIR_Win * win, const void *base); +typedef int (*MPIDI_NM_mpi_compare_and_swap_t) (const void *origin_addr, const void *compare_addr, + void *result_addr, MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp, + MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_raccumulate_t) (const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win, MPIR_Request ** request); -typedef int (*MPIDI_NM_fetch_and_op_t) (const void *origin_addr, void *result_addr, - MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp, MPI_Op op, MPIR_Win * win); -typedef int (*MPIDI_NM_win_allocate_t) (MPI_Aint size, int disp_unit, MPIR_Info * info, - MPIR_Comm * comm, void *baseptr, MPIR_Win ** win); -typedef int (*MPIDI_NM_win_flush_t) (int rank, MPIR_Win * win); -typedef int (*MPIDI_NM_win_flush_local_all_t) (MPIR_Win * win); -typedef int (*MPIDI_NM_win_unlock_all_t) (MPIR_Win * win); -typedef int (*MPIDI_NM_win_create_dynamic_t) (MPIR_Info * info, MPIR_Comm * comm, MPIR_Win ** win); -typedef int (*MPIDI_NM_rget_t) (void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - int target_rank, MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win, - MPIR_Request ** request); -typedef int (*MPIDI_NM_win_sync_t) (MPIR_Win * win); -typedef int (*MPIDI_NM_win_flush_all_t) (MPIR_Win * win); -typedef int (*MPIDI_NM_get_accumulate_t) (const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, void *result_addr, - int result_count, MPI_Datatype result_datatype, - int target_rank, MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win); -typedef int (*MPIDI_NM_win_lock_all_t) (int assert, MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_rget_accumulate_t) (const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, void *result_addr, + int result_count, MPI_Datatype result_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, MPIR_Request ** request); +typedef int (*MPIDI_NM_mpi_fetch_and_op_t) (const void *origin_addr, void *result_addr, + MPI_Datatype datatype, int target_rank, + MPI_Aint target_disp, MPI_Op op, MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_allocate_t) (MPI_Aint size, int disp_unit, MPIR_Info * info, + MPIR_Comm * comm, void *baseptr, MPIR_Win ** win); +typedef int (*MPIDI_NM_mpi_win_flush_t) (int rank, MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_flush_local_all_t) (MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_unlock_all_t) (MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_create_dynamic_t) (MPIR_Info * info, MPIR_Comm * comm, + MPIR_Win ** win); +typedef int (*MPIDI_NM_mpi_rget_t) (void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win, + MPIR_Request ** request); +typedef int (*MPIDI_NM_mpi_win_sync_t) (MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_flush_all_t) (MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_get_accumulate_t) (const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, void *result_addr, + int result_count, MPI_Datatype result_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win); +typedef int (*MPIDI_NM_mpi_win_lock_all_t) (int assert, MPIR_Win * win); typedef int (*MPIDI_NM_rank_is_local_t) (int target, MPIR_Comm * comm); -typedef int (*MPIDI_NM_barrier_t) (MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_bcast_t) (void *buffer, int count, MPI_Datatype datatype, int root, - MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_allreduce_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_allgather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, +typedef int (*MPIDI_NM_mpi_barrier_t) (MPIR_Comm * comm, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_bcast_t) (void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_allgatherv_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_scatter_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_scatterv_t) (const void *sendbuf, const int *sendcounts, const int *displs, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_gather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_gatherv_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_alltoall_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_alltoallv_t) (const void *sendbuf, const int *sendcounts, const int *sdispls, - MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_alltoallw_t) (const void *sendbuf, const int *sendcounts, const int *sdispls, - const MPI_Datatype sendtypes[], void *recvbuf, - const int *recvcounts, const int *rdispls, - const MPI_Datatype recvtypes[], MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_reduce_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_reduce_scatter_t) (const void *sendbuf, void *recvbuf, const int *recvcounts, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, +typedef int (*MPIDI_NM_mpi_allreduce_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_allgather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_allgatherv_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_reduce_scatter_block_t) (const void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_scan_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_exscan_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_NM_neighbor_allgather_t) (const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm); -typedef int (*MPIDI_NM_neighbor_allgatherv_t) (const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm); -typedef int (*MPIDI_NM_neighbor_alltoallv_t) (const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm); -typedef int (*MPIDI_NM_neighbor_alltoallw_t) (const void *sendbuf, const int *sendcounts, - const MPI_Aint * sdispls, - const MPI_Datatype * sendtypes, void *recvbuf, - const int *recvcounts, const MPI_Aint * rdispls, - const MPI_Datatype * recvtypes, MPIR_Comm * comm); -typedef int (*MPIDI_NM_neighbor_alltoall_t) (const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm); -typedef int (*MPIDI_NM_ineighbor_allgather_t) (const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_NM_ineighbor_allgatherv_t) (const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_NM_ineighbor_alltoall_t) (const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_NM_ineighbor_alltoallv_t) (const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_NM_ineighbor_alltoallw_t) (const void *sendbuf, const int *sendcounts, - const MPI_Aint * sdispls, - const MPI_Datatype * sendtypes, void *recvbuf, - const int *recvcounts, const MPI_Aint * rdispls, - const MPI_Datatype * recvtypes, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_NM_ibarrier_t) (MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_NM_ibcast_t) (void *buffer, int count, MPI_Datatype datatype, int root, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_NM_iallgather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_NM_iallgatherv_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, +typedef int (*MPIDI_NM_mpi_scatter_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_scatterv_t) (const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_gather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_gatherv_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_NM_iallreduce_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype recvtype, int root, MPIR_Comm * comm, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_alltoall_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_alltoallv_t) (const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *rdispls, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_alltoallw_t) (const void *sendbuf, const int *sendcounts, + const int *sdispls, const MPI_Datatype sendtypes[], + void *recvbuf, const int *recvcounts, const int *rdispls, + const MPI_Datatype recvtypes[], MPIR_Comm * comm, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_reduce_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_reduce_scatter_t) (const void *sendbuf, void *recvbuf, + const int *recvcounts, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_reduce_scatter_block_t) (const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_scan_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_exscan_t) (const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_NM_ialltoall_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_NM_ialltoallv_t) (const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *rdispls, - MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_NM_ialltoallw_t) (const void *sendbuf, const int *sendcounts, - const int *sdispls, const MPI_Datatype sendtypes[], - void *recvbuf, const int *recvcounts, const int *rdispls, - const MPI_Datatype recvtypes[], MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_NM_iexscan_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_NM_igather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_NM_igatherv_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_NM_ireduce_scatter_block_t) (const void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_NM_ireduce_scatter_t) (const void *sendbuf, void *recvbuf, - const int *recvcounts, MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_NM_ireduce_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm * comm_ptr, - MPI_Request * req); -typedef int (*MPIDI_NM_iscan_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_NM_iscatter_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_NM_iscatterv_t) (const void *sendbuf, const int *sendcounts, const int *displs, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_NM_mpi_neighbor_allgather_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm); +typedef int (*MPIDI_NM_mpi_neighbor_allgatherv_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm); +typedef int (*MPIDI_NM_mpi_neighbor_alltoallv_t) (const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm); +typedef int (*MPIDI_NM_mpi_neighbor_alltoallw_t) (const void *sendbuf, const int *sendcounts, + const MPI_Aint * sdispls, + const MPI_Datatype * sendtypes, void *recvbuf, + const int *recvcounts, const MPI_Aint * rdispls, + const MPI_Datatype * recvtypes, MPIR_Comm * comm); +typedef int (*MPIDI_NM_mpi_neighbor_alltoall_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm); +typedef int (*MPIDI_NM_mpi_ineighbor_allgather_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_NM_mpi_ineighbor_allgatherv_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_NM_mpi_ineighbor_alltoall_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_NM_mpi_ineighbor_alltoallv_t) (const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_NM_mpi_ineighbor_alltoallw_t) (const void *sendbuf, const int *sendcounts, + const MPI_Aint * sdispls, + const MPI_Datatype * sendtypes, void *recvbuf, + const int *recvcounts, const MPI_Aint * rdispls, + const MPI_Datatype * recvtypes, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_NM_mpi_ibarrier_t) (MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_NM_mpi_ibcast_t) (void *buffer, int count, MPI_Datatype datatype, int root, + MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_NM_mpi_iallgather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_NM_mpi_iallgatherv_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_NM_mpi_iallreduce_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_NM_mpi_ialltoall_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_NM_mpi_ialltoallv_t) (const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *rdispls, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_NM_mpi_ialltoallw_t) (const void *sendbuf, const int *sendcounts, + const int *sdispls, const MPI_Datatype sendtypes[], + void *recvbuf, const int *recvcounts, const int *rdispls, + const MPI_Datatype recvtypes[], MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_NM_mpi_iexscan_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_NM_mpi_igather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_NM_mpi_igatherv_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_NM_mpi_ireduce_scatter_block_t) (const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_NM_mpi_ireduce_scatter_t) (const void *sendbuf, void *recvbuf, + const int *recvcounts, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_NM_mpi_ireduce_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPI_Request * req); +typedef int (*MPIDI_NM_mpi_iscan_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_NM_type_create_hook_t) (MPIR_Datatype * datatype_p); -typedef int (*MPIDI_NM_type_free_hook_t) (MPIR_Datatype * datatype_p); -typedef int (*MPIDI_NM_op_create_hook_t) (MPIR_Op * op_p); -typedef int (*MPIDI_NM_op_free_hook_t) (MPIR_Op * op_p); +typedef int (*MPIDI_NM_mpi_iscatter_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_NM_mpi_iscatterv_t) (const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm_ptr, MPI_Request * req); +typedef int (*MPIDI_NM_mpi_type_create_hook_t) (MPIR_Datatype * datatype_p); +typedef int (*MPIDI_NM_mpi_type_free_hook_t) (MPIR_Datatype * datatype_p); +typedef int (*MPIDI_NM_mpi_op_create_hook_t) (MPIR_Op * op_p); +typedef int (*MPIDI_NM_mpi_op_free_hook_t) (MPIR_Op * op_p); typedef struct MPIDI_NM_funcs { - MPIDI_NM_init_t init; - MPIDI_NM_finalize_t finalize; + MPIDI_NM_mpi_init_t mpi_init; + MPIDI_NM_mpi_finalize_t mpi_finalize; MPIDI_NM_progress_t progress; - MPIDI_NM_comm_connect_t comm_connect; - MPIDI_NM_comm_disconnect_t comm_disconnect; - MPIDI_NM_open_port_t open_port; - MPIDI_NM_close_port_t close_port; - MPIDI_NM_comm_accept_t comm_accept; + MPIDI_NM_mpi_comm_connect_t mpi_comm_connect; + MPIDI_NM_mpi_comm_disconnect_t mpi_comm_disconnect; + MPIDI_NM_mpi_open_port_t mpi_open_port; + MPIDI_NM_mpi_close_port_t mpi_close_port; + MPIDI_NM_mpi_comm_accept_t mpi_comm_accept; /* Routines that handle addressing */ MPIDI_NM_comm_get_lpid_t comm_get_lpid; MPIDI_NM_gpid_get_t gpid_get; MPIDI_NM_getallincomm_t getallincomm; MPIDI_NM_gpid_tolpidarray_t gpid_tolpidarray; MPIDI_NM_create_intercomm_from_lpids_t create_intercomm_from_lpids; - MPIDI_NM_comm_create_hook_t comm_create_hook; - MPIDI_NM_comm_free_hook_t comm_free_hook; + MPIDI_NM_mpi_comm_create_hook_t mpi_comm_create_hook; + MPIDI_NM_mpi_comm_free_hook_t mpi_comm_free_hook; /* Request allocation routines */ MPIDI_NM_am_request_init_t am_request_init; MPIDI_NM_am_request_finalize_t am_request_finalize; @@ -372,112 +389,112 @@ typedef struct MPIDI_NM_funcs { } MPIDI_NM_funcs_t; typedef struct MPIDI_NM_native_funcs { - MPIDI_NM_send_t send; - MPIDI_NM_ssend_t ssend; - MPIDI_NM_startall_t startall; - MPIDI_NM_send_init_t send_init; - MPIDI_NM_ssend_init_t ssend_init; - MPIDI_NM_rsend_init_t rsend_init; - MPIDI_NM_bsend_init_t bsend_init; - MPIDI_NM_isend_t isend; - MPIDI_NM_issend_t issend; - MPIDI_NM_cancel_send_t cancel_send; - MPIDI_NM_recv_init_t recv_init; - MPIDI_NM_recv_t recv; - MPIDI_NM_irecv_t irecv; - MPIDI_NM_imrecv_t imrecv; - MPIDI_NM_cancel_recv_t cancel_recv; - MPIDI_NM_alloc_mem_t alloc_mem; - MPIDI_NM_free_mem_t free_mem; - MPIDI_NM_improbe_t improbe; - MPIDI_NM_iprobe_t iprobe; - MPIDI_NM_win_set_info_t win_set_info; - MPIDI_NM_win_shared_query_t win_shared_query; - MPIDI_NM_put_t put; - MPIDI_NM_win_start_t win_start; - MPIDI_NM_win_complete_t win_complete; - MPIDI_NM_win_post_t win_post; - MPIDI_NM_win_wait_t win_wait; - MPIDI_NM_win_test_t win_test; - MPIDI_NM_win_lock_t win_lock; - MPIDI_NM_win_unlock_t win_unlock; - MPIDI_NM_win_get_info_t win_get_info; - MPIDI_NM_get_t get; - MPIDI_NM_win_free_t win_free; - MPIDI_NM_win_fence_t win_fence; - MPIDI_NM_win_create_t win_create; - MPIDI_NM_accumulate_t accumulate; - MPIDI_NM_win_attach_t win_attach; - MPIDI_NM_win_allocate_shared_t win_allocate_shared; - MPIDI_NM_rput_t rput; - MPIDI_NM_win_flush_local_t win_flush_local; - MPIDI_NM_win_detach_t win_detach; - MPIDI_NM_compare_and_swap_t compare_and_swap; - MPIDI_NM_raccumulate_t raccumulate; - MPIDI_NM_rget_accumulate_t rget_accumulate; - MPIDI_NM_fetch_and_op_t fetch_and_op; - MPIDI_NM_win_allocate_t win_allocate; - MPIDI_NM_win_flush_t win_flush; - MPIDI_NM_win_flush_local_all_t win_flush_local_all; - MPIDI_NM_win_unlock_all_t win_unlock_all; - MPIDI_NM_win_create_dynamic_t win_create_dynamic; - MPIDI_NM_rget_t rget; - MPIDI_NM_win_sync_t win_sync; - MPIDI_NM_win_flush_all_t win_flush_all; - MPIDI_NM_get_accumulate_t get_accumulate; - MPIDI_NM_win_lock_all_t win_lock_all; + MPIDI_NM_mpi_send_t mpi_send; + MPIDI_NM_mpi_ssend_t mpi_ssend; + MPIDI_NM_mpi_startall_t mpi_startall; + MPIDI_NM_mpi_send_init_t mpi_send_init; + MPIDI_NM_mpi_ssend_init_t mpi_ssend_init; + MPIDI_NM_mpi_rsend_init_t mpi_rsend_init; + MPIDI_NM_mpi_bsend_init_t mpi_bsend_init; + MPIDI_NM_mpi_isend_t mpi_isend; + MPIDI_NM_mpi_issend_t mpi_issend; + MPIDI_NM_mpi_cancel_send_t mpi_cancel_send; + MPIDI_NM_mpi_recv_init_t mpi_recv_init; + MPIDI_NM_mpi_recv_t mpi_recv; + MPIDI_NM_mpi_irecv_t mpi_irecv; + MPIDI_NM_mpi_imrecv_t mpi_imrecv; + MPIDI_NM_mpi_cancel_recv_t mpi_cancel_recv; + MPIDI_NM_mpi_alloc_mem_t mpi_alloc_mem; + MPIDI_NM_mpi_free_mem_t mpi_free_mem; + MPIDI_NM_mpi_improbe_t mpi_improbe; + MPIDI_NM_mpi_iprobe_t mpi_iprobe; + MPIDI_NM_mpi_win_set_info_t mpi_win_set_info; + MPIDI_NM_mpi_win_shared_query_t mpi_win_shared_query; + MPIDI_NM_mpi_put_t mpi_put; + MPIDI_NM_mpi_win_start_t mpi_win_start; + MPIDI_NM_mpi_win_complete_t mpi_win_complete; + MPIDI_NM_mpi_win_post_t mpi_win_post; + MPIDI_NM_mpi_win_wait_t mpi_win_wait; + MPIDI_NM_mpi_win_test_t mpi_win_test; + MPIDI_NM_mpi_win_lock_t mpi_win_lock; + MPIDI_NM_mpi_win_unlock_t mpi_win_unlock; + MPIDI_NM_mpi_win_get_info_t mpi_win_get_info; + MPIDI_NM_mpi_get_t mpi_get; + MPIDI_NM_mpi_win_free_t mpi_win_free; + MPIDI_NM_mpi_win_fence_t mpi_win_fence; + MPIDI_NM_mpi_win_create_t mpi_win_create; + MPIDI_NM_mpi_accumulate_t mpi_accumulate; + MPIDI_NM_mpi_win_attach_t mpi_win_attach; + MPIDI_NM_mpi_win_allocate_shared_t mpi_win_allocate_shared; + MPIDI_NM_mpi_rput_t mpi_rput; + MPIDI_NM_mpi_win_flush_local_t mpi_win_flush_local; + MPIDI_NM_mpi_win_detach_t mpi_win_detach; + MPIDI_NM_mpi_compare_and_swap_t mpi_compare_and_swap; + MPIDI_NM_mpi_raccumulate_t mpi_raccumulate; + MPIDI_NM_mpi_rget_accumulate_t mpi_rget_accumulate; + MPIDI_NM_mpi_fetch_and_op_t mpi_fetch_and_op; + MPIDI_NM_mpi_win_allocate_t mpi_win_allocate; + MPIDI_NM_mpi_win_flush_t mpi_win_flush; + MPIDI_NM_mpi_win_flush_local_all_t mpi_win_flush_local_all; + MPIDI_NM_mpi_win_unlock_all_t mpi_win_unlock_all; + MPIDI_NM_mpi_win_create_dynamic_t mpi_win_create_dynamic; + MPIDI_NM_mpi_rget_t mpi_rget; + MPIDI_NM_mpi_win_sync_t mpi_win_sync; + MPIDI_NM_mpi_win_flush_all_t mpi_win_flush_all; + MPIDI_NM_mpi_get_accumulate_t mpi_get_accumulate; + MPIDI_NM_mpi_win_lock_all_t mpi_win_lock_all; MPIDI_NM_rank_is_local_t rank_is_local; /* Collectives */ - MPIDI_NM_barrier_t barrier; - MPIDI_NM_bcast_t bcast; - MPIDI_NM_allreduce_t allreduce; - MPIDI_NM_allgather_t allgather; - MPIDI_NM_allgatherv_t allgatherv; - MPIDI_NM_scatter_t scatter; - MPIDI_NM_scatterv_t scatterv; - MPIDI_NM_gather_t gather; - MPIDI_NM_gatherv_t gatherv; - MPIDI_NM_alltoall_t alltoall; - MPIDI_NM_alltoallv_t alltoallv; - MPIDI_NM_alltoallw_t alltoallw; - MPIDI_NM_reduce_t reduce; - MPIDI_NM_reduce_scatter_t reduce_scatter; - MPIDI_NM_reduce_scatter_block_t reduce_scatter_block; - MPIDI_NM_scan_t scan; - MPIDI_NM_exscan_t exscan; - MPIDI_NM_neighbor_allgather_t neighbor_allgather; - MPIDI_NM_neighbor_allgatherv_t neighbor_allgatherv; - MPIDI_NM_neighbor_alltoall_t neighbor_alltoall; - MPIDI_NM_neighbor_alltoallv_t neighbor_alltoallv; - MPIDI_NM_neighbor_alltoallw_t neighbor_alltoallw; - MPIDI_NM_ineighbor_allgather_t ineighbor_allgather; - MPIDI_NM_ineighbor_allgatherv_t ineighbor_allgatherv; - MPIDI_NM_ineighbor_alltoall_t ineighbor_alltoall; - MPIDI_NM_ineighbor_alltoallv_t ineighbor_alltoallv; - MPIDI_NM_ineighbor_alltoallw_t ineighbor_alltoallw; - MPIDI_NM_ibarrier_t ibarrier; - MPIDI_NM_ibcast_t ibcast; - MPIDI_NM_iallgather_t iallgather; - MPIDI_NM_iallgatherv_t iallgatherv; - MPIDI_NM_iallreduce_t iallreduce; - MPIDI_NM_ialltoall_t ialltoall; - MPIDI_NM_ialltoallv_t ialltoallv; - MPIDI_NM_ialltoallw_t ialltoallw; - MPIDI_NM_iexscan_t iexscan; - MPIDI_NM_igather_t igather; - MPIDI_NM_igatherv_t igatherv; - MPIDI_NM_ireduce_scatter_block_t ireduce_scatter_block; - MPIDI_NM_ireduce_scatter_t ireduce_scatter; - MPIDI_NM_ireduce_t ireduce; - MPIDI_NM_iscan_t iscan; - MPIDI_NM_iscatter_t iscatter; - MPIDI_NM_iscatterv_t iscatterv; + MPIDI_NM_mpi_barrier_t mpi_barrier; + MPIDI_NM_mpi_bcast_t mpi_bcast; + MPIDI_NM_mpi_allreduce_t mpi_allreduce; + MPIDI_NM_mpi_allgather_t mpi_allgather; + MPIDI_NM_mpi_allgatherv_t mpi_allgatherv; + MPIDI_NM_mpi_scatter_t mpi_scatter; + MPIDI_NM_mpi_scatterv_t mpi_scatterv; + MPIDI_NM_mpi_gather_t mpi_gather; + MPIDI_NM_mpi_gatherv_t mpi_gatherv; + MPIDI_NM_mpi_alltoall_t mpi_alltoall; + MPIDI_NM_mpi_alltoallv_t mpi_alltoallv; + MPIDI_NM_mpi_alltoallw_t mpi_alltoallw; + MPIDI_NM_mpi_reduce_t mpi_reduce; + MPIDI_NM_mpi_reduce_scatter_t mpi_reduce_scatter; + MPIDI_NM_mpi_reduce_scatter_block_t mpi_reduce_scatter_block; + MPIDI_NM_mpi_scan_t mpi_scan; + MPIDI_NM_mpi_exscan_t mpi_exscan; + MPIDI_NM_mpi_neighbor_allgather_t mpi_neighbor_allgather; + MPIDI_NM_mpi_neighbor_allgatherv_t mpi_neighbor_allgatherv; + MPIDI_NM_mpi_neighbor_alltoall_t mpi_neighbor_alltoall; + MPIDI_NM_mpi_neighbor_alltoallv_t mpi_neighbor_alltoallv; + MPIDI_NM_mpi_neighbor_alltoallw_t mpi_neighbor_alltoallw; + MPIDI_NM_mpi_ineighbor_allgather_t mpi_ineighbor_allgather; + MPIDI_NM_mpi_ineighbor_allgatherv_t mpi_ineighbor_allgatherv; + MPIDI_NM_mpi_ineighbor_alltoall_t mpi_ineighbor_alltoall; + MPIDI_NM_mpi_ineighbor_alltoallv_t mpi_ineighbor_alltoallv; + MPIDI_NM_mpi_ineighbor_alltoallw_t mpi_ineighbor_alltoallw; + MPIDI_NM_mpi_ibarrier_t mpi_ibarrier; + MPIDI_NM_mpi_ibcast_t mpi_ibcast; + MPIDI_NM_mpi_iallgather_t mpi_iallgather; + MPIDI_NM_mpi_iallgatherv_t mpi_iallgatherv; + MPIDI_NM_mpi_iallreduce_t mpi_iallreduce; + MPIDI_NM_mpi_ialltoall_t mpi_ialltoall; + MPIDI_NM_mpi_ialltoallv_t mpi_ialltoallv; + MPIDI_NM_mpi_ialltoallw_t mpi_ialltoallw; + MPIDI_NM_mpi_iexscan_t mpi_iexscan; + MPIDI_NM_mpi_igather_t mpi_igather; + MPIDI_NM_mpi_igatherv_t mpi_igatherv; + MPIDI_NM_mpi_ireduce_scatter_block_t mpi_ireduce_scatter_block; + MPIDI_NM_mpi_ireduce_scatter_t mpi_ireduce_scatter; + MPIDI_NM_mpi_ireduce_t mpi_ireduce; + MPIDI_NM_mpi_iscan_t mpi_iscan; + MPIDI_NM_mpi_iscatter_t mpi_iscatter; + MPIDI_NM_mpi_iscatterv_t mpi_iscatterv; /* Datatype hooks */ - MPIDI_NM_type_create_hook_t type_create_hook; - MPIDI_NM_type_free_hook_t type_free_hook; + MPIDI_NM_mpi_type_create_hook_t mpi_type_create_hook; + MPIDI_NM_mpi_type_free_hook_t mpi_type_free_hook; /* Op hooks */ - MPIDI_NM_op_create_hook_t op_create_hook; - MPIDI_NM_op_free_hook_t op_free_hook; + MPIDI_NM_mpi_op_create_hook_t mpi_op_create_hook; + MPIDI_NM_mpi_op_free_hook_t mpi_op_free_hook; } MPIDI_NM_native_funcs_t; extern MPIDI_NM_funcs_t *MPIDI_NM_funcs[]; @@ -487,11 +504,11 @@ extern MPIDI_NM_native_funcs_t *MPIDI_NM_native_func; extern int MPIDI_num_netmods; extern char MPIDI_NM_strings[][MPIDI_MAX_NETMOD_STRING_LEN]; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_init(int rank, int size, int appnum, int *tag_ub, - MPIR_Comm * comm_world, MPIR_Comm * comm_self, - int spawned, int num_contexts, - void **netmod_contexts) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_finalize(void) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_init(int rank, int size, int appnum, int *tag_ub, + MPIR_Comm * comm_world, MPIR_Comm * comm_self, + int spawned, int num_contexts, + void **netmod_contexts) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_finalize(void) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_progress(void *netmod_context, int blocking) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_am_reg_handler(int handler_id, @@ -499,19 +516,20 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_NM_am_reg_handler(int handler_id, origin_handler_fn, MPIDI_NM_am_target_handler_fn target_handler_fn) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_comm_connect(const char *port_name, MPIR_Info * info, - int root, MPIR_Comm * comm, - MPIR_Comm ** - newcomm_ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_comm_disconnect(MPIR_Comm * - comm_ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_open_port(MPIR_Info * info_ptr, - char *port_name) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_close_port(const char *port_name) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_comm_accept(const char *port_name, MPIR_Info * info, - int root, MPIR_Comm * comm, - MPIR_Comm ** - newcomm_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_comm_connect(const char *port_name, MPIR_Info * info, + int root, MPIR_Comm * comm, + MPIR_Comm ** + newcomm_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_comm_disconnect(MPIR_Comm * + comm_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_open_port(MPIR_Info * info_ptr, + char *port_name) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_close_port(const char *port_name) + MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_comm_accept(const char *port_name, MPIR_Info * info, + int root, MPIR_Comm * comm, + MPIR_Comm ** + newcomm_ptr) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_am_send_hdr(int rank, MPIR_Comm * comm, int handler_id, const void *am_hdr, size_t am_hdr_sz, void *netmod_context) MPL_STATIC_INLINE_SUFFIX; @@ -525,9 +543,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_NM_am_isendv(int rank, MPIR_Comm * comm, int const void *data, MPI_Count count, MPI_Datatype datatype, MPIR_Request * sreq, void *netmod_context) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_am_send_hdr_reply(MPIR_Context_id_t context_id, - int src_rank, int handler_id, - const void *am_hdr, +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_am_send_hdr_reply(MPIR_Context_id_t context_id, int src_rank, + int handler_id, const void *am_hdr, size_t am_hdr_sz) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_am_isend_reply(MPIR_Context_id_t context_id, int src_rank, int handler_id, const void *am_hdr, @@ -550,423 +567,448 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_NM_create_intercomm_from_lpids(MPIR_Comm * ne int size, const int lpids[]) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_comm_create_hook(MPIR_Comm * comm) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_comm_free_hook(MPIR_Comm * comm) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_comm_create_hook(MPIR_Comm * + comm) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_comm_free_hook(MPIR_Comm * comm) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX void MPIDI_NM_am_request_init(MPIR_Request * req) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX void MPIDI_NM_am_request_finalize(MPIR_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_send(const void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ssend(const void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_startall(int count, - MPIR_Request * requests[]) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_send_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_send(const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, + MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ssend(const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ssend_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_rsend_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_bsend_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_startall(int count, + MPIR_Request * + requests[]) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_send_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** + request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ssend_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** + request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_rsend_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** + request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_bsend_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** + request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_isend(const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, + MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_issend(const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_isend(const void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_issend(const void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_cancel_send(MPIR_Request * sreq) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_recv_init(void *buf, int count, MPI_Datatype datatype, +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_cancel_send(MPIR_Request * sreq) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, + MPIR_Request ** + request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_recv(void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPI_Status * status, + MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_irecv(void *buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_recv(void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, MPI_Status * status, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_irecv(void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_imrecv(void *buf, int count, MPI_Datatype datatype, - MPIR_Request * message, - MPIR_Request ** rreqp) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_cancel_recv(MPIR_Request * rreq) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX void *MPIDI_NM_alloc_mem(size_t size, - MPIR_Info * info_ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_free_mem(void *ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_improbe(int source, int tag, MPIR_Comm * comm, - int context_offset, int *flag, - MPIR_Request ** message, - MPI_Status * status) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iprobe(int source, int tag, MPIR_Comm * comm, - int context_offset, int *flag, - MPI_Status * status) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_set_info(MPIR_Win * win, - MPIR_Info * info) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_shared_query(MPIR_Win * win, int rank, - MPI_Aint * size, int *disp_unit, - void *baseptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_put(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_start(MPIR_Group * group, int assert, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_complete(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_post(MPIR_Group * group, int assert, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_wait(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_test(MPIR_Win * win, int *flag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_lock(int lock_type, int rank, int assert, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_unlock(int rank, MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_get_info(MPIR_Win * win, - MPIR_Info ** info_p_p) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_get(void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_free(MPIR_Win ** win_ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_fence(int assert, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_create(void *base, MPI_Aint length, int disp_unit, - MPIR_Info * info, MPIR_Comm * comm_ptr, - MPIR_Win ** win_ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_accumulate(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_attach(MPIR_Win * win, void *base, - MPI_Aint size) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_allocate_shared(MPI_Aint size, int disp_unit, - MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, - void **base_ptr, - MPIR_Win ** - win_ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_rput(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_flush_local(int rank, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_detach(MPIR_Win * win, - const void *base) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_compare_and_swap(const void *origin_addr, - const void *compare_addr, - void *result_addr, - MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_raccumulate(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, - int target_rank, MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_rget_accumulate(const void *origin_addr, - int origin_count, +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_imrecv(void *buf, int count, MPI_Datatype datatype, + MPIR_Request * message, + MPIR_Request ** rreqp) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_cancel_recv(MPIR_Request * rreq) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX void *MPIDI_NM_mpi_alloc_mem(size_t size, + MPIR_Info * + info_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_free_mem(void *ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_improbe(int source, int tag, MPIR_Comm * comm, + int context_offset, int *flag, + MPIR_Request ** message, + MPI_Status * status) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iprobe(int source, int tag, MPIR_Comm * comm, + int context_offset, int *flag, + MPI_Status * status) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_set_info(MPIR_Win * win, + MPIR_Info * info) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_shared_query(MPIR_Win * win, int rank, + MPI_Aint * size, int *disp_unit, + void *baseptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_put(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_start(MPIR_Group * group, int assert, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_complete(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_post(MPIR_Group * group, int assert, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_wait(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_test(MPIR_Win * win, + int *flag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_lock(int lock_type, int rank, int assert, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_unlock(int rank, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_get_info(MPIR_Win * win, + MPIR_Info ** + info_p_p) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_get(void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_free(MPIR_Win ** win_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_fence(int assert, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_create(void *base, MPI_Aint length, int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_accumulate(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_attach(MPIR_Win * win, void *base, + MPI_Aint size) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_allocate_shared(MPI_Aint size, int disp_unit, + MPIR_Info * info_ptr, + MPIR_Comm * comm_ptr, + void **base_ptr, + MPIR_Win ** + win_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_rput(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win, + MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_flush_local(int rank, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_detach(MPIR_Win * win, + const void *base) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_compare_and_swap(const void *origin_addr, + const void *compare_addr, + void *result_addr, + MPI_Datatype datatype, int target_rank, + MPI_Aint target_disp, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win, MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_fetch_and_op(const void *origin_addr, void *result_addr, - MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp, MPI_Op op, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_allocate(MPI_Aint size, int disp_unit, - MPIR_Info * info, MPIR_Comm * comm, - void *baseptr, - MPIR_Win ** win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_flush(int rank, MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_flush_local_all(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_unlock_all(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, - MPIR_Win ** win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_rget(void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_sync(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_flush_all(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_get_accumulate(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, - void *result_addr, int result_count, - MPI_Datatype result_datatype, - int target_rank, MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_lock_all(int assert, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_rget_accumulate(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, int result_count, + MPI_Datatype result_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win, + MPIR_Request ** + request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_fetch_and_op(const void *origin_addr, void *result_addr, + MPI_Datatype datatype, int target_rank, + MPI_Aint target_disp, MPI_Op op, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_allocate(MPI_Aint size, int disp_unit, + MPIR_Info * info, MPIR_Comm * comm, + void *baseptr, + MPIR_Win ** win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_flush(int rank, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_flush_local_all(MPIR_Win * + win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_unlock_all(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, + MPIR_Win ** + win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_rget(void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win, + MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_sync(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_flush_all(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_get_accumulate(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, int result_count, + MPI_Datatype result_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_lock_all(int assert, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_rank_is_local(int target, MPIR_Comm * comm) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_barrier(MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_bcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_allreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_barrier(MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_bcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_allgatherv(const void *sendbuf, int sendcount, +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_allreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_scatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_scatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm_ptr, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_scatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_scatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_gather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_gatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_gatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_alltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_alltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, + const MPI_Datatype sendtypes[], void *recvbuf, + const int *recvcounts, const int *rdispls, + const MPI_Datatype recvtypes[], + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_reduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_reduce_scatter(const void *sendbuf, void *recvbuf, + const int *recvcounts, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm_ptr, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_reduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_scan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_alltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_alltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, - const MPI_Datatype sendtypes[], void *recvbuf, - const int *recvcounts, const int *rdispls, - const MPI_Datatype recvtypes[], - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_reduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_reduce_scatter(const void *sendbuf, void *recvbuf, - const int *recvcounts, +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_exscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_neighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * + comm) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_neighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, + const int *displs, + MPI_Datatype recvtype, + MPIR_Comm * + comm) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_neighbor_alltoallv(const void *sendbuf, + const int *sendcounts, + const int *sdispls, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, + const int *rdispls, + MPI_Datatype recvtype, + MPIR_Comm * + comm) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_neighbor_alltoallw(const void *sendbuf, + const int *sendcounts, + const MPI_Aint * sdispls, + const MPI_Datatype * sendtypes, + void *recvbuf, const int *recvcounts, + const MPI_Aint * rdispls, + const MPI_Datatype * recvtypes, + MPIR_Comm * + comm) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_neighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * + comm) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ineighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * + req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ineighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, + const int *displs, + MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * + req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ineighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * + req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ineighbor_alltoallv(const void *sendbuf, + const int *sendcounts, + const int *sdispls, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, + const int *rdispls, + MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * + req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ineighbor_alltoallw(const void *sendbuf, + const int *sendcounts, + const MPI_Aint * sdispls, + const MPI_Datatype * sendtypes, + void *recvbuf, const int *recvcounts, + const MPI_Aint * rdispls, + const MPI_Datatype * recvtypes, + MPIR_Comm * comm, + MPI_Request * + req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ibarrier(MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ibcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iallgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iallgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iallreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, - MPIR_Errflag_t * - errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_reduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, - MPIR_Errflag_t * - errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_scan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_exscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_neighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_neighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, - const int *displs, - MPI_Datatype recvtype, - MPIR_Comm * - comm) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_neighbor_alltoallv(const void *sendbuf, - const int *sendcounts, - const int *sdispls, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, - const int *rdispls, - MPI_Datatype recvtype, - MPIR_Comm * comm) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_neighbor_alltoallw(const void *sendbuf, - const int *sendcounts, - const MPI_Aint * sdispls, - const MPI_Datatype * sendtypes, - void *recvbuf, const int *recvcounts, - const MPI_Aint * rdispls, - const MPI_Datatype * recvtypes, - MPIR_Comm * comm) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_neighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ineighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * - req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ineighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, - void *recvbuf, - const int *recvcounts, - const int *displs, - MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * - req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ineighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * - req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ineighbor_alltoallv(const void *sendbuf, - const int *sendcounts, - const int *sdispls, - MPI_Datatype sendtype, void *recvbuf, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ialltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ialltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ialltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, + const MPI_Datatype sendtypes[], void *recvbuf, + const int *recvcounts, const int *rdispls, + const MPI_Datatype recvtypes[], + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iexscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_igather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_igatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ireduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, + MPI_Request * + req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ireduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcounts, - const int *rdispls, - MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * - req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ineighbor_alltoallw(const void *sendbuf, - const int *sendcounts, - const MPI_Aint * sdispls, - const MPI_Datatype * sendtypes, - void *recvbuf, const int *recvcounts, - const MPI_Aint * rdispls, - const MPI_Datatype * recvtypes, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ibarrier(MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ibcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iallgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iallgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ireduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iallreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ialltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ialltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ialltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, - const MPI_Datatype sendtypes[], void *recvbuf, - const int *recvcounts, const int *rdispls, - const MPI_Datatype recvtypes[], - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iexscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_igather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_igatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ireduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPI_Request * - req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ireduce_scatter(const void *sendbuf, void *recvbuf, - const int *recvcounts, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ireduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iscatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iscatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm_ptr, +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_type_create_hook(MPIR_Datatype * - datatype_p) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_type_free_hook(MPIR_Datatype * - datatype_p) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_op_create_hook(MPIR_Op * op_p) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_op_free_hook(MPIR_Op * op_p) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iscatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iscatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm_ptr, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_type_create_hook(MPIR_Datatype * + datatype_p) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_type_free_hook(MPIR_Datatype * + datatype_p) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_op_create_hook(MPIR_Op * op_p) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_op_free_hook(MPIR_Op * op_p) MPL_STATIC_INLINE_SUFFIX; #endif diff --git a/src/mpid/ch4/netmod/include/netmod_impl.h b/src/mpid/ch4/netmod/include/netmod_impl.h index 4ba34a1..ad16dbc 100644 --- a/src/mpid/ch4/netmod/include/netmod_impl.h +++ b/src/mpid/ch4/netmod/include/netmod_impl.h @@ -16,17 +16,18 @@ #ifndef NETMOD_DIRECT #ifndef NETMOD_DISABLE_INLINES -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_init(int rank, int size, int appnum, int *tag_ub, - MPIR_Comm * comm_world, MPIR_Comm * comm_self, - int spawned, int num_contexts, void **netmod_contexts) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_init(int rank, int size, int appnum, int *tag_ub, + MPIR_Comm * comm_world, MPIR_Comm * comm_self, + int spawned, int num_contexts, + void **netmod_contexts) { - return MPIDI_NM_func->init(rank, size, appnum, tag_ub, comm_world, comm_self, spawned, - num_contexts, netmod_contexts); + return MPIDI_NM_func->mpi_init(rank, size, appnum, tag_ub, comm_world, comm_self, spawned, + num_contexts, netmod_contexts); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_finalize(void) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_finalize(void) { - return MPIDI_NM_func->finalize(); + return MPIDI_NM_func->mpi_finalize(); }; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_progress(void *netmod_context, int blocking) @@ -43,33 +44,33 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_NM_am_reg_handler(int handler_id, return MPIDI_NM_func->am_reg_handler(handler_id, origin_handler_fn, target_handler_fn); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_comm_connect(const char *port_name, MPIR_Info * info, - int root, MPIR_Comm * comm, - MPIR_Comm ** newcomm_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_comm_connect(const char *port_name, MPIR_Info * info, + int root, MPIR_Comm * comm, + MPIR_Comm ** newcomm_ptr) { - return MPIDI_NM_func->comm_connect(port_name, info, root, comm, newcomm_ptr); + return MPIDI_NM_func->mpi_comm_connect(port_name, info, root, comm, newcomm_ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_comm_disconnect(MPIR_Comm * comm_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_comm_disconnect(MPIR_Comm * comm_ptr) { - return MPIDI_NM_func->comm_disconnect(comm_ptr); + return MPIDI_NM_func->mpi_comm_disconnect(comm_ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_open_port(MPIR_Info * info_ptr, char *port_name) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_open_port(MPIR_Info * info_ptr, char *port_name) { - return MPIDI_NM_func->open_port(info_ptr, port_name); + return MPIDI_NM_func->mpi_open_port(info_ptr, port_name); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_close_port(const char *port_name) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_close_port(const char *port_name) { - return MPIDI_NM_func->close_port(port_name); + return MPIDI_NM_func->mpi_close_port(port_name); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_comm_accept(const char *port_name, MPIR_Info * info, - int root, MPIR_Comm * comm, - MPIR_Comm ** newcomm_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_comm_accept(const char *port_name, MPIR_Info * info, + int root, MPIR_Comm * comm, + MPIR_Comm ** newcomm_ptr) { - return MPIDI_NM_func->comm_accept(port_name, info, root, comm, newcomm_ptr); + return MPIDI_NM_func->mpi_comm_accept(port_name, info, root, comm, newcomm_ptr); }; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_am_send_hdr(int rank, MPIR_Comm * comm, int handler_id, @@ -154,14 +155,14 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_NM_create_intercomm_from_lpids(MPIR_Comm * ne return MPIDI_NM_func->create_intercomm_from_lpids(newcomm_ptr, size, lpids); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_comm_create_hook(MPIR_Comm * comm) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_comm_create_hook(MPIR_Comm * comm) { - return MPIDI_NM_func->comm_create_hook(comm); + return MPIDI_NM_func->mpi_comm_create_hook(comm); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_comm_free_hook(MPIR_Comm * comm) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_comm_free_hook(MPIR_Comm * comm) { - return MPIDI_NM_func->comm_free_hook(comm); + return MPIDI_NM_func->mpi_comm_free_hook(comm); }; MPL_STATIC_INLINE_PREFIX void MPIDI_NM_am_request_init(MPIR_Request * req) @@ -174,386 +175,390 @@ MPL_STATIC_INLINE_PREFIX void MPIDI_NM_am_request_finalize(MPIR_Request * req) return MPIDI_NM_func->am_request_finalize(req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_send(const void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_send(const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { - return MPIDI_NM_native_func->send(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_NM_native_func->mpi_send(buf, count, datatype, rank, tag, comm, context_offset, + request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ssend(const void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) -{ - return MPIDI_NM_native_func->ssend(buf, count, datatype, rank, tag, comm, context_offset, - request); -}; - -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_startall(int count, MPIR_Request * requests[]) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ssend(const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { - return MPIDI_NM_native_func->startall(count, requests); + return MPIDI_NM_native_func->mpi_ssend(buf, count, datatype, rank, tag, comm, context_offset, + request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_send_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_startall(int count, MPIR_Request * requests[]) { - return MPIDI_NM_native_func->send_init(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_NM_native_func->mpi_startall(count, requests); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ssend_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_send_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_NM_native_func->ssend_init(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_NM_native_func->mpi_send_init(buf, count, datatype, rank, tag, comm, + context_offset, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_rsend_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ssend_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_NM_native_func->rsend_init(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_NM_native_func->mpi_ssend_init(buf, count, datatype, rank, tag, comm, + context_offset, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_bsend_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_rsend_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_NM_native_func->bsend_init(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_NM_native_func->mpi_rsend_init(buf, count, datatype, rank, tag, comm, + context_offset, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_isend(const void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_bsend_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_NM_native_func->isend(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_NM_native_func->mpi_bsend_init(buf, count, datatype, rank, tag, comm, + context_offset, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_issend(const void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_isend(const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { - return MPIDI_NM_native_func->issend(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_NM_native_func->mpi_isend(buf, count, datatype, rank, tag, comm, context_offset, + request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_cancel_send(MPIR_Request * sreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_issend(const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { - return MPIDI_NM_native_func->cancel_send(sreq); + return MPIDI_NM_native_func->mpi_issend(buf, count, datatype, rank, tag, comm, context_offset, + request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_recv_init(void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_cancel_send(MPIR_Request * sreq) { - return MPIDI_NM_native_func->recv_init(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_NM_native_func->mpi_cancel_send(sreq); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_recv(void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, MPI_Status * status, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { - return MPIDI_NM_native_func->recv(buf, count, datatype, rank, tag, comm, context_offset, status, - request); + return MPIDI_NM_native_func->mpi_recv_init(buf, count, datatype, rank, tag, comm, + context_offset, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_irecv(void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_recv(void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPI_Status * status, + MPIR_Request ** request) { - return MPIDI_NM_native_func->irecv(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_NM_native_func->mpi_recv(buf, count, datatype, rank, tag, comm, context_offset, + status, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_imrecv(void *buf, int count, MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_irecv(void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { - return MPIDI_NM_native_func->imrecv(buf, count, datatype, message, rreqp); + return MPIDI_NM_native_func->mpi_irecv(buf, count, datatype, rank, tag, comm, context_offset, + request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_cancel_recv(MPIR_Request * rreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_imrecv(void *buf, int count, MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp) { - return MPIDI_NM_native_func->cancel_recv(rreq); + return MPIDI_NM_native_func->mpi_imrecv(buf, count, datatype, message, rreqp); }; -MPL_STATIC_INLINE_PREFIX void *MPIDI_NM_alloc_mem(size_t size, MPIR_Info * info_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_cancel_recv(MPIR_Request * rreq) { - return MPIDI_NM_native_func->alloc_mem(size, info_ptr); + return MPIDI_NM_native_func->mpi_cancel_recv(rreq); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_free_mem(void *ptr) +MPL_STATIC_INLINE_PREFIX void *MPIDI_NM_mpi_alloc_mem(size_t size, MPIR_Info * info_ptr) { - return MPIDI_NM_native_func->free_mem(ptr); + return MPIDI_NM_native_func->mpi_alloc_mem(size, info_ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_improbe(int source, int tag, MPIR_Comm * comm, - int context_offset, int *flag, - MPIR_Request ** message, MPI_Status * status) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_free_mem(void *ptr) { - return MPIDI_NM_native_func->improbe(source, tag, comm, context_offset, flag, message, status); + return MPIDI_NM_native_func->mpi_free_mem(ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iprobe(int source, int tag, MPIR_Comm * comm, - int context_offset, int *flag, MPI_Status * status) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_improbe(int source, int tag, MPIR_Comm * comm, + int context_offset, int *flag, + MPIR_Request ** message, MPI_Status * status) { - return MPIDI_NM_native_func->iprobe(source, tag, comm, context_offset, flag, status); + return MPIDI_NM_native_func->mpi_improbe(source, tag, comm, context_offset, flag, message, + status); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_set_info(MPIR_Win * win, MPIR_Info * info) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iprobe(int source, int tag, MPIR_Comm * comm, + int context_offset, int *flag, MPI_Status * status) { - return MPIDI_NM_native_func->win_set_info(win, info); + return MPIDI_NM_native_func->mpi_iprobe(source, tag, comm, context_offset, flag, status); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_shared_query(MPIR_Win * win, int rank, - MPI_Aint * size, int *disp_unit, - void *baseptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_set_info(MPIR_Win * win, MPIR_Info * info) { - return MPIDI_NM_native_func->win_shared_query(win, rank, size, disp_unit, baseptr); + return MPIDI_NM_native_func->mpi_win_set_info(win, info); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_put(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_shared_query(MPIR_Win * win, int rank, + MPI_Aint * size, int *disp_unit, + void *baseptr) { - return MPIDI_NM_native_func->put(origin_addr, origin_count, origin_datatype, target_rank, - target_disp, target_count, target_datatype, win); + return MPIDI_NM_native_func->mpi_win_shared_query(win, rank, size, disp_unit, baseptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_start(MPIR_Group * group, int assert, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_put(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win) { - return MPIDI_NM_native_func->win_start(group, assert, win); + return MPIDI_NM_native_func->mpi_put(origin_addr, origin_count, origin_datatype, target_rank, + target_disp, target_count, target_datatype, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_complete(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_start(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_NM_native_func->win_complete(win); + return MPIDI_NM_native_func->mpi_win_start(group, assert, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_post(MPIR_Group * group, int assert, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_complete(MPIR_Win * win) { - return MPIDI_NM_native_func->win_post(group, assert, win); + return MPIDI_NM_native_func->mpi_win_complete(win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_wait(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_post(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_NM_native_func->win_wait(win); + return MPIDI_NM_native_func->mpi_win_post(group, assert, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_test(MPIR_Win * win, int *flag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_wait(MPIR_Win * win) { - return MPIDI_NM_native_func->win_test(win, flag); + return MPIDI_NM_native_func->mpi_win_wait(win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_test(MPIR_Win * win, int *flag) { - return MPIDI_NM_native_func->win_lock(lock_type, rank, assert, win); + return MPIDI_NM_native_func->mpi_win_test(win, flag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_unlock(int rank, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_lock(int lock_type, int rank, int assert, + MPIR_Win * win) { - return MPIDI_NM_native_func->win_unlock(rank, win); + return MPIDI_NM_native_func->mpi_win_lock(lock_type, rank, assert, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_unlock(int rank, MPIR_Win * win) { - return MPIDI_NM_native_func->win_get_info(win, info_p_p); + return MPIDI_NM_native_func->mpi_win_unlock(rank, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_get(void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) { - return MPIDI_NM_native_func->get(origin_addr, origin_count, origin_datatype, target_rank, - target_disp, target_count, target_datatype, win); + return MPIDI_NM_native_func->mpi_win_get_info(win, info_p_p); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_free(MPIR_Win ** win_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_get(void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win) { - return MPIDI_NM_native_func->win_free(win_ptr); + return MPIDI_NM_native_func->mpi_get(origin_addr, origin_count, origin_datatype, target_rank, + target_disp, target_count, target_datatype, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_fence(int assert, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_free(MPIR_Win ** win_ptr) { - return MPIDI_NM_native_func->win_fence(assert, win); + return MPIDI_NM_native_func->mpi_win_free(win_ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_create(void *base, MPI_Aint length, int disp_unit, - MPIR_Info * info, MPIR_Comm * comm_ptr, - MPIR_Win ** win_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_fence(int assert, MPIR_Win * win) { - return MPIDI_NM_native_func->win_create(base, length, disp_unit, info, comm_ptr, win_ptr); + return MPIDI_NM_native_func->mpi_win_fence(assert, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_accumulate(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_create(void *base, MPI_Aint length, int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr) { - return MPIDI_NM_native_func->accumulate(origin_addr, origin_count, origin_datatype, target_rank, - target_disp, target_count, target_datatype, op, win); + return MPIDI_NM_native_func->mpi_win_create(base, length, disp_unit, info, comm_ptr, win_ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_attach(MPIR_Win * win, void *base, MPI_Aint size) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_accumulate(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) { - return MPIDI_NM_native_func->win_attach(win, base, size); + return MPIDI_NM_native_func->mpi_accumulate(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_allocate_shared(MPI_Aint size, int disp_unit, - MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, - void **base_ptr, MPIR_Win ** win_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_attach(MPIR_Win * win, void *base, MPI_Aint size) { - return MPIDI_NM_native_func->win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, base_ptr, - win_ptr); + return MPIDI_NM_native_func->mpi_win_attach(win, base, size); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_rput(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_allocate_shared(MPI_Aint size, int disp_unit, + MPIR_Info * info_ptr, + MPIR_Comm * comm_ptr, + void **base_ptr, MPIR_Win ** win_ptr) { - return MPIDI_NM_native_func->rput(origin_addr, origin_count, origin_datatype, target_rank, - target_disp, target_count, target_datatype, win, request); + return MPIDI_NM_native_func->mpi_win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, + base_ptr, win_ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_flush_local(int rank, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_rput(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win, + MPIR_Request ** request) { - return MPIDI_NM_native_func->win_flush_local(rank, win); + return MPIDI_NM_native_func->mpi_rput(origin_addr, origin_count, origin_datatype, target_rank, + target_disp, target_count, target_datatype, win, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_detach(MPIR_Win * win, const void *base) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_flush_local(int rank, MPIR_Win * win) { - return MPIDI_NM_native_func->win_detach(win, base); + return MPIDI_NM_native_func->mpi_win_flush_local(rank, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_compare_and_swap(const void *origin_addr, - const void *compare_addr, - void *result_addr, - MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_detach(MPIR_Win * win, const void *base) { - return MPIDI_NM_native_func->compare_and_swap(origin_addr, compare_addr, result_addr, datatype, - target_rank, target_disp, win); + return MPIDI_NM_native_func->mpi_win_detach(win, base); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_raccumulate(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, - int target_rank, MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_compare_and_swap(const void *origin_addr, + const void *compare_addr, + void *result_addr, + MPI_Datatype datatype, int target_rank, + MPI_Aint target_disp, MPIR_Win * win) { - return MPIDI_NM_native_func->raccumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win, request); + return MPIDI_NM_native_func->mpi_compare_and_swap(origin_addr, compare_addr, result_addr, + datatype, target_rank, target_disp, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_rget_accumulate(const void *origin_addr, - int origin_count, +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_NM_native_func->rget_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, + return MPIDI_NM_native_func->mpi_raccumulate(origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, win, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_fetch_and_op(const void *origin_addr, void *result_addr, - MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_rget_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, int result_count, + MPI_Datatype result_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_NM_native_func->fetch_and_op(origin_addr, result_addr, datatype, target_rank, - target_disp, op, win); + return MPIDI_NM_native_func->mpi_rget_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_allocate(MPI_Aint size, int disp_unit, - MPIR_Info * info, MPIR_Comm * comm, - void *baseptr, MPIR_Win ** win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_fetch_and_op(const void *origin_addr, void *result_addr, + MPI_Datatype datatype, int target_rank, + MPI_Aint target_disp, MPI_Op op, + MPIR_Win * win) { - return MPIDI_NM_native_func->win_allocate(size, disp_unit, info, comm, baseptr, win); + return MPIDI_NM_native_func->mpi_fetch_and_op(origin_addr, result_addr, datatype, target_rank, + target_disp, op, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_flush(int rank, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_allocate(MPI_Aint size, int disp_unit, + MPIR_Info * info, MPIR_Comm * comm, + void *baseptr, MPIR_Win ** win) { - return MPIDI_NM_native_func->win_flush(rank, win); + return MPIDI_NM_native_func->mpi_win_allocate(size, disp_unit, info, comm, baseptr, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_flush_local_all(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_flush(int rank, MPIR_Win * win) { - return MPIDI_NM_native_func->win_flush_local_all(win); + return MPIDI_NM_native_func->mpi_win_flush(rank, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_unlock_all(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_flush_local_all(MPIR_Win * win) { - return MPIDI_NM_native_func->win_unlock_all(win); + return MPIDI_NM_native_func->mpi_win_flush_local_all(win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, - MPIR_Win ** win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_unlock_all(MPIR_Win * win) { - return MPIDI_NM_native_func->win_create_dynamic(info, comm, win); + return MPIDI_NM_native_func->mpi_win_unlock_all(win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_rget(void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, + MPIR_Win ** win) { - return MPIDI_NM_native_func->rget(origin_addr, origin_count, origin_datatype, target_rank, - target_disp, target_count, target_datatype, win, request); + return MPIDI_NM_native_func->mpi_win_create_dynamic(info, comm, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_sync(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_rget(void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win, + MPIR_Request ** request) { - return MPIDI_NM_native_func->win_sync(win); + return MPIDI_NM_native_func->mpi_rget(origin_addr, origin_count, origin_datatype, target_rank, + target_disp, target_count, target_datatype, win, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_flush_all(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_sync(MPIR_Win * win) { - return MPIDI_NM_native_func->win_flush_all(win); + return MPIDI_NM_native_func->mpi_win_sync(win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_get_accumulate(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, - void *result_addr, int result_count, - MPI_Datatype result_datatype, - int target_rank, MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_flush_all(MPIR_Win * win) { - return MPIDI_NM_native_func->get_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win); + return MPIDI_NM_native_func->mpi_win_flush_all(win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_win_lock_all(int assert, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_get_accumulate(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, int result_count, + MPI_Datatype result_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) { - return MPIDI_NM_native_func->win_lock_all(assert, win); + return MPIDI_NM_native_func->mpi_get_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win); +}; + +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_win_lock_all(int assert, MPIR_Win * win) +{ + return MPIDI_NM_native_func->mpi_win_lock_all(assert, win); }; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_rank_is_local(int target, MPIR_Comm * comm) @@ -561,426 +566,433 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_NM_rank_is_local(int target, MPIR_Comm * comm return MPIDI_NM_native_func->rank_is_local(target, comm); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_barrier(MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_barrier(MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->barrier(comm, errflag); + return MPIDI_NM_native_func->mpi_barrier(comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_bcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_bcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm, + MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->bcast(buffer, count, datatype, root, comm, errflag); + return MPIDI_NM_native_func->mpi_bcast(buffer, count, datatype, root, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_allreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_allreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->allreduce(sendbuf, recvbuf, count, datatype, op, comm, errflag); + return MPIDI_NM_native_func->mpi_allreduce(sendbuf, recvbuf, count, datatype, op, comm, + errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, comm, errflag); + return MPIDI_NM_native_func->mpi_allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, - displs, recvtype, comm, errflag); + return MPIDI_NM_native_func->mpi_allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_scatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_scatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, - root, comm, errflag); + return MPIDI_NM_native_func->mpi_scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_scatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_scatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, recvcount, - recvtype, root, comm_ptr, errflag); + return MPIDI_NM_native_func->mpi_scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, + recvcount, recvtype, root, comm_ptr, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_gather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_gather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->gather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, - root, comm, errflag); + return MPIDI_NM_native_func->mpi_gather(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_gatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_gatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, - recvtype, root, comm, errflag); + return MPIDI_NM_native_func->mpi_gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, root, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->alltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, comm, errflag); + return MPIDI_NM_native_func->mpi_alltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_alltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_alltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, - recvcounts, rdispls, recvtype, comm, errflag); + return MPIDI_NM_native_func->mpi_alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, + recvcounts, rdispls, recvtype, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_alltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, - const MPI_Datatype sendtypes[], void *recvbuf, - const int *recvcounts, const int *rdispls, - const MPI_Datatype recvtypes[], - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_alltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, + const MPI_Datatype sendtypes[], void *recvbuf, + const int *recvcounts, const int *rdispls, + const MPI_Datatype recvtypes[], + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, - recvcounts, rdispls, recvtypes, comm, errflag); + return MPIDI_NM_native_func->mpi_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, + recvcounts, rdispls, recvtypes, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_reduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_reduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->reduce(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, - errflag); + return MPIDI_NM_native_func->mpi_reduce(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, + errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_reduce_scatter(const void *sendbuf, void *recvbuf, - const int *recvcounts, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_reduce_scatter(const void *sendbuf, void *recvbuf, + const int *recvcounts, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->reduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, - comm_ptr, errflag); + return MPIDI_NM_native_func->mpi_reduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, + comm_ptr, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_reduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_reduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->reduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, - comm_ptr, errflag); + return MPIDI_NM_native_func->mpi_reduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, + comm_ptr, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_scan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_scan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->scan(sendbuf, recvbuf, count, datatype, op, comm, errflag); + return MPIDI_NM_native_func->mpi_scan(sendbuf, recvbuf, count, datatype, op, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_exscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_exscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_native_func->exscan(sendbuf, recvbuf, count, datatype, op, comm, errflag); + return MPIDI_NM_native_func->mpi_exscan(sendbuf, recvbuf, count, datatype, op, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_neighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_neighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm) { - return MPIDI_NM_native_func->neighbor_allgather(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, comm); + return MPIDI_NM_native_func->mpi_neighbor_allgather(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_neighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, - const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_neighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, + const int *displs, + MPI_Datatype recvtype, + MPIR_Comm * comm) { - return MPIDI_NM_native_func->neighbor_allgatherv(sendbuf, sendcount, sendtype, recvbuf, - recvcounts, displs, recvtype, comm); + return MPIDI_NM_native_func->mpi_neighbor_allgatherv(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, comm); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_neighbor_alltoallv(const void *sendbuf, - const int *sendcounts, - const int *sdispls, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, - const int *rdispls, - MPI_Datatype recvtype, MPIR_Comm * comm) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_neighbor_alltoallv(const void *sendbuf, + const int *sendcounts, + const int *sdispls, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, + const int *rdispls, + MPI_Datatype recvtype, + MPIR_Comm * comm) { - return MPIDI_NM_native_func->neighbor_alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, - recvcounts, rdispls, recvtype, comm); + return MPIDI_NM_native_func->mpi_neighbor_alltoallv(sendbuf, sendcounts, sdispls, sendtype, + recvbuf, recvcounts, rdispls, recvtype, + comm); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_neighbor_alltoallw(const void *sendbuf, - const int *sendcounts, - const MPI_Aint * sdispls, - const MPI_Datatype * sendtypes, - void *recvbuf, const int *recvcounts, - const MPI_Aint * rdispls, - const MPI_Datatype * recvtypes, - MPIR_Comm * comm) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_neighbor_alltoallw(const void *sendbuf, + const int *sendcounts, + const MPI_Aint * sdispls, + const MPI_Datatype * sendtypes, + void *recvbuf, const int *recvcounts, + const MPI_Aint * rdispls, + const MPI_Datatype * recvtypes, + MPIR_Comm * comm) { - return MPIDI_NM_native_func->neighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, - recvbuf, recvcounts, rdispls, recvtypes, comm); + return MPIDI_NM_native_func->mpi_neighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, + recvbuf, recvcounts, rdispls, recvtypes, + comm); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_neighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_neighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm) { - return MPIDI_NM_native_func->neighbor_alltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, comm); + return MPIDI_NM_native_func->mpi_neighbor_alltoall(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ineighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ineighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->ineighbor_allgather(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, comm, req); + return MPIDI_NM_native_func->mpi_ineighbor_allgather(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ineighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, - void *recvbuf, - const int *recvcounts, - const int *displs, - MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ineighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, + void *recvbuf, + const int *recvcounts, + const int *displs, + MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->ineighbor_allgatherv(sendbuf, sendcount, sendtype, recvbuf, - recvcounts, displs, recvtype, comm, req); + return MPIDI_NM_native_func->mpi_ineighbor_allgatherv(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ineighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ineighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->ineighbor_alltoall(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, comm, req); + return MPIDI_NM_native_func->mpi_ineighbor_alltoall(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ineighbor_alltoallv(const void *sendbuf, - const int *sendcounts, - const int *sdispls, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, - const int *rdispls, - MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ineighbor_alltoallv(const void *sendbuf, + const int *sendcounts, + const int *sdispls, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, + const int *rdispls, + MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->ineighbor_alltoallv(sendbuf, sendcounts, sdispls, sendtype, - recvbuf, recvcounts, rdispls, recvtype, comm, - req); + return MPIDI_NM_native_func->mpi_ineighbor_alltoallv(sendbuf, sendcounts, sdispls, sendtype, + recvbuf, recvcounts, rdispls, recvtype, + comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ineighbor_alltoallw(const void *sendbuf, - const int *sendcounts, - const MPI_Aint * sdispls, - const MPI_Datatype * sendtypes, - void *recvbuf, const int *recvcounts, - const MPI_Aint * rdispls, - const MPI_Datatype * recvtypes, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ineighbor_alltoallw(const void *sendbuf, + const int *sendcounts, + const MPI_Aint * sdispls, + const MPI_Datatype * sendtypes, + void *recvbuf, const int *recvcounts, + const MPI_Aint * rdispls, + const MPI_Datatype * recvtypes, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->ineighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, - recvbuf, recvcounts, rdispls, recvtypes, comm, - req); + return MPIDI_NM_native_func->mpi_ineighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, + recvbuf, recvcounts, rdispls, recvtypes, + comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ibarrier(MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ibarrier(MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->ibarrier(comm, req); + return MPIDI_NM_native_func->mpi_ibarrier(comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ibcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ibcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->ibcast(buffer, count, datatype, root, comm, req); + return MPIDI_NM_native_func->mpi_ibcast(buffer, count, datatype, root, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iallgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iallgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->iallgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, comm, req); + return MPIDI_NM_native_func->mpi_iallgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iallgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iallgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPI_Request * req) { - return MPIDI_NM_native_func->iallgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, - displs, recvtype, comm, req); + return MPIDI_NM_native_func->mpi_iallgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iallreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iallreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->iallreduce(sendbuf, recvbuf, count, datatype, op, comm, req); + return MPIDI_NM_native_func->mpi_iallreduce(sendbuf, recvbuf, count, datatype, op, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ialltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ialltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->ialltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, comm, req); + return MPIDI_NM_native_func->mpi_ialltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ialltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ialltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->ialltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, - recvcounts, rdispls, recvtype, comm, req); + return MPIDI_NM_native_func->mpi_ialltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, + recvcounts, rdispls, recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ialltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, - const MPI_Datatype sendtypes[], void *recvbuf, - const int *recvcounts, const int *rdispls, - const MPI_Datatype recvtypes[], - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ialltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, + const MPI_Datatype sendtypes[], void *recvbuf, + const int *recvcounts, const int *rdispls, + const MPI_Datatype recvtypes[], + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->ialltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, - recvcounts, rdispls, recvtypes, comm, req); + return MPIDI_NM_native_func->mpi_ialltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, + recvcounts, rdispls, recvtypes, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iexscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iexscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->iexscan(sendbuf, recvbuf, count, datatype, op, comm, req); + return MPIDI_NM_native_func->mpi_iexscan(sendbuf, recvbuf, count, datatype, op, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_igather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_igather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->igather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, - root, comm, req); + return MPIDI_NM_native_func->mpi_igather(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_igatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_igatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->igatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, - recvtype, root, comm, req); + return MPIDI_NM_native_func->mpi_igatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, root, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ireduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ireduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->ireduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, - comm, req); + return MPIDI_NM_native_func->mpi_ireduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, + op, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ireduce_scatter(const void *sendbuf, void *recvbuf, - const int *recvcounts, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ireduce_scatter(const void *sendbuf, void *recvbuf, + const int *recvcounts, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->ireduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm, - req); + return MPIDI_NM_native_func->mpi_ireduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, + comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_ireduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_ireduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPI_Request * req) { - return MPIDI_NM_native_func->ireduce(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, - req); + return MPIDI_NM_native_func->mpi_ireduce(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, + req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPI_Request * req) { - return MPIDI_NM_native_func->iscan(sendbuf, recvbuf, count, datatype, op, comm, req); + return MPIDI_NM_native_func->mpi_iscan(sendbuf, recvbuf, count, datatype, op, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iscatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iscatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_native_func->iscatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, root, comm, req); + return MPIDI_NM_native_func->mpi_iscatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iscatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm_ptr, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_iscatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm_ptr, MPI_Request * req) { - return MPIDI_NM_native_func->iscatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, - recvcount, recvtype, root, comm_ptr, req); + return MPIDI_NM_native_func->mpi_iscatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, + recvcount, recvtype, root, comm_ptr, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_type_create_hook(MPIR_Datatype * datatype_p) { - return MPIDI_NM_native_func->type_create_hook(datatype_p); + return MPIDI_NM_native_func->mpi_type_create_hook(datatype_p); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_type_free_hook(MPIR_Datatype * datatype_p) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_type_free_hook(MPIR_Datatype * datatype_p) { - return MPIDI_NM_native_func->type_free_hook(datatype_p); + return MPIDI_NM_native_func->mpi_type_free_hook(datatype_p); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_op_create_hook(MPIR_Op * op_p) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_op_create_hook(MPIR_Op * op_p) { - return MPIDI_NM_native_func->op_create_hook(op_p); + return MPIDI_NM_native_func->mpi_op_create_hook(op_p); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_NM_op_free_hook(MPIR_Op * op_p) +MPL_STATIC_INLINE_PREFIX int MPIDI_NM_mpi_op_free_hook(MPIR_Op * op_p) { - return MPIDI_NM_native_func->op_free_hook(op_p); + return MPIDI_NM_native_func->mpi_op_free_hook(op_p); }; #endif /* NETMOD_DISABLE_INLINES */ diff --git a/src/mpid/ch4/netmod/ofi/func_table.c b/src/mpid/ch4/netmod/ofi/func_table.c index f1586d4..f8789f2 100644 --- a/src/mpid/ch4/netmod/ofi/func_table.c +++ b/src/mpid/ch4/netmod/ofi/func_table.c @@ -14,21 +14,21 @@ #include <mpidimpl.h> #include "netmod_direct.h" MPIDI_NM_funcs_t MPIDI_NM_ofi_funcs = { - MPIDI_NM_init, - MPIDI_NM_finalize, + MPIDI_NM_mpi_init, + MPIDI_NM_mpi_finalize, MPIDI_NM_progress, - MPIDI_NM_comm_connect, - MPIDI_NM_comm_disconnect, - MPIDI_NM_open_port, - MPIDI_NM_close_port, - MPIDI_NM_comm_accept, + MPIDI_NM_mpi_comm_connect, + MPIDI_NM_mpi_comm_disconnect, + MPIDI_NM_mpi_open_port, + MPIDI_NM_mpi_close_port, + MPIDI_NM_mpi_comm_accept, MPIDI_NM_comm_get_lpid, MPIDI_NM_gpid_get, MPIDI_NM_getallincomm, MPIDI_NM_gpid_tolpidarray, MPIDI_NM_create_intercomm_from_lpids, - MPIDI_NM_comm_create_hook, - MPIDI_NM_comm_free_hook, + MPIDI_NM_mpi_comm_create_hook, + MPIDI_NM_mpi_comm_free_hook, MPIDI_NM_am_request_init, MPIDI_NM_am_request_finalize, MPIDI_NM_am_reg_handler, @@ -42,108 +42,108 @@ MPIDI_NM_funcs_t MPIDI_NM_ofi_funcs = { }; MPIDI_NM_native_funcs_t MPIDI_NM_native_ofi_funcs = { - MPIDI_NM_send, - MPIDI_NM_ssend, - MPIDI_NM_startall, - MPIDI_NM_send_init, - MPIDI_NM_ssend_init, - MPIDI_NM_rsend_init, - MPIDI_NM_bsend_init, - MPIDI_NM_isend, - MPIDI_NM_issend, - MPIDI_NM_cancel_send, - MPIDI_NM_recv_init, - MPIDI_NM_recv, - MPIDI_NM_irecv, - MPIDI_NM_imrecv, - MPIDI_NM_cancel_recv, - MPIDI_NM_alloc_mem, - MPIDI_NM_free_mem, - MPIDI_NM_improbe, - MPIDI_NM_iprobe, - MPIDI_NM_win_set_info, - MPIDI_NM_win_shared_query, - MPIDI_NM_put, - MPIDI_NM_win_start, - MPIDI_NM_win_complete, - MPIDI_NM_win_post, - MPIDI_NM_win_wait, - MPIDI_NM_win_test, - MPIDI_NM_win_lock, - MPIDI_NM_win_unlock, - MPIDI_NM_win_get_info, - MPIDI_NM_get, - MPIDI_NM_win_free, - MPIDI_NM_win_fence, - MPIDI_NM_win_create, - MPIDI_NM_accumulate, - MPIDI_NM_win_attach, - MPIDI_NM_win_allocate_shared, - MPIDI_NM_rput, - MPIDI_NM_win_flush_local, - MPIDI_NM_win_detach, - MPIDI_NM_compare_and_swap, - MPIDI_NM_raccumulate, - MPIDI_NM_rget_accumulate, - MPIDI_NM_fetch_and_op, - MPIDI_NM_win_allocate, - MPIDI_NM_win_flush, - MPIDI_NM_win_flush_local_all, - MPIDI_NM_win_unlock_all, - MPIDI_NM_win_create_dynamic, - MPIDI_NM_rget, - MPIDI_NM_win_sync, - MPIDI_NM_win_flush_all, - MPIDI_NM_get_accumulate, - MPIDI_NM_win_lock_all, + MPIDI_NM_mpi_send, + MPIDI_NM_mpi_ssend, + MPIDI_NM_mpi_startall, + MPIDI_NM_mpi_send_init, + MPIDI_NM_mpi_ssend_init, + MPIDI_NM_mpi_rsend_init, + MPIDI_NM_mpi_bsend_init, + MPIDI_NM_mpi_isend, + MPIDI_NM_mpi_issend, + MPIDI_NM_mpi_cancel_send, + MPIDI_NM_mpi_recv_init, + MPIDI_NM_mpi_recv, + MPIDI_NM_mpi_irecv, + MPIDI_NM_mpi_imrecv, + MPIDI_NM_mpi_cancel_recv, + MPIDI_NM_mpi_alloc_mem, + MPIDI_NM_mpi_free_mem, + MPIDI_NM_mpi_improbe, + MPIDI_NM_mpi_iprobe, + MPIDI_NM_mpi_win_set_info, + MPIDI_NM_mpi_win_shared_query, + MPIDI_NM_mpi_put, + MPIDI_NM_mpi_win_start, + MPIDI_NM_mpi_win_complete, + MPIDI_NM_mpi_win_post, + MPIDI_NM_mpi_win_wait, + MPIDI_NM_mpi_win_test, + MPIDI_NM_mpi_win_lock, + MPIDI_NM_mpi_win_unlock, + MPIDI_NM_mpi_win_get_info, + MPIDI_NM_mpi_get, + MPIDI_NM_mpi_win_free, + MPIDI_NM_mpi_win_fence, + MPIDI_NM_mpi_win_create, + MPIDI_NM_mpi_accumulate, + MPIDI_NM_mpi_win_attach, + MPIDI_NM_mpi_win_allocate_shared, + MPIDI_NM_mpi_rput, + MPIDI_NM_mpi_win_flush_local, + MPIDI_NM_mpi_win_detach, + MPIDI_NM_mpi_compare_and_swap, + MPIDI_NM_mpi_raccumulate, + MPIDI_NM_mpi_rget_accumulate, + MPIDI_NM_mpi_fetch_and_op, + MPIDI_NM_mpi_win_allocate, + MPIDI_NM_mpi_win_flush, + MPIDI_NM_mpi_win_flush_local_all, + MPIDI_NM_mpi_win_unlock_all, + MPIDI_NM_mpi_win_create_dynamic, + MPIDI_NM_mpi_rget, + MPIDI_NM_mpi_win_sync, + MPIDI_NM_mpi_win_flush_all, + MPIDI_NM_mpi_get_accumulate, + MPIDI_NM_mpi_win_lock_all, MPIDI_NM_rank_is_local, - MPIDI_NM_barrier, - MPIDI_NM_bcast, - MPIDI_NM_allreduce, - MPIDI_NM_allgather, - MPIDI_NM_allgatherv, - MPIDI_NM_scatter, - MPIDI_NM_scatterv, - MPIDI_NM_gather, - MPIDI_NM_gatherv, - MPIDI_NM_alltoall, - MPIDI_NM_alltoallv, - MPIDI_NM_alltoallw, - MPIDI_NM_reduce, - MPIDI_NM_reduce_scatter, - MPIDI_NM_reduce_scatter_block, - MPIDI_NM_scan, - MPIDI_NM_exscan, - MPIDI_NM_neighbor_allgather, - MPIDI_NM_neighbor_allgatherv, - MPIDI_NM_neighbor_alltoall, - MPIDI_NM_neighbor_alltoallv, - MPIDI_NM_neighbor_alltoallw, - MPIDI_NM_ineighbor_allgather, - MPIDI_NM_ineighbor_allgatherv, - MPIDI_NM_ineighbor_alltoall, - MPIDI_NM_ineighbor_alltoallv, - MPIDI_NM_ineighbor_alltoallw, - MPIDI_NM_ibarrier, - MPIDI_NM_ibcast, - MPIDI_NM_iallgather, - MPIDI_NM_iallgatherv, - MPIDI_NM_iallreduce, - MPIDI_NM_ialltoall, - MPIDI_NM_ialltoallv, - MPIDI_NM_ialltoallw, - MPIDI_NM_iexscan, - MPIDI_NM_igather, - MPIDI_NM_igatherv, - MPIDI_NM_ireduce_scatter_block, - MPIDI_NM_ireduce_scatter, - MPIDI_NM_ireduce, - MPIDI_NM_iscan, - MPIDI_NM_iscatter, - MPIDI_NM_iscatterv, - MPIDI_NM_type_create_hook, - MPIDI_NM_type_free_hook, - MPIDI_NM_op_create_hook, - MPIDI_NM_op_free_hook, + MPIDI_NM_mpi_barrier, + MPIDI_NM_mpi_bcast, + MPIDI_NM_mpi_allreduce, + MPIDI_NM_mpi_allgather, + MPIDI_NM_mpi_allgatherv, + MPIDI_NM_mpi_scatter, + MPIDI_NM_mpi_scatterv, + MPIDI_NM_mpi_gather, + MPIDI_NM_mpi_gatherv, + MPIDI_NM_mpi_alltoall, + MPIDI_NM_mpi_alltoallv, + MPIDI_NM_mpi_alltoallw, + MPIDI_NM_mpi_reduce, + MPIDI_NM_mpi_reduce_scatter, + MPIDI_NM_mpi_reduce_scatter_block, + MPIDI_NM_mpi_scan, + MPIDI_NM_mpi_exscan, + MPIDI_NM_mpi_neighbor_allgather, + MPIDI_NM_mpi_neighbor_allgatherv, + MPIDI_NM_mpi_neighbor_alltoall, + MPIDI_NM_mpi_neighbor_alltoallv, + MPIDI_NM_mpi_neighbor_alltoallw, + MPIDI_NM_mpi_ineighbor_allgather, + MPIDI_NM_mpi_ineighbor_allgatherv, + MPIDI_NM_mpi_ineighbor_alltoall, + MPIDI_NM_mpi_ineighbor_alltoallv, + MPIDI_NM_mpi_ineighbor_alltoallw, + MPIDI_NM_mpi_ibarrier, + MPIDI_NM_mpi_ibcast, + MPIDI_NM_mpi_iallgather, + MPIDI_NM_mpi_iallgatherv, + MPIDI_NM_mpi_iallreduce, + MPIDI_NM_mpi_ialltoall, + MPIDI_NM_mpi_ialltoallv, + MPIDI_NM_mpi_ialltoallw, + MPIDI_NM_mpi_iexscan, + MPIDI_NM_mpi_igather, + MPIDI_NM_mpi_igatherv, + MPIDI_NM_mpi_ireduce_scatter_block, + MPIDI_NM_mpi_ireduce_scatter, + MPIDI_NM_mpi_ireduce, + MPIDI_NM_mpi_iscan, + MPIDI_NM_mpi_iscatter, + MPIDI_NM_mpi_iscatterv, + MPIDI_NM_mpi_type_create_hook, + MPIDI_NM_mpi_type_free_hook, + MPIDI_NM_mpi_op_create_hook, + MPIDI_NM_mpi_op_free_hook, }; #endif diff --git a/src/mpid/ch4/netmod/ofi/ofi_am_probe.h b/src/mpid/ch4/netmod/ofi/ofi_am_probe.h index e8575ec..58a750c 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_am_probe.h +++ b/src/mpid/ch4/netmod/ofi/ofi_am_probe.h @@ -19,21 +19,21 @@ static inline int MPIDI_NM_probe(int source, return MPIDI_CH4U_probe(source, tag, comm, context_offset, status); } -static inline int MPIDI_NM_improbe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, - int *flag, MPIR_Request ** message, MPI_Status * status) +static inline int MPIDI_NM_mpi_improbe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, + int *flag, MPIR_Request ** message, MPI_Status * status) { - return MPIDI_CH4U_improbe(source, tag, comm, context_offset, flag, message, status); + return MPIDI_CH4U_mpi_improbe(source, tag, comm, context_offset, flag, message, status); } -static inline int MPIDI_NM_iprobe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, int *flag, MPI_Status * status) +static inline int MPIDI_NM_mpi_iprobe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, int *flag, MPI_Status * status) { - return MPIDI_CH4U_iprobe(source, tag, comm, context_offset, flag, status); + return MPIDI_CH4U_mpi_iprobe(source, tag, comm, context_offset, flag, status); } #endif /* NETMOD_AM_OFI_PROBE_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/ofi/ofi_am_recv.h b/src/mpid/ch4/netmod/ofi/ofi_am_recv.h index 0e844db..45c1932 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_am_recv.h +++ b/src/mpid/ch4/netmod/ofi/ofi_am_recv.h @@ -13,49 +13,52 @@ #include "ofi_impl.h" -static inline int MPIDI_NM_recv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPI_Status * status, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_recv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPI_Status * status, + MPIR_Request ** request) { - return MPIDI_CH4U_recv(buf, count, datatype, rank, tag, comm, context_offset, status, request); + return MPIDI_CH4U_mpi_recv(buf, count, datatype, rank, tag, comm, context_offset, status, + request); } -static inline int MPIDI_NM_recv_init(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_recv_init(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_recv_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_recv_init(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_imrecv(void *buf, - int count, - MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp) +static inline int MPIDI_NM_mpi_imrecv(void *buf, + int count, + MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp) { - return MPIDI_CH4U_imrecv(buf, count, datatype, message, rreqp); + return MPIDI_CH4U_mpi_imrecv(buf, count, datatype, message, rreqp); } -static inline int MPIDI_NM_irecv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_irecv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_cancel_recv(MPIR_Request * rreq) +static inline int MPIDI_NM_mpi_cancel_recv(MPIR_Request * rreq) { - return MPIDI_CH4U_cancel_recv(rreq); + return MPIDI_CH4U_mpi_cancel_recv(rreq); } #endif /* NETMOD_AM_OFI_RECV_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/ofi/ofi_am_rma.h b/src/mpid/ch4/netmod/ofi/ofi_am_rma.h index e93b892..d04235a 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_am_rma.h +++ b/src/mpid/ch4/netmod/ofi/ofi_am_rma.h @@ -13,136 +13,141 @@ #include "ofi_impl.h" -static inline int MPIDI_NM_put(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_NM_mpi_put(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { - return MPIDI_CH4U_put(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + return MPIDI_CH4U_mpi_put(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); } -static inline int MPIDI_NM_get(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_NM_mpi_get(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { - return MPIDI_CH4U_get(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + return MPIDI_CH4U_mpi_get(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); } -static inline int MPIDI_NM_rput(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rput(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rput(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win, request); + return MPIDI_CH4U_mpi_rput(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win, + request); } -static inline int MPIDI_NM_compare_and_swap(const void *origin_addr, - const void *compare_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, MPIR_Win * win) -{ - return MPIDI_CH4U_compare_and_swap(origin_addr, compare_addr, result_addr, - datatype, target_rank, target_disp, win); -} - -static inline int MPIDI_NM_raccumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_compare_and_swap(const void *origin_addr, + const void *compare_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp, + MPIR_Win * win) { - return MPIDI_CH4U_raccumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win, request); + return MPIDI_CH4U_mpi_compare_and_swap(origin_addr, compare_addr, result_addr, + datatype, target_rank, target_disp, win); } -static inline int MPIDI_NM_rget_accumulate(const void *origin_addr, +static inline int MPIDI_NM_mpi_raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rget_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, + return MPIDI_CH4U_mpi_raccumulate(origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, win, request); } -static inline int MPIDI_NM_fetch_and_op(const void *origin_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, - MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) +static inline int MPIDI_NM_mpi_rget_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +{ + return MPIDI_CH4U_mpi_rget_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win, request); +} + +static inline int MPIDI_NM_mpi_fetch_and_op(const void *origin_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, + MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) { - return MPIDI_CH4U_fetch_and_op(origin_addr, result_addr, datatype, - target_rank, target_disp, op, win); + return MPIDI_CH4U_mpi_fetch_and_op(origin_addr, result_addr, datatype, + target_rank, target_disp, op, win); } -static inline int MPIDI_NM_rget(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rget(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rget(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win, request); + return MPIDI_CH4U_mpi_rget(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win, + request); } -static inline int MPIDI_NM_get_accumulate(const void *origin_addr, +static inline int MPIDI_NM_mpi_get_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) +{ + return MPIDI_CH4U_mpi_get_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win); +} + +static inline int MPIDI_NM_mpi_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) { - return MPIDI_CH4U_get_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win); -} - -static inline int MPIDI_NM_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) -{ - return MPIDI_CH4U_accumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, op, win); + return MPIDI_CH4U_mpi_accumulate(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, op, + win); } #endif /* NETMOD_AM_OFI_RMA_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/ofi/ofi_am_send.h b/src/mpid/ch4/netmod/ofi/ofi_am_send.h index 777377a..3165a33 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_am_send.h +++ b/src/mpid/ch4/netmod/ofi/ofi_am_send.h @@ -13,14 +13,14 @@ #include "ofi_impl.h" -static inline int MPIDI_NM_send(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_send(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_send(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_send(buf, count, datatype, rank, tag, comm, context_offset, request); } static inline int MPIDI_NM_rsend(const void *buf, @@ -45,84 +45,91 @@ static inline int MPIDI_NM_irsend(const void *buf, return MPIDI_CH4U_irsend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_ssend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_ssend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_startall(int count, MPIR_Request * requests[]) +static inline int MPIDI_NM_mpi_startall(int count, MPIR_Request * requests[]) { - return MPIDI_CH4U_startall(count, requests); + return MPIDI_CH4U_mpi_startall(count, requests); } -static inline int MPIDI_NM_send_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_send_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_send_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_send_init(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_ssend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_ssend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_ssend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_ssend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } -static inline int MPIDI_NM_bsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_bsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_bsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_bsend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } -static inline int MPIDI_NM_rsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_rsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_rsend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } -static inline int MPIDI_NM_isend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_isend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_isend(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_isend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_issend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_issend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_issend(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_issend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_cancel_send(MPIR_Request * sreq) +static inline int MPIDI_NM_mpi_cancel_send(MPIR_Request * sreq) { - return MPIDI_CH4U_cancel_send(sreq); + return MPIDI_CH4U_mpi_cancel_send(sreq); } #endif /* NETMOD_AM_OFI_SEND_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/ofi/ofi_am_spawn.h b/src/mpid/ch4/netmod/ofi/ofi_am_spawn.h index 75a5ef5..ba6249d 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_am_spawn.h +++ b/src/mpid/ch4/netmod/ofi/ofi_am_spawn.h @@ -13,35 +13,35 @@ #include "ofi_impl.h" -static inline int MPIDI_NM_comm_connect(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) +static inline int MPIDI_NM_mpi_comm_connect(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_comm_disconnect(MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_comm_disconnect(MPIR_Comm * comm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_open_port(MPIR_Info * info_ptr, char *port_name) +static inline int MPIDI_NM_mpi_open_port(MPIR_Info * info_ptr, char *port_name) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_close_port(const char *port_name) +static inline int MPIDI_NM_mpi_close_port(const char *port_name) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_comm_accept(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) +static inline int MPIDI_NM_mpi_comm_accept(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; diff --git a/src/mpid/ch4/netmod/ofi/ofi_am_win.h b/src/mpid/ch4/netmod/ofi/ofi_am_win.h index 89e5081..0670648 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_am_win.h +++ b/src/mpid/ch4/netmod/ofi/ofi_am_win.h @@ -13,147 +13,150 @@ #include "ofi_impl.h" -static inline int MPIDI_NM_win_set_info(MPIR_Win * win, MPIR_Info * info) +static inline int MPIDI_NM_mpi_win_set_info(MPIR_Win * win, MPIR_Info * info) { - return MPIDI_CH4R_win_set_info(win, info); + return MPIDI_CH4R_mpi_win_set_info(win, info); } -static inline int MPIDI_NM_win_start(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_start(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_start(group, assert, win); + return MPIDI_CH4R_mpi_win_start(group, assert, win); } -static inline int MPIDI_NM_win_complete(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_complete(MPIR_Win * win) { - return MPIDI_CH4R_win_complete(win); + return MPIDI_CH4R_mpi_win_complete(win); } -static inline int MPIDI_NM_win_post(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_post(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_post(group, assert, win); + return MPIDI_CH4R_mpi_win_post(group, assert, win); } -static inline int MPIDI_NM_win_wait(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_wait(MPIR_Win * win) { - return MPIDI_CH4R_win_wait(win); + return MPIDI_CH4R_mpi_win_wait(win); } -static inline int MPIDI_NM_win_test(MPIR_Win * win, int *flag) +static inline int MPIDI_NM_mpi_win_test(MPIR_Win * win, int *flag) { - return MPIDI_CH4R_win_test(win, flag); + return MPIDI_CH4R_mpi_win_test(win, flag); } -static inline int MPIDI_NM_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_lock(lock_type, rank, assert, win); + return MPIDI_CH4R_mpi_win_lock(lock_type, rank, assert, win); } -static inline int MPIDI_NM_win_unlock(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_unlock(int rank, MPIR_Win * win) { - return MPIDI_CH4R_win_unlock(rank, win); + return MPIDI_CH4R_mpi_win_unlock(rank, win); } -static inline int MPIDI_NM_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) +static inline int MPIDI_NM_mpi_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) { - return MPIDI_CH4R_win_get_info(win, info_p_p); + return MPIDI_CH4R_mpi_win_get_info(win, info_p_p); } -static inline int MPIDI_NM_win_free(MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_free(MPIR_Win ** win_ptr) { - return MPIDI_CH4R_win_free(win_ptr); + return MPIDI_CH4R_mpi_win_free(win_ptr); } -static inline int MPIDI_NM_win_fence(int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_fence(int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_fence(assert, win); + return MPIDI_CH4R_mpi_win_fence(assert, win); } -static inline int MPIDI_NM_win_create(void *base, - MPI_Aint length, - int disp_unit, - MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_create(void *base, + MPI_Aint length, + int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr) { - return MPIDI_CH4R_win_create(base, length, disp_unit, info, comm_ptr, win_ptr); + return MPIDI_CH4R_mpi_win_create(base, length, disp_unit, info, comm_ptr, win_ptr); } -static inline int MPIDI_NM_win_attach(MPIR_Win * win, void *base, MPI_Aint size) +static inline int MPIDI_NM_mpi_win_attach(MPIR_Win * win, void *base, MPI_Aint size) { - return MPIDI_CH4R_win_attach(win, base, size); + return MPIDI_CH4R_mpi_win_attach(win, base, size); } -static inline int MPIDI_NM_win_allocate_shared(MPI_Aint size, - int disp_unit, - MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, - void **base_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_allocate_shared(MPI_Aint size, + int disp_unit, + MPIR_Info * info_ptr, + MPIR_Comm * comm_ptr, + void **base_ptr, MPIR_Win ** win_ptr) { - return MPIDI_CH4R_win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, base_ptr, win_ptr); + return MPIDI_CH4R_mpi_win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, base_ptr, + win_ptr); } -static inline int MPIDI_NM_win_detach(MPIR_Win * win, const void *base) +static inline int MPIDI_NM_mpi_win_detach(MPIR_Win * win, const void *base) { - return MPIDI_CH4R_win_detach(win, base); + return MPIDI_CH4R_mpi_win_detach(win, base); } -static inline int MPIDI_NM_win_shared_query(MPIR_Win * win, - int rank, - MPI_Aint * size, int *disp_unit, void *baseptr) +static inline int MPIDI_NM_mpi_win_shared_query(MPIR_Win * win, + int rank, + MPI_Aint * size, int *disp_unit, void *baseptr) { - return MPIDI_CH4R_win_shared_query(win, rank, size, disp_unit, baseptr); + return MPIDI_CH4R_mpi_win_shared_query(win, rank, size, disp_unit, baseptr); } -static inline int MPIDI_NM_win_allocate(MPI_Aint size, - int disp_unit, - MPIR_Info * info, - MPIR_Comm * comm, void *baseptr, MPIR_Win ** win) +static inline int MPIDI_NM_mpi_win_allocate(MPI_Aint size, + int disp_unit, + MPIR_Info * info, + MPIR_Comm * comm, void *baseptr, MPIR_Win ** win) { - return MPIDI_CH4R_win_allocate(size, disp_unit, info, comm, baseptr, win); + return MPIDI_CH4R_mpi_win_allocate(size, disp_unit, info, comm, baseptr, win); } -static inline int MPIDI_NM_win_flush(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush(int rank, MPIR_Win * win) { - return MPIDI_CH4R_win_flush(rank, win); + return MPIDI_CH4R_mpi_win_flush(rank, win); } -static inline int MPIDI_NM_win_flush_local_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_local_all(MPIR_Win * win) { - return MPIDI_CH4R_win_flush_local_all(win); + return MPIDI_CH4R_mpi_win_flush_local_all(win); } -static inline int MPIDI_NM_win_unlock_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_unlock_all(MPIR_Win * win) { - return MPIDI_CH4R_win_unlock_all(win); + return MPIDI_CH4R_mpi_win_unlock_all(win); } -static inline int MPIDI_NM_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, MPIR_Win ** win) +static inline int MPIDI_NM_mpi_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, + MPIR_Win ** win) { - return MPIDI_CH4R_win_create_dynamic(info, comm, win); + return MPIDI_CH4R_mpi_win_create_dynamic(info, comm, win); } -static inline int MPIDI_NM_win_flush_local(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_local(int rank, MPIR_Win * win) { - return MPIDI_CH4R_win_flush_local(rank, win); + return MPIDI_CH4R_mpi_win_flush_local(rank, win); } -static inline int MPIDI_NM_win_sync(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_sync(MPIR_Win * win) { - return MPIDI_CH4R_win_sync(win); + return MPIDI_CH4R_mpi_win_sync(win); } -static inline int MPIDI_NM_win_flush_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_all(MPIR_Win * win) { - return MPIDI_CH4R_win_flush_all(win); + return MPIDI_CH4R_mpi_win_flush_all(win); } -static inline int MPIDI_NM_win_lock_all(int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_lock_all(int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_lock_all(assert, win); + return MPIDI_CH4R_mpi_win_lock_all(assert, win); } diff --git a/src/mpid/ch4/netmod/ofi/ofi_coll.h b/src/mpid/ch4/netmod/ofi/ofi_coll.h index 1f87481..a6ee413 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_coll.h +++ b/src/mpid/ch4/netmod/ofi/ofi_coll.h @@ -14,10 +14,10 @@ #include "ofi_impl.h" #undef FUNCNAME -#define FUNCNAME MPIDI_NM_barrier +#define FUNCNAME MPIDI_NM_mpi_barrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_BARRIER); @@ -30,11 +30,11 @@ static inline int MPIDI_NM_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errfla } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_bcast +#define FUNCNAME MPIDI_NM_mpi_bcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_bcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_bcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_BCAST); @@ -47,12 +47,12 @@ static inline int MPIDI_NM_bcast(void *buffer, int count, MPI_Datatype datatype, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_allreduce +#define FUNCNAME MPIDI_NM_mpi_allreduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_allreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_allreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLREDUCE); @@ -65,12 +65,12 @@ static inline int MPIDI_NM_allreduce(const void *sendbuf, void *recvbuf, int cou } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_allgather +#define FUNCNAME MPIDI_NM_mpi_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLGATHER); @@ -84,13 +84,13 @@ static inline int MPIDI_NM_allgather(const void *sendbuf, int sendcount, MPI_Dat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_allgatherv +#define FUNCNAME MPIDI_NM_mpi_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLGATHERV); @@ -104,12 +104,12 @@ static inline int MPIDI_NM_allgatherv(const void *sendbuf, int sendcount, MPI_Da } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_gather +#define FUNCNAME MPIDI_NM_mpi_gather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_GATHER); @@ -123,13 +123,13 @@ static inline int MPIDI_NM_gather(const void *sendbuf, int sendcount, MPI_Dataty } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_gatherv +#define FUNCNAME MPIDI_NM_mpi_gatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_GATHERV); @@ -143,12 +143,12 @@ static inline int MPIDI_NM_gatherv(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_scatter +#define FUNCNAME MPIDI_NM_mpi_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_SCATTER); @@ -162,13 +162,13 @@ static inline int MPIDI_NM_scatter(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_scatterv +#define FUNCNAME MPIDI_NM_mpi_scatterv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_scatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_scatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_SCATTERV); @@ -182,12 +182,12 @@ static inline int MPIDI_NM_scatterv(const void *sendbuf, const int *sendcounts, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_alltoall +#define FUNCNAME MPIDI_NM_mpi_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLTOALL); @@ -201,14 +201,14 @@ static inline int MPIDI_NM_alltoall(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_alltoallv +#define FUNCNAME MPIDI_NM_mpi_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_alltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_alltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLTOALLV); @@ -221,14 +221,14 @@ static inline int MPIDI_NM_alltoallv(const void *sendbuf, const int *sendcounts, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_alltoallw +#define FUNCNAME MPIDI_NM_mpi_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_alltoallw(const void *sendbuf, const int sendcounts[], - const int sdispls[], const MPI_Datatype sendtypes[], - void *recvbuf, const int recvcounts[], - const int rdispls[], const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_alltoallw(const void *sendbuf, const int sendcounts[], + const int sdispls[], const MPI_Datatype sendtypes[], + void *recvbuf, const int recvcounts[], + const int rdispls[], const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLTOALLW); @@ -242,12 +242,12 @@ static inline int MPIDI_NM_alltoallw(const void *sendbuf, const int sendcounts[] } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_reduce +#define FUNCNAME MPIDI_NM_mpi_reduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_reduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_reduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_REDUCE); @@ -260,12 +260,13 @@ static inline int MPIDI_NM_reduce(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_reduce_scatter +#define FUNCNAME MPIDI_NM_mpi_reduce_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_reduce_scatter(const void *sendbuf, void *recvbuf, - const int recvcounts[], MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_reduce_scatter(const void *sendbuf, void *recvbuf, + const int recvcounts[], MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_REDUCE_SCATTER); @@ -278,13 +279,13 @@ static inline int MPIDI_NM_reduce_scatter(const void *sendbuf, void *recvbuf, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_reduce_scatter_block +#define FUNCNAME MPIDI_NM_mpi_reduce_scatter_block #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_reduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_reduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_REDUCE_SCATTER_BLOCK); @@ -298,12 +299,12 @@ static inline int MPIDI_NM_reduce_scatter_block(const void *sendbuf, void *recvb } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_scan +#define FUNCNAME MPIDI_NM_mpi_scan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_scan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_scan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_SCAN); @@ -316,12 +317,12 @@ static inline int MPIDI_NM_scan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_exscan +#define FUNCNAME MPIDI_NM_mpi_exscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_exscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_exscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_EXSCAN); @@ -334,12 +335,13 @@ static inline int MPIDI_NM_exscan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_allgather +#define FUNCNAME MPIDI_NM_mpi_neighbor_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLGATHER); @@ -354,13 +356,13 @@ static inline int MPIDI_NM_neighbor_allgather(const void *sendbuf, int sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_allgatherv +#define FUNCNAME MPIDI_NM_mpi_neighbor_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLGATHERV); @@ -374,12 +376,13 @@ static inline int MPIDI_NM_neighbor_allgatherv(const void *sendbuf, int sendcoun } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_alltoall +#define FUNCNAME MPIDI_NM_mpi_neighbor_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLTOALL); @@ -393,14 +396,14 @@ static inline int MPIDI_NM_neighbor_alltoall(const void *sendbuf, int sendcount, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_alltoallv +#define FUNCNAME MPIDI_NM_mpi_neighbor_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_alltoallv(const void *sendbuf, const int sendcounts[], - const int sdispls[], MPI_Datatype sendtype, - void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, - MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLTOALLV); @@ -414,14 +417,15 @@ static inline int MPIDI_NM_neighbor_alltoallv(const void *sendbuf, const int sen } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_alltoallw +#define FUNCNAME MPIDI_NM_mpi_neighbor_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_alltoallw(const void *sendbuf, const int sendcounts[], - const MPI_Aint sdispls[], - const MPI_Datatype sendtypes[], void *recvbuf, - const int recvcounts[], const MPI_Aint rdispls[], - const MPI_Datatype recvtypes[], MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, + const int recvcounts[], const MPI_Aint rdispls[], + const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLTOALLW); @@ -435,13 +439,13 @@ static inline int MPIDI_NM_neighbor_alltoallw(const void *sendbuf, const int sen } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_allgather +#define FUNCNAME MPIDI_NM_mpi_ineighbor_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLGATHER); @@ -455,14 +459,14 @@ static inline int MPIDI_NM_ineighbor_allgather(const void *sendbuf, int sendcoun } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_allgatherv +#define FUNCNAME MPIDI_NM_mpi_ineighbor_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLGATHERV); @@ -477,13 +481,13 @@ static inline int MPIDI_NM_ineighbor_allgatherv(const void *sendbuf, int sendcou } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_alltoall +#define FUNCNAME MPIDI_NM_mpi_ineighbor_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLTOALL); @@ -497,14 +501,14 @@ static inline int MPIDI_NM_ineighbor_alltoall(const void *sendbuf, int sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_alltoallv +#define FUNCNAME MPIDI_NM_mpi_ineighbor_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], - const int sdispls[], MPI_Datatype sendtype, - void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLTOALLV); @@ -519,15 +523,15 @@ static inline int MPIDI_NM_ineighbor_alltoallv(const void *sendbuf, const int se } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_alltoallw +#define FUNCNAME MPIDI_NM_mpi_ineighbor_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], - const MPI_Aint sdispls[], - const MPI_Datatype sendtypes[], void *recvbuf, - const int recvcounts[], const MPI_Aint rdispls[], - const MPI_Datatype recvtypes[], MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, + const int recvcounts[], const MPI_Aint rdispls[], + const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLTOALLW); @@ -542,10 +546,10 @@ static inline int MPIDI_NM_ineighbor_alltoallw(const void *sendbuf, const int se } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ibarrier +#define FUNCNAME MPIDI_NM_mpi_ibarrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IBARRIER); @@ -558,11 +562,11 @@ static inline int MPIDI_NM_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ibcast +#define FUNCNAME MPIDI_NM_mpi_ibcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ibcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ibcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IBCAST); @@ -575,12 +579,12 @@ static inline int MPIDI_NM_ibcast(void *buffer, int count, MPI_Datatype datatype } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iallgather +#define FUNCNAME MPIDI_NM_mpi_iallgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLGATHER); @@ -594,13 +598,14 @@ static inline int MPIDI_NM_iallgather(const void *sendbuf, int sendcount, MPI_Da } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iallgatherv +#define FUNCNAME MPIDI_NM_mpi_iallgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_iallgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLGATHERV); @@ -614,12 +619,12 @@ static inline int MPIDI_NM_iallgatherv(const void *sendbuf, int sendcount, MPI_D } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iallreduce +#define FUNCNAME MPIDI_NM_mpi_iallreduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iallreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPI_Request * request) +static inline int MPIDI_NM_mpi_iallreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPI_Request * request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLREDUCE); @@ -632,12 +637,12 @@ static inline int MPIDI_NM_iallreduce(const void *sendbuf, void *recvbuf, int co } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ialltoall +#define FUNCNAME MPIDI_NM_mpi_ialltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLTOALL); @@ -651,14 +656,14 @@ static inline int MPIDI_NM_ialltoall(const void *sendbuf, int sendcount, MPI_Dat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ialltoallv +#define FUNCNAME MPIDI_NM_mpi_ialltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ialltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ialltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLTOALLV); @@ -673,14 +678,14 @@ static inline int MPIDI_NM_ialltoallv(const void *sendbuf, const int *sendcounts } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ialltoallw +#define FUNCNAME MPIDI_NM_mpi_ialltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ialltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, const MPI_Datatype sendtypes[], - void *recvbuf, const int *recvcounts, - const int *rdispls, const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ialltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, const MPI_Datatype sendtypes[], + void *recvbuf, const int *recvcounts, + const int *rdispls, const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLTOALLW); @@ -695,12 +700,12 @@ static inline int MPIDI_NM_ialltoallw(const void *sendbuf, const int *sendcounts } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iexscan +#define FUNCNAME MPIDI_NM_mpi_iexscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iexscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_iexscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IEXSCAN); @@ -713,12 +718,12 @@ static inline int MPIDI_NM_iexscan(const void *sendbuf, void *recvbuf, int count } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_igather +#define FUNCNAME MPIDI_NM_mpi_igather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IGATHER); @@ -732,13 +737,13 @@ static inline int MPIDI_NM_igather(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_igatherv +#define FUNCNAME MPIDI_NM_mpi_igatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IGATHERV); @@ -752,12 +757,13 @@ static inline int MPIDI_NM_igatherv(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ireduce_scatter_block +#define FUNCNAME MPIDI_NM_mpi_ireduce_scatter_block #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ireduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ireduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE_SCATTER_BLOCK); @@ -771,12 +777,12 @@ static inline int MPIDI_NM_ireduce_scatter_block(const void *sendbuf, void *recv } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ireduce_scatter +#define FUNCNAME MPIDI_NM_mpi_ireduce_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ireduce_scatter(const void *sendbuf, void *recvbuf, - const int recvcounts[], MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ireduce_scatter(const void *sendbuf, void *recvbuf, + const int recvcounts[], MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE_SCATTER); @@ -790,12 +796,12 @@ static inline int MPIDI_NM_ireduce_scatter(const void *sendbuf, void *recvbuf, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ireduce +#define FUNCNAME MPIDI_NM_mpi_ireduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ireduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ireduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE); @@ -808,12 +814,12 @@ static inline int MPIDI_NM_ireduce(const void *sendbuf, void *recvbuf, int count } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iscan +#define FUNCNAME MPIDI_NM_mpi_iscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_iscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ISCAN); @@ -826,13 +832,13 @@ static inline int MPIDI_NM_iscan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iscatter +#define FUNCNAME MPIDI_NM_mpi_iscatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iscatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm, MPI_Request * request) +static inline int MPIDI_NM_mpi_iscatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ISCATTER); @@ -846,14 +852,14 @@ static inline int MPIDI_NM_iscatter(const void *sendbuf, int sendcount, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iscatterv +#define FUNCNAME MPIDI_NM_mpi_iscatterv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iscatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * request) +static inline int MPIDI_NM_mpi_iscatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ISCATTERV); diff --git a/src/mpid/ch4/netmod/ofi/ofi_comm.h b/src/mpid/ch4/netmod/ofi/ofi_comm.h index bf17dab..3c7ed98 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_comm.h +++ b/src/mpid/ch4/netmod/ofi/ofi_comm.h @@ -15,10 +15,10 @@ #include "mpl_utlist.h" #undef FUNCNAME -#define FUNCNAME MPIDI_NM_comm_create_hook +#define FUNCNAME MPIDI_NM_mpi_comm_create_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_create_hook(MPIR_Comm * comm) +static inline int MPIDI_NM_mpi_comm_create_hook(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_COMM_CREATE); @@ -42,10 +42,10 @@ static inline int MPIDI_NM_comm_create_hook(MPIR_Comm * comm) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_comm_free_hook +#define FUNCNAME MPIDI_NM_mpi_comm_free_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_free_hook(MPIR_Comm * comm) +static inline int MPIDI_NM_mpi_comm_free_hook(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_COMM_DESTROY); diff --git a/src/mpid/ch4/netmod/ofi/ofi_datatype.h b/src/mpid/ch4/netmod/ofi/ofi_datatype.h index 7a12b23..9e6d964 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_datatype.h +++ b/src/mpid/ch4/netmod/ofi/ofi_datatype.h @@ -13,12 +13,12 @@ #include "ofi_impl.h" -static inline int MPIDI_NM_type_free_hook(MPIR_Datatype * datatype_p) +static inline int MPIDI_NM_mpi_type_free_hook(MPIR_Datatype * datatype_p) { return 0; } -static inline int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) +static inline int MPIDI_NM_mpi_type_create_hook(MPIR_Datatype * datatype_p) { return 0; } diff --git a/src/mpid/ch4/netmod/ofi/ofi_init.h b/src/mpid/ch4/netmod/ofi/ofi_init.h index 149f159..9046bf2 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_init.h +++ b/src/mpid/ch4/netmod/ofi/ofi_init.h @@ -392,7 +392,7 @@ static inline int MPIDI_OFI_init_generic(int rank, MPIR_Assert(MPIDI_OFI_DEFAULT_SHORT_SEND_SIZE <= MPIDI_Global.max_send); MPIDI_Global.am_buf_pool = MPIDI_CH4U_create_buf_pool(MPIDI_OFI_BUF_POOL_NUM, MPIDI_OFI_BUF_POOL_SIZE); - mpi_errno = MPIDI_CH4U_init(comm_world, comm_self, num_contexts, netmod_contexts); + mpi_errno = MPIDI_CH4U_mpi_init(comm_world, comm_self, num_contexts, netmod_contexts); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -482,16 +482,16 @@ static inline int MPIDI_OFI_init_generic(int rank, #undef FUNCNAME -#define FUNCNAME MPIDI_NM_init +#define FUNCNAME MPIDI_NM_mpi_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_init(int rank, - int size, - int appnum, - int *tag_ub, - MPIR_Comm * comm_world, - MPIR_Comm * comm_self, - int spawned, int num_contexts, void **netmod_contexts) +static inline int MPIDI_NM_mpi_init(int rank, + int size, + int appnum, + int *tag_ub, + MPIR_Comm * comm_world, + MPIR_Comm * comm_self, + int spawned, int num_contexts, void **netmod_contexts) { int mpi_errno; mpi_errno = MPIDI_OFI_init_generic(rank, size, appnum, tag_ub, comm_world, @@ -562,7 +562,7 @@ static inline int MPIDI_OFI_finalize_generic(int do_scalable_ep, int do_am, int comm = MPIR_Process.comm_self; MPIR_Comm_release_always(comm); - MPIDI_CH4U_finalize(); + MPIDI_CH4U_mpi_finalize(); MPIDI_OFI_map_destroy(MPIDI_Global.win_map); @@ -589,13 +589,13 @@ static inline int MPIDI_OFI_finalize_generic(int do_scalable_ep, int do_am, int goto fn_exit; } -static inline int MPIDI_NM_finalize(void) +static inline int MPIDI_NM_mpi_finalize(void) { return MPIDI_OFI_finalize_generic(MPIDI_OFI_ENABLE_SCALABLE_ENDPOINTS, MPIDI_OFI_ENABLE_AM, MPIDI_OFI_ENABLE_STX_RMA); } -static inline void *MPIDI_NM_alloc_mem(size_t size, MPIR_Info * info_ptr) +static inline void *MPIDI_NM_mpi_alloc_mem(size_t size, MPIR_Info * info_ptr) { void *ap; @@ -603,7 +603,7 @@ static inline void *MPIDI_NM_alloc_mem(size_t size, MPIR_Info * info_ptr) return ap; } -static inline int MPIDI_NM_free_mem(void *ptr) +static inline int MPIDI_NM_mpi_free_mem(void *ptr) { int mpi_errno = MPI_SUCCESS; MPL_free(ptr); diff --git a/src/mpid/ch4/netmod/ofi/ofi_op.h b/src/mpid/ch4/netmod/ofi/ofi_op.h index 7fb4904..f21c99b 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_op.h +++ b/src/mpid/ch4/netmod/ofi/ofi_op.h @@ -13,12 +13,12 @@ #include "ofi_impl.h" -static inline int MPIDI_NM_op_free_hook(MPIR_Op * op_p) +static inline int MPIDI_NM_mpi_op_free_hook(MPIR_Op * op_p) { return 0; } -static inline int MPIDI_NM_op_create_hook(MPIR_Op * op_p) +static inline int MPIDI_NM_mpi_op_create_hook(MPIR_Op * op_p) { return 0; } diff --git a/src/mpid/ch4/netmod/ofi/ofi_probe.h b/src/mpid/ch4/netmod/ofi/ofi_probe.h index b2eaff4..e7b57c1 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_probe.h +++ b/src/mpid/ch4/netmod/ofi/ofi_probe.h @@ -124,14 +124,14 @@ static inline int MPIDI_NM_probe(int source, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_improbe +#define FUNCNAME MPIDI_NM_mpi_improbe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_improbe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, - int *flag, MPIR_Request ** message, MPI_Status * status) +static inline int MPIDI_NM_mpi_improbe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, + int *flag, MPIR_Request ** message, MPI_Status * status) { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_NETMOD_IMPROBE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_NETMOD_OFI_NETMOD_IMPROBE); @@ -149,13 +149,13 @@ static inline int MPIDI_NM_improbe(int source, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iprobe +#define FUNCNAME MPIDI_NM_mpi_iprobe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iprobe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, int *flag, MPI_Status * status) +static inline int MPIDI_NM_mpi_iprobe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, int *flag, MPI_Status * status) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_NETMOD_IPROBE); diff --git a/src/mpid/ch4/netmod/ofi/ofi_recv.h b/src/mpid/ch4/netmod/ofi/ofi_recv.h index bed547d..375b73d 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_recv.h +++ b/src/mpid/ch4/netmod/ofi/ofi_recv.h @@ -117,17 +117,17 @@ __ALWAYS_INLINE__ int MPIDI_OFI_do_irecv(void *buf, #undef FUNCNAME -#define FUNCNAME MPIDI_NM_recv +#define FUNCNAME MPIDI_NM_mpi_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_recv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, - MPI_Status * status, MPIR_Request ** request) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_recv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, + MPI_Status * status, MPIR_Request ** request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_RECV); @@ -139,16 +139,16 @@ __ALWAYS_INLINE__ int MPIDI_NM_recv(void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_recv_init +#define FUNCNAME MPIDI_NM_mpi_recv_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_recv_init(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_recv_init(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { MPIR_Request *rreq; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_RECV_INIT); @@ -184,13 +184,13 @@ __ALWAYS_INLINE__ int MPIDI_NM_recv_init(void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_imrecv +#define FUNCNAME MPIDI_NM_mpi_imrecv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_imrecv(void *buf, - int count, - MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_imrecv(void *buf, + int count, + MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp) { int mpi_errno = MPI_SUCCESS; MPIR_Request *rreq; @@ -220,15 +220,16 @@ __ALWAYS_INLINE__ int MPIDI_NM_imrecv(void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_irecv +#define FUNCNAME MPIDI_NM_mpi_irecv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_irecv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_irecv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_IRECV); @@ -240,10 +241,10 @@ __ALWAYS_INLINE__ int MPIDI_NM_irecv(void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_cancel_recv +#define FUNCNAME MPIDI_NM_mpi_cancel_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_cancel_recv(MPIR_Request * rreq) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_cancel_recv(MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch4/netmod/ofi/ofi_rma.h b/src/mpid/ch4/netmod/ofi/ofi_rma.h index 0675b18..531c96e 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_rma.h +++ b/src/mpid/ch4/netmod/ofi/ofi_rma.h @@ -377,15 +377,15 @@ static inline int MPIDI_OFI_do_put(const void *origin_addr, #undef FUNCNAME -#define FUNCNAME MPIDI_NM_put +#define FUNCNAME MPIDI_NM_mpi_put #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_put(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_NM_mpi_put(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_PUT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_NETMOD_OFI_PUT); @@ -525,15 +525,15 @@ static inline int MPIDI_OFI_do_get(void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_get +#define FUNCNAME MPIDI_NM_mpi_get #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_get(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_NM_mpi_get(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { int origin_contig, target_contig, mpi_errno = MPI_SUCCESS; MPIDI_OFI_win_datatype_t origin_dt, target_dt; @@ -605,17 +605,17 @@ static inline int MPIDI_NM_get(void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_rput +#define FUNCNAME MPIDI_NM_mpi_rput #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_rput(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rput(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_RPUT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_NETMOD_OFI_RPUT); @@ -660,14 +660,15 @@ static inline int MPIDI_NM_rput(const void *origin_addr, #undef FUNCNAME -#define FUNCNAME MPIDI_NM_compare_and_swap +#define FUNCNAME MPIDI_NM_mpi_compare_and_swap #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_compare_and_swap(const void *origin_addr, - const void *compare_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, MPIR_Win * win) +static inline int MPIDI_NM_mpi_compare_and_swap(const void *origin_addr, + const void *compare_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp, + MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; enum fi_op fi_op; @@ -894,12 +895,13 @@ static inline int MPIDI_OFI_do_accumulate(const void *origin_addr, am_fallback: /* Fall back to active message */ MPIDI_OFI_win_request_complete(req); - return MPIDI_CH4U_accumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, op, win); + return MPIDI_CH4U_mpi_accumulate(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, op, + win); } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_get_accumulate +#define FUNCNAME MPIDI_NM_mpi_get_accumulate #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static inline int MPIDI_OFI_do_get_accumulate(const void *origin_addr, @@ -1095,25 +1097,25 @@ static inline int MPIDI_OFI_do_get_accumulate(const void *origin_addr, goto fn_exit; am_fallback: MPIDI_OFI_win_request_complete(req); - return MPIDI_CH4U_get_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win); + return MPIDI_CH4U_mpi_get_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win); } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_raccumulate +#define FUNCNAME MPIDI_NM_mpi_raccumulate #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_raccumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_raccumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, MPIR_Request ** request) { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_RACCUMULATE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_NETMOD_OFI_RACCUMULATE); @@ -1134,20 +1136,20 @@ static inline int MPIDI_NM_raccumulate(const void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_rget_accumulate +#define FUNCNAME MPIDI_NM_mpi_rget_accumulate #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_rget_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rget_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_Request *rreq; @@ -1164,14 +1166,14 @@ static inline int MPIDI_NM_rget_accumulate(const void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_fetch_and_op +#define FUNCNAME MPIDI_NM_mpi_fetch_and_op #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_fetch_and_op(const void *origin_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, - MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) +static inline int MPIDI_NM_mpi_fetch_and_op(const void *origin_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, + MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_FETCH_AND_OP); @@ -1189,17 +1191,17 @@ static inline int MPIDI_NM_fetch_and_op(const void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_rget +#define FUNCNAME MPIDI_NM_mpi_rget #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_rget(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rget(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_RGET); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_NETMOD_OFI_RGET); @@ -1242,19 +1244,20 @@ static inline int MPIDI_NM_rget(void *origin_addr, #undef FUNCNAME -#define FUNCNAME MPIDI_NM_get_accumulate +#define FUNCNAME MPIDI_NM_mpi_get_accumulate #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_get_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) +static inline int MPIDI_NM_mpi_get_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_GET_ACCUMULATE); @@ -1268,16 +1271,16 @@ static inline int MPIDI_NM_get_accumulate(const void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_accumulate +#define FUNCNAME MPIDI_NM_mpi_accumulate #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) +static inline int MPIDI_NM_mpi_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_ACCUMULATE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_NETMOD_OFI_ACCUMULATE); diff --git a/src/mpid/ch4/netmod/ofi/ofi_send.h b/src/mpid/ch4/netmod/ofi/ofi_send.h index 8cc943d..43a7e4c 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_send.h +++ b/src/mpid/ch4/netmod/ofi/ofi_send.h @@ -331,10 +331,10 @@ __ALWAYS_INLINE__ int MPIDI_OFI_persistent_send(MPIDI_OFI_SENDPARAMS) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_send +#define FUNCNAME MPIDI_NM_mpi_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_send(MPIDI_OFI_SENDPARAMS) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_send(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_SEND); @@ -374,10 +374,10 @@ __ALWAYS_INLINE__ int MPIDI_NM_irsend(MPIDI_OFI_SENDPARAMS) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ssend +#define FUNCNAME MPIDI_NM_mpi_ssend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_ssend(MPIDI_OFI_SENDPARAMS) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_ssend(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_SSEND); @@ -389,10 +389,10 @@ __ALWAYS_INLINE__ int MPIDI_NM_ssend(MPIDI_OFI_SENDPARAMS) #undef FUNCNAME -#define FUNCNAME MPIDI_NM_isend +#define FUNCNAME MPIDI_NM_mpi_isend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_isend(MPIDI_OFI_SENDPARAMS) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_isend(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_ISEND); @@ -403,10 +403,10 @@ __ALWAYS_INLINE__ int MPIDI_NM_isend(MPIDI_OFI_SENDPARAMS) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_issend +#define FUNCNAME MPIDI_NM_mpi_issend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_issend(MPIDI_OFI_SENDPARAMS) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_issend(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_ISSEND); @@ -418,10 +418,10 @@ __ALWAYS_INLINE__ int MPIDI_NM_issend(MPIDI_OFI_SENDPARAMS) #undef FUNCNAME -#define FUNCNAME MPIDI_NM_startall +#define FUNCNAME MPIDI_NM_mpi_startall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_startall(int count, MPIR_Request * requests[]) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_startall(int count, MPIR_Request * requests[]) { int rc = MPI_SUCCESS, i; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_STARTALL); @@ -432,13 +432,13 @@ __ALWAYS_INLINE__ int MPIDI_NM_startall(int count, MPIR_Request * requests[]) switch (MPIDI_OFI_REQUEST(preq, util.persist.type)) { #ifdef MPIDI_BUILD_CH4_SHM - STARTALL_CASE(MPIDI_PTYPE_RECV, MPIDI_NM_irecv, preq->comm->recvcontext_id); + STARTALL_CASE(MPIDI_PTYPE_RECV, MPIDI_NM_mpi_irecv, preq->comm->recvcontext_id); #else STARTALL_CASE(MPIDI_PTYPE_RECV, MPIDI_Irecv, preq->comm->recvcontext_id); #endif #ifdef MPIDI_BUILD_CH4_SHM - STARTALL_CASE(MPIDI_PTYPE_SEND, MPIDI_NM_isend, preq->comm->context_id); + STARTALL_CASE(MPIDI_PTYPE_SEND, MPIDI_NM_mpi_isend, preq->comm->context_id); #else STARTALL_CASE(MPIDI_PTYPE_SEND, MPIDI_Isend, preq->comm->context_id); #endif @@ -489,10 +489,10 @@ __ALWAYS_INLINE__ int MPIDI_NM_startall(int count, MPIR_Request * requests[]) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_send_init +#define FUNCNAME MPIDI_NM_mpi_send_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_send_init(MPIDI_OFI_SENDPARAMS) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_send_init(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_SEND_INIT); @@ -504,10 +504,10 @@ __ALWAYS_INLINE__ int MPIDI_NM_send_init(MPIDI_OFI_SENDPARAMS) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ssend_init +#define FUNCNAME MPIDI_NM_mpi_ssend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_ssend_init(MPIDI_OFI_SENDPARAMS) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_ssend_init(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_SSEND_INIT); @@ -519,10 +519,10 @@ __ALWAYS_INLINE__ int MPIDI_NM_ssend_init(MPIDI_OFI_SENDPARAMS) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_bsend_init +#define FUNCNAME MPIDI_NM_mpi_bsend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_bsend_init(MPIDI_OFI_SENDPARAMS) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_bsend_init(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_BSEND_INIT); @@ -534,10 +534,10 @@ __ALWAYS_INLINE__ int MPIDI_NM_bsend_init(MPIDI_OFI_SENDPARAMS) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_rsend_init +#define FUNCNAME MPIDI_NM_mpi_rsend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_rsend_init(MPIDI_OFI_SENDPARAMS) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_rsend_init(MPIDI_OFI_SENDPARAMS) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_RSEND_INIT); @@ -549,10 +549,10 @@ __ALWAYS_INLINE__ int MPIDI_NM_rsend_init(MPIDI_OFI_SENDPARAMS) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_cancel_send +#define FUNCNAME MPIDI_NM_mpi_cancel_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -__ALWAYS_INLINE__ int MPIDI_NM_cancel_send(MPIR_Request * sreq) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_cancel_send(MPIR_Request * sreq) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_CANCEL_SEND); diff --git a/src/mpid/ch4/netmod/ofi/ofi_spawn.h b/src/mpid/ch4/netmod/ofi/ofi_spawn.h index 9b109d8..a0c0272 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_spawn.h +++ b/src/mpid/ch4/netmod/ofi/ofi_spawn.h @@ -380,12 +380,12 @@ static inline int MPIDI_OFI_dynproc_exchange_map(int root, #undef FUNCNAME -#define FUNCNAME MPIDI_NM_comm_connect +#define FUNCNAME MPIDI_NM_mpi_comm_connect #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_connect(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm) +static inline int MPIDI_NM_mpi_comm_connect(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm) { int entries, mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_COMM_CONNECT); @@ -437,10 +437,10 @@ static inline int MPIDI_NM_comm_connect(const char *port_name, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_comm_disconnect +#define FUNCNAME MPIDI_NM_mpi_comm_disconnect #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_disconnect(MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_comm_disconnect(MPIR_Comm * comm_ptr) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -462,7 +462,7 @@ static inline int MPIDI_NM_comm_disconnect(MPIR_Comm * comm_ptr) #define FUNCNAME MPIDI_NM_comm_open_port #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_open_port(MPIR_Info * info_ptr, char *port_name) +static inline int MPIDI_NM_mpi_open_port(MPIR_Info * info_ptr, char *port_name) { int mpi_errno = MPI_SUCCESS; int str_errno = MPL_STR_SUCCESS; @@ -488,7 +488,7 @@ static inline int MPIDI_NM_open_port(MPIR_Info * info_ptr, char *port_name) #define FUNCNAME MPIDI_NM_comm_close_port #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_close_port(const char *port_name) +static inline int MPIDI_NM_mpi_close_port(const char *port_name) { int mpi_errno = MPI_SUCCESS; int port_name_tag; @@ -507,9 +507,9 @@ static inline int MPIDI_NM_close_port(const char *port_name) #define FUNCNAME MPIDI_NM_comm_close_port #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_accept(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm) +static inline int MPIDI_NM_mpi_comm_accept(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm) { int entries, mpi_errno = MPI_SUCCESS; char *child_addr_table = NULL; diff --git a/src/mpid/ch4/netmod/ofi/ofi_win.h b/src/mpid/ch4/netmod/ofi/ofi_win.h index 32e7520..5f75f71 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_win.h +++ b/src/mpid/ch4/netmod/ofi/ofi_win.h @@ -304,16 +304,16 @@ static inline int MPIDI_Win_progress_fence(MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_set_info +#define FUNCNAME MPIDI_NM_mpi_win_set_info #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_set_info(MPIR_Win * win, MPIR_Info * info) +static inline int MPIDI_NM_mpi_win_set_info(MPIR_Win * win, MPIR_Info * info) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_WIN_SET_INFO); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_NETMOD_OFI_WIN_SET_INFO); - mpi_errno = MPIDI_CH4R_win_set_info(win, info); + mpi_errno = MPIDI_CH4R_mpi_win_set_info(win, info); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -325,10 +325,10 @@ static inline int MPIDI_NM_win_set_info(MPIR_Win * win, MPIR_Info * info) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_start +#define FUNCNAME MPIDI_NM_mpi_win_start #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_start(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_start(MPIR_Group * group, int assert, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; @@ -357,10 +357,10 @@ static inline int MPIDI_NM_win_start(MPIR_Group * group, int assert, MPIR_Win * #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_complete +#define FUNCNAME MPIDI_NM_mpi_win_complete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_complete(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_complete(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; @@ -400,10 +400,10 @@ static inline int MPIDI_NM_win_complete(MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_post +#define FUNCNAME MPIDI_NM_mpi_win_post #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_post(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_post(MPIR_Group * group, int assert, MPIR_Win * win) { int peer, index, mpi_errno = MPI_SUCCESS; MPIDI_OFI_win_control_t msg; @@ -440,10 +440,10 @@ static inline int MPIDI_NM_win_post(MPIR_Group * group, int assert, MPIR_Win * w } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_wait +#define FUNCNAME MPIDI_NM_mpi_win_wait #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_wait(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_wait(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; @@ -472,10 +472,10 @@ static inline int MPIDI_NM_win_wait(MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_test +#define FUNCNAME MPIDI_NM_mpi_win_test #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_test(MPIR_Win * win, int *flag) +static inline int MPIDI_NM_mpi_win_test(MPIR_Win * win, int *flag) { int mpi_errno = MPI_SUCCESS; @@ -507,10 +507,10 @@ static inline int MPIDI_NM_win_test(MPIR_Win * win, int *flag) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_lock +#define FUNCNAME MPIDI_NM_mpi_win_lock #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; @@ -546,10 +546,10 @@ static inline int MPIDI_NM_win_lock(int lock_type, int rank, int assert, MPIR_Wi } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_unlock +#define FUNCNAME MPIDI_NM_mpi_win_unlock #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_unlock(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_unlock(int rank, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_WIN_UNLOCK); @@ -583,16 +583,16 @@ static inline int MPIDI_NM_win_unlock(int rank, MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_get_info +#define FUNCNAME MPIDI_NM_mpi_win_get_info #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) +static inline int MPIDI_NM_mpi_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_WIN_GET_INFO); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_NETMOD_OFI_WIN_GET_INFO); - mpi_errno = MPIDI_CH4R_win_get_info(win, info_p_p); + mpi_errno = MPIDI_CH4R_mpi_win_get_info(win, info_p_p); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -605,10 +605,10 @@ static inline int MPIDI_NM_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_free +#define FUNCNAME MPIDI_NM_mpi_win_free #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_free(MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_free(MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -650,10 +650,10 @@ static inline int MPIDI_NM_win_free(MPIR_Win ** win_ptr) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_fence +#define FUNCNAME MPIDI_NM_mpi_win_fence #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_fence(int massert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_fence(int massert, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -688,13 +688,14 @@ static inline int MPIDI_NM_win_fence(int massert, MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_create +#define FUNCNAME MPIDI_NM_mpi_win_create #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_create(void *base, - MPI_Aint length, - int disp_unit, - MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_create(void *base, + MPI_Aint length, + int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -731,10 +732,10 @@ static inline int MPIDI_NM_win_create(void *base, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_attach +#define FUNCNAME MPIDI_NM_mpi_win_attach #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_attach(MPIR_Win * win, void *base, MPI_Aint size) +static inline int MPIDI_NM_mpi_win_attach(MPIR_Win * win, void *base, MPI_Aint size) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_WIN_ATTACH); @@ -750,14 +751,14 @@ static inline int MPIDI_NM_win_attach(MPIR_Win * win, void *base, MPI_Aint size) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_allocate_shared +#define FUNCNAME MPIDI_NM_mpi_win_allocate_shared #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_allocate_shared(MPI_Aint size, - int disp_unit, - MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, - void **base_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_allocate_shared(MPI_Aint size, + int disp_unit, + MPIR_Info * info_ptr, + MPIR_Comm * comm_ptr, + void **base_ptr, MPIR_Win ** win_ptr) { int i = 0, fd = -1, rc, first = 0, mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -912,10 +913,10 @@ static inline int MPIDI_NM_win_allocate_shared(MPI_Aint size, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_detach +#define FUNCNAME MPIDI_NM_mpi_win_detach #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_detach(MPIR_Win * win, const void *base) +static inline int MPIDI_NM_mpi_win_detach(MPIR_Win * win, const void *base) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_WIN_DETACH); @@ -930,12 +931,12 @@ static inline int MPIDI_NM_win_detach(MPIR_Win * win, const void *base) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_shared_query +#define FUNCNAME MPIDI_NM_mpi_win_shared_query #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_shared_query(MPIR_Win * win, - int rank, - MPI_Aint * size, int *disp_unit, void *baseptr) +static inline int MPIDI_NM_mpi_win_shared_query(MPIR_Win * win, + int rank, + MPI_Aint * size, int *disp_unit, void *baseptr) { int mpi_errno = MPI_SUCCESS; @@ -966,13 +967,13 @@ static inline int MPIDI_NM_win_shared_query(MPIR_Win * win, #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_allocate +#define FUNCNAME MPIDI_NM_mpi_win_allocate #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_allocate(MPI_Aint size, - int disp_unit, - MPIR_Info * info, - MPIR_Comm * comm, void *baseptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_allocate(MPI_Aint size, + int disp_unit, + MPIR_Info * info, + MPIR_Comm * comm, void *baseptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -1014,10 +1015,10 @@ static inline int MPIDI_NM_win_allocate(MPI_Aint size, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_flush +#define FUNCNAME MPIDI_NM_mpi_win_flush #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_flush(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush(int rank, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_WIN_FLUSH); @@ -1035,10 +1036,10 @@ static inline int MPIDI_NM_win_flush(int rank, MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_flush_local_all +#define FUNCNAME MPIDI_NM_mpi_win_flush_local_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_flush_local_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_local_all(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_WIN_FLUSH_LOCAL_ALL); @@ -1055,10 +1056,10 @@ static inline int MPIDI_NM_win_flush_local_all(MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_unlock_all +#define FUNCNAME MPIDI_NM_mpi_win_unlock_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_unlock_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_unlock_all(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_WIN_UNLOCK_ALL); @@ -1102,11 +1103,11 @@ static inline int MPIDI_NM_win_unlock_all(MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_create_dynamic +#define FUNCNAME MPIDI_NM_mpi_win_create_dynamic #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_create_dynamic(MPIR_Info * info, - MPIR_Comm * comm, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_create_dynamic(MPIR_Info * info, + MPIR_Comm * comm, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; int rc = MPI_SUCCESS; @@ -1139,10 +1140,10 @@ static inline int MPIDI_NM_win_create_dynamic(MPIR_Info * info, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_flush_local +#define FUNCNAME MPIDI_NM_mpi_win_flush_local #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_flush_local(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_local(int rank, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_WIN_FLUSH_LOCAL); @@ -1161,10 +1162,10 @@ static inline int MPIDI_NM_win_flush_local(int rank, MPIR_Win * win) #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_sync +#define FUNCNAME MPIDI_NM_mpi_win_sync #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_sync(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_sync(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_WIN_SYNC); @@ -1182,10 +1183,10 @@ static inline int MPIDI_NM_win_sync(MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_flush_all +#define FUNCNAME MPIDI_NM_mpi_win_flush_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_flush_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_all(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_OFI_WIN_FLUSH_ALL); @@ -1202,10 +1203,10 @@ static inline int MPIDI_NM_win_flush_all(MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_win_lock_all +#define FUNCNAME MPIDI_NM_mpi_win_lock_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_win_lock_all(int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_lock_all(int assert, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIDI_CH4U_win_lock_info *lockQ; diff --git a/src/mpid/ch4/netmod/portals4/func_table.c b/src/mpid/ch4/netmod/portals4/func_table.c index 59cfe2b..e707315 100644 --- a/src/mpid/ch4/netmod/portals4/func_table.c +++ b/src/mpid/ch4/netmod/portals4/func_table.c @@ -14,21 +14,21 @@ #include "netmod_direct.h" MPIDI_NM_funcs_t MPIDI_NM_portals4_funcs = { - MPIDI_NM_init, - MPIDI_NM_finalize, + MPIDI_NM_mpi_init, + MPIDI_NM_mpi_finalize, MPIDI_NM_progress, - MPIDI_NM_comm_connect, - MPIDI_NM_comm_disconnect, - MPIDI_NM_open_port, - MPIDI_NM_close_port, - MPIDI_NM_comm_accept, + MPIDI_NM_mpi_comm_connect, + MPIDI_NM_mpi_comm_disconnect, + MPIDI_NM_mpi_open_port, + MPIDI_NM_mpi_close_port, + MPIDI_NM_mpi_comm_accept, MPIDI_NM_comm_get_lpid, MPIDI_NM_gpid_get, MPIDI_NM_getallincomm, MPIDI_NM_gpid_tolpidarray, MPIDI_NM_create_intercomm_from_lpids, - MPIDI_NM_comm_create_hook, - MPIDI_NM_comm_free_hook, + MPIDI_NM_mpi_comm_create_hook, + MPIDI_NM_mpi_comm_free_hook, MPIDI_NM_am_request_init, MPIDI_NM_am_request_finalize, MPIDI_NM_am_reg_handler, @@ -42,108 +42,108 @@ MPIDI_NM_funcs_t MPIDI_NM_portals4_funcs = { }; MPIDI_NM_native_funcs_t MPIDI_NM_native_portals4_funcs = { - MPIDI_NM_send, - MPIDI_NM_ssend, - MPIDI_NM_startall, - MPIDI_NM_send_init, - MPIDI_NM_ssend_init, - MPIDI_NM_rsend_init, - MPIDI_NM_bsend_init, - MPIDI_NM_isend, - MPIDI_NM_issend, - MPIDI_NM_cancel_send, - MPIDI_NM_recv_init, - MPIDI_NM_recv, - MPIDI_NM_irecv, - MPIDI_NM_imrecv, - MPIDI_NM_cancel_recv, - MPIDI_NM_alloc_mem, - MPIDI_NM_free_mem, - MPIDI_NM_improbe, - MPIDI_NM_iprobe, - MPIDI_NM_win_set_info, - MPIDI_NM_win_shared_query, - MPIDI_NM_put, - MPIDI_NM_win_start, - MPIDI_NM_win_complete, - MPIDI_NM_win_post, - MPIDI_NM_win_wait, - MPIDI_NM_win_test, - MPIDI_NM_win_lock, - MPIDI_NM_win_unlock, - MPIDI_NM_win_get_info, - MPIDI_NM_get, - MPIDI_NM_win_free, - MPIDI_NM_win_fence, - MPIDI_NM_win_create, - MPIDI_NM_accumulate, - MPIDI_NM_win_attach, - MPIDI_NM_win_allocate_shared, - MPIDI_NM_rput, - MPIDI_NM_win_flush_local, - MPIDI_NM_win_detach, - MPIDI_NM_compare_and_swap, - MPIDI_NM_raccumulate, - MPIDI_NM_rget_accumulate, - MPIDI_NM_fetch_and_op, - MPIDI_NM_win_allocate, - MPIDI_NM_win_flush, - MPIDI_NM_win_flush_local_all, - MPIDI_NM_win_unlock_all, - MPIDI_NM_win_create_dynamic, - MPIDI_NM_rget, - MPIDI_NM_win_sync, - MPIDI_NM_win_flush_all, - MPIDI_NM_get_accumulate, - MPIDI_NM_win_lock_all, + MPIDI_NM_mpi_send, + MPIDI_NM_mpi_ssend, + MPIDI_NM_mpi_startall, + MPIDI_NM_mpi_send_init, + MPIDI_NM_mpi_ssend_init, + MPIDI_NM_mpi_rsend_init, + MPIDI_NM_mpi_bsend_init, + MPIDI_NM_mpi_isend, + MPIDI_NM_mpi_issend, + MPIDI_NM_mpi_cancel_send, + MPIDI_NM_mpi_recv_init, + MPIDI_NM_mpi_recv, + MPIDI_NM_mpi_irecv, + MPIDI_NM_mpi_imrecv, + MPIDI_NM_mpi_cancel_recv, + MPIDI_NM_mpi_alloc_mem, + MPIDI_NM_mpi_free_mem, + MPIDI_NM_mpi_improbe, + MPIDI_NM_mpi_iprobe, + MPIDI_NM_mpi_win_set_info, + MPIDI_NM_mpi_win_shared_query, + MPIDI_NM_mpi_put, + MPIDI_NM_mpi_win_start, + MPIDI_NM_mpi_win_complete, + MPIDI_NM_mpi_win_post, + MPIDI_NM_mpi_win_wait, + MPIDI_NM_mpi_win_test, + MPIDI_NM_mpi_win_lock, + MPIDI_NM_mpi_win_unlock, + MPIDI_NM_mpi_win_get_info, + MPIDI_NM_mpi_get, + MPIDI_NM_mpi_win_free, + MPIDI_NM_mpi_win_fence, + MPIDI_NM_mpi_win_create, + MPIDI_NM_mpi_accumulate, + MPIDI_NM_mpi_win_attach, + MPIDI_NM_mpi_win_allocate_shared, + MPIDI_NM_mpi_rput, + MPIDI_NM_mpi_win_flush_local, + MPIDI_NM_mpi_win_detach, + MPIDI_NM_mpi_compare_and_swap, + MPIDI_NM_mpi_raccumulate, + MPIDI_NM_mpi_rget_accumulate, + MPIDI_NM_mpi_fetch_and_op, + MPIDI_NM_mpi_win_allocate, + MPIDI_NM_mpi_win_flush, + MPIDI_NM_mpi_win_flush_local_all, + MPIDI_NM_mpi_win_unlock_all, + MPIDI_NM_mpi_win_create_dynamic, + MPIDI_NM_mpi_rget, + MPIDI_NM_mpi_win_sync, + MPIDI_NM_mpi_win_flush_all, + MPIDI_NM_mpi_get_accumulate, + MPIDI_NM_mpi_win_lock_all, MPIDI_NM_rank_is_local, - MPIDI_NM_barrier, - MPIDI_NM_bcast, - MPIDI_NM_allreduce, - MPIDI_NM_allgather, - MPIDI_NM_allgatherv, - MPIDI_NM_scatter, - MPIDI_NM_scatterv, - MPIDI_NM_gather, - MPIDI_NM_gatherv, - MPIDI_NM_alltoall, - MPIDI_NM_alltoallv, - MPIDI_NM_alltoallw, - MPIDI_NM_reduce, - MPIDI_NM_reduce_scatter, - MPIDI_NM_reduce_scatter_block, - MPIDI_NM_scan, - MPIDI_NM_exscan, - MPIDI_NM_neighbor_allgather, - MPIDI_NM_neighbor_allgatherv, - MPIDI_NM_neighbor_alltoall, - MPIDI_NM_neighbor_alltoallv, - MPIDI_NM_neighbor_alltoallw, - MPIDI_NM_ineighbor_allgather, - MPIDI_NM_ineighbor_allgatherv, - MPIDI_NM_ineighbor_alltoall, - MPIDI_NM_ineighbor_alltoallv, - MPIDI_NM_ineighbor_alltoallw, - MPIDI_NM_ibarrier, - MPIDI_NM_ibcast, - MPIDI_NM_iallgather, - MPIDI_NM_iallgatherv, - MPIDI_NM_iallreduce, - MPIDI_NM_ialltoall, - MPIDI_NM_ialltoallv, - MPIDI_NM_ialltoallw, - MPIDI_NM_iexscan, - MPIDI_NM_igather, - MPIDI_NM_igatherv, - MPIDI_NM_ireduce_scatter_block, - MPIDI_NM_ireduce_scatter, - MPIDI_NM_ireduce, - MPIDI_NM_iscan, - MPIDI_NM_iscatter, - MPIDI_NM_iscatterv, - MPIDI_NM_type_create_hook, - MPIDI_NM_type_free_hook, - MPIDI_NM_op_create_hook, - MPIDI_NM_op_free_hook + MPIDI_NM_mpi_barrier, + MPIDI_NM_mpi_bcast, + MPIDI_NM_mpi_allreduce, + MPIDI_NM_mpi_allgather, + MPIDI_NM_mpi_allgatherv, + MPIDI_NM_mpi_scatter, + MPIDI_NM_mpi_scatterv, + MPIDI_NM_mpi_gather, + MPIDI_NM_mpi_gatherv, + MPIDI_NM_mpi_alltoall, + MPIDI_NM_mpi_alltoallv, + MPIDI_NM_mpi_alltoallw, + MPIDI_NM_mpi_reduce, + MPIDI_NM_mpi_reduce_scatter, + MPIDI_NM_mpi_reduce_scatter_block, + MPIDI_NM_mpi_scan, + MPIDI_NM_mpi_exscan, + MPIDI_NM_mpi_neighbor_allgather, + MPIDI_NM_mpi_neighbor_allgatherv, + MPIDI_NM_mpi_neighbor_alltoall, + MPIDI_NM_mpi_neighbor_alltoallv, + MPIDI_NM_mpi_neighbor_alltoallw, + MPIDI_NM_mpi_ineighbor_allgather, + MPIDI_NM_mpi_ineighbor_allgatherv, + MPIDI_NM_mpi_ineighbor_alltoall, + MPIDI_NM_mpi_ineighbor_alltoallv, + MPIDI_NM_mpi_ineighbor_alltoallw, + MPIDI_NM_mpi_ibarrier, + MPIDI_NM_mpi_ibcast, + MPIDI_NM_mpi_iallgather, + MPIDI_NM_mpi_iallgatherv, + MPIDI_NM_mpi_iallreduce, + MPIDI_NM_mpi_ialltoall, + MPIDI_NM_mpi_ialltoallv, + MPIDI_NM_mpi_ialltoallw, + MPIDI_NM_mpi_iexscan, + MPIDI_NM_mpi_igather, + MPIDI_NM_mpi_igatherv, + MPIDI_NM_mpi_ireduce_scatter_block, + MPIDI_NM_mpi_ireduce_scatter, + MPIDI_NM_mpi_ireduce, + MPIDI_NM_mpi_iscan, + MPIDI_NM_mpi_iscatter, + MPIDI_NM_mpi_iscatterv, + MPIDI_NM_mpi_type_create_hook, + MPIDI_NM_mpi_type_free_hook, + MPIDI_NM_mpi_op_create_hook, + MPIDI_NM_mpi_op_free_hook }; #endif diff --git a/src/mpid/ch4/netmod/portals4/ptl_coll.h b/src/mpid/ch4/netmod/portals4/ptl_coll.h index 5d7073f..ae1695c 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_coll.h +++ b/src/mpid/ch4/netmod/portals4/ptl_coll.h @@ -15,10 +15,10 @@ #include "ptl_impl.h" #undef FUNCNAME -#define FUNCNAME MPIDI_NM_barrier +#define FUNCNAME MPIDI_NM_mpi_barrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_BARRIER); @@ -31,11 +31,11 @@ static inline int MPIDI_NM_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errfla } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_bcast +#define FUNCNAME MPIDI_NM_mpi_bcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_bcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_bcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_BCAST); @@ -48,12 +48,12 @@ static inline int MPIDI_NM_bcast(void *buffer, int count, MPI_Datatype datatype, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_allreduce +#define FUNCNAME MPIDI_NM_mpi_allreduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_allreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_allreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLREDUCE); @@ -66,12 +66,12 @@ static inline int MPIDI_NM_allreduce(const void *sendbuf, void *recvbuf, int cou } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_allgather +#define FUNCNAME MPIDI_NM_mpi_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLGATHER); @@ -85,13 +85,13 @@ static inline int MPIDI_NM_allgather(const void *sendbuf, int sendcount, MPI_Dat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_allgatherv +#define FUNCNAME MPIDI_NM_mpi_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLGATHERV); @@ -105,12 +105,12 @@ static inline int MPIDI_NM_allgatherv(const void *sendbuf, int sendcount, MPI_Da } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_gather +#define FUNCNAME MPIDI_NM_mpi_gather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_GATHER); @@ -124,13 +124,13 @@ static inline int MPIDI_NM_gather(const void *sendbuf, int sendcount, MPI_Dataty } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_gatherv +#define FUNCNAME MPIDI_NM_mpi_gatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_GATHERV); @@ -144,12 +144,12 @@ static inline int MPIDI_NM_gatherv(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_scatter +#define FUNCNAME MPIDI_NM_mpi_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_SCATTER); @@ -163,13 +163,13 @@ static inline int MPIDI_NM_scatter(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_scatterv +#define FUNCNAME MPIDI_NM_mpi_scatterv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_scatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_scatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_SCATTERV); @@ -183,12 +183,12 @@ static inline int MPIDI_NM_scatterv(const void *sendbuf, const int *sendcounts, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_alltoall +#define FUNCNAME MPIDI_NM_mpi_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLTOALL); @@ -202,14 +202,14 @@ static inline int MPIDI_NM_alltoall(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_alltoallv +#define FUNCNAME MPIDI_NM_mpi_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_alltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_alltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLTOALLV); @@ -222,14 +222,14 @@ static inline int MPIDI_NM_alltoallv(const void *sendbuf, const int *sendcounts, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_alltoallw +#define FUNCNAME MPIDI_NM_mpi_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_alltoallw(const void *sendbuf, const int sendcounts[], - const int sdispls[], const MPI_Datatype sendtypes[], - void *recvbuf, const int recvcounts[], - const int rdispls[], const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_alltoallw(const void *sendbuf, const int sendcounts[], + const int sdispls[], const MPI_Datatype sendtypes[], + void *recvbuf, const int recvcounts[], + const int rdispls[], const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLTOALLW); @@ -243,12 +243,12 @@ static inline int MPIDI_NM_alltoallw(const void *sendbuf, const int sendcounts[] } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_reduce +#define FUNCNAME MPIDI_NM_mpi_reduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_reduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_reduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_REDUCE); @@ -261,12 +261,13 @@ static inline int MPIDI_NM_reduce(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_reduce_scatter +#define FUNCNAME MPIDI_NM_mpi_reduce_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_reduce_scatter(const void *sendbuf, void *recvbuf, - const int recvcounts[], MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_reduce_scatter(const void *sendbuf, void *recvbuf, + const int recvcounts[], MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_REDUCE_SCATTER); @@ -279,13 +280,13 @@ static inline int MPIDI_NM_reduce_scatter(const void *sendbuf, void *recvbuf, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_reduce_scatter_block +#define FUNCNAME MPIDI_NM_mpi_reduce_scatter_block #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_reduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_reduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_REDUCE_SCATTER_BLOCK); @@ -299,12 +300,12 @@ static inline int MPIDI_NM_reduce_scatter_block(const void *sendbuf, void *recvb } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_scan +#define FUNCNAME MPIDI_NM_mpi_scan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_scan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_scan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_SCAN); @@ -317,12 +318,12 @@ static inline int MPIDI_NM_scan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_exscan +#define FUNCNAME MPIDI_NM_mpi_exscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_exscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_exscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_EXSCAN); @@ -335,12 +336,13 @@ static inline int MPIDI_NM_exscan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_allgather +#define FUNCNAME MPIDI_NM_mpi_neighbor_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLGATHER); @@ -355,13 +357,13 @@ static inline int MPIDI_NM_neighbor_allgather(const void *sendbuf, int sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_allgatherv +#define FUNCNAME MPIDI_NM_mpi_neighbor_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLGATHERV); @@ -375,12 +377,13 @@ static inline int MPIDI_NM_neighbor_allgatherv(const void *sendbuf, int sendcoun } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_alltoall +#define FUNCNAME MPIDI_NM_mpi_neighbor_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLTOALL); @@ -394,14 +397,14 @@ static inline int MPIDI_NM_neighbor_alltoall(const void *sendbuf, int sendcount, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_alltoallv +#define FUNCNAME MPIDI_NM_mpi_neighbor_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_alltoallv(const void *sendbuf, const int sendcounts[], - const int sdispls[], MPI_Datatype sendtype, - void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, - MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLTOALLV); @@ -415,14 +418,15 @@ static inline int MPIDI_NM_neighbor_alltoallv(const void *sendbuf, const int sen } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_alltoallw +#define FUNCNAME MPIDI_NM_mpi_neighbor_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_alltoallw(const void *sendbuf, const int sendcounts[], - const MPI_Aint sdispls[], - const MPI_Datatype sendtypes[], void *recvbuf, - const int recvcounts[], const MPI_Aint rdispls[], - const MPI_Datatype recvtypes[], MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, + const int recvcounts[], const MPI_Aint rdispls[], + const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLTOALLW); @@ -436,13 +440,13 @@ static inline int MPIDI_NM_neighbor_alltoallw(const void *sendbuf, const int sen } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_allgather +#define FUNCNAME MPIDI_NM_mpi_ineighbor_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLGATHER); @@ -456,14 +460,14 @@ static inline int MPIDI_NM_ineighbor_allgather(const void *sendbuf, int sendcoun } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_allgatherv +#define FUNCNAME MPIDI_NM_mpi_ineighbor_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLGATHERV); @@ -478,13 +482,13 @@ static inline int MPIDI_NM_ineighbor_allgatherv(const void *sendbuf, int sendcou } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_alltoall +#define FUNCNAME MPIDI_NM_mpi_ineighbor_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLTOALL); @@ -498,14 +502,14 @@ static inline int MPIDI_NM_ineighbor_alltoall(const void *sendbuf, int sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_alltoallv +#define FUNCNAME MPIDI_NM_mpi_ineighbor_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], - const int sdispls[], MPI_Datatype sendtype, - void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLTOALLV); @@ -520,15 +524,15 @@ static inline int MPIDI_NM_ineighbor_alltoallv(const void *sendbuf, const int se } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_alltoallw +#define FUNCNAME MPIDI_NM_mpi_ineighbor_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], - const MPI_Aint sdispls[], - const MPI_Datatype sendtypes[], void *recvbuf, - const int recvcounts[], const MPI_Aint rdispls[], - const MPI_Datatype recvtypes[], MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, + const int recvcounts[], const MPI_Aint rdispls[], + const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLTOALLW); @@ -543,10 +547,10 @@ static inline int MPIDI_NM_ineighbor_alltoallw(const void *sendbuf, const int se } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ibarrier +#define FUNCNAME MPIDI_NM_mpi_ibarrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IBARRIER); @@ -559,11 +563,11 @@ static inline int MPIDI_NM_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ibcast +#define FUNCNAME MPIDI_NM_mpi_ibcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ibcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ibcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IBCAST); @@ -576,12 +580,12 @@ static inline int MPIDI_NM_ibcast(void *buffer, int count, MPI_Datatype datatype } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iallgather +#define FUNCNAME MPIDI_NM_mpi_iallgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLGATHER); @@ -595,12 +599,12 @@ static inline int MPIDI_NM_iallgather(const void *sendbuf, int sendcount, MPI_Da } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iallreduce +#define FUNCNAME MPIDI_NM_mpi_iallreduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iallreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_iallreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE); @@ -614,13 +618,14 @@ static inline int MPIDI_NM_iallreduce(const void *sendbuf, void *recvbuf, int co #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iallgatherv +#define FUNCNAME MPIDI_NM_mpi_iallgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_iallgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLGATHERV); @@ -634,12 +639,12 @@ static inline int MPIDI_NM_iallgatherv(const void *sendbuf, int sendcount, MPI_D } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ialltoall +#define FUNCNAME MPIDI_NM_mpi_ialltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLTOALL); @@ -653,14 +658,14 @@ static inline int MPIDI_NM_ialltoall(const void *sendbuf, int sendcount, MPI_Dat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ialltoallv +#define FUNCNAME MPIDI_NM_mpi_ialltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ialltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ialltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLTOALLV); @@ -675,14 +680,14 @@ static inline int MPIDI_NM_ialltoallv(const void *sendbuf, const int *sendcounts } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ialltoallw +#define FUNCNAME MPIDI_NM_mpi_ialltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ialltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, const MPI_Datatype sendtypes[], - void *recvbuf, const int *recvcounts, - const int *rdispls, const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ialltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, const MPI_Datatype sendtypes[], + void *recvbuf, const int *recvcounts, + const int *rdispls, const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLTOALLW); @@ -697,12 +702,12 @@ static inline int MPIDI_NM_ialltoallw(const void *sendbuf, const int *sendcounts } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iexscan +#define FUNCNAME MPIDI_NM_mpi_iexscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iexscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_iexscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IEXSCAN); @@ -715,12 +720,12 @@ static inline int MPIDI_NM_iexscan(const void *sendbuf, void *recvbuf, int count } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_igather +#define FUNCNAME MPIDI_NM_mpi_igather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IGATHER); @@ -734,13 +739,13 @@ static inline int MPIDI_NM_igather(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_igatherv +#define FUNCNAME MPIDI_NM_mpi_igatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IGATHERV); @@ -754,12 +759,13 @@ static inline int MPIDI_NM_igatherv(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ireduce_scatter_block +#define FUNCNAME MPIDI_NM_mpi_ireduce_scatter_block #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ireduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ireduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE_SCATTER_BLOCK); @@ -773,12 +779,12 @@ static inline int MPIDI_NM_ireduce_scatter_block(const void *sendbuf, void *recv } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ireduce_scatter +#define FUNCNAME MPIDI_NM_mpi_ireduce_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ireduce_scatter(const void *sendbuf, void *recvbuf, - const int recvcounts[], MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ireduce_scatter(const void *sendbuf, void *recvbuf, + const int recvcounts[], MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE_SCATTER); @@ -792,12 +798,12 @@ static inline int MPIDI_NM_ireduce_scatter(const void *sendbuf, void *recvbuf, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ireduce +#define FUNCNAME MPIDI_NM_mpi_ireduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ireduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ireduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE); @@ -810,12 +816,12 @@ static inline int MPIDI_NM_ireduce(const void *sendbuf, void *recvbuf, int count } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iscan +#define FUNCNAME MPIDI_NM_mpi_iscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_iscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ISCAN); @@ -828,13 +834,13 @@ static inline int MPIDI_NM_iscan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iscatter +#define FUNCNAME MPIDI_NM_mpi_iscatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iscatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm, MPI_Request * request) +static inline int MPIDI_NM_mpi_iscatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ISCATTER); @@ -848,14 +854,14 @@ static inline int MPIDI_NM_iscatter(const void *sendbuf, int sendcount, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iscatterv +#define FUNCNAME MPIDI_NM_mpi_iscatterv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iscatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * request) +static inline int MPIDI_NM_mpi_iscatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ISCATTERV); diff --git a/src/mpid/ch4/netmod/portals4/ptl_comm.h b/src/mpid/ch4/netmod/portals4/ptl_comm.h index 4edbcd9..c15e2f7 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_comm.h +++ b/src/mpid/ch4/netmod/portals4/ptl_comm.h @@ -14,10 +14,10 @@ #include "ptl_impl.h" #undef FUNCNAME -#define FUNCNAME MPIDI_NM_comm_create_hook +#define FUNCNAME MPIDI_NM_mpi_comm_create_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_create_hook(MPIR_Comm * comm) +static inline int MPIDI_NM_mpi_comm_create_hook(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; mpi_errno = MPIDI_CH4U_init_comm(comm); @@ -25,10 +25,10 @@ static inline int MPIDI_NM_comm_create_hook(MPIR_Comm * comm) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_comm_free_hook +#define FUNCNAME MPIDI_NM_mpi_comm_free_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_free_hook(MPIR_Comm * comm) +static inline int MPIDI_NM_mpi_comm_free_hook(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; mpi_errno = MPIDI_CH4U_destroy_comm(comm); diff --git a/src/mpid/ch4/netmod/portals4/ptl_datatype.h b/src/mpid/ch4/netmod/portals4/ptl_datatype.h index 8f1cc2e..3d2c4d2 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_datatype.h +++ b/src/mpid/ch4/netmod/portals4/ptl_datatype.h @@ -9,12 +9,12 @@ #include "ptl_impl.h" -static inline int MPIDI_NM_type_free_hook(MPIR_Datatype * datatype_p) +static inline int MPIDI_NM_mpi_type_free_hook(MPIR_Datatype * datatype_p) { return 0; } -static inline int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) +static inline int MPIDI_NM_mpi_type_create_hook(MPIR_Datatype * datatype_p) { return 0; } diff --git a/src/mpid/ch4/netmod/portals4/ptl_init.h b/src/mpid/ch4/netmod/portals4/ptl_init.h index 4f2d592..06b1f51 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_init.h +++ b/src/mpid/ch4/netmod/portals4/ptl_init.h @@ -40,16 +40,16 @@ static inline int MPIDI_PTL_append_overflow(size_t i) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_init +#define FUNCNAME MPIDI_NM_mpi_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_init(int rank, - int size, - int appnum, - int *tag_ub, - MPIR_Comm * comm_world, - MPIR_Comm * comm_self, - int spawned, int num_contexts, void **netmod_contexts) +static inline int MPIDI_NM_mpi_init(int rank, + int size, + int appnum, + int *tag_ub, + MPIR_Comm * comm_world, + MPIR_Comm * comm_self, + int spawned, int num_contexts, void **netmod_contexts) { int mpi_errno = MPI_SUCCESS; int ret; @@ -163,7 +163,7 @@ static inline int MPIDI_NM_init(int rank, } /* Setup CH4R Active Messages */ - MPIDI_CH4U_init(comm_world, comm_self, num_contexts, netmod_contexts); + MPIDI_CH4U_mpi_init(comm_world, comm_self, num_contexts, netmod_contexts); for (i = 0; i < MPIDI_PTL_NUM_OVERFLOW_BUFFERS; i++) { MPIDI_PTL_global.overflow_bufs[i] = MPL_malloc(MPIDI_PTL_OVERFLOW_BUFFER_SZ); MPIDI_PTL_append_overflow(i); @@ -183,7 +183,7 @@ static inline int MPIDI_NM_init(int rank, goto fn_exit; } -static inline int MPIDI_NM_finalize(void) +static inline int MPIDI_NM_mpi_finalize(void) { int mpi_errno = MPI_SUCCESS; int ret, i; @@ -191,7 +191,7 @@ static inline int MPIDI_NM_finalize(void) MPIR_Comm_release(MPIR_Process.comm_world); MPIR_Comm_release(MPIR_Process.comm_self); - MPIDI_CH4U_finalize(); + MPIDI_CH4U_mpi_finalize(); for (i = 0; i < MPIDI_PTL_NUM_OVERFLOW_BUFFERS; i++) { ret = PtlMEUnlink(MPIDI_PTL_global.overflow_me_handles[i]); @@ -245,14 +245,14 @@ static inline int MPIDI_NM_create_intercomm_from_lpids(MPIR_Comm * newcomm_ptr, return MPI_SUCCESS; } -static inline int MPIDI_NM_free_mem(void *ptr) +static inline int MPIDI_NM_mpi_free_mem(void *ptr) { - return MPIDI_CH4U_free_mem(ptr); + return MPIDI_CH4U_mpi_free_mem(ptr); } -static inline void *MPIDI_NM_alloc_mem(size_t size, MPIR_Info * info_ptr) +static inline void *MPIDI_NM_mpi_alloc_mem(size_t size, MPIR_Info * info_ptr) { - return MPIDI_CH4U_alloc_mem(size, info_ptr); + return MPIDI_CH4U_mpi_alloc_mem(size, info_ptr); } diff --git a/src/mpid/ch4/netmod/portals4/ptl_op.h b/src/mpid/ch4/netmod/portals4/ptl_op.h index a79ad6e..7a690da 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_op.h +++ b/src/mpid/ch4/netmod/portals4/ptl_op.h @@ -9,13 +9,13 @@ #include "ptl_impl.h" -static inline int MPIDI_NM_op_free_hook(MPIR_Op * op_p) +static inline int MPIDI_NM_mpi_op_free_hook(MPIR_Op * op_p) { MPIR_Assert(0); return 0; } -static inline int MPIDI_NM_op_create_hook(MPIR_Op * op_p) +static inline int MPIDI_NM_mpi_op_create_hook(MPIR_Op * op_p) { MPIR_Assert(0); return 0; diff --git a/src/mpid/ch4/netmod/portals4/ptl_probe.h b/src/mpid/ch4/netmod/portals4/ptl_probe.h index df4eae2..7f23bd9 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_probe.h +++ b/src/mpid/ch4/netmod/portals4/ptl_probe.h @@ -19,21 +19,21 @@ static inline int MPIDI_NM_probe(int source, return MPIDI_CH4U_probe(source, tag, comm, context_offset, status); } -static inline int MPIDI_NM_improbe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, - int *flag, MPIR_Request ** message, MPI_Status * status) +static inline int MPIDI_NM_mpi_improbe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, + int *flag, MPIR_Request ** message, MPI_Status * status) { - return MPIDI_CH4U_improbe(source, tag, comm, context_offset, flag, message, status); + return MPIDI_CH4U_mpi_improbe(source, tag, comm, context_offset, flag, message, status); } -static inline int MPIDI_NM_iprobe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, int *flag, MPI_Status * status) +static inline int MPIDI_NM_mpi_iprobe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, int *flag, MPI_Status * status) { - return MPIDI_CH4U_iprobe(source, tag, comm, context_offset, flag, status); + return MPIDI_CH4U_mpi_iprobe(source, tag, comm, context_offset, flag, status); } #endif /* NETMOD_PTL_PROBE_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/portals4/ptl_recv.h b/src/mpid/ch4/netmod/portals4/ptl_recv.h index a239a3a..5b29727 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_recv.h +++ b/src/mpid/ch4/netmod/portals4/ptl_recv.h @@ -13,48 +13,51 @@ #include "ptl_impl.h" -static inline int MPIDI_NM_recv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPI_Status * status, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_recv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPI_Status * status, + MPIR_Request ** request) { - return MPIDI_CH4U_recv(buf, count, datatype, rank, tag, comm, context_offset, status, request); + return MPIDI_CH4U_mpi_recv(buf, count, datatype, rank, tag, comm, context_offset, status, + request); } -static inline int MPIDI_NM_recv_init(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_recv_init(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_imrecv(void *buf, - int count, - MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp) +static inline int MPIDI_NM_mpi_imrecv(void *buf, + int count, + MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_irecv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_irecv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_cancel_recv(MPIR_Request * rreq) +static inline int MPIDI_NM_mpi_cancel_recv(MPIR_Request * rreq) { MPIR_Assert(0); return MPI_SUCCESS; diff --git a/src/mpid/ch4/netmod/portals4/ptl_rma.h b/src/mpid/ch4/netmod/portals4/ptl_rma.h index 8be0450..e455697 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_rma.h +++ b/src/mpid/ch4/netmod/portals4/ptl_rma.h @@ -13,136 +13,141 @@ #include "ptl_impl.h" -static inline int MPIDI_NM_put(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_NM_mpi_put(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { - return MPIDI_CH4U_put(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + return MPIDI_CH4U_mpi_put(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); } -static inline int MPIDI_NM_get(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_NM_mpi_get(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { - return MPIDI_CH4U_get(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + return MPIDI_CH4U_mpi_get(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); } -static inline int MPIDI_NM_rput(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rput(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rput(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win, request); + return MPIDI_CH4U_mpi_rput(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win, + request); } -static inline int MPIDI_NM_compare_and_swap(const void *origin_addr, - const void *compare_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, MPIR_Win * win) -{ - return MPIDI_CH4U_compare_and_swap(origin_addr, compare_addr, result_addr, - datatype, target_rank, target_disp, win); -} - -static inline int MPIDI_NM_raccumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_compare_and_swap(const void *origin_addr, + const void *compare_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp, + MPIR_Win * win) { - return MPIDI_CH4U_raccumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win, request); + return MPIDI_CH4U_mpi_compare_and_swap(origin_addr, compare_addr, result_addr, + datatype, target_rank, target_disp, win); } -static inline int MPIDI_NM_rget_accumulate(const void *origin_addr, +static inline int MPIDI_NM_mpi_raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rget_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, + return MPIDI_CH4U_mpi_raccumulate(origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, win, request); } -static inline int MPIDI_NM_fetch_and_op(const void *origin_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, - MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) +static inline int MPIDI_NM_mpi_rget_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +{ + return MPIDI_CH4U_mpi_rget_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win, request); +} + +static inline int MPIDI_NM_mpi_fetch_and_op(const void *origin_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, + MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) { - return MPIDI_CH4U_fetch_and_op(origin_addr, result_addr, datatype, - target_rank, target_disp, op, win); + return MPIDI_CH4U_mpi_fetch_and_op(origin_addr, result_addr, datatype, + target_rank, target_disp, op, win); } -static inline int MPIDI_NM_rget(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rget(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rget(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win, request); + return MPIDI_CH4U_mpi_rget(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win, + request); } -static inline int MPIDI_NM_get_accumulate(const void *origin_addr, +static inline int MPIDI_NM_mpi_get_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) +{ + return MPIDI_CH4U_mpi_get_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win); +} + +static inline int MPIDI_NM_mpi_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) { - return MPIDI_CH4U_get_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win); -} - -static inline int MPIDI_NM_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) -{ - return MPIDI_CH4U_accumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, op, win); + return MPIDI_CH4U_mpi_accumulate(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, op, + win); } #endif /* NETMOD_PTL_RMA_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/portals4/ptl_send.h b/src/mpid/ch4/netmod/portals4/ptl_send.h index d910222..0419e44 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_send.h +++ b/src/mpid/ch4/netmod/portals4/ptl_send.h @@ -13,14 +13,14 @@ #include "ptl_impl.h" -static inline int MPIDI_NM_send(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_send(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_send(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_send(buf, count, datatype, rank, tag, comm, context_offset, request); } static inline int MPIDI_NM_rsend(const void *buf, @@ -45,84 +45,91 @@ static inline int MPIDI_NM_irsend(const void *buf, return MPIDI_CH4U_irsend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_ssend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_ssend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_startall(int count, MPIR_Request * requests[]) +static inline int MPIDI_NM_mpi_startall(int count, MPIR_Request * requests[]) { - return MPIDI_CH4U_startall(count, requests); + return MPIDI_CH4U_mpi_startall(count, requests); } -static inline int MPIDI_NM_send_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_send_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_send_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_send_init(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_ssend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_ssend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_ssend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_ssend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } -static inline int MPIDI_NM_bsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_bsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_bsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_bsend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } -static inline int MPIDI_NM_rsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_rsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_rsend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } -static inline int MPIDI_NM_isend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_isend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_isend(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_isend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_issend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_issend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_issend(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_issend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_cancel_send(MPIR_Request * sreq) +static inline int MPIDI_NM_mpi_cancel_send(MPIR_Request * sreq) { - return MPIDI_CH4U_cancel_send(sreq); + return MPIDI_CH4U_mpi_cancel_send(sreq); } #endif /* NETMOD_PTL_SEND_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/portals4/ptl_spawn.h b/src/mpid/ch4/netmod/portals4/ptl_spawn.h index b0ef76a..905d9ec 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_spawn.h +++ b/src/mpid/ch4/netmod/portals4/ptl_spawn.h @@ -13,35 +13,35 @@ #include "ptl_impl.h" -static inline int MPIDI_NM_comm_connect(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) +static inline int MPIDI_NM_mpi_comm_connect(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_comm_disconnect(MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_comm_disconnect(MPIR_Comm * comm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_open_port(MPIR_Info * info_ptr, char *port_name) +static inline int MPIDI_NM_mpi_open_port(MPIR_Info * info_ptr, char *port_name) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_close_port(const char *port_name) +static inline int MPIDI_NM_mpi_close_port(const char *port_name) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_comm_accept(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) +static inline int MPIDI_NM_mpi_comm_accept(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; diff --git a/src/mpid/ch4/netmod/portals4/ptl_win.h b/src/mpid/ch4/netmod/portals4/ptl_win.h index c325315..06d7d96 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_win.h +++ b/src/mpid/ch4/netmod/portals4/ptl_win.h @@ -13,147 +13,150 @@ #include "ptl_impl.h" -static inline int MPIDI_NM_win_set_info(MPIR_Win * win, MPIR_Info * info) +static inline int MPIDI_NM_mpi_win_set_info(MPIR_Win * win, MPIR_Info * info) { - return MPIDI_CH4R_win_set_info(win, info); + return MPIDI_CH4R_mpi_win_set_info(win, info); } -static inline int MPIDI_NM_win_start(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_start(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_start(group, assert, win); + return MPIDI_CH4R_mpi_win_start(group, assert, win); } -static inline int MPIDI_NM_win_complete(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_complete(MPIR_Win * win) { - return MPIDI_CH4R_win_complete(win); + return MPIDI_CH4R_mpi_win_complete(win); } -static inline int MPIDI_NM_win_post(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_post(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_post(group, assert, win); + return MPIDI_CH4R_mpi_win_post(group, assert, win); } -static inline int MPIDI_NM_win_wait(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_wait(MPIR_Win * win) { - return MPIDI_CH4R_win_wait(win); + return MPIDI_CH4R_mpi_win_wait(win); } -static inline int MPIDI_NM_win_test(MPIR_Win * win, int *flag) +static inline int MPIDI_NM_mpi_win_test(MPIR_Win * win, int *flag) { - return MPIDI_CH4R_win_test(win, flag); + return MPIDI_CH4R_mpi_win_test(win, flag); } -static inline int MPIDI_NM_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_lock(lock_type, rank, assert, win); + return MPIDI_CH4R_mpi_win_lock(lock_type, rank, assert, win); } -static inline int MPIDI_NM_win_unlock(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_unlock(int rank, MPIR_Win * win) { - return MPIDI_CH4R_win_unlock(rank, win); + return MPIDI_CH4R_mpi_win_unlock(rank, win); } -static inline int MPIDI_NM_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) +static inline int MPIDI_NM_mpi_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) { - return MPIDI_CH4R_win_get_info(win, info_p_p); + return MPIDI_CH4R_mpi_win_get_info(win, info_p_p); } -static inline int MPIDI_NM_win_free(MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_free(MPIR_Win ** win_ptr) { - return MPIDI_CH4R_win_free(win_ptr); + return MPIDI_CH4R_mpi_win_free(win_ptr); } -static inline int MPIDI_NM_win_fence(int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_fence(int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_fence(assert, win); + return MPIDI_CH4R_mpi_win_fence(assert, win); } -static inline int MPIDI_NM_win_create(void *base, - MPI_Aint length, - int disp_unit, - MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_create(void *base, + MPI_Aint length, + int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr) { - return MPIDI_CH4R_win_create(base, length, disp_unit, info, comm_ptr, win_ptr); + return MPIDI_CH4R_mpi_win_create(base, length, disp_unit, info, comm_ptr, win_ptr); } -static inline int MPIDI_NM_win_attach(MPIR_Win * win, void *base, MPI_Aint size) +static inline int MPIDI_NM_mpi_win_attach(MPIR_Win * win, void *base, MPI_Aint size) { - return MPIDI_CH4R_win_attach(win, base, size); + return MPIDI_CH4R_mpi_win_attach(win, base, size); } -static inline int MPIDI_NM_win_allocate_shared(MPI_Aint size, - int disp_unit, - MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, - void **base_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_allocate_shared(MPI_Aint size, + int disp_unit, + MPIR_Info * info_ptr, + MPIR_Comm * comm_ptr, + void **base_ptr, MPIR_Win ** win_ptr) { - return MPIDI_CH4R_win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, base_ptr, win_ptr); + return MPIDI_CH4R_mpi_win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, base_ptr, + win_ptr); } -static inline int MPIDI_NM_win_detach(MPIR_Win * win, const void *base) +static inline int MPIDI_NM_mpi_win_detach(MPIR_Win * win, const void *base) { - return MPIDI_CH4R_win_detach(win, base); + return MPIDI_CH4R_mpi_win_detach(win, base); } -static inline int MPIDI_NM_win_shared_query(MPIR_Win * win, - int rank, - MPI_Aint * size, int *disp_unit, void *baseptr) +static inline int MPIDI_NM_mpi_win_shared_query(MPIR_Win * win, + int rank, + MPI_Aint * size, int *disp_unit, void *baseptr) { - return MPIDI_CH4R_win_shared_query(win, rank, size, disp_unit, baseptr); + return MPIDI_CH4R_mpi_win_shared_query(win, rank, size, disp_unit, baseptr); } -static inline int MPIDI_NM_win_allocate(MPI_Aint size, - int disp_unit, - MPIR_Info * info, - MPIR_Comm * comm, void *baseptr, MPIR_Win ** win) +static inline int MPIDI_NM_mpi_win_allocate(MPI_Aint size, + int disp_unit, + MPIR_Info * info, + MPIR_Comm * comm, void *baseptr, MPIR_Win ** win) { - return MPIDI_CH4R_win_allocate(size, disp_unit, info, comm, baseptr, win); + return MPIDI_CH4R_mpi_win_allocate(size, disp_unit, info, comm, baseptr, win); } -static inline int MPIDI_NM_win_flush(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush(int rank, MPIR_Win * win) { - return MPIDI_CH4R_win_flush(rank, win); + return MPIDI_CH4R_mpi_win_flush(rank, win); } -static inline int MPIDI_NM_win_flush_local_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_local_all(MPIR_Win * win) { - return MPIDI_CH4R_win_flush_local_all(win); + return MPIDI_CH4R_mpi_win_flush_local_all(win); } -static inline int MPIDI_NM_win_unlock_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_unlock_all(MPIR_Win * win) { - return MPIDI_CH4R_win_unlock_all(win); + return MPIDI_CH4R_mpi_win_unlock_all(win); } -static inline int MPIDI_NM_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, MPIR_Win ** win) +static inline int MPIDI_NM_mpi_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, + MPIR_Win ** win) { - return MPIDI_CH4R_win_create_dynamic(info, comm, win); + return MPIDI_CH4R_mpi_win_create_dynamic(info, comm, win); } -static inline int MPIDI_NM_win_flush_local(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_local(int rank, MPIR_Win * win) { - return MPIDI_CH4R_win_flush_local(rank, win); + return MPIDI_CH4R_mpi_win_flush_local(rank, win); } -static inline int MPIDI_NM_win_sync(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_sync(MPIR_Win * win) { - return MPIDI_CH4R_win_sync(win); + return MPIDI_CH4R_mpi_win_sync(win); } -static inline int MPIDI_NM_win_flush_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_all(MPIR_Win * win) { - return MPIDI_CH4R_win_flush_all(win); + return MPIDI_CH4R_mpi_win_flush_all(win); } -static inline int MPIDI_NM_win_lock_all(int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_lock_all(int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_lock_all(assert, win); + return MPIDI_CH4R_mpi_win_lock_all(assert, win); } diff --git a/src/mpid/ch4/netmod/stubnm/globals.c b/src/mpid/ch4/netmod/stubnm/globals.c index 190d561..f87b80b 100644 --- a/src/mpid/ch4/netmod/stubnm/globals.c +++ b/src/mpid/ch4/netmod/stubnm/globals.c @@ -14,21 +14,21 @@ #include <mpidimpl.h> #include "netmod_direct.h" MPIDI_NM_funcs_t MPIDI_NM_stubnm_funcs = { - MPIDI_NM_init, - MPIDI_NM_finalize, + MPIDI_NM_mpi_init, + MPIDI_NM_mpi_finalize, MPIDI_NM_progress, - MPIDI_NM_comm_connect, - MPIDI_NM_comm_disconnect, - MPIDI_NM_open_port, - MPIDI_NM_close_port, - MPIDI_NM_comm_accept, + MPIDI_NM_mpi_comm_connect, + MPIDI_NM_mpi_comm_disconnect, + MPIDI_NM_mpi_open_port, + MPIDI_NM_mpi_close_port, + MPIDI_NM_mpi_comm_accept, MPIDI_NM_comm_get_lpid, MPIDI_NM_gpid_get, MPIDI_NM_getallincomm, MPIDI_NM_gpid_tolpidarray, MPIDI_NM_create_intercomm_from_lpids, - MPIDI_NM_comm_create_hook, - MPIDI_NM_comm_free_hook, + MPIDI_NM_mpi_comm_create_hook, + MPIDI_NM_mpi_comm_free_hook, MPIDI_NM_am_request_init, MPIDI_NM_am_request_finalize, MPIDI_NM_am_reg_handler, @@ -42,108 +42,109 @@ MPIDI_NM_funcs_t MPIDI_NM_stubnm_funcs = { }; MPIDI_NM_native_funcs_t MPIDI_NM_native_stubnm_funcs = { - MPIDI_NM_send, - MPIDI_NM_ssend, - MPIDI_NM_startall, - MPIDI_NM_send_init, - MPIDI_NM_ssend_init, - MPIDI_NM_rsend_init, - MPIDI_NM_bsend_init, - MPIDI_NM_isend, - MPIDI_NM_issend, - MPIDI_NM_cancel_send, - MPIDI_NM_recv_init, - MPIDI_NM_recv, - MPIDI_NM_irecv, - MPIDI_NM_imrecv, - MPIDI_NM_cancel_recv, - MPIDI_NM_alloc_mem, - MPIDI_NM_free_mem, - MPIDI_NM_improbe, - MPIDI_NM_iprobe, - MPIDI_NM_win_set_info, - MPIDI_NM_win_shared_query, - MPIDI_NM_put, - MPIDI_NM_win_start, - MPIDI_NM_win_complete, - MPIDI_NM_win_post, - MPIDI_NM_win_wait, - MPIDI_NM_win_test, - MPIDI_NM_win_lock, - MPIDI_NM_win_unlock, - MPIDI_NM_win_get_info, - MPIDI_NM_get, - MPIDI_NM_win_free, - MPIDI_NM_win_fence, - MPIDI_NM_win_create, - MPIDI_NM_accumulate, - MPIDI_NM_win_attach, - MPIDI_NM_win_allocate_shared, - MPIDI_NM_rput, - MPIDI_NM_win_flush_local, - MPIDI_NM_win_detach, - MPIDI_NM_compare_and_swap, - MPIDI_NM_raccumulate, - MPIDI_NM_rget_accumulate, - MPIDI_NM_fetch_and_op, - MPIDI_NM_win_allocate, - MPIDI_NM_win_flush, - MPIDI_NM_win_flush_local_all, - MPIDI_NM_win_unlock_all, - MPIDI_NM_win_create_dynamic, - MPIDI_NM_rget, - MPIDI_NM_win_sync, - MPIDI_NM_win_flush_all, - MPIDI_NM_get_accumulate, - MPIDI_NM_win_lock_all, + MPIDI_NM_mpi_send, + MPIDI_NM_mpi_ssend, + MPIDI_NM_mpi_startall, + MPIDI_NM_mpi_send_init, + MPIDI_NM_mpi_ssend_init, + MPIDI_NM_mpi_rsend_init, + MPIDI_NM_mpi_bsend_init, + MPIDI_NM_mpi_isend, + MPIDI_NM_mpi_issend, + MPIDI_NM_mpi_cancel_send, + MPIDI_NM_mpi_recv_init, + MPIDI_NM_mpi_recv, + MPIDI_NM_mpi_irecv, + MPIDI_NM_mpi_imrecv, + MPIDI_NM_mpi_cancel_recv, + MPIDI_NM_mpi_alloc_mem, + MPIDI_NM_mpi_free_mem, + MPIDI_NM_mpi_improbe, + MPIDI_NM_mpi_iprobe, + MPIDI_NM_mpi_win_set_info, + MPIDI_NM_mpi_win_shared_query, + MPIDI_NM_mpi_put, + MPIDI_NM_mpi_win_start, + MPIDI_NM_mpi_win_complete, + MPIDI_NM_mpi_win_post, + MPIDI_NM_mpi_win_wait, + MPIDI_NM_mpi_win_test, + MPIDI_NM_mpi_win_lock, + MPIDI_NM_mpi_win_unlock, + MPIDI_NM_mpi_win_get_info, + MPIDI_NM_mpi_get, + MPIDI_NM_mpi_win_free, + MPIDI_NM_mpi_win_fence, + MPIDI_NM_mpi_win_create, + MPIDI_NM_mpi_accumulate, + MPIDI_NM_mpi_win_attach, + MPIDI_NM_mpi_win_allocate_shared, + MPIDI_NM_mpi_rput, + MPIDI_NM_mpi_win_flush_local, + MPIDI_NM_mpi_win_detach, + MPIDI_NM_mpi_compare_and_swap, + MPIDI_NM_mpi_raccumulate, + MPIDI_NM_mpi_rget_accumulate, + MPIDI_NM_mpi_fetch_and_op, + MPIDI_NM_mpi_win_allocate, + MPIDI_NM_mpi_win_flush, + MPIDI_NM_mpi_win_flush_local_all, + MPIDI_NM_mpi_win_unlock_all, + MPIDI_NM_mpi_win_create_dynamic, + MPIDI_NM_mpi_rget, + MPIDI_NM_mpi_win_sync, + MPIDI_NM_mpi_win_flush_all, + MPIDI_NM_mpi_get_accumulate, + MPIDI_NM_mpi_win_lock_all, MPIDI_NM_rank_is_local, - MPIDI_NM_barrier, - MPIDI_NM_bcast, - MPIDI_NM_allreduce, - MPIDI_NM_allgather, - MPIDI_NM_allgatherv, - MPIDI_NM_scatter, - MPIDI_NM_scatterv, - MPIDI_NM_gather, - MPIDI_NM_gatherv, - MPIDI_NM_alltoall, - MPIDI_NM_alltoallv, - MPIDI_NM_alltoallw, - MPIDI_NM_reduce, - MPIDI_NM_reduce_scatter, - MPIDI_NM_reduce_scatter_block, - MPIDI_NM_scan, - MPIDI_NM_exscan, - MPIDI_NM_neighbor_allgather, - MPIDI_NM_neighbor_allgatherv, - MPIDI_NM_neighbor_alltoall, - MPIDI_NM_neighbor_alltoallv, - MPIDI_NM_neighbor_alltoallw, - MPIDI_NM_ineighbor_allgather, - MPIDI_NM_ineighbor_allgatherv, - MPIDI_NM_ineighbor_alltoall, - MPIDI_NM_ineighbor_alltoallv, - MPIDI_NM_ineighbor_alltoallw, - MPIDI_NM_ibarrier, - MPIDI_NM_ibcast, - MPIDI_NM_iallgather, - MPIDI_NM_iallgatherv, - MPIDI_NM_iallreduce, - MPIDI_NM_ialltoall, - MPIDI_NM_ialltoallv, - MPIDI_NM_ialltoallw, - MPIDI_NM_iexscan, - MPIDI_NM_igather, - MPIDI_NM_igatherv, - MPIDI_NM_ireduce_scatter_block, - MPIDI_NM_ireduce_scatter, - MPIDI_NM_ireduce, - MPIDI_NM_iscan, - MPIDI_NM_iscatter, - MPIDI_NM_iscatterv, - MPIDI_NM_type_create_hook, - MPIDI_NM_type_free_hook, - MPIDI_NM_op_create_hook, - MPIDI_NM_op_free_hook, + MPIDI_NM_mpi_barrier, + MPIDI_NM_mpi_bcast, + MPIDI_NM_mpi_allreduce, + MPIDI_NM_mpi_allgather, + MPIDI_NM_mpi_allgatherv, + MPIDI_NM_mpi_scatter, + MPIDI_NM_mpi_scatterv, + MPIDI_NM_mpi_gather, + MPIDI_NM_mpi_gatherv, + MPIDI_NM_mpi_alltoall, + MPIDI_NM_mpi_alltoallv, + MPIDI_NM_mpi_alltoallw, + MPIDI_NM_mpi_reduce, + MPIDI_NM_mpi_reduce_scatter, + MPIDI_NM_mpi_reduce_scatter_block, + MPIDI_NM_mpi_scan, + MPIDI_NM_mpi_exscan, + MPIDI_NM_mpi_neighbor_allgather, + MPIDI_NM_mpi_neighbor_allgatherv, + MPIDI_NM_mpi_neighbor_alltoall, + MPIDI_NM_mpi_neighbor_alltoallv, + MPIDI_NM_mpi_neighbor_alltoallw, + MPIDI_NM_mpi_ineighbor_allgather, + MPIDI_NM_mpi_ineighbor_allgatherv, + MPIDI_NM_mpi_ineighbor_alltoall, + MPIDI_NM_mpi_ineighbor_alltoallv, + MPIDI_NM_mpi_ineighbor_alltoallw, + MPIDI_NM_mpi_ibarrier, + MPIDI_NM_mpi_ibcast, + MPIDI_NM_mpi_iallgather, + MPIDI_NM_mpi_iallgatherv, + MPIDI_NM_mpi_iallreduce, + MPIDI_NM_mpi_ialltoall, + MPIDI_NM_mpi_ialltoallv, + MPIDI_NM_mpi_ialltoallw, + MPIDI_NM_mpi_iexscan, + MPIDI_NM_mpi_igather, + MPIDI_NM_mpi_igatherv, + MPIDI_NM_mpi_ireduce_scatter_block, + MPIDI_NM_mpi_ireduce_scatter, + MPIDI_NM_mpi_ireduce, + MPIDI_NM_mpi_iscan, + MPIDI_NM_mpi_iscatter, + MPIDI_NM_mpi_iscatterv, + MPIDI_NM_mpi_type_create_hook, + MPIDI_NM_mpi_type_dup_hook, + MPIDI_NM_mpi_type_free_hook, + MPIDI_NM_mpi_op_create_hook, + MPIDI_NM_mpi_op_free_hook, }; #endif diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_coll.h b/src/mpid/ch4/netmod/stubnm/stubnm_coll.h index cf76ab6..4ffb542 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_coll.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_coll.h @@ -15,10 +15,10 @@ #include "stubnm_impl.h" #undef FUNCNAME -#define FUNCNAME MPIDI_NM_barrier +#define FUNCNAME MPIDI_NM_mpi_barrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_BARRIER); @@ -31,11 +31,11 @@ static inline int MPIDI_NM_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errfla } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_bcast +#define FUNCNAME MPIDI_NM_mpi_bcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_bcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_bcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_BCAST); @@ -48,12 +48,12 @@ static inline int MPIDI_NM_bcast(void *buffer, int count, MPI_Datatype datatype, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_allreduce +#define FUNCNAME MPIDI_NM_mpi_allreduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_allreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_allreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLREDUCE); @@ -66,12 +66,12 @@ static inline int MPIDI_NM_allreduce(const void *sendbuf, void *recvbuf, int cou } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_allgather +#define FUNCNAME MPIDI_NM_mpi_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLGATHER); @@ -85,13 +85,13 @@ static inline int MPIDI_NM_allgather(const void *sendbuf, int sendcount, MPI_Dat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_allgatherv +#define FUNCNAME MPIDI_NM_mpi_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLGATHERV); @@ -105,12 +105,12 @@ static inline int MPIDI_NM_allgatherv(const void *sendbuf, int sendcount, MPI_Da } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_gather +#define FUNCNAME MPIDI_NM_mpi_gather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_GATHER); @@ -124,13 +124,13 @@ static inline int MPIDI_NM_gather(const void *sendbuf, int sendcount, MPI_Dataty } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_gatherv +#define FUNCNAME MPIDI_NM_mpi_gatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_GATHERV); @@ -144,12 +144,12 @@ static inline int MPIDI_NM_gatherv(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_scatter +#define FUNCNAME MPIDI_NM_mpi_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_SCATTER); @@ -163,13 +163,13 @@ static inline int MPIDI_NM_scatter(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_scatterv +#define FUNCNAME MPIDI_NM_mpi_scatterv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_scatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_scatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_SCATTERV); @@ -183,12 +183,12 @@ static inline int MPIDI_NM_scatterv(const void *sendbuf, const int *sendcounts, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_alltoall +#define FUNCNAME MPIDI_NM_mpi_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLTOALL); @@ -202,14 +202,14 @@ static inline int MPIDI_NM_alltoall(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_alltoallv +#define FUNCNAME MPIDI_NM_mpi_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_alltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_alltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLTOALLV); @@ -222,14 +222,14 @@ static inline int MPIDI_NM_alltoallv(const void *sendbuf, const int *sendcounts, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_alltoallw +#define FUNCNAME MPIDI_NM_mpi_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_alltoallw(const void *sendbuf, const int sendcounts[], - const int sdispls[], const MPI_Datatype sendtypes[], - void *recvbuf, const int recvcounts[], - const int rdispls[], const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_alltoallw(const void *sendbuf, const int sendcounts[], + const int sdispls[], const MPI_Datatype sendtypes[], + void *recvbuf, const int recvcounts[], + const int rdispls[], const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLTOALLW); @@ -243,12 +243,12 @@ static inline int MPIDI_NM_alltoallw(const void *sendbuf, const int sendcounts[] } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_reduce +#define FUNCNAME MPIDI_NM_mpi_reduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_reduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_reduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_REDUCE); @@ -261,12 +261,13 @@ static inline int MPIDI_NM_reduce(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_reduce_scatter +#define FUNCNAME MPIDI_NM_mpi_reduce_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_reduce_scatter(const void *sendbuf, void *recvbuf, - const int recvcounts[], MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_reduce_scatter(const void *sendbuf, void *recvbuf, + const int recvcounts[], MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_REDUCE_SCATTER); @@ -279,13 +280,13 @@ static inline int MPIDI_NM_reduce_scatter(const void *sendbuf, void *recvbuf, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_reduce_scatter_block +#define FUNCNAME MPIDI_NM_mpi_reduce_scatter_block #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_reduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_reduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_REDUCE_SCATTER_BLOCK); @@ -299,12 +300,12 @@ static inline int MPIDI_NM_reduce_scatter_block(const void *sendbuf, void *recvb } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_scan +#define FUNCNAME MPIDI_NM_mpi_scan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_scan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_scan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_SCAN); @@ -317,12 +318,12 @@ static inline int MPIDI_NM_scan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_exscan +#define FUNCNAME MPIDI_NM_mpi_exscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_exscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_exscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_EXSCAN); @@ -335,12 +336,13 @@ static inline int MPIDI_NM_exscan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_allgather +#define FUNCNAME MPIDI_NM_mpi_neighbor_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLGATHER); @@ -355,13 +357,13 @@ static inline int MPIDI_NM_neighbor_allgather(const void *sendbuf, int sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_allgatherv +#define FUNCNAME MPIDI_NM_mpi_neighbor_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLGATHERV); @@ -375,12 +377,13 @@ static inline int MPIDI_NM_neighbor_allgatherv(const void *sendbuf, int sendcoun } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_alltoall +#define FUNCNAME MPIDI_NM_mpi_neighbor_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLTOALL); @@ -394,14 +397,14 @@ static inline int MPIDI_NM_neighbor_alltoall(const void *sendbuf, int sendcount, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_alltoallv +#define FUNCNAME MPIDI_NM_mpi_neighbor_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_alltoallv(const void *sendbuf, const int sendcounts[], - const int sdispls[], MPI_Datatype sendtype, - void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, - MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLTOALLV); @@ -415,14 +418,15 @@ static inline int MPIDI_NM_neighbor_alltoallv(const void *sendbuf, const int sen } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_alltoallw +#define FUNCNAME MPIDI_NM_mpi_neighbor_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_alltoallw(const void *sendbuf, const int sendcounts[], - const MPI_Aint sdispls[], - const MPI_Datatype sendtypes[], void *recvbuf, - const int recvcounts[], const MPI_Aint rdispls[], - const MPI_Datatype recvtypes[], MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, + const int recvcounts[], const MPI_Aint rdispls[], + const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLTOALLW); @@ -436,13 +440,13 @@ static inline int MPIDI_NM_neighbor_alltoallw(const void *sendbuf, const int sen } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_allgather +#define FUNCNAME MPIDI_NM_mpi_ineighbor_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLGATHER); @@ -456,14 +460,14 @@ static inline int MPIDI_NM_ineighbor_allgather(const void *sendbuf, int sendcoun } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_allgatherv +#define FUNCNAME MPIDI_NM_mpi_ineighbor_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLGATHERV); @@ -478,13 +482,13 @@ static inline int MPIDI_NM_ineighbor_allgatherv(const void *sendbuf, int sendcou } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_alltoall +#define FUNCNAME MPIDI_NM_mpi_ineighbor_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLTOALL); @@ -498,14 +502,14 @@ static inline int MPIDI_NM_ineighbor_alltoall(const void *sendbuf, int sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_alltoallv +#define FUNCNAME MPIDI_NM_mpi_ineighbor_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], - const int sdispls[], MPI_Datatype sendtype, - void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLTOALLV); @@ -520,15 +524,15 @@ static inline int MPIDI_NM_ineighbor_alltoallv(const void *sendbuf, const int se } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_alltoallw +#define FUNCNAME MPIDI_NM_mpi_ineighbor_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], - const MPI_Aint sdispls[], - const MPI_Datatype sendtypes[], void *recvbuf, - const int recvcounts[], const MPI_Aint rdispls[], - const MPI_Datatype recvtypes[], MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, + const int recvcounts[], const MPI_Aint rdispls[], + const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLTOALLW); @@ -543,10 +547,10 @@ static inline int MPIDI_NM_ineighbor_alltoallw(const void *sendbuf, const int se } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ibarrier +#define FUNCNAME MPIDI_NM_mpi_ibarrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IBARRIER); @@ -559,11 +563,11 @@ static inline int MPIDI_NM_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ibcast +#define FUNCNAME MPIDI_NM_mpi_ibcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ibcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ibcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IBCAST); @@ -576,12 +580,12 @@ static inline int MPIDI_NM_ibcast(void *buffer, int count, MPI_Datatype datatype } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iallgather +#define FUNCNAME MPIDI_NM_mpi_iallgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLGATHER); @@ -595,12 +599,12 @@ static inline int MPIDI_NM_iallgather(const void *sendbuf, int sendcount, MPI_Da } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iallreduce +#define FUNCNAME MPIDI_NM_mpi_iallreduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iallreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_iallreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE); @@ -614,13 +618,14 @@ static inline int MPIDI_NM_iallreduce(const void *sendbuf, void *recvbuf, int co #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iallgatherv +#define FUNCNAME MPIDI_NM_mpi_iallgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_iallgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLGATHERV); @@ -634,12 +639,12 @@ static inline int MPIDI_NM_iallgatherv(const void *sendbuf, int sendcount, MPI_D } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ialltoall +#define FUNCNAME MPIDI_NM_mpi_ialltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLTOALL); @@ -653,14 +658,14 @@ static inline int MPIDI_NM_ialltoall(const void *sendbuf, int sendcount, MPI_Dat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ialltoallv +#define FUNCNAME MPIDI_NM_mpi_ialltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ialltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ialltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLTOALLV); @@ -675,14 +680,14 @@ static inline int MPIDI_NM_ialltoallv(const void *sendbuf, const int *sendcounts } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ialltoallw +#define FUNCNAME MPIDI_NM_mpi_ialltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ialltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, const MPI_Datatype sendtypes[], - void *recvbuf, const int *recvcounts, - const int *rdispls, const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ialltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, const MPI_Datatype sendtypes[], + void *recvbuf, const int *recvcounts, + const int *rdispls, const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLTOALLW); @@ -697,12 +702,12 @@ static inline int MPIDI_NM_ialltoallw(const void *sendbuf, const int *sendcounts } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iexscan +#define FUNCNAME MPIDI_NM_mpi_iexscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iexscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_iexscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IEXSCAN); @@ -715,12 +720,12 @@ static inline int MPIDI_NM_iexscan(const void *sendbuf, void *recvbuf, int count } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_igather +#define FUNCNAME MPIDI_NM_mpi_igather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IGATHER); @@ -734,13 +739,13 @@ static inline int MPIDI_NM_igather(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_igatherv +#define FUNCNAME MPIDI_NM_mpi_igatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IGATHERV); @@ -754,12 +759,13 @@ static inline int MPIDI_NM_igatherv(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ireduce_scatter_block +#define FUNCNAME MPIDI_NM_mpi_ireduce_scatter_block #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ireduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ireduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE_SCATTER_BLOCK); @@ -773,12 +779,12 @@ static inline int MPIDI_NM_ireduce_scatter_block(const void *sendbuf, void *recv } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ireduce_scatter +#define FUNCNAME MPIDI_NM_mpi_ireduce_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ireduce_scatter(const void *sendbuf, void *recvbuf, - const int recvcounts[], MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ireduce_scatter(const void *sendbuf, void *recvbuf, + const int recvcounts[], MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE_SCATTER); @@ -792,12 +798,12 @@ static inline int MPIDI_NM_ireduce_scatter(const void *sendbuf, void *recvbuf, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ireduce +#define FUNCNAME MPIDI_NM_mpi_ireduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ireduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ireduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE); @@ -810,12 +816,12 @@ static inline int MPIDI_NM_ireduce(const void *sendbuf, void *recvbuf, int count } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iscan +#define FUNCNAME MPIDI_NM_mpi_iscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_iscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ISCAN); @@ -828,13 +834,13 @@ static inline int MPIDI_NM_iscan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iscatter +#define FUNCNAME MPIDI_NM_mpi_iscatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iscatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm, MPI_Request * request) +static inline int MPIDI_NM_mpi_iscatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ISCATTER); @@ -848,14 +854,14 @@ static inline int MPIDI_NM_iscatter(const void *sendbuf, int sendcount, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iscatterv +#define FUNCNAME MPIDI_NM_mpi_iscatterv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iscatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * request) +static inline int MPIDI_NM_mpi_iscatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ISCATTERV); diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_comm.h b/src/mpid/ch4/netmod/stubnm/stubnm_comm.h index da5ef9a..1d3877f 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_comm.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_comm.h @@ -14,10 +14,10 @@ #include "stubnm_impl.h" #undef FUNCNAME -#define FUNCNAME MPIDI_NM_comm_create_hook +#define FUNCNAME MPIDI_NM_mpi_comm_create_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_create_hook(MPIR_Comm * comm) +static inline int MPIDI_NM_mpi_comm_create_hook(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; MPIR_Assert(0); @@ -25,10 +25,10 @@ static inline int MPIDI_NM_comm_create_hook(MPIR_Comm * comm) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_comm_free_hook +#define FUNCNAME MPIDI_NM_mpi_comm_free_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_free_hook(MPIR_Comm * comm) +static inline int MPIDI_NM_mpi_comm_free_hook(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; MPIR_Assert(0); diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_datatype.h b/src/mpid/ch4/netmod/stubnm/stubnm_datatype.h index cac199f..8a416a0 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_datatype.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_datatype.h @@ -13,13 +13,13 @@ #include "stubnm_impl.h" -static inline int MPIDI_NM_type_free_hook(MPIR_Datatype * datatype_p) +static inline int MPIDI_NM_mpi_type_free_hook(MPIR_Datatype * datatype_p) { MPIR_Assert(0); return 0; } -static inline int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) +static inline int MPIDI_NM_mpi_type_create_hook(MPIR_Datatype * datatype_p) { MPIR_Assert(0); return 0; diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_init.h b/src/mpid/ch4/netmod/stubnm/stubnm_init.h index 8b1a78d..fbe2d18 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_init.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_init.h @@ -13,13 +13,13 @@ #include "stubnm_impl.h" -static inline int MPIDI_NM_init(int rank, - int size, - int appnum, - int *tag_ub, - MPIR_Comm * comm_world, - MPIR_Comm * comm_self, - int spawned, int num_contexts, void **netmod_contexts) +static inline int MPIDI_NM_mpi_init(int rank, + int size, + int appnum, + int *tag_ub, + MPIR_Comm * comm_world, + MPIR_Comm * comm_self, + int spawned, int num_contexts, void **netmod_contexts) { int mpi_errno = MPI_SUCCESS; @@ -28,7 +28,7 @@ static inline int MPIDI_NM_init(int rank, return mpi_errno; } -static inline int MPIDI_NM_finalize(void) +static inline int MPIDI_NM_mpi_finalize(void) { int mpi_errno = MPI_SUCCESS; MPIR_Assert(0); @@ -69,14 +69,14 @@ static inline int MPIDI_NM_create_intercomm_from_lpids(MPIR_Comm * newcomm_ptr, return MPI_SUCCESS; } -static inline int MPIDI_NM_free_mem(void *ptr) +static inline int MPIDI_NM_mpi_free_mem(void *ptr) { - return MPIDI_CH4U_free_mem(ptr); + return MPIDI_CH4U_mpi_free_mem(ptr); } -static inline void *MPIDI_NM_alloc_mem(size_t size, MPIR_Info * info_ptr) +static inline void *MPIDI_NM_mpi_alloc_mem(size_t size, MPIR_Info * info_ptr) { - return MPIDI_CH4U_alloc_mem(size, info_ptr); + return MPIDI_CH4U_mpi_alloc_mem(size, info_ptr); } diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_op.h b/src/mpid/ch4/netmod/stubnm/stubnm_op.h index 3c37b0d..de79fac 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_op.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_op.h @@ -13,13 +13,13 @@ #include "stubnm_impl.h" -static inline int MPIDI_NM_op_free_hook(MPIR_Op * op_p) +static inline int MPIDI_NM_mpi_op_free_hook(MPIR_Op * op_p) { MPIR_Assert(0); return; } -static inline int MPIDI_NM_op_create_hook(MPIR_Op * op_p) +static inline int MPIDI_NM_mpi_op_create_hook(MPIR_Op * op_p) { MPIR_Assert(0); return; diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_probe.h b/src/mpid/ch4/netmod/stubnm/stubnm_probe.h index 6442fb6..15f8f62 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_probe.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_probe.h @@ -19,21 +19,21 @@ static inline int MPIDI_NM_probe(int source, return MPIDI_CH4U_probe(source, tag, comm, context_offset, status); } -static inline int MPIDI_NM_improbe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, - int *flag, MPIR_Request ** message, MPI_Status * status) +static inline int MPIDI_NM_mpi_improbe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, + int *flag, MPIR_Request ** message, MPI_Status * status) { - return MPIDI_CH4U_improbe(source, tag, comm, context_offset, flag, message, status); + return MPIDI_CH4U_mpi_improbe(source, tag, comm, context_offset, flag, message, status); } -static inline int MPIDI_NM_iprobe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, int *flag, MPI_Status * status) +static inline int MPIDI_NM_mpi_iprobe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, int *flag, MPI_Status * status) { - return MPIDI_CH4U_iprobe(source, tag, comm, context_offset, flag, status); + return MPIDI_CH4U_mpi_iprobe(source, tag, comm, context_offset, flag, status); } #endif /* NETMOD_STUBNM_PROBE_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_recv.h b/src/mpid/ch4/netmod/stubnm/stubnm_recv.h index 18724cc..3916157 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_recv.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_recv.h @@ -13,52 +13,54 @@ #include "stubnm_impl.h" -static inline int MPIDI_NM_recv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPI_Status * status, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_recv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPI_Status * status, + MPIR_Request ** request) { int err = MPI_SUCCESS; MPIR_Assert(0); return err; } -static inline int MPIDI_NM_recv_init(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_recv_init(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_imrecv(void *buf, - int count, - MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp) +static inline int MPIDI_NM_mpi_imrecv(void *buf, + int count, + MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_irecv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_irecv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { int err = MPI_SUCCESS; MPIR_Assert(0); return err; } -static inline int MPIDI_NM_cancel_recv(MPIR_Request * rreq) +static inline int MPIDI_NM_mpi_cancel_recv(MPIR_Request * rreq) { MPIR_Assert(0); return MPI_SUCCESS; diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_rma.h b/src/mpid/ch4/netmod/stubnm/stubnm_rma.h index de8172f..d78f373 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_rma.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_rma.h @@ -13,136 +13,141 @@ #include "stubnm_impl.h" -static inline int MPIDI_NM_put(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_NM_mpi_put(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { - return MPIDI_CH4U_put(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + return MPIDI_CH4U_mpi_put(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); } -static inline int MPIDI_NM_get(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_NM_mpi_get(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { - return MPIDI_CH4U_get(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + return MPIDI_CH4U_mpi_get(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); } -static inline int MPIDI_NM_rput(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rput(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rput(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win, request); + return MPIDI_CH4U_mpi_rput(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win, + request); } -static inline int MPIDI_NM_compare_and_swap(const void *origin_addr, - const void *compare_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, MPIR_Win * win) -{ - return MPIDI_CH4U_compare_and_swap(origin_addr, compare_addr, result_addr, - datatype, target_rank, target_disp, win); -} - -static inline int MPIDI_NM_raccumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_compare_and_swap(const void *origin_addr, + const void *compare_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp, + MPIR_Win * win) { - return MPIDI_CH4U_raccumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win, request); + return MPIDI_CH4U_mpi_compare_and_swap(origin_addr, compare_addr, result_addr, + datatype, target_rank, target_disp, win); } -static inline int MPIDI_NM_rget_accumulate(const void *origin_addr, +static inline int MPIDI_NM_mpi_raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rget_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, + return MPIDI_CH4U_mpi_raccumulate(origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, win, request); } -static inline int MPIDI_NM_fetch_and_op(const void *origin_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, - MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) +static inline int MPIDI_NM_mpi_rget_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +{ + return MPIDI_CH4U_mpi_rget_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win, request); +} + +static inline int MPIDI_NM_mpi_fetch_and_op(const void *origin_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, + MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) { - return MPIDI_CH4U_fetch_and_op(origin_addr, result_addr, datatype, - target_rank, target_disp, op, win); + return MPIDI_CH4U_mpi_fetch_and_op(origin_addr, result_addr, datatype, + target_rank, target_disp, op, win); } -static inline int MPIDI_NM_rget(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rget(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rget(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win, request); + return MPIDI_CH4U_mpi_rget(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win, + request); } -static inline int MPIDI_NM_get_accumulate(const void *origin_addr, +static inline int MPIDI_NM_mpi_get_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) +{ + return MPIDI_CH4U_mpi_get_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win); +} + +static inline int MPIDI_NM_mpi_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) { - return MPIDI_CH4U_get_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win); -} - -static inline int MPIDI_NM_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) -{ - return MPIDI_CH4U_accumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, op, win); + return MPIDI_CH4U_mpi_accumulate(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, op, + win); } #endif /* NETMOD_STUBNM_RMA_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_send.h b/src/mpid/ch4/netmod/stubnm/stubnm_send.h index c83867d..b543c42 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_send.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_send.h @@ -13,14 +13,14 @@ #include "stubnm_impl.h" -static inline int MPIDI_NM_send(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_send(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_send(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_send(buf, count, datatype, rank, tag, comm, context_offset, request); } static inline int MPIDI_NM_rsend(const void *buf, @@ -45,84 +45,91 @@ static inline int MPIDI_NM_irsend(const void *buf, return MPIDI_CH4U_irsend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_ssend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_ssend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_startall(int count, MPIR_Request * requests[]) +static inline int MPIDI_NM_mpi_startall(int count, MPIR_Request * requests[]) { - return MPIDI_CH4U_startall(count, requests); + return MPIDI_CH4U_mpi_startall(count, requests); } -static inline int MPIDI_NM_send_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_send_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_send_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_send_init(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_ssend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_ssend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_ssend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_ssend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } -static inline int MPIDI_NM_bsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_bsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_bsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_bsend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } -static inline int MPIDI_NM_rsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_rsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_rsend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } -static inline int MPIDI_NM_isend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_isend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_isend(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_isend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_issend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_issend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_issend(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_issend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_cancel_send(MPIR_Request * sreq) +static inline int MPIDI_NM_mpi_cancel_send(MPIR_Request * sreq) { - return MPIDI_CH4U_cancel_send(sreq); + return MPIDI_CH4U_mpi_cancel_send(sreq); } #endif /* NETMOD_STUBNM_SEND_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_spawn.h b/src/mpid/ch4/netmod/stubnm/stubnm_spawn.h index 2f70a59..1c6725b 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_spawn.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_spawn.h @@ -13,35 +13,35 @@ #include "stubnm_impl.h" -static inline int MPIDI_NM_comm_connect(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) +static inline int MPIDI_NM_mpi_comm_connect(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_comm_disconnect(MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_comm_disconnect(MPIR_Comm * comm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_open_port(MPIR_Info * info_ptr, char *port_name) +static inline int MPIDI_NM_mpi_open_port(MPIR_Info * info_ptr, char *port_name) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_close_port(const char *port_name) +static inline int MPIDI_NM_mpi_close_port(const char *port_name) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_NM_comm_accept(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) +static inline int MPIDI_NM_mpi_comm_accept(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_win.h b/src/mpid/ch4/netmod/stubnm/stubnm_win.h index 5c8a112..fd99d1a 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_win.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_win.h @@ -13,147 +13,150 @@ #include "stubnm_impl.h" -static inline int MPIDI_NM_win_set_info(MPIR_Win * win, MPIR_Info * info) +static inline int MPIDI_NM_mpi_win_set_info(MPIR_Win * win, MPIR_Info * info) { - return MPIDI_CH4R_win_set_info(win, info); + return MPIDI_CH4R_mpi_win_set_info(win, info); } -static inline int MPIDI_NM_win_start(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_start(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_start(group, assert, win); + return MPIDI_CH4R_mpi_win_start(group, assert, win); } -static inline int MPIDI_NM_win_complete(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_complete(MPIR_Win * win) { - return MPIDI_CH4R_win_complete(win); + return MPIDI_CH4R_mpi_win_complete(win); } -static inline int MPIDI_NM_win_post(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_post(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_post(group, assert, win); + return MPIDI_CH4R_mpi_win_post(group, assert, win); } -static inline int MPIDI_NM_win_wait(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_wait(MPIR_Win * win) { - return MPIDI_CH4R_win_wait(win); + return MPIDI_CH4R_mpi_win_wait(win); } -static inline int MPIDI_NM_win_test(MPIR_Win * win, int *flag) +static inline int MPIDI_NM_mpi_win_test(MPIR_Win * win, int *flag) { - return MPIDI_CH4R_win_test(win, flag); + return MPIDI_CH4R_mpi_win_test(win, flag); } -static inline int MPIDI_NM_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_lock(lock_type, rank, assert, win); + return MPIDI_CH4R_mpi_win_lock(lock_type, rank, assert, win); } -static inline int MPIDI_NM_win_unlock(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_unlock(int rank, MPIR_Win * win) { - return MPIDI_CH4R_win_unlock(rank, win); + return MPIDI_CH4R_mpi_win_unlock(rank, win); } -static inline int MPIDI_NM_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) +static inline int MPIDI_NM_mpi_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) { - return MPIDI_CH4R_win_get_info(win, info_p_p); + return MPIDI_CH4R_mpi_win_get_info(win, info_p_p); } -static inline int MPIDI_NM_win_free(MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_free(MPIR_Win ** win_ptr) { - return MPIDI_CH4R_win_free(win_ptr); + return MPIDI_CH4R_mpi_win_free(win_ptr); } -static inline int MPIDI_NM_win_fence(int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_fence(int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_fence(assert, win); + return MPIDI_CH4R_mpi_win_fence(assert, win); } -static inline int MPIDI_NM_win_create(void *base, - MPI_Aint length, - int disp_unit, - MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_create(void *base, + MPI_Aint length, + int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr) { - return MPIDI_CH4R_win_create(base, length, disp_unit, info, comm_ptr, win_ptr); + return MPIDI_CH4R_mpi_win_create(base, length, disp_unit, info, comm_ptr, win_ptr); } -static inline int MPIDI_NM_win_attach(MPIR_Win * win, void *base, MPI_Aint size) +static inline int MPIDI_NM_mpi_win_attach(MPIR_Win * win, void *base, MPI_Aint size) { - return MPIDI_CH4R_win_attach(win, base, size); + return MPIDI_CH4R_mpi_win_attach(win, base, size); } -static inline int MPIDI_NM_win_allocate_shared(MPI_Aint size, - int disp_unit, - MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, - void **base_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_allocate_shared(MPI_Aint size, + int disp_unit, + MPIR_Info * info_ptr, + MPIR_Comm * comm_ptr, + void **base_ptr, MPIR_Win ** win_ptr) { - return MPIDI_CH4R_win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, base_ptr, win_ptr); + return MPIDI_CH4R_mpi_win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, base_ptr, + win_ptr); } -static inline int MPIDI_NM_win_detach(MPIR_Win * win, const void *base) +static inline int MPIDI_NM_mpi_win_detach(MPIR_Win * win, const void *base) { - return MPIDI_CH4R_win_detach(win, base); + return MPIDI_CH4R_mpi_win_detach(win, base); } -static inline int MPIDI_NM_win_shared_query(MPIR_Win * win, - int rank, - MPI_Aint * size, int *disp_unit, void *baseptr) +static inline int MPIDI_NM_mpi_win_shared_query(MPIR_Win * win, + int rank, + MPI_Aint * size, int *disp_unit, void *baseptr) { - return MPIDI_CH4R_win_shared_query(win, rank, size, disp_unit, baseptr); + return MPIDI_CH4R_mpi_win_shared_query(win, rank, size, disp_unit, baseptr); } -static inline int MPIDI_NM_win_allocate(MPI_Aint size, - int disp_unit, - MPIR_Info * info, - MPIR_Comm * comm, void *baseptr, MPIR_Win ** win) +static inline int MPIDI_NM_mpi_win_allocate(MPI_Aint size, + int disp_unit, + MPIR_Info * info, + MPIR_Comm * comm, void *baseptr, MPIR_Win ** win) { - return MPIDI_CH4R_win_allocate(size, disp_unit, info, comm, baseptr, win); + return MPIDI_CH4R_mpi_win_allocate(size, disp_unit, info, comm, baseptr, win); } -static inline int MPIDI_NM_win_flush(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush(int rank, MPIR_Win * win) { - return MPIDI_CH4R_win_flush(rank, win); + return MPIDI_CH4R_mpi_win_flush(rank, win); } -static inline int MPIDI_NM_win_flush_local_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_local_all(MPIR_Win * win) { - return MPIDI_CH4R_win_flush_local_all(win); + return MPIDI_CH4R_mpi_win_flush_local_all(win); } -static inline int MPIDI_NM_win_unlock_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_unlock_all(MPIR_Win * win) { - return MPIDI_CH4R_win_unlock_all(win); + return MPIDI_CH4R_mpi_win_unlock_all(win); } -static inline int MPIDI_NM_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, MPIR_Win ** win) +static inline int MPIDI_NM_mpi_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, + MPIR_Win ** win) { - return MPIDI_CH4R_win_create_dynamic(info, comm, win); + return MPIDI_CH4R_mpi_win_create_dynamic(info, comm, win); } -static inline int MPIDI_NM_win_flush_local(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_local(int rank, MPIR_Win * win) { - return MPIDI_CH4R_win_flush_local(rank, win); + return MPIDI_CH4R_mpi_win_flush_local(rank, win); } -static inline int MPIDI_NM_win_sync(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_sync(MPIR_Win * win) { - return MPIDI_CH4R_win_sync(win); + return MPIDI_CH4R_mpi_win_sync(win); } -static inline int MPIDI_NM_win_flush_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_all(MPIR_Win * win) { - return MPIDI_CH4R_win_flush_all(win); + return MPIDI_CH4R_mpi_win_flush_all(win); } -static inline int MPIDI_NM_win_lock_all(int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_lock_all(int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_lock_all(assert, win); + return MPIDI_CH4R_mpi_win_lock_all(assert, win); } diff --git a/src/mpid/ch4/netmod/ucx/func_table.c b/src/mpid/ch4/netmod/ucx/func_table.c index 01c9ec5..aa2a904 100644 --- a/src/mpid/ch4/netmod/ucx/func_table.c +++ b/src/mpid/ch4/netmod/ucx/func_table.c @@ -12,21 +12,21 @@ #include <mpidimpl.h> #include "netmod_direct.h" MPIDI_NM_funcs_t MPIDI_NM_ucx_funcs = { - MPIDI_NM_init, - MPIDI_NM_finalize, + MPIDI_NM_mpi_init, + MPIDI_NM_mpi_finalize, MPIDI_NM_progress, - MPIDI_NM_comm_connect, - MPIDI_NM_comm_disconnect, - MPIDI_NM_open_port, - MPIDI_NM_close_port, - MPIDI_NM_comm_accept, + MPIDI_NM_mpi_comm_connect, + MPIDI_NM_mpi_comm_disconnect, + MPIDI_NM_mpi_open_port, + MPIDI_NM_mpi_close_port, + MPIDI_NM_mpi_comm_accept, MPIDI_NM_comm_get_lpid, MPIDI_NM_gpid_get, MPIDI_NM_getallincomm, MPIDI_NM_gpid_tolpidarray, MPIDI_NM_create_intercomm_from_lpids, - MPIDI_NM_comm_create_hook, - MPIDI_NM_comm_free_hook, + MPIDI_NM_mpi_comm_create_hook, + MPIDI_NM_mpi_comm_free_hook, MPIDI_NM_am_request_init, MPIDI_NM_am_request_finalize, MPIDI_NM_am_reg_handler, @@ -40,108 +40,108 @@ MPIDI_NM_funcs_t MPIDI_NM_ucx_funcs = { }; MPIDI_NM_native_funcs_t MPIDI_NM_native_ucx_funcs = { - MPIDI_NM_send, - MPIDI_NM_ssend, - MPIDI_NM_startall, - MPIDI_NM_send_init, - MPIDI_NM_ssend_init, - MPIDI_NM_rsend_init, - MPIDI_NM_bsend_init, - MPIDI_NM_isend, - MPIDI_NM_issend, - MPIDI_NM_cancel_send, - MPIDI_NM_recv_init, - MPIDI_NM_recv, - MPIDI_NM_irecv, - MPIDI_NM_imrecv, - MPIDI_NM_cancel_recv, - MPIDI_NM_alloc_mem, - MPIDI_NM_free_mem, - MPIDI_NM_improbe, - MPIDI_NM_iprobe, - MPIDI_NM_win_set_info, - MPIDI_NM_win_shared_query, - MPIDI_NM_put, - MPIDI_NM_win_start, - MPIDI_NM_win_complete, - MPIDI_NM_win_post, - MPIDI_NM_win_wait, - MPIDI_NM_win_test, - MPIDI_NM_win_lock, - MPIDI_NM_win_unlock, - MPIDI_NM_win_get_info, - MPIDI_NM_get, - MPIDI_NM_win_free, - MPIDI_NM_win_fence, - MPIDI_NM_win_create, - MPIDI_NM_accumulate, - MPIDI_NM_win_attach, - MPIDI_NM_win_allocate_shared, - MPIDI_NM_rput, - MPIDI_NM_win_flush_local, - MPIDI_NM_win_detach, - MPIDI_NM_compare_and_swap, - MPIDI_NM_raccumulate, - MPIDI_NM_rget_accumulate, - MPIDI_NM_fetch_and_op, - MPIDI_NM_win_allocate, - MPIDI_NM_win_flush, - MPIDI_NM_win_flush_local_all, - MPIDI_NM_win_unlock_all, - MPIDI_NM_win_create_dynamic, - MPIDI_NM_rget, - MPIDI_NM_win_sync, - MPIDI_NM_win_flush_all, - MPIDI_NM_get_accumulate, - MPIDI_NM_win_lock_all, + MPIDI_NM_mpi_send, + MPIDI_NM_mpi_ssend, + MPIDI_NM_mpi_startall, + MPIDI_NM_mpi_send_init, + MPIDI_NM_mpi_ssend_init, + MPIDI_NM_mpi_rsend_init, + MPIDI_NM_mpi_bsend_init, + MPIDI_NM_mpi_isend, + MPIDI_NM_mpi_issend, + MPIDI_NM_mpi_cancel_send, + MPIDI_NM_mpi_recv_init, + MPIDI_NM_mpi_recv, + MPIDI_NM_mpi_irecv, + MPIDI_NM_mpi_imrecv, + MPIDI_NM_mpi_cancel_recv, + MPIDI_NM_mpi_alloc_mem, + MPIDI_NM_mpi_free_mem, + MPIDI_NM_mpi_improbe, + MPIDI_NM_mpi_iprobe, + MPIDI_NM_mpi_win_set_info, + MPIDI_NM_mpi_win_shared_query, + MPIDI_NM_mpi_put, + MPIDI_NM_mpi_win_start, + MPIDI_NM_mpi_win_complete, + MPIDI_NM_mpi_win_post, + MPIDI_NM_mpi_win_wait, + MPIDI_NM_mpi_win_test, + MPIDI_NM_mpi_win_lock, + MPIDI_NM_mpi_win_unlock, + MPIDI_NM_mpi_win_get_info, + MPIDI_NM_mpi_get, + MPIDI_NM_mpi_win_free, + MPIDI_NM_mpi_win_fence, + MPIDI_NM_mpi_win_create, + MPIDI_NM_mpi_accumulate, + MPIDI_NM_mpi_win_attach, + MPIDI_NM_mpi_win_allocate_shared, + MPIDI_NM_mpi_rput, + MPIDI_NM_mpi_win_flush_local, + MPIDI_NM_mpi_win_detach, + MPIDI_NM_mpi_compare_and_swap, + MPIDI_NM_mpi_raccumulate, + MPIDI_NM_mpi_rget_accumulate, + MPIDI_NM_mpi_fetch_and_op, + MPIDI_NM_mpi_win_allocate, + MPIDI_NM_mpi_win_flush, + MPIDI_NM_mpi_win_flush_local_all, + MPIDI_NM_mpi_win_unlock_all, + MPIDI_NM_mpi_win_create_dynamic, + MPIDI_NM_mpi_rget, + MPIDI_NM_mpi_win_sync, + MPIDI_NM_mpi_win_flush_all, + MPIDI_NM_mpi_get_accumulate, + MPIDI_NM_mpi_win_lock_all, MPIDI_NM_rank_is_local, - MPIDI_NM_barrier, - MPIDI_NM_bcast, - MPIDI_NM_allreduce, - MPIDI_NM_allgather, - MPIDI_NM_allgatherv, - MPIDI_NM_scatter, - MPIDI_NM_scatterv, - MPIDI_NM_gather, - MPIDI_NM_gatherv, - MPIDI_NM_alltoall, - MPIDI_NM_alltoallv, - MPIDI_NM_alltoallw, - MPIDI_NM_reduce, - MPIDI_NM_reduce_scatter, - MPIDI_NM_reduce_scatter_block, - MPIDI_NM_scan, - MPIDI_NM_exscan, - MPIDI_NM_neighbor_allgather, - MPIDI_NM_neighbor_allgatherv, - MPIDI_NM_neighbor_alltoall, - MPIDI_NM_neighbor_alltoallv, - MPIDI_NM_neighbor_alltoallw, - MPIDI_NM_ineighbor_allgather, - MPIDI_NM_ineighbor_allgatherv, - MPIDI_NM_ineighbor_alltoall, - MPIDI_NM_ineighbor_alltoallv, - MPIDI_NM_ineighbor_alltoallw, - MPIDI_NM_ibarrier, - MPIDI_NM_ibcast, - MPIDI_NM_iallgather, - MPIDI_NM_iallgatherv, - MPIDI_NM_iallreduce, - MPIDI_NM_ialltoall, - MPIDI_NM_ialltoallv, - MPIDI_NM_ialltoallw, - MPIDI_NM_iexscan, - MPIDI_NM_igather, - MPIDI_NM_igatherv, - MPIDI_NM_ireduce_scatter_block, - MPIDI_NM_ireduce_scatter, - MPIDI_NM_ireduce, - MPIDI_NM_iscan, - MPIDI_NM_iscatter, - MPIDI_NM_iscatterv, - MPIDI_NM_type_create_hook, - MPIDI_NM_type_free_hook, - MPIDI_NM_op_create_hook, - MPIDI_NM_op_free_hook + MPIDI_NM_mpi_barrier, + MPIDI_NM_mpi_bcast, + MPIDI_NM_mpi_allreduce, + MPIDI_NM_mpi_allgather, + MPIDI_NM_mpi_allgatherv, + MPIDI_NM_mpi_scatter, + MPIDI_NM_mpi_scatterv, + MPIDI_NM_mpi_gather, + MPIDI_NM_mpi_gatherv, + MPIDI_NM_mpi_alltoall, + MPIDI_NM_mpi_alltoallv, + MPIDI_NM_mpi_alltoallw, + MPIDI_NM_mpi_reduce, + MPIDI_NM_mpi_reduce_scatter, + MPIDI_NM_mpi_reduce_scatter_block, + MPIDI_NM_mpi_scan, + MPIDI_NM_mpi_exscan, + MPIDI_NM_mpi_neighbor_allgather, + MPIDI_NM_mpi_neighbor_allgatherv, + MPIDI_NM_mpi_neighbor_alltoall, + MPIDI_NM_mpi_neighbor_alltoallv, + MPIDI_NM_mpi_neighbor_alltoallw, + MPIDI_NM_mpi_ineighbor_allgather, + MPIDI_NM_mpi_ineighbor_allgatherv, + MPIDI_NM_mpi_ineighbor_alltoall, + MPIDI_NM_mpi_ineighbor_alltoallv, + MPIDI_NM_mpi_ineighbor_alltoallw, + MPIDI_NM_mpi_ibarrier, + MPIDI_NM_mpi_ibcast, + MPIDI_NM_mpi_iallgather, + MPIDI_NM_mpi_iallgatherv, + MPIDI_NM_mpi_iallreduce, + MPIDI_NM_mpi_ialltoall, + MPIDI_NM_mpi_ialltoallv, + MPIDI_NM_mpi_ialltoallw, + MPIDI_NM_mpi_iexscan, + MPIDI_NM_mpi_igather, + MPIDI_NM_mpi_igatherv, + MPIDI_NM_mpi_ireduce_scatter_block, + MPIDI_NM_mpi_ireduce_scatter, + MPIDI_NM_mpi_ireduce, + MPIDI_NM_mpi_iscan, + MPIDI_NM_mpi_iscatter, + MPIDI_NM_mpi_iscatterv, + MPIDI_NM_mpi_type_create_hook, + MPIDI_NM_mpi_type_free_hook, + MPIDI_NM_mpi_op_create_hook, + MPIDI_NM_mpi_op_free_hook }; #endif diff --git a/src/mpid/ch4/netmod/ucx/ucx_am_recv.h b/src/mpid/ch4/netmod/ucx/ucx_am_recv.h index 2f4f821..f3d3305 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_am_recv.h +++ b/src/mpid/ch4/netmod/ucx/ucx_am_recv.h @@ -13,48 +13,51 @@ #include "ucx_impl.h" -static inline int MPIDI_NM_recv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPI_Status * status, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_recv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPI_Status * status, + MPIR_Request ** request) { - return MPIDI_CH4U_recv(buf, count, datatype, rank, tag, comm, context_offset, status, request); + return MPIDI_CH4U_mpi_recv(buf, count, datatype, rank, tag, comm, context_offset, status, + request); } -static inline int MPIDI_NM_recv_init(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_recv_init(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_recv_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_recv_init(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_imrecv(void *buf, - int count, - MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp) +static inline int MPIDI_NM_mpi_imrecv(void *buf, + int count, + MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp) { - return MPIDI_CH4U_imrecv(buf, count, datatype, message, rreqp); + return MPIDI_CH4U_mpi_imrecv(buf, count, datatype, message, rreqp); } -static inline int MPIDI_NM_irecv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_irecv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_cancel_recv(MPIR_Request * rreq) +static inline int MPIDI_NM_mpi_cancel_recv(MPIR_Request * rreq) { - return MPIDI_CH4U_cancel_recv(rreq); + return MPIDI_CH4U_mpi_cancel_recv(rreq); } #endif /* NETMOD_UCX_RECV_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/ucx/ucx_am_rma.h b/src/mpid/ch4/netmod/ucx/ucx_am_rma.h index 7863464..42168e8 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_am_rma.h +++ b/src/mpid/ch4/netmod/ucx/ucx_am_rma.h @@ -14,136 +14,141 @@ #include "ucx_impl.h" -static inline int MPIDI_NM_put(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_NM_mpi_put(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { - return MPIDI_CH4U_put(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + return MPIDI_CH4U_mpi_put(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); } -static inline int MPIDI_NM_get(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_NM_mpi_get(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { - return MPIDI_CH4U_get(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + return MPIDI_CH4U_mpi_get(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); } -static inline int MPIDI_NM_rput(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rput(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rput(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win, request); + return MPIDI_CH4U_mpi_rput(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win, + request); } -static inline int MPIDI_NM_compare_and_swap(const void *origin_addr, - const void *compare_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, MPIR_Win * win) -{ - return MPIDI_CH4U_compare_and_swap(origin_addr, compare_addr, result_addr, - datatype, target_rank, target_disp, win); -} - -static inline int MPIDI_NM_raccumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_compare_and_swap(const void *origin_addr, + const void *compare_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp, + MPIR_Win * win) { - return MPIDI_CH4U_raccumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win, request); + return MPIDI_CH4U_mpi_compare_and_swap(origin_addr, compare_addr, result_addr, + datatype, target_rank, target_disp, win); } -static inline int MPIDI_NM_rget_accumulate(const void *origin_addr, +static inline int MPIDI_NM_mpi_raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rget_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, + return MPIDI_CH4U_mpi_raccumulate(origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, win, request); } -static inline int MPIDI_NM_fetch_and_op(const void *origin_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, - MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) +static inline int MPIDI_NM_mpi_rget_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +{ + return MPIDI_CH4U_mpi_rget_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win, request); +} + +static inline int MPIDI_NM_mpi_fetch_and_op(const void *origin_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, + MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) { - return MPIDI_CH4U_fetch_and_op(origin_addr, result_addr, datatype, - target_rank, target_disp, op, win); + return MPIDI_CH4U_mpi_fetch_and_op(origin_addr, result_addr, datatype, + target_rank, target_disp, op, win); } -static inline int MPIDI_NM_rget(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rget(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rget(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win, request); + return MPIDI_CH4U_mpi_rget(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win, + request); } -static inline int MPIDI_NM_get_accumulate(const void *origin_addr, +static inline int MPIDI_NM_mpi_get_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) +{ + return MPIDI_CH4U_mpi_get_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win); +} + +static inline int MPIDI_NM_mpi_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) { - return MPIDI_CH4U_get_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win); -} - -static inline int MPIDI_NM_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) -{ - return MPIDI_CH4U_accumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, op, win); + return MPIDI_CH4U_mpi_accumulate(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, op, + win); } #endif /* NETMOD_UCX_AM_RMA_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/ucx/ucx_am_send.h b/src/mpid/ch4/netmod/ucx/ucx_am_send.h index 9fd977b..3c9ec9b 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_am_send.h +++ b/src/mpid/ch4/netmod/ucx/ucx_am_send.h @@ -13,14 +13,14 @@ #include "ucx_impl.h" -static inline int MPIDI_NM_send(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_send(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_send(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_send(buf, count, datatype, rank, tag, comm, context_offset, request); } static inline int MPIDI_NM_rsend(const void *buf, @@ -45,84 +45,91 @@ static inline int MPIDI_NM_irsend(const void *buf, return MPIDI_CH4U_irsend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_ssend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_ssend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_startall(int count, MPIR_Request * requests[]) +static inline int MPIDI_NM_mpi_startall(int count, MPIR_Request * requests[]) { - return MPIDI_CH4U_startall(count, requests); + return MPIDI_CH4U_mpi_startall(count, requests); } -static inline int MPIDI_NM_send_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_send_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_send_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_send_init(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_ssend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_ssend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_ssend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_ssend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } -static inline int MPIDI_NM_bsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_bsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_bsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_bsend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } -static inline int MPIDI_NM_rsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_rsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_rsend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } -static inline int MPIDI_NM_isend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_isend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_isend(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_isend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_issend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_issend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_issend(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_issend(buf, count, datatype, rank, tag, comm, context_offset, request); } -static inline int MPIDI_NM_cancel_send(MPIR_Request * sreq) +static inline int MPIDI_NM_mpi_cancel_send(MPIR_Request * sreq) { - return MPIDI_CH4U_cancel_send(sreq); + return MPIDI_CH4U_mpi_cancel_send(sreq); } #endif /* NETMOD_UCX_SEND_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/ucx/ucx_am_win.h b/src/mpid/ch4/netmod/ucx/ucx_am_win.h index 2bf5da9..ea142a5 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_am_win.h +++ b/src/mpid/ch4/netmod/ucx/ucx_am_win.h @@ -13,147 +13,150 @@ #include "ucx_impl.h" -static inline int MPIDI_NM_win_set_info(MPIR_Win * win, MPIR_Info * info) +static inline int MPIDI_NM_mpi_win_set_info(MPIR_Win * win, MPIR_Info * info) { - return MPIDI_CH4R_win_set_info(win, info); + return MPIDI_CH4R_mpi_win_set_info(win, info); } -static inline int MPIDI_NM_win_start(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_start(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_start(group, assert, win); + return MPIDI_CH4R_mpi_win_start(group, assert, win); } -static inline int MPIDI_NM_win_complete(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_complete(MPIR_Win * win) { - return MPIDI_CH4R_win_complete(win); + return MPIDI_CH4R_mpi_win_complete(win); } -static inline int MPIDI_NM_win_post(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_post(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_post(group, assert, win); + return MPIDI_CH4R_mpi_win_post(group, assert, win); } -static inline int MPIDI_NM_win_wait(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_wait(MPIR_Win * win) { - return MPIDI_CH4R_win_wait(win); + return MPIDI_CH4R_mpi_win_wait(win); } -static inline int MPIDI_NM_win_test(MPIR_Win * win, int *flag) +static inline int MPIDI_NM_mpi_win_test(MPIR_Win * win, int *flag) { - return MPIDI_CH4R_win_test(win, flag); + return MPIDI_CH4R_mpi_win_test(win, flag); } -static inline int MPIDI_NM_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_lock(lock_type, rank, assert, win); + return MPIDI_CH4R_mpi_win_lock(lock_type, rank, assert, win); } -static inline int MPIDI_NM_win_unlock(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_unlock(int rank, MPIR_Win * win) { - return MPIDI_CH4R_win_unlock(rank, win); + return MPIDI_CH4R_mpi_win_unlock(rank, win); } -static inline int MPIDI_NM_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) +static inline int MPIDI_NM_mpi_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) { - return MPIDI_CH4R_win_get_info(win, info_p_p); + return MPIDI_CH4R_mpi_win_get_info(win, info_p_p); } -static inline int MPIDI_NM_win_free(MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_free(MPIR_Win ** win_ptr) { - return MPIDI_CH4R_win_free(win_ptr); + return MPIDI_CH4R_mpi_win_free(win_ptr); } -static inline int MPIDI_NM_win_fence(int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_fence(int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_fence(assert, win); + return MPIDI_CH4R_mpi_win_fence(assert, win); } -static inline int MPIDI_NM_win_create(void *base, - MPI_Aint length, - int disp_unit, - MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_create(void *base, + MPI_Aint length, + int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr) { - return MPIDI_CH4R_win_create(base, length, disp_unit, info, comm_ptr, win_ptr); + return MPIDI_CH4R_mpi_win_create(base, length, disp_unit, info, comm_ptr, win_ptr); } -static inline int MPIDI_NM_win_attach(MPIR_Win * win, void *base, MPI_Aint size) +static inline int MPIDI_NM_mpi_win_attach(MPIR_Win * win, void *base, MPI_Aint size) { - return MPIDI_CH4R_win_attach(win, base, size); + return MPIDI_CH4R_mpi_win_attach(win, base, size); } -static inline int MPIDI_NM_win_allocate_shared(MPI_Aint size, - int disp_unit, - MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, - void **base_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_allocate_shared(MPI_Aint size, + int disp_unit, + MPIR_Info * info_ptr, + MPIR_Comm * comm_ptr, + void **base_ptr, MPIR_Win ** win_ptr) { - return MPIDI_CH4R_win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, base_ptr, win_ptr); + return MPIDI_CH4R_mpi_win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, base_ptr, + win_ptr); } -static inline int MPIDI_NM_win_detach(MPIR_Win * win, const void *base) +static inline int MPIDI_NM_mpi_win_detach(MPIR_Win * win, const void *base) { - return MPIDI_CH4R_win_detach(win, base); + return MPIDI_CH4R_mpi_win_detach(win, base); } -static inline int MPIDI_NM_win_shared_query(MPIR_Win * win, - int rank, - MPI_Aint * size, int *disp_unit, void *baseptr) +static inline int MPIDI_NM_mpi_win_shared_query(MPIR_Win * win, + int rank, + MPI_Aint * size, int *disp_unit, void *baseptr) { - return MPIDI_CH4R_win_shared_query(win, rank, size, disp_unit, baseptr); + return MPIDI_CH4R_mpi_win_shared_query(win, rank, size, disp_unit, baseptr); } -static inline int MPIDI_NM_win_allocate(MPI_Aint size, - int disp_unit, - MPIR_Info * info, - MPIR_Comm * comm, void *baseptr, MPIR_Win ** win) +static inline int MPIDI_NM_mpi_win_allocate(MPI_Aint size, + int disp_unit, + MPIR_Info * info, + MPIR_Comm * comm, void *baseptr, MPIR_Win ** win) { - return MPIDI_CH4R_win_allocate(size, disp_unit, info, comm, baseptr, win); + return MPIDI_CH4R_mpi_win_allocate(size, disp_unit, info, comm, baseptr, win); } -static inline int MPIDI_NM_win_flush(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush(int rank, MPIR_Win * win) { - return MPIDI_CH4R_win_flush(rank, win); + return MPIDI_CH4R_mpi_win_flush(rank, win); } -static inline int MPIDI_NM_win_flush_local_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_local_all(MPIR_Win * win) { - return MPIDI_CH4R_win_flush_local_all(win); + return MPIDI_CH4R_mpi_win_flush_local_all(win); } -static inline int MPIDI_NM_win_unlock_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_unlock_all(MPIR_Win * win) { - return MPIDI_CH4R_win_unlock_all(win); + return MPIDI_CH4R_mpi_win_unlock_all(win); } -static inline int MPIDI_NM_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, MPIR_Win ** win) +static inline int MPIDI_NM_mpi_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, + MPIR_Win ** win) { - return MPIDI_CH4R_win_create_dynamic(info, comm, win); + return MPIDI_CH4R_mpi_win_create_dynamic(info, comm, win); } -static inline int MPIDI_NM_win_flush_local(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_local(int rank, MPIR_Win * win) { - return MPIDI_CH4R_win_flush_local(rank, win); + return MPIDI_CH4R_mpi_win_flush_local(rank, win); } -static inline int MPIDI_NM_win_sync(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_sync(MPIR_Win * win) { - return MPIDI_CH4R_win_sync(win); + return MPIDI_CH4R_mpi_win_sync(win); } -static inline int MPIDI_NM_win_flush_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_all(MPIR_Win * win) { - return MPIDI_CH4R_win_flush_all(win); + return MPIDI_CH4R_mpi_win_flush_all(win); } -static inline int MPIDI_NM_win_lock_all(int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_lock_all(int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_lock_all(assert, win); + return MPIDI_CH4R_mpi_win_lock_all(assert, win); } diff --git a/src/mpid/ch4/netmod/ucx/ucx_coll.h b/src/mpid/ch4/netmod/ucx/ucx_coll.h index 185c5b9..6d1d37c 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_coll.h +++ b/src/mpid/ch4/netmod/ucx/ucx_coll.h @@ -12,10 +12,10 @@ #include "ucx_impl.h" #undef FUNCNAME -#define FUNCNAME MPIDI_NM_barrier +#define FUNCNAME MPIDI_NM_mpi_barrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_BARRIER); @@ -28,11 +28,11 @@ static inline int MPIDI_NM_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errfla } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_bcast +#define FUNCNAME MPIDI_NM_mpi_bcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_bcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_bcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_BCAST); @@ -45,12 +45,12 @@ static inline int MPIDI_NM_bcast(void *buffer, int count, MPI_Datatype datatype, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_allreduce +#define FUNCNAME MPIDI_NM_mpi_allreduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_allreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_allreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLREDUCE); @@ -63,12 +63,12 @@ static inline int MPIDI_NM_allreduce(const void *sendbuf, void *recvbuf, int cou } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_allgather +#define FUNCNAME MPIDI_NM_mpi_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLGATHER); @@ -82,13 +82,13 @@ static inline int MPIDI_NM_allgather(const void *sendbuf, int sendcount, MPI_Dat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_allgatherv +#define FUNCNAME MPIDI_NM_mpi_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLGATHERV); @@ -102,12 +102,12 @@ static inline int MPIDI_NM_allgatherv(const void *sendbuf, int sendcount, MPI_Da } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_gather +#define FUNCNAME MPIDI_NM_mpi_gather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_GATHER); @@ -121,13 +121,13 @@ static inline int MPIDI_NM_gather(const void *sendbuf, int sendcount, MPI_Dataty } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_gatherv +#define FUNCNAME MPIDI_NM_mpi_gatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_GATHERV); @@ -141,12 +141,12 @@ static inline int MPIDI_NM_gatherv(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_scatter +#define FUNCNAME MPIDI_NM_mpi_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_SCATTER); @@ -160,13 +160,13 @@ static inline int MPIDI_NM_scatter(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_scatterv +#define FUNCNAME MPIDI_NM_mpi_scatterv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_scatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_scatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_SCATTERV); @@ -180,12 +180,12 @@ static inline int MPIDI_NM_scatterv(const void *sendbuf, const int *sendcounts, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_alltoall +#define FUNCNAME MPIDI_NM_mpi_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLTOALL); @@ -199,14 +199,14 @@ static inline int MPIDI_NM_alltoall(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_alltoallv +#define FUNCNAME MPIDI_NM_mpi_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_alltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_alltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLTOALLV); @@ -219,14 +219,14 @@ static inline int MPIDI_NM_alltoallv(const void *sendbuf, const int *sendcounts, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_alltoallw +#define FUNCNAME MPIDI_NM_mpi_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_alltoallw(const void *sendbuf, const int sendcounts[], - const int sdispls[], const MPI_Datatype sendtypes[], - void *recvbuf, const int recvcounts[], - const int rdispls[], const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_alltoallw(const void *sendbuf, const int sendcounts[], + const int sdispls[], const MPI_Datatype sendtypes[], + void *recvbuf, const int recvcounts[], + const int rdispls[], const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ALLTOALLW); @@ -240,12 +240,12 @@ static inline int MPIDI_NM_alltoallw(const void *sendbuf, const int sendcounts[] } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_reduce +#define FUNCNAME MPIDI_NM_mpi_reduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_reduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_reduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_REDUCE); @@ -258,12 +258,13 @@ static inline int MPIDI_NM_reduce(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_reduce_scatter +#define FUNCNAME MPIDI_NM_mpi_reduce_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_reduce_scatter(const void *sendbuf, void *recvbuf, - const int recvcounts[], MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_reduce_scatter(const void *sendbuf, void *recvbuf, + const int recvcounts[], MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_REDUCE_SCATTER); @@ -276,13 +277,13 @@ static inline int MPIDI_NM_reduce_scatter(const void *sendbuf, void *recvbuf, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_reduce_scatter_block +#define FUNCNAME MPIDI_NM_mpi_reduce_scatter_block #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_reduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_reduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_REDUCE_SCATTER_BLOCK); @@ -296,12 +297,12 @@ static inline int MPIDI_NM_reduce_scatter_block(const void *sendbuf, void *recvb } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_scan +#define FUNCNAME MPIDI_NM_mpi_scan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_scan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_scan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_SCAN); @@ -314,12 +315,12 @@ static inline int MPIDI_NM_scan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_exscan +#define FUNCNAME MPIDI_NM_mpi_exscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_exscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_NM_mpi_exscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_EXSCAN); @@ -332,12 +333,13 @@ static inline int MPIDI_NM_exscan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_allgather +#define FUNCNAME MPIDI_NM_mpi_neighbor_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLGATHER); @@ -352,13 +354,13 @@ static inline int MPIDI_NM_neighbor_allgather(const void *sendbuf, int sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_allgatherv +#define FUNCNAME MPIDI_NM_mpi_neighbor_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLGATHERV); @@ -372,12 +374,13 @@ static inline int MPIDI_NM_neighbor_allgatherv(const void *sendbuf, int sendcoun } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_alltoall +#define FUNCNAME MPIDI_NM_mpi_neighbor_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLTOALL); @@ -391,14 +394,14 @@ static inline int MPIDI_NM_neighbor_alltoall(const void *sendbuf, int sendcount, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_alltoallv +#define FUNCNAME MPIDI_NM_mpi_neighbor_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_alltoallv(const void *sendbuf, const int sendcounts[], - const int sdispls[], MPI_Datatype sendtype, - void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, - MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLTOALLV); @@ -412,14 +415,15 @@ static inline int MPIDI_NM_neighbor_alltoallv(const void *sendbuf, const int sen } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_neighbor_alltoallw +#define FUNCNAME MPIDI_NM_mpi_neighbor_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_neighbor_alltoallw(const void *sendbuf, const int sendcounts[], - const MPI_Aint sdispls[], - const MPI_Datatype sendtypes[], void *recvbuf, - const int recvcounts[], const MPI_Aint rdispls[], - const MPI_Datatype recvtypes[], MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_neighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, + const int recvcounts[], const MPI_Aint rdispls[], + const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_NEIGHBOR_ALLTOALLW); @@ -433,13 +437,13 @@ static inline int MPIDI_NM_neighbor_alltoallw(const void *sendbuf, const int sen } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_allgather +#define FUNCNAME MPIDI_NM_mpi_ineighbor_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLGATHER); @@ -453,14 +457,14 @@ static inline int MPIDI_NM_ineighbor_allgather(const void *sendbuf, int sendcoun } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_allgatherv +#define FUNCNAME MPIDI_NM_mpi_ineighbor_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLGATHERV); @@ -475,13 +479,13 @@ static inline int MPIDI_NM_ineighbor_allgatherv(const void *sendbuf, int sendcou } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_alltoall +#define FUNCNAME MPIDI_NM_mpi_ineighbor_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLTOALL); @@ -495,14 +499,14 @@ static inline int MPIDI_NM_ineighbor_alltoall(const void *sendbuf, int sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_alltoallv +#define FUNCNAME MPIDI_NM_mpi_ineighbor_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], - const int sdispls[], MPI_Datatype sendtype, - void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLTOALLV); @@ -517,15 +521,15 @@ static inline int MPIDI_NM_ineighbor_alltoallv(const void *sendbuf, const int se } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ineighbor_alltoallw +#define FUNCNAME MPIDI_NM_mpi_ineighbor_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], - const MPI_Aint sdispls[], - const MPI_Datatype sendtypes[], void *recvbuf, - const int recvcounts[], const MPI_Aint rdispls[], - const MPI_Datatype recvtypes[], MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, + const int recvcounts[], const MPI_Aint rdispls[], + const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_INEIGHBOR_ALLTOALLW); @@ -540,10 +544,10 @@ static inline int MPIDI_NM_ineighbor_alltoallw(const void *sendbuf, const int se } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ibarrier +#define FUNCNAME MPIDI_NM_mpi_ibarrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IBARRIER); @@ -556,11 +560,11 @@ static inline int MPIDI_NM_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ibcast +#define FUNCNAME MPIDI_NM_mpi_ibcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ibcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ibcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IBCAST); @@ -573,12 +577,12 @@ static inline int MPIDI_NM_ibcast(void *buffer, int count, MPI_Datatype datatype } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iallgather +#define FUNCNAME MPIDI_NM_mpi_iallgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLGATHER); @@ -592,13 +596,14 @@ static inline int MPIDI_NM_iallgather(const void *sendbuf, int sendcount, MPI_Da } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iallgatherv +#define FUNCNAME MPIDI_NM_mpi_iallgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_iallgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLGATHERV); @@ -612,12 +617,12 @@ static inline int MPIDI_NM_iallgatherv(const void *sendbuf, int sendcount, MPI_D } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iallreduce +#define FUNCNAME MPIDI_NM_mpi_iallreduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iallreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPI_Request * request) +static inline int MPIDI_NM_mpi_iallreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPI_Request * request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLREDUCE); @@ -630,12 +635,12 @@ static inline int MPIDI_NM_iallreduce(const void *sendbuf, void *recvbuf, int co } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ialltoall +#define FUNCNAME MPIDI_NM_mpi_ialltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLTOALL); @@ -649,14 +654,14 @@ static inline int MPIDI_NM_ialltoall(const void *sendbuf, int sendcount, MPI_Dat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ialltoallv +#define FUNCNAME MPIDI_NM_mpi_ialltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ialltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ialltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLTOALLV); @@ -671,14 +676,14 @@ static inline int MPIDI_NM_ialltoallv(const void *sendbuf, const int *sendcounts } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ialltoallw +#define FUNCNAME MPIDI_NM_mpi_ialltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ialltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, const MPI_Datatype sendtypes[], - void *recvbuf, const int *recvcounts, - const int *rdispls, const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ialltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, const MPI_Datatype sendtypes[], + void *recvbuf, const int *recvcounts, + const int *rdispls, const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IALLTOALLW); @@ -693,12 +698,12 @@ static inline int MPIDI_NM_ialltoallw(const void *sendbuf, const int *sendcounts } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iexscan +#define FUNCNAME MPIDI_NM_mpi_iexscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iexscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_iexscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IEXSCAN); @@ -711,12 +716,12 @@ static inline int MPIDI_NM_iexscan(const void *sendbuf, void *recvbuf, int count } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_igather +#define FUNCNAME MPIDI_NM_mpi_igather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IGATHER); @@ -730,13 +735,13 @@ static inline int MPIDI_NM_igather(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_igatherv +#define FUNCNAME MPIDI_NM_mpi_igatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IGATHERV); @@ -750,12 +755,13 @@ static inline int MPIDI_NM_igatherv(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ireduce_scatter_block +#define FUNCNAME MPIDI_NM_mpi_ireduce_scatter_block #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ireduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ireduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE_SCATTER_BLOCK); @@ -769,12 +775,12 @@ static inline int MPIDI_NM_ireduce_scatter_block(const void *sendbuf, void *recv } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ireduce_scatter +#define FUNCNAME MPIDI_NM_mpi_ireduce_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ireduce_scatter(const void *sendbuf, void *recvbuf, - const int recvcounts[], MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ireduce_scatter(const void *sendbuf, void *recvbuf, + const int recvcounts[], MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE_SCATTER); @@ -788,12 +794,12 @@ static inline int MPIDI_NM_ireduce_scatter(const void *sendbuf, void *recvbuf, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_ireduce +#define FUNCNAME MPIDI_NM_mpi_ireduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ireduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_NM_mpi_ireduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_IREDUCE); @@ -806,12 +812,12 @@ static inline int MPIDI_NM_ireduce(const void *sendbuf, void *recvbuf, int count } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iscan +#define FUNCNAME MPIDI_NM_mpi_iscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_NM_mpi_iscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ISCAN); @@ -824,13 +830,13 @@ static inline int MPIDI_NM_iscan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iscatter +#define FUNCNAME MPIDI_NM_mpi_iscatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iscatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm, MPI_Request * request) +static inline int MPIDI_NM_mpi_iscatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ISCATTER); @@ -844,14 +850,14 @@ static inline int MPIDI_NM_iscatter(const void *sendbuf, int sendcount, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_iscatterv +#define FUNCNAME MPIDI_NM_mpi_iscatterv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_iscatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * request) +static inline int MPIDI_NM_mpi_iscatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NM_ISCATTERV); diff --git a/src/mpid/ch4/netmod/ucx/ucx_comm.h b/src/mpid/ch4/netmod/ucx/ucx_comm.h index 5b4368c..85e1ce0 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_comm.h +++ b/src/mpid/ch4/netmod/ucx/ucx_comm.h @@ -12,10 +12,10 @@ #include "ucx_impl.h" #undef FUNCNAME -#define FUNCNAME MPIDI_NM_comm_create_hook +#define FUNCNAME MPIDI_NM_mpi_comm_create_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_create_hook(MPIR_Comm * comm) +static inline int MPIDI_NM_mpi_comm_create_hook(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_UCX_COMM_CREATE); @@ -29,10 +29,10 @@ static inline int MPIDI_NM_comm_create_hook(MPIR_Comm * comm) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_comm_free_hook +#define FUNCNAME MPIDI_NM_mpi_comm_free_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_free_hook(MPIR_Comm * comm) +static inline int MPIDI_NM_mpi_comm_free_hook(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_UCX_COMM_DESTROY); diff --git a/src/mpid/ch4/netmod/ucx/ucx_datatype.h b/src/mpid/ch4/netmod/ucx/ucx_datatype.h index ce4f933..bfcd91d 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_datatype.h +++ b/src/mpid/ch4/netmod/ucx/ucx_datatype.h @@ -107,7 +107,7 @@ static ucp_generic_dt_ops_t MPIDI_UCX_datatype_ops = { }; -static inline int MPIDI_NM_type_free_hook(MPIR_Datatype * datatype_p) +static inline int MPIDI_NM_mpi_type_free_hook(MPIR_Datatype * datatype_p) { @@ -119,7 +119,7 @@ static inline int MPIDI_NM_type_free_hook(MPIR_Datatype * datatype_p) return 0; } -static inline int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) +static inline int MPIDI_NM_mpi_type_create_hook(MPIR_Datatype * datatype_p) { ucp_datatype_t ucp_datatype; ucs_status_t status; diff --git a/src/mpid/ch4/netmod/ucx/ucx_init.h b/src/mpid/ch4/netmod/ucx/ucx_init.h index 52374b0..acbd31f 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_init.h +++ b/src/mpid/ch4/netmod/ucx/ucx_init.h @@ -15,16 +15,16 @@ #include "pmi.h" #include <ucp/api/ucp.h> #undef FUNCNAME -#define FUNCNAME MPIDI_NM_init +#define FUNCNAME MPIDI_NM_mpi_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_init(int rank, - int size, - int appnum, - int *tag_ub, - MPIR_Comm * comm_world, - MPIR_Comm * comm_self, - int spawned, int num_contexts, void **netmod_contexts) +static inline int MPIDI_NM_mpi_init(int rank, + int size, + int appnum, + int *tag_ub, + MPIR_Comm * comm_world, + MPIR_Comm * comm_self, + int spawned, int num_contexts, void **netmod_contexts) { int mpi_errno = MPI_SUCCESS, thr_err, pmi_errno; int str_errno = MPL_STR_SUCCESS; @@ -108,7 +108,7 @@ static inline int MPIDI_NM_init(int rank, memset(remote_addr, 0x0, maxlen); } - MPIDI_CH4U_init(comm_world, comm_self, num_contexts, netmod_contexts); + MPIDI_CH4U_mpi_init(comm_world, comm_self, num_contexts, netmod_contexts); mpi_errno = MPIR_Datatype_init_names(); MPIDI_CH4_UCX_MPI_ERROR(mpi_errno); @@ -127,7 +127,7 @@ static inline int MPIDI_NM_init(int rank, } -static inline int MPIDI_NM_finalize(void) +static inline int MPIDI_NM_mpi_finalize(void) { int mpi_errno = MPI_SUCCESS, thr_err, pmi_errno; int i, j, max_n_avts; @@ -157,7 +157,7 @@ static inline int MPIDI_NM_finalize(void) if (MPIDI_UCX_global.pmi_addr_table) MPL_free(MPIDI_UCX_global.pmi_addr_table); - MPIDI_CH4U_finalize(); + MPIDI_CH4U_mpi_finalize(); PMI_Finalize(); fn_exit: @@ -305,14 +305,14 @@ static inline int MPIDI_NM_create_intercomm_from_lpids(MPIR_Comm * newcomm_ptr, return MPI_SUCCESS; } -static inline int MPIDI_NM_free_mem(void *ptr) +static inline int MPIDI_NM_mpi_free_mem(void *ptr) { - return MPIDI_CH4U_free_mem(ptr); + return MPIDI_CH4U_mpi_free_mem(ptr); } -static inline void *MPIDI_NM_alloc_mem(size_t size, MPIR_Info * info_ptr) +static inline void *MPIDI_NM_mpi_alloc_mem(size_t size, MPIR_Info * info_ptr) { - return MPIDI_CH4U_alloc_mem(size, info_ptr); + return MPIDI_CH4U_mpi_alloc_mem(size, info_ptr); } #endif /* NETMOD_UCX_INIT_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/ucx/ucx_op.h b/src/mpid/ch4/netmod/ucx/ucx_op.h index fb58231..13e9b30 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_op.h +++ b/src/mpid/ch4/netmod/ucx/ucx_op.h @@ -11,12 +11,12 @@ #include "ucx_impl.h" -static inline int MPIDI_NM_op_free_hook(MPIR_Op * op_p) +static inline int MPIDI_NM_mpi_op_free_hook(MPIR_Op * op_p) { return 0; } -static inline int MPIDI_NM_op_create_hook(MPIR_Op * op_p) +static inline int MPIDI_NM_mpi_op_create_hook(MPIR_Op * op_p) { return 0; } diff --git a/src/mpid/ch4/netmod/ucx/ucx_probe.h b/src/mpid/ch4/netmod/ucx/ucx_probe.h index 8806146..b1d9e72 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_probe.h +++ b/src/mpid/ch4/netmod/ucx/ucx_probe.h @@ -43,11 +43,11 @@ static inline int ucx_do_iprobe(int source, } -static inline int MPIDI_NM_improbe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, - int *flag, MPIR_Request ** message, MPI_Status * status) +static inline int MPIDI_NM_mpi_improbe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, + int *flag, MPIR_Request ** message, MPI_Status * status) { @@ -85,10 +85,10 @@ static inline int MPIDI_NM_improbe(int source, } -static inline int MPIDI_NM_iprobe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, int *flag, MPI_Status * status) +static inline int MPIDI_NM_mpi_iprobe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, int *flag, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch4/netmod/ucx/ucx_recv.h b/src/mpid/ch4/netmod/ucx/ucx_recv.h index 11eb7cf..e166096 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_recv.h +++ b/src/mpid/ch4/netmod/ucx/ucx_recv.h @@ -134,34 +134,34 @@ static inline int do_irecv(void *buf, } -__ALWAYS_INLINE__ int MPIDI_NM_recv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, - MPI_Status * status, MPIR_Request ** request) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_recv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, + MPI_Status * status, MPIR_Request ** request) { return do_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); } -__ALWAYS_INLINE__ int MPIDI_NM_recv_init(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_recv_init(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { - return MPIDI_CH4U_recv_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_recv_init(buf, count, datatype, rank, tag, comm, context_offset, request); } -__ALWAYS_INLINE__ int MPIDI_NM_imrecv(void *buf, - int count, - MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_imrecv(void *buf, + int count, + MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp) { ucp_tag_message_h message_handler; int mpi_errno = MPI_SUCCESS; @@ -218,12 +218,13 @@ __ALWAYS_INLINE__ int MPIDI_NM_imrecv(void *buf, goto fn_exit; } -__ALWAYS_INLINE__ int MPIDI_NM_irecv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +__ALWAYS_INLINE__ int MPIDI_NM_mpi_irecv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { @@ -232,7 +233,7 @@ __ALWAYS_INLINE__ int MPIDI_NM_irecv(void *buf, } -static inline int MPIDI_NM_cancel_recv(MPIR_Request * rreq) +static inline int MPIDI_NM_mpi_cancel_recv(MPIR_Request * rreq) { if (MPIDI_UCX_REQ(rreq).a.ucp_request) { diff --git a/src/mpid/ch4/netmod/ucx/ucx_rma.h b/src/mpid/ch4/netmod/ucx/ucx_rma.h index 88aa9af..3c0046c 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_rma.h +++ b/src/mpid/ch4/netmod/ucx/ucx_rma.h @@ -78,12 +78,12 @@ static inline int MPIDI_UCX_contig_get(void *origin_addr, } -static inline int MPIDI_NM_put(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_NM_mpi_put(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_NETMOD_UCX_PUT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_NETMOD_UCX_PUT); @@ -92,8 +92,8 @@ static inline int MPIDI_NM_put(const void *origin_addr, MPI_Aint origin_true_lb, target_true_lb; size_t offset; if (win->create_flavor == MPI_WIN_FLAVOR_DYNAMIC || win->create_flavor == MPI_WIN_FLAVOR_SHARED) - return MPIDI_CH4U_put(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + return MPIDI_CH4U_mpi_put(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); @@ -109,8 +109,8 @@ static inline int MPIDI_NM_put(const void *origin_addr, if (unlikely((origin_bytes == 0) || (target_rank == MPI_PROC_NULL))) goto fn_exit; if (!target_contig || !origin_contig || MPIDI_UCX_WIN_INFO(win, target_rank).rkey == NULL) - return MPIDI_CH4U_put(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + return MPIDI_CH4U_mpi_put(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); MPIDI_CH4U_EPOCH_CHECK_SYNC(win, mpi_errno, goto fn_fail); @@ -132,12 +132,12 @@ static inline int MPIDI_NM_put(const void *origin_addr, } -static inline int MPIDI_NM_get(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_NM_mpi_get(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { @@ -150,8 +150,8 @@ static inline int MPIDI_NM_get(void *origin_addr, MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_NETMOD_UCX_GET); if (win->create_flavor == MPI_WIN_FLAVOR_DYNAMIC || win->create_flavor == MPI_WIN_FLAVOR_SHARED) - return MPIDI_CH4U_get(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + return MPIDI_CH4U_mpi_get(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); MPIDI_Datatype_check_contig_size_lb(target_datatype, target_count, target_contig, target_bytes, target_true_lb); @@ -164,8 +164,8 @@ static inline int MPIDI_NM_get(void *origin_addr, if (!origin_contig || !target_contig || MPIDI_UCX_WIN_INFO(win, target_rank).rkey == NULL) - return MPIDI_CH4U_get(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + return MPIDI_CH4U_mpi_get(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); MPIDI_CH4U_EPOCH_CHECK_SYNC(win, mpi_errno, goto fn_fail); @@ -186,114 +186,119 @@ static inline int MPIDI_NM_get(void *origin_addr, } -static inline int MPIDI_NM_rput(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rput(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rput(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win, request); + return MPIDI_CH4U_mpi_rput(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win, + request); } -static inline int MPIDI_NM_compare_and_swap(const void *origin_addr, - const void *compare_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, MPIR_Win * win) +static inline int MPIDI_NM_mpi_compare_and_swap(const void *origin_addr, + const void *compare_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp, + MPIR_Win * win) { - return MPIDI_CH4U_compare_and_swap(origin_addr, compare_addr, result_addr, - datatype, target_rank, target_disp, win); + return MPIDI_CH4U_mpi_compare_and_swap(origin_addr, compare_addr, result_addr, + datatype, target_rank, target_disp, win); } -static inline int MPIDI_NM_raccumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win, MPIR_Request ** request) -{ - return MPIDI_CH4U_raccumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win, request); -} - -static inline int MPIDI_NM_rget_accumulate(const void *origin_addr, +static inline int MPIDI_NM_mpi_raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rget_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, + return MPIDI_CH4U_mpi_raccumulate(origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, win, request); } -static inline int MPIDI_NM_fetch_and_op(const void *origin_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, - MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) +static inline int MPIDI_NM_mpi_rget_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_fetch_and_op(origin_addr, result_addr, datatype, - target_rank, target_disp, op, win); + return MPIDI_CH4U_mpi_rget_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win, request); +} + +static inline int MPIDI_NM_mpi_fetch_and_op(const void *origin_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, + MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) +{ + return MPIDI_CH4U_mpi_fetch_and_op(origin_addr, result_addr, datatype, + target_rank, target_disp, op, win); } -static inline int MPIDI_NM_rget(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rget(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_CH4U_rget(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win, request); + return MPIDI_CH4U_mpi_rget(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win, + request); } -static inline int MPIDI_NM_get_accumulate(const void *origin_addr, +static inline int MPIDI_NM_mpi_get_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) +{ + return MPIDI_CH4U_mpi_get_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win); +} + +static inline int MPIDI_NM_mpi_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) { - return MPIDI_CH4U_get_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win); -} - -static inline int MPIDI_NM_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) -{ - return MPIDI_CH4U_accumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, op, win); + return MPIDI_CH4U_mpi_accumulate(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, op, + win); } #endif /* NETMOD_UCX_RMA_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/ucx/ucx_send.h b/src/mpid/ch4/netmod/ucx/ucx_send.h index 6b2f41c..0217ca4 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_send.h +++ b/src/mpid/ch4/netmod/ucx/ucx_send.h @@ -320,12 +320,12 @@ static inline int ucx_sync_send(const void *buf, #define FUNCNAME MPIDI_netmode_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_send(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_send(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { int mpi_errno; @@ -370,87 +370,94 @@ static inline int MPIDI_netmod_irsend(const void *buf, #define FUNCNAME MPIDI_netmode_ssend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ssend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_ssend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { return ucx_sync_send(buf, count, datatype, rank, tag, comm, context_offset, request, 0); } -static inline int MPIDI_NM_startall(int count, MPIR_Request * requests[]) +static inline int MPIDI_NM_mpi_startall(int count, MPIR_Request * requests[]) { - return MPIDI_CH4U_startall(count, requests); + return MPIDI_CH4U_mpi_startall(count, requests); } #undef FUNCNAME #define FUNCNAME MPIDI_netmode_send_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_send_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_send_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_send_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_send_init(buf, count, datatype, rank, tag, comm, context_offset, request); } #undef FUNCNAME #define FUNCNAME MPIDI_netmode_ssend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_ssend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_ssend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_ssend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_ssend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } #undef FUNCNAME #define FUNCNAME MPIDI_netmode_bsend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_bsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_bsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_bsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_bsend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } #undef FUNCNAME #define FUNCNAME MPIDI_netmode_rsend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_rsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_rsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_CH4U_rsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + return MPIDI_CH4U_mpi_rsend_init(buf, count, datatype, rank, tag, comm, context_offset, + request); } #undef FUNCNAME #define FUNCNAME MPIDI_netmode_isend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_isend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_isend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { return ucx_send(buf, count, datatype, rank, tag, comm, context_offset, request, 1); @@ -461,12 +468,12 @@ static inline int MPIDI_NM_isend(const void *buf, #define FUNCNAME MPIDI_netmode_issend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_issend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_NM_mpi_issend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { return ucx_sync_send(buf, count, datatype, rank, tag, comm, context_offset, request, 1); @@ -477,7 +484,7 @@ static inline int MPIDI_NM_issend(const void *buf, #define FUNCNAME MPIDI_netmode_cancel_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_cancel_send(MPIR_Request * sreq) +static inline int MPIDI_NM_mpi_cancel_send(MPIR_Request * sreq) { if (MPIDI_UCX_REQ(sreq).a.ucp_request) { ucp_request_cancel(MPIDI_UCX_global.worker, MPIDI_UCX_REQ(sreq).a.ucp_request); diff --git a/src/mpid/ch4/netmod/ucx/ucx_spawn.h b/src/mpid/ch4/netmod/ucx/ucx_spawn.h index 037b348..cdc8bae 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_spawn.h +++ b/src/mpid/ch4/netmod/ucx/ucx_spawn.h @@ -15,7 +15,7 @@ #define FUNCNAME MPIDI_netmod_comm_open_port #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_open_port(MPIR_Info * info_ptr, char *port_name) +static inline int MPIDI_NM_mpi_open_port(MPIR_Info * info_ptr, char *port_name) { int mpi_errno = MPI_SUCCESS; fn_exit: @@ -29,7 +29,7 @@ static inline int MPIDI_NM_open_port(MPIR_Info * info_ptr, char *port_name) #define FUNCNAME MPIDI_netmod_comm_close_port #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_close_port(const char *port_name) +static inline int MPIDI_NM_mpi_close_port(const char *port_name) { int mpi_errno = MPI_SUCCESS; fn_exit: @@ -40,12 +40,12 @@ static inline int MPIDI_NM_close_port(const char *port_name) } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_comm_connect +#define FUNCNAME MPIDI_NM_mpi_comm_connect #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_connect(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm) +static inline int MPIDI_NM_mpi_comm_connect(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm) { int mpi_errno = MPI_SUCCESS; @@ -59,10 +59,10 @@ static inline int MPIDI_NM_comm_connect(const char *port_name, } #undef FUNCNAME -#define FUNCNAME MPIDI_NM_comm_disconnect +#define FUNCNAME MPIDI_NM_mpi_comm_disconnect #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_disconnect(MPIR_Comm * comm_ptr) +static inline int MPIDI_NM_mpi_comm_disconnect(MPIR_Comm * comm_ptr) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -83,9 +83,9 @@ static inline int MPIDI_NM_comm_disconnect(MPIR_Comm * comm_ptr) #define FUNCNAME MPIDI_netmod_comm_close_port #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_NM_comm_accept(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm) +static inline int MPIDI_NM_mpi_comm_accept(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm_ptr, MPIR_Comm ** newcomm) { int mpi_errno = MPI_SUCCESS; diff --git a/src/mpid/ch4/netmod/ucx/ucx_win.h b/src/mpid/ch4/netmod/ucx/ucx_win.h index 8ae3fad..16ccbdd 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_win.h +++ b/src/mpid/ch4/netmod/ucx/ucx_win.h @@ -159,51 +159,51 @@ static inline int MPIDI_UCX_Win_init(MPI_Aint length, } -static inline int MPIDI_NM_win_set_info(MPIR_Win * win, MPIR_Info * info) +static inline int MPIDI_NM_mpi_win_set_info(MPIR_Win * win, MPIR_Info * info) { - return MPIDI_CH4R_win_set_info(win, info); + return MPIDI_CH4R_mpi_win_set_info(win, info); } -static inline int MPIDI_NM_win_start(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_start(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_start(group, assert, win); + return MPIDI_CH4R_mpi_win_start(group, assert, win); } -static inline int MPIDI_NM_win_complete(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_complete(MPIR_Win * win) { ucs_status_t ucp_status; ucp_status = ucp_worker_flush(MPIDI_UCX_global.worker); - return MPIDI_CH4R_win_complete(win); + return MPIDI_CH4R_mpi_win_complete(win); } -static inline int MPIDI_NM_win_post(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_post(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_post(group, assert, win); + return MPIDI_CH4R_mpi_win_post(group, assert, win); } -static inline int MPIDI_NM_win_wait(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_wait(MPIR_Win * win) { - return MPIDI_CH4R_win_wait(win); + return MPIDI_CH4R_mpi_win_wait(win); } -static inline int MPIDI_NM_win_test(MPIR_Win * win, int *flag) +static inline int MPIDI_NM_mpi_win_test(MPIR_Win * win, int *flag) { - return MPIDI_CH4R_win_test(win, flag); + return MPIDI_CH4R_mpi_win_test(win, flag); } -static inline int MPIDI_NM_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_lock(lock_type, rank, assert, win); + return MPIDI_CH4R_mpi_win_lock(lock_type, rank, assert, win); } -static inline int MPIDI_NM_win_unlock(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_unlock(int rank, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; @@ -212,20 +212,20 @@ static inline int MPIDI_NM_win_unlock(int rank, MPIR_Win * win) /* make sure all operations are completed */ ucp_status = ucp_ep_flush(ep); MPIDI_UCX_CHK_STATUS(ucp_status, ucp_worker_fence); - mpi_errno = MPIDI_CH4R_win_unlock(rank, win); + mpi_errno = MPIDI_CH4R_mpi_win_unlock(rank, win); fn_exit: return mpi_errno; fn_fail: goto fn_exit; } -static inline int MPIDI_NM_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) +static inline int MPIDI_NM_mpi_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) { - return MPIDI_CH4R_win_get_info(win, info_p_p); + return MPIDI_CH4R_mpi_win_get_info(win, info_p_p); } -static inline int MPIDI_NM_win_free(MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_free(MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -250,7 +250,7 @@ static inline int MPIDI_NM_win_free(MPIR_Win ** win_ptr) } -static inline int MPIDI_NM_win_fence(int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_fence(int assert, MPIR_Win * win) { int mpi_errno; ucs_status_t ucp_status; @@ -259,7 +259,7 @@ static inline int MPIDI_NM_win_fence(int assert, MPIR_Win * win) ucp_status = ucp_worker_flush(MPIDI_UCX_global.worker); - mpi_errno = MPIDI_CH4R_win_fence(assert, win); + mpi_errno = MPIDI_CH4R_mpi_win_fence(assert, win); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -270,10 +270,11 @@ static inline int MPIDI_NM_win_fence(int assert, MPIR_Win * win) goto fn_exit; } -static inline int MPIDI_NM_win_create(void *base, - MPI_Aint length, - int disp_unit, - MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_create(void *base, + MPI_Aint length, + int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -310,36 +311,38 @@ static inline int MPIDI_NM_win_create(void *base, } -static inline int MPIDI_NM_win_attach(MPIR_Win * win, void *base, MPI_Aint size) +static inline int MPIDI_NM_mpi_win_attach(MPIR_Win * win, void *base, MPI_Aint size) { - return MPIDI_CH4R_win_attach(win, base, size); + return MPIDI_CH4R_mpi_win_attach(win, base, size); } -static inline int MPIDI_NM_win_allocate_shared(MPI_Aint size, - int disp_unit, - MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, - void **base_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_allocate_shared(MPI_Aint size, + int disp_unit, + MPIR_Info * info_ptr, + MPIR_Comm * comm_ptr, + void **base_ptr, MPIR_Win ** win_ptr) { - return MPIDI_CH4R_win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, base_ptr, win_ptr); + return MPIDI_CH4R_mpi_win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, base_ptr, + win_ptr); } -static inline int MPIDI_NM_win_detach(MPIR_Win * win, const void *base) +static inline int MPIDI_NM_mpi_win_detach(MPIR_Win * win, const void *base) { - return MPIDI_CH4R_win_detach(win, base); + return MPIDI_CH4R_mpi_win_detach(win, base); } -static inline int MPIDI_NM_win_shared_query(MPIR_Win * win, - int rank, - MPI_Aint * size, int *disp_unit, void *baseptr) +static inline int MPIDI_NM_mpi_win_shared_query(MPIR_Win * win, + int rank, + MPI_Aint * size, int *disp_unit, void *baseptr) { - return MPIDI_CH4R_win_shared_query(win, rank, size, disp_unit, baseptr); + return MPIDI_CH4R_mpi_win_shared_query(win, rank, size, disp_unit, baseptr); } -static inline int MPIDI_NM_win_allocate(MPI_Aint length, - int disp_unit, - MPIR_Info * info, - MPIR_Comm * comm_ptr, void *baseptr, MPIR_Win ** win_ptr) +static inline int MPIDI_NM_mpi_win_allocate(MPI_Aint length, + int disp_unit, + MPIR_Info * info, + MPIR_Comm * comm_ptr, void *baseptr, + MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; @@ -377,7 +380,7 @@ static inline int MPIDI_NM_win_allocate(MPI_Aint length, } -static inline int MPIDI_NM_win_flush(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush(int rank, MPIR_Win * win) { int mpi_errno; @@ -385,7 +388,7 @@ static inline int MPIDI_NM_win_flush(int rank, MPIR_Win * win) ucp_ep_h ep = MPIDI_UCX_COMM_TO_EP(win->comm_ptr, rank); - mpi_errno = MPIDI_CH4R_win_flush(rank, win); + mpi_errno = MPIDI_CH4R_mpi_win_flush(rank, win); if (mpi_errno) MPIR_ERR_POP(mpi_errno); /* only flush the endpoint */ @@ -400,11 +403,11 @@ static inline int MPIDI_NM_win_flush(int rank, MPIR_Win * win) } -static inline int MPIDI_NM_win_flush_local_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_local_all(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; ucs_status_t ucp_status; - mpi_errno = MPIDI_CH4R_win_flush_local_all(win); + mpi_errno = MPIDI_CH4R_mpi_win_flush_local_all(win); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -423,7 +426,7 @@ static inline int MPIDI_NM_win_flush_local_all(MPIR_Win * win) goto fn_exit; } -static inline int MPIDI_NM_win_unlock_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_unlock_all(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; ucs_status_t ucp_status; @@ -431,23 +434,24 @@ static inline int MPIDI_NM_win_unlock_all(MPIR_Win * win) /*first we have to make sure that all operations are completed */ ucp_status = ucp_worker_flush(MPIDI_UCX_global.worker); MPIDI_UCX_CHK_STATUS(ucp_status, ucp_worker_fence); - mpi_errno = MPIDI_CH4R_win_unlock_all(win); + mpi_errno = MPIDI_CH4R_mpi_win_unlock_all(win); fn_exit: return mpi_errno; fn_fail: goto fn_exit; } -static inline int MPIDI_NM_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, MPIR_Win ** win) +static inline int MPIDI_NM_mpi_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, + MPIR_Win ** win) { - return MPIDI_CH4R_win_create_dynamic(info, comm, win); + return MPIDI_CH4R_mpi_win_create_dynamic(info, comm, win); } -static inline int MPIDI_NM_win_flush_local(int rank, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_local(int rank, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; ucs_status_t ucp_status; - mpi_errno = MPIDI_CH4R_win_flush_local(rank, win); + mpi_errno = MPIDI_CH4R_mpi_win_flush_local(rank, win); ucp_ep_h ep = MPIDI_UCX_COMM_TO_EP(win->comm_ptr, rank); if (mpi_errno) @@ -468,18 +472,18 @@ static inline int MPIDI_NM_win_flush_local(int rank, MPIR_Win * win) } -static inline int MPIDI_NM_win_sync(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_sync(MPIR_Win * win) { - return MPIDI_CH4R_win_sync(win); + return MPIDI_CH4R_mpi_win_sync(win); } -static inline int MPIDI_NM_win_flush_all(MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_flush_all(MPIR_Win * win) { /*maybe we just flush all eps here? More efficient for smaller communicators...*/ int mpi_errno = MPI_SUCCESS; ucs_status_t ucp_status; - mpi_errno = MPIDI_CH4R_win_flush_all(win); + mpi_errno = MPIDI_CH4R_mpi_win_flush_all(win); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -494,9 +498,9 @@ static inline int MPIDI_NM_win_flush_all(MPIR_Win * win) } -static inline int MPIDI_NM_win_lock_all(int assert, MPIR_Win * win) +static inline int MPIDI_NM_mpi_win_lock_all(int assert, MPIR_Win * win) { - return MPIDI_CH4R_win_lock_all(assert, win); + return MPIDI_CH4R_mpi_win_lock_all(assert, win); } diff --git a/src/mpid/ch4/shm/include/shm.h b/src/mpid/ch4/shm/include/shm.h index 7b90ecb..597922e 100644 --- a/src/mpid/ch4/shm/include/shm.h +++ b/src/mpid/ch4/shm/include/shm.h @@ -27,19 +27,19 @@ typedef int (*MPIDI_SHM_am_target_handler_fn) MPIDI_SHM_am_completion_handler_fn * cmpl_handler_fn, /* completion handler */ MPIR_Request ** req); /* if allocated, need pointer to completion function */ -typedef int (*MPIDI_SHM_init_t) (int rank, int size); -typedef int (*MPIDI_SHM_finalize_t) (void); +typedef int (*MPIDI_SHM_mpi_init_t) (int rank, int size); +typedef int (*MPIDI_SHM_mpi_finalize_t) (void); typedef int (*MPIDI_SHM_progress_t) (int blocking); typedef int (*MPIDI_SHM_am_reg_handler_t) (int handler_id, MPIDI_SHM_am_origin_handler_fn origin_handler_fn, MPIDI_SHM_am_target_handler_fn target_handler_fn); -typedef int (*MPIDI_SHM_comm_connect_t) (const char *port_name, MPIR_Info * info, int root, - MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr); -typedef int (*MPIDI_SHM_comm_disconnect_t) (MPIR_Comm * comm_ptr); -typedef int (*MPIDI_SHM_open_port_t) (MPIR_Info * info_ptr, char *port_name); -typedef int (*MPIDI_SHM_close_port_t) (const char *port_name); -typedef int (*MPIDI_SHM_comm_accept_t) (const char *port_name, MPIR_Info * info, int root, - MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr); +typedef int (*MPIDI_SHM_mpi_comm_connect_t) (const char *port_name, MPIR_Info * info, int root, + MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr); +typedef int (*MPIDI_SHM_mpi_comm_disconnect_t) (MPIR_Comm * comm_ptr); +typedef int (*MPIDI_SHM_mpi_open_port_t) (MPIR_Info * info_ptr, char *port_name); +typedef int (*MPIDI_SHM_mpi_close_port_t) (const char *port_name); +typedef int (*MPIDI_SHM_mpi_comm_accept_t) (const char *port_name, MPIR_Info * info, int root, + MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr); typedef int (*MPIDI_SHM_am_send_hdr_t) (int rank, MPIR_Comm * comm, int handler_id, const void *am_hdr, size_t am_hdr_sz, void *shm_context); typedef int (*MPIDI_SHM_am_isend_t) (int rank, MPIR_Comm * comm, int handler_id, const void *am_hdr, @@ -82,295 +82,311 @@ typedef int (*MPIDI_SHM_getallincomm_t) (MPIR_Comm * comm_ptr, int local_size, typedef int (*MPIDI_SHM_gpid_tolpidarray_t) (int size, MPIR_Gpid gpid[], int lpid[]); typedef int (*MPIDI_SHM_create_intercomm_from_lpids_t) (MPIR_Comm * newcomm_ptr, int size, const int lpids[]); -typedef int (*MPIDI_SHM_comm_create_hook_t) (MPIR_Comm * comm); -typedef int (*MPIDI_SHM_comm_free_hook_t) (MPIR_Comm * comm); -typedef int (*MPIDI_SHM_type_create_hook_t) (MPIR_Datatype * type); -typedef int (*MPIDI_SHM_type_free_hook_t) (MPIR_Datatype * type); -typedef int (*MPIDI_SHM_op_create_hook_t) (MPIR_Op * op); -typedef int (*MPIDI_SHM_op_free_hook_t) (MPIR_Op * op); +typedef int (*MPIDI_SHM_mpi_comm_create_hook_t) (MPIR_Comm * comm); +typedef int (*MPIDI_SHM_mpi_comm_free_hook_t) (MPIR_Comm * comm); +typedef int (*MPIDI_SHM_mpi_type_create_hook_t) (MPIR_Datatype * type); +typedef int (*MPIDI_SHM_mpi_type_free_hook_t) (MPIR_Datatype * type); +typedef int (*MPIDI_SHM_mpi_op_create_hook_t) (MPIR_Op * op); +typedef int (*MPIDI_SHM_mpi_op_free_hook_t) (MPIR_Op * op); typedef void (*MPIDI_SHM_am_request_init_t) (MPIR_Request * req); typedef void (*MPIDI_SHM_am_request_finalize_t) (MPIR_Request * req); -typedef int (*MPIDI_SHM_send_t) (const void *buf, int count, MPI_Datatype datatype, int rank, - int tag, MPIR_Comm * comm, int context_offset, - MPIR_Request ** request); -typedef int (*MPIDI_SHM_ssend_t) (const void *buf, int count, MPI_Datatype datatype, int rank, - int tag, MPIR_Comm * comm, int context_offset, - MPIR_Request ** request); -typedef int (*MPIDI_SHM_startall_t) (int count, MPIR_Request * requests[]); -typedef int (*MPIDI_SHM_send_init_t) (const void *buf, int count, MPI_Datatype datatype, int rank, +typedef int (*MPIDI_SHM_mpi_send_t) (const void *buf, int count, MPI_Datatype datatype, int rank, + int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_SHM_mpi_ssend_t) (const void *buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPIR_Request ** request); -typedef int (*MPIDI_SHM_ssend_init_t) (const void *buf, int count, MPI_Datatype datatype, int rank, - int tag, MPIR_Comm * comm, int context_offset, - MPIR_Request ** request); -typedef int (*MPIDI_SHM_rsend_init_t) (const void *buf, int count, MPI_Datatype datatype, int rank, - int tag, MPIR_Comm * comm, int context_offset, - MPIR_Request ** request); -typedef int (*MPIDI_SHM_bsend_init_t) (const void *buf, int count, MPI_Datatype datatype, int rank, +typedef int (*MPIDI_SHM_mpi_startall_t) (int count, MPIR_Request * requests[]); +typedef int (*MPIDI_SHM_mpi_send_init_t) (const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_SHM_mpi_ssend_init_t) (const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_SHM_mpi_rsend_init_t) (const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_SHM_mpi_bsend_init_t) (const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_SHM_mpi_isend_t) (const void *buf, int count, MPI_Datatype datatype, int rank, + int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_SHM_mpi_issend_t) (const void *buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPIR_Request ** request); -typedef int (*MPIDI_SHM_isend_t) (const void *buf, int count, MPI_Datatype datatype, int rank, - int tag, MPIR_Comm * comm, int context_offset, - MPIR_Request ** request); -typedef int (*MPIDI_SHM_issend_t) (const void *buf, int count, MPI_Datatype datatype, int rank, - int tag, MPIR_Comm * comm, int context_offset, - MPIR_Request ** request); -typedef int (*MPIDI_SHM_cancel_send_t) (MPIR_Request * sreq); -typedef int (*MPIDI_SHM_recv_init_t) (void *buf, int count, MPI_Datatype datatype, int rank, +typedef int (*MPIDI_SHM_mpi_cancel_send_t) (MPIR_Request * sreq); +typedef int (*MPIDI_SHM_mpi_recv_init_t) (void *buf, int count, MPI_Datatype datatype, int rank, + int tag, MPIR_Comm * comm, int context_offset, + MPIR_Request ** request); +typedef int (*MPIDI_SHM_mpi_recv_t) (void *buf, int count, MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, MPI_Status * status, + MPIR_Request ** request); +typedef int (*MPIDI_SHM_mpi_irecv_t) (void *buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPIR_Request ** request); -typedef int (*MPIDI_SHM_recv_t) (void *buf, int count, MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, MPI_Status * status, - MPIR_Request ** request); -typedef int (*MPIDI_SHM_irecv_t) (void *buf, int count, MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request); -typedef int (*MPIDI_SHM_imrecv_t) (void *buf, int count, MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp); -typedef int (*MPIDI_SHM_cancel_recv_t) (MPIR_Request * rreq); -typedef void *(*MPIDI_SHM_alloc_mem_t) (size_t size, MPIR_Info * info_ptr); -typedef int (*MPIDI_SHM_free_mem_t) (void *ptr); -typedef int (*MPIDI_SHM_improbe_t) (int source, int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPIR_Request ** message, MPI_Status * status); -typedef int (*MPIDI_SHM_iprobe_t) (int source, int tag, MPIR_Comm * comm, int context_offset, - int *flag, MPI_Status * status); -typedef int (*MPIDI_SHM_win_set_info_t) (MPIR_Win * win, MPIR_Info * info); -typedef int (*MPIDI_SHM_win_shared_query_t) (MPIR_Win * win, int rank, MPI_Aint * size, - int *disp_unit, void *baseptr); -typedef int (*MPIDI_SHM_put_t) (const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win); -typedef int (*MPIDI_SHM_win_start_t) (MPIR_Group * group, int assert, MPIR_Win * win); -typedef int (*MPIDI_SHM_win_complete_t) (MPIR_Win * win); -typedef int (*MPIDI_SHM_win_post_t) (MPIR_Group * group, int assert, MPIR_Win * win); -typedef int (*MPIDI_SHM_win_wait_t) (MPIR_Win * win); -typedef int (*MPIDI_SHM_win_test_t) (MPIR_Win * win, int *flag); -typedef int (*MPIDI_SHM_win_lock_t) (int lock_type, int rank, int assert, MPIR_Win * win); -typedef int (*MPIDI_SHM_win_unlock_t) (int rank, MPIR_Win * win); -typedef int (*MPIDI_SHM_win_get_info_t) (MPIR_Win * win, MPIR_Info ** info_p_p); -typedef int (*MPIDI_SHM_get_t) (void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - int target_rank, MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win); -typedef int (*MPIDI_SHM_win_free_t) (MPIR_Win ** win_ptr); -typedef int (*MPIDI_SHM_win_fence_t) (int assert, MPIR_Win * win); -typedef int (*MPIDI_SHM_win_create_t) (void *base, MPI_Aint length, int disp_unit, MPIR_Info * info, - MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr); -typedef int (*MPIDI_SHM_accumulate_t) (const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win); -typedef int (*MPIDI_SHM_win_attach_t) (MPIR_Win * win, void *base, MPI_Aint size); -typedef int (*MPIDI_SHM_win_allocate_shared_t) (MPI_Aint size, int disp_unit, MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, void **base_ptr, - MPIR_Win ** win_ptr); -typedef int (*MPIDI_SHM_rput_t) (const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win, - MPIR_Request ** request); -typedef int (*MPIDI_SHM_win_flush_local_t) (int rank, MPIR_Win * win); -typedef int (*MPIDI_SHM_win_detach_t) (MPIR_Win * win, const void *base); -typedef int (*MPIDI_SHM_compare_and_swap_t) (const void *origin_addr, const void *compare_addr, - void *result_addr, MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, MPIR_Win * win); -typedef int (*MPIDI_SHM_raccumulate_t) (const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win, - MPIR_Request ** request); -typedef int (*MPIDI_SHM_rget_accumulate_t) (const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, void *result_addr, - int result_count, MPI_Datatype result_datatype, - int target_rank, MPI_Aint target_disp, int target_count, +typedef int (*MPIDI_SHM_mpi_imrecv_t) (void *buf, int count, MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp); +typedef int (*MPIDI_SHM_mpi_cancel_recv_t) (MPIR_Request * rreq); +typedef void *(*MPIDI_SHM_mpi_alloc_mem_t) (size_t size, MPIR_Info * info_ptr); +typedef int (*MPIDI_SHM_mpi_free_mem_t) (void *ptr); +typedef int (*MPIDI_SHM_mpi_improbe_t) (int source, int tag, MPIR_Comm * comm, int context_offset, + int *flag, MPIR_Request ** message, MPI_Status * status); +typedef int (*MPIDI_SHM_mpi_iprobe_t) (int source, int tag, MPIR_Comm * comm, int context_offset, + int *flag, MPI_Status * status); +typedef int (*MPIDI_SHM_mpi_win_set_info_t) (MPIR_Win * win, MPIR_Info * info); +typedef int (*MPIDI_SHM_mpi_win_shared_query_t) (MPIR_Win * win, int rank, MPI_Aint * size, + int *disp_unit, void *baseptr); +typedef int (*MPIDI_SHM_mpi_put_t) (const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_start_t) (MPIR_Group * group, int assert, MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_complete_t) (MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_post_t) (MPIR_Group * group, int assert, MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_wait_t) (MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_test_t) (MPIR_Win * win, int *flag); +typedef int (*MPIDI_SHM_mpi_win_lock_t) (int lock_type, int rank, int assert, MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_unlock_t) (int rank, MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_get_info_t) (MPIR_Win * win, MPIR_Info ** info_p_p); +typedef int (*MPIDI_SHM_mpi_get_t) (void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_free_t) (MPIR_Win ** win_ptr); +typedef int (*MPIDI_SHM_mpi_win_fence_t) (int assert, MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_create_t) (void *base, MPI_Aint length, int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr); +typedef int (*MPIDI_SHM_mpi_accumulate_t) (const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_attach_t) (MPIR_Win * win, void *base, MPI_Aint size); +typedef int (*MPIDI_SHM_mpi_win_allocate_shared_t) (MPI_Aint size, int disp_unit, + MPIR_Info * info_ptr, MPIR_Comm * comm_ptr, + void **base_ptr, MPIR_Win ** win_ptr); +typedef int (*MPIDI_SHM_mpi_rput_t) (const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win, + MPIR_Request ** request); +typedef int (*MPIDI_SHM_mpi_win_flush_local_t) (int rank, MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_detach_t) (MPIR_Win * win, const void *base); +typedef int (*MPIDI_SHM_mpi_compare_and_swap_t) (const void *origin_addr, const void *compare_addr, + void *result_addr, MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp, + MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_raccumulate_t) (const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win, MPIR_Request ** request); -typedef int (*MPIDI_SHM_fetch_and_op_t) (const void *origin_addr, void *result_addr, - MPI_Datatype datatype, int target_rank, - MPI_Aint target_disp, MPI_Op op, MPIR_Win * win); -typedef int (*MPIDI_SHM_win_allocate_t) (MPI_Aint size, int disp_unit, MPIR_Info * info, - MPIR_Comm * comm, void *baseptr, MPIR_Win ** win); -typedef int (*MPIDI_SHM_win_flush_t) (int rank, MPIR_Win * win); -typedef int (*MPIDI_SHM_win_flush_local_all_t) (MPIR_Win * win); -typedef int (*MPIDI_SHM_win_unlock_all_t) (MPIR_Win * win); -typedef int (*MPIDI_SHM_win_create_dynamic_t) (MPIR_Info * info, MPIR_Comm * comm, MPIR_Win ** win); -typedef int (*MPIDI_SHM_rget_t) (void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - int target_rank, MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win, - MPIR_Request ** request); -typedef int (*MPIDI_SHM_win_sync_t) (MPIR_Win * win); -typedef int (*MPIDI_SHM_win_flush_all_t) (MPIR_Win * win); -typedef int (*MPIDI_SHM_get_accumulate_t) (const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, void *result_addr, - int result_count, MPI_Datatype result_datatype, - int target_rank, MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win); -typedef int (*MPIDI_SHM_win_lock_all_t) (int assert, MPIR_Win * win); -typedef int (*MPIDI_SHM_barrier_t) (MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_bcast_t) (void *buffer, int count, MPI_Datatype datatype, int root, - MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_allreduce_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_allgather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, +typedef int (*MPIDI_SHM_mpi_rget_accumulate_t) (const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, void *result_addr, + int result_count, MPI_Datatype result_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, MPIR_Request ** request); +typedef int (*MPIDI_SHM_mpi_fetch_and_op_t) (const void *origin_addr, void *result_addr, + MPI_Datatype datatype, int target_rank, + MPI_Aint target_disp, MPI_Op op, MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_allocate_t) (MPI_Aint size, int disp_unit, MPIR_Info * info, + MPIR_Comm * comm, void *baseptr, MPIR_Win ** win); +typedef int (*MPIDI_SHM_mpi_win_flush_t) (int rank, MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_flush_local_all_t) (MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_unlock_all_t) (MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_create_dynamic_t) (MPIR_Info * info, MPIR_Comm * comm, + MPIR_Win ** win); +typedef int (*MPIDI_SHM_mpi_rget_t) (void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win, + MPIR_Request ** request); +typedef int (*MPIDI_SHM_mpi_win_sync_t) (MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_flush_all_t) (MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_get_accumulate_t) (const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, void *result_addr, + int result_count, MPI_Datatype result_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_win_lock_all_t) (int assert, MPIR_Win * win); +typedef int (*MPIDI_SHM_mpi_barrier_t) (MPIR_Comm * comm, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_bcast_t) (void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_allgatherv_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_scatter_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_scatterv_t) (const void *sendbuf, const int *sendcounts, const int *displs, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_gather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_gatherv_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_alltoall_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_alltoallv_t) (const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *rdispls, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_alltoallw_t) (const void *sendbuf, const int *sendcounts, - const int *sdispls, const MPI_Datatype sendtypes[], - void *recvbuf, const int *recvcounts, const int *rdispls, - const MPI_Datatype recvtypes[], MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_reduce_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_reduce_scatter_t) (const void *sendbuf, void *recvbuf, - const int *recvcounts, MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_reduce_scatter_block_t) (const void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_scan_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_exscan_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_neighbor_allgather_t) (const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_neighbor_allgatherv_t) (const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_neighbor_alltoallv_t) (const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm, MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_neighbor_alltoallw_t) (const void *sendbuf, const int *sendcounts, - const MPI_Aint * sdispls, - const MPI_Datatype * sendtypes, void *recvbuf, - const int *recvcounts, const MPI_Aint * rdispls, - const MPI_Datatype * recvtypes, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_neighbor_alltoall_t) (const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPIR_Errflag_t * errflag); -typedef int (*MPIDI_SHM_ineighbor_allgather_t) (const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_SHM_ineighbor_allgatherv_t) (const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_SHM_ineighbor_alltoall_t) (const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_SHM_ineighbor_alltoallv_t) (const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_SHM_ineighbor_alltoallw_t) (const void *sendbuf, const int *sendcounts, - const MPI_Aint * sdispls, - const MPI_Datatype * sendtypes, void *recvbuf, - const int *recvcounts, const MPI_Aint * rdispls, - const MPI_Datatype * recvtypes, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_SHM_ibarrier_t) (MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_SHM_ibcast_t) (void *buffer, int count, MPI_Datatype datatype, int root, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_SHM_iallgather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, +typedef int (*MPIDI_SHM_mpi_allreduce_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_allgather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_allgatherv_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_scatter_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_scatterv_t) (const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_gather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_SHM_iallgatherv_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_gatherv_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_SHM_iallreduce_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype recvtype, int root, MPIR_Comm * comm, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_alltoall_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_alltoallv_t) (const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *rdispls, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_alltoallw_t) (const void *sendbuf, const int *sendcounts, + const int *sdispls, const MPI_Datatype sendtypes[], + void *recvbuf, const int *recvcounts, const int *rdispls, + const MPI_Datatype recvtypes[], MPIR_Comm * comm, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_reduce_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_reduce_scatter_t) (const void *sendbuf, void *recvbuf, + const int *recvcounts, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_reduce_scatter_block_t) (const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_scan_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_exscan_t) (const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_SHM_ialltoall_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_SHM_ialltoallv_t) (const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *rdispls, - MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_SHM_ialltoallw_t) (const void *sendbuf, const int *sendcounts, - const int *sdispls, const MPI_Datatype sendtypes[], - void *recvbuf, const int *recvcounts, const int *rdispls, - const MPI_Datatype recvtypes[], MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_SHM_iexscan_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_SHM_igather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_SHM_igatherv_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_SHM_ireduce_scatter_block_t) (const void *sendbuf, void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_SHM_ireduce_scatter_t) (const void *sendbuf, void *recvbuf, - const int *recvcounts, MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_SHM_ireduce_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPI_Request * req); -typedef int (*MPIDI_SHM_iscan_t) (const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, - MPI_Request * req); -typedef int (*MPIDI_SHM_iscatter_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * req); -typedef int (*MPIDI_SHM_iscatterv_t) (const void *sendbuf, const int *sendcounts, const int *displs, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_neighbor_allgather_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_neighbor_allgatherv_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_neighbor_alltoallv_t) (const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_neighbor_alltoallw_t) (const void *sendbuf, const int *sendcounts, + const MPI_Aint * sdispls, + const MPI_Datatype * sendtypes, void *recvbuf, + const int *recvcounts, const MPI_Aint * rdispls, + const MPI_Datatype * recvtypes, MPIR_Comm * comm, + MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_neighbor_alltoall_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag); +typedef int (*MPIDI_SHM_mpi_ineighbor_allgather_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_ineighbor_allgatherv_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_ineighbor_alltoall_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_ineighbor_alltoallv_t) (const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_ineighbor_alltoallw_t) (const void *sendbuf, const int *sendcounts, + const MPI_Aint * sdispls, + const MPI_Datatype * sendtypes, void *recvbuf, + const int *recvcounts, const MPI_Aint * rdispls, + const MPI_Datatype * recvtypes, + MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_ibarrier_t) (MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_ibcast_t) (void *buffer, int count, MPI_Datatype datatype, int root, + MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_iallgather_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, int recvcount, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_iallgatherv_t) (const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_iallreduce_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_ialltoall_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_ialltoallv_t) (const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *rdispls, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_ialltoallw_t) (const void *sendbuf, const int *sendcounts, + const int *sdispls, const MPI_Datatype sendtypes[], + void *recvbuf, const int *recvcounts, const int *rdispls, + const MPI_Datatype recvtypes[], MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_iexscan_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_igather_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_igatherv_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_ireduce_scatter_block_t) (const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm, + MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_ireduce_scatter_t) (const void *sendbuf, void *recvbuf, + const int *recvcounts, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_ireduce_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_iscan_t) (const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_iscatter_t) (const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * req); +typedef int (*MPIDI_SHM_mpi_iscatterv_t) (const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm_ptr, MPI_Request * req); typedef struct MPIDI_SHM_funcs { - MPIDI_SHM_init_t init; - MPIDI_SHM_finalize_t finalize; + MPIDI_SHM_mpi_init_t mpi_init; + MPIDI_SHM_mpi_finalize_t mpi_finalize; MPIDI_SHM_progress_t progress; MPIDI_SHM_am_reg_handler_t am_reg_handler; - MPIDI_SHM_comm_connect_t comm_connect; - MPIDI_SHM_comm_disconnect_t comm_disconnect; - MPIDI_SHM_open_port_t open_port; - MPIDI_SHM_close_port_t close_port; - MPIDI_SHM_comm_accept_t comm_accept; + MPIDI_SHM_mpi_comm_connect_t mpi_comm_connect; + MPIDI_SHM_mpi_comm_disconnect_t mpi_comm_disconnect; + MPIDI_SHM_mpi_open_port_t mpi_open_port; + MPIDI_SHM_mpi_close_port_t mpi_close_port; + MPIDI_SHM_mpi_comm_accept_t mpi_comm_accept; MPIDI_SHM_am_send_hdr_t am_send_hdr; MPIDI_SHM_am_isend_t am_isend; MPIDI_SHM_inject_am_t inject_am; @@ -391,117 +407,117 @@ typedef struct MPIDI_SHM_funcs { MPIDI_SHM_getallincomm_t getallincomm; MPIDI_SHM_gpid_tolpidarray_t gpid_tolpidarray; MPIDI_SHM_create_intercomm_from_lpids_t create_intercomm_from_lpids; - MPIDI_SHM_comm_create_hook_t comm_create_hook; - MPIDI_SHM_comm_free_hook_t comm_free_hook; - MPIDI_SHM_type_create_hook_t type_create_hook; - MPIDI_SHM_type_free_hook_t type_free_hook; - MPIDI_SHM_op_create_hook_t op_create_hook; - MPIDI_SHM_op_free_hook_t op_free_hook; + MPIDI_SHM_mpi_comm_create_hook_t mpi_comm_create_hook; + MPIDI_SHM_mpi_comm_free_hook_t mpi_comm_free_hook; + MPIDI_SHM_mpi_type_create_hook_t mpi_type_create_hook; + MPIDI_SHM_mpi_type_free_hook_t mpi_type_free_hook; + MPIDI_SHM_mpi_op_create_hook_t mpi_op_create_hook; + MPIDI_SHM_mpi_op_free_hook_t mpi_op_free_hook; /* Request allocation routines */ MPIDI_SHM_am_request_init_t am_request_init; MPIDI_SHM_am_request_finalize_t am_request_finalize; } MPIDI_SHM_funcs_t; typedef struct MPIDI_SHM_native_funcs { - MPIDI_SHM_send_t send; - MPIDI_SHM_ssend_t ssend; - MPIDI_SHM_startall_t startall; - MPIDI_SHM_send_init_t send_init; - MPIDI_SHM_ssend_init_t ssend_init; - MPIDI_SHM_rsend_init_t rsend_init; - MPIDI_SHM_bsend_init_t bsend_init; - MPIDI_SHM_isend_t isend; - MPIDI_SHM_issend_t issend; - MPIDI_SHM_cancel_send_t cancel_send; - MPIDI_SHM_recv_init_t recv_init; - MPIDI_SHM_recv_t recv; - MPIDI_SHM_irecv_t irecv; - MPIDI_SHM_imrecv_t imrecv; - MPIDI_SHM_cancel_recv_t cancel_recv; - MPIDI_SHM_alloc_mem_t alloc_mem; - MPIDI_SHM_free_mem_t free_mem; - MPIDI_SHM_improbe_t improbe; - MPIDI_SHM_iprobe_t iprobe; - MPIDI_SHM_win_set_info_t win_set_info; - MPIDI_SHM_win_shared_query_t win_shared_query; - MPIDI_SHM_put_t put; - MPIDI_SHM_win_start_t win_start; - MPIDI_SHM_win_complete_t win_complete; - MPIDI_SHM_win_post_t win_post; - MPIDI_SHM_win_wait_t win_wait; - MPIDI_SHM_win_test_t win_test; - MPIDI_SHM_win_lock_t win_lock; - MPIDI_SHM_win_unlock_t win_unlock; - MPIDI_SHM_win_get_info_t win_get_info; - MPIDI_SHM_get_t get; - MPIDI_SHM_win_free_t win_free; - MPIDI_SHM_win_fence_t win_fence; - MPIDI_SHM_win_create_t win_create; - MPIDI_SHM_accumulate_t accumulate; - MPIDI_SHM_win_attach_t win_attach; - MPIDI_SHM_win_allocate_shared_t win_allocate_shared; - MPIDI_SHM_rput_t rput; - MPIDI_SHM_win_flush_local_t win_flush_local; - MPIDI_SHM_win_detach_t win_detach; - MPIDI_SHM_compare_and_swap_t compare_and_swap; - MPIDI_SHM_raccumulate_t raccumulate; - MPIDI_SHM_rget_accumulate_t rget_accumulate; - MPIDI_SHM_fetch_and_op_t fetch_and_op; - MPIDI_SHM_win_allocate_t win_allocate; - MPIDI_SHM_win_flush_t win_flush; - MPIDI_SHM_win_flush_local_all_t win_flush_local_all; - MPIDI_SHM_win_unlock_all_t win_unlock_all; - MPIDI_SHM_win_create_dynamic_t win_create_dynamic; - MPIDI_SHM_rget_t rget; - MPIDI_SHM_win_sync_t win_sync; - MPIDI_SHM_win_flush_all_t win_flush_all; - MPIDI_SHM_get_accumulate_t get_accumulate; - MPIDI_SHM_win_lock_all_t win_lock_all; + MPIDI_SHM_mpi_send_t mpi_send; + MPIDI_SHM_mpi_ssend_t mpi_ssend; + MPIDI_SHM_mpi_startall_t mpi_startall; + MPIDI_SHM_mpi_send_init_t mpi_send_init; + MPIDI_SHM_mpi_ssend_init_t mpi_ssend_init; + MPIDI_SHM_mpi_rsend_init_t mpi_rsend_init; + MPIDI_SHM_mpi_bsend_init_t mpi_bsend_init; + MPIDI_SHM_mpi_isend_t mpi_isend; + MPIDI_SHM_mpi_issend_t mpi_issend; + MPIDI_SHM_mpi_cancel_send_t mpi_cancel_send; + MPIDI_SHM_mpi_recv_init_t mpi_recv_init; + MPIDI_SHM_mpi_recv_t mpi_recv; + MPIDI_SHM_mpi_irecv_t mpi_irecv; + MPIDI_SHM_mpi_imrecv_t mpi_imrecv; + MPIDI_SHM_mpi_cancel_recv_t mpi_cancel_recv; + MPIDI_SHM_mpi_alloc_mem_t mpi_alloc_mem; + MPIDI_SHM_mpi_free_mem_t mpi_free_mem; + MPIDI_SHM_mpi_improbe_t mpi_improbe; + MPIDI_SHM_mpi_iprobe_t mpi_iprobe; + MPIDI_SHM_mpi_win_set_info_t mpi_win_set_info; + MPIDI_SHM_mpi_win_shared_query_t mpi_win_shared_query; + MPIDI_SHM_mpi_put_t mpi_put; + MPIDI_SHM_mpi_win_start_t mpi_win_start; + MPIDI_SHM_mpi_win_complete_t mpi_win_complete; + MPIDI_SHM_mpi_win_post_t mpi_win_post; + MPIDI_SHM_mpi_win_wait_t mpi_win_wait; + MPIDI_SHM_mpi_win_test_t mpi_win_test; + MPIDI_SHM_mpi_win_lock_t mpi_win_lock; + MPIDI_SHM_mpi_win_unlock_t mpi_win_unlock; + MPIDI_SHM_mpi_win_get_info_t mpi_win_get_info; + MPIDI_SHM_mpi_get_t mpi_get; + MPIDI_SHM_mpi_win_free_t mpi_win_free; + MPIDI_SHM_mpi_win_fence_t mpi_win_fence; + MPIDI_SHM_mpi_win_create_t mpi_win_create; + MPIDI_SHM_mpi_accumulate_t mpi_accumulate; + MPIDI_SHM_mpi_win_attach_t mpi_win_attach; + MPIDI_SHM_mpi_win_allocate_shared_t mpi_win_allocate_shared; + MPIDI_SHM_mpi_rput_t mpi_rput; + MPIDI_SHM_mpi_win_flush_local_t mpi_win_flush_local; + MPIDI_SHM_mpi_win_detach_t mpi_win_detach; + MPIDI_SHM_mpi_compare_and_swap_t mpi_compare_and_swap; + MPIDI_SHM_mpi_raccumulate_t mpi_raccumulate; + MPIDI_SHM_mpi_rget_accumulate_t mpi_rget_accumulate; + MPIDI_SHM_mpi_fetch_and_op_t mpi_fetch_and_op; + MPIDI_SHM_mpi_win_allocate_t mpi_win_allocate; + MPIDI_SHM_mpi_win_flush_t mpi_win_flush; + MPIDI_SHM_mpi_win_flush_local_all_t mpi_win_flush_local_all; + MPIDI_SHM_mpi_win_unlock_all_t mpi_win_unlock_all; + MPIDI_SHM_mpi_win_create_dynamic_t mpi_win_create_dynamic; + MPIDI_SHM_mpi_rget_t mpi_rget; + MPIDI_SHM_mpi_win_sync_t mpi_win_sync; + MPIDI_SHM_mpi_win_flush_all_t mpi_win_flush_all; + MPIDI_SHM_mpi_get_accumulate_t mpi_get_accumulate; + MPIDI_SHM_mpi_win_lock_all_t mpi_win_lock_all; /* Collectives */ - MPIDI_SHM_barrier_t barrier; - MPIDI_SHM_bcast_t bcast; - MPIDI_SHM_allreduce_t allreduce; - MPIDI_SHM_allgather_t allgather; - MPIDI_SHM_allgatherv_t allgatherv; - MPIDI_SHM_scatter_t scatter; - MPIDI_SHM_scatterv_t scatterv; - MPIDI_SHM_gather_t gather; - MPIDI_SHM_gatherv_t gatherv; - MPIDI_SHM_alltoall_t alltoall; - MPIDI_SHM_alltoallv_t alltoallv; - MPIDI_SHM_alltoallw_t alltoallw; - MPIDI_SHM_reduce_t reduce; - MPIDI_SHM_reduce_scatter_t reduce_scatter; - MPIDI_SHM_reduce_scatter_block_t reduce_scatter_block; - MPIDI_SHM_scan_t scan; - MPIDI_SHM_exscan_t exscan; - MPIDI_SHM_neighbor_allgather_t neighbor_allgather; - MPIDI_SHM_neighbor_allgatherv_t neighbor_allgatherv; - MPIDI_SHM_neighbor_alltoall_t neighbor_alltoall; - MPIDI_SHM_neighbor_alltoallv_t neighbor_alltoallv; - MPIDI_SHM_neighbor_alltoallw_t neighbor_alltoallw; - MPIDI_SHM_ineighbor_allgather_t ineighbor_allgather; - MPIDI_SHM_ineighbor_allgatherv_t ineighbor_allgatherv; - MPIDI_SHM_ineighbor_alltoall_t ineighbor_alltoall; - MPIDI_SHM_ineighbor_alltoallv_t ineighbor_alltoallv; - MPIDI_SHM_ineighbor_alltoallw_t ineighbor_alltoallw; - MPIDI_SHM_ibarrier_t ibarrier; - MPIDI_SHM_ibcast_t ibcast; - MPIDI_SHM_iallgather_t iallgather; - MPIDI_SHM_iallgatherv_t iallgatherv; - MPIDI_SHM_iallreduce_t iallreduce; - MPIDI_SHM_ialltoall_t ialltoall; - MPIDI_SHM_ialltoallv_t ialltoallv; - MPIDI_SHM_ialltoallw_t ialltoallw; - MPIDI_SHM_iexscan_t iexscan; - MPIDI_SHM_igather_t igather; - MPIDI_SHM_igatherv_t igatherv; - MPIDI_SHM_ireduce_scatter_block_t ireduce_scatter_block; - MPIDI_SHM_ireduce_scatter_t ireduce_scatter; - MPIDI_SHM_ireduce_t ireduce; - MPIDI_SHM_iscan_t iscan; - MPIDI_SHM_iscatter_t iscatter; - MPIDI_SHM_iscatterv_t iscatterv; + MPIDI_SHM_mpi_barrier_t mpi_barrier; + MPIDI_SHM_mpi_bcast_t mpi_bcast; + MPIDI_SHM_mpi_allreduce_t mpi_allreduce; + MPIDI_SHM_mpi_allgather_t mpi_allgather; + MPIDI_SHM_mpi_allgatherv_t mpi_allgatherv; + MPIDI_SHM_mpi_scatter_t mpi_scatter; + MPIDI_SHM_mpi_scatterv_t mpi_scatterv; + MPIDI_SHM_mpi_gather_t mpi_gather; + MPIDI_SHM_mpi_gatherv_t mpi_gatherv; + MPIDI_SHM_mpi_alltoall_t mpi_alltoall; + MPIDI_SHM_mpi_alltoallv_t mpi_alltoallv; + MPIDI_SHM_mpi_alltoallw_t mpi_alltoallw; + MPIDI_SHM_mpi_reduce_t mpi_reduce; + MPIDI_SHM_mpi_reduce_scatter_t mpi_reduce_scatter; + MPIDI_SHM_mpi_reduce_scatter_block_t mpi_reduce_scatter_block; + MPIDI_SHM_mpi_scan_t mpi_scan; + MPIDI_SHM_mpi_exscan_t mpi_exscan; + MPIDI_SHM_mpi_neighbor_allgather_t mpi_neighbor_allgather; + MPIDI_SHM_mpi_neighbor_allgatherv_t mpi_neighbor_allgatherv; + MPIDI_SHM_mpi_neighbor_alltoall_t mpi_neighbor_alltoall; + MPIDI_SHM_mpi_neighbor_alltoallv_t mpi_neighbor_alltoallv; + MPIDI_SHM_mpi_neighbor_alltoallw_t mpi_neighbor_alltoallw; + MPIDI_SHM_mpi_ineighbor_allgather_t mpi_ineighbor_allgather; + MPIDI_SHM_mpi_ineighbor_allgatherv_t mpi_ineighbor_allgatherv; + MPIDI_SHM_mpi_ineighbor_alltoall_t mpi_ineighbor_alltoall; + MPIDI_SHM_mpi_ineighbor_alltoallv_t mpi_ineighbor_alltoallv; + MPIDI_SHM_mpi_ineighbor_alltoallw_t mpi_ineighbor_alltoallw; + MPIDI_SHM_mpi_ibarrier_t mpi_ibarrier; + MPIDI_SHM_mpi_ibcast_t mpi_ibcast; + MPIDI_SHM_mpi_iallgather_t mpi_iallgather; + MPIDI_SHM_mpi_iallgatherv_t mpi_iallgatherv; + MPIDI_SHM_mpi_iallreduce_t mpi_iallreduce; + MPIDI_SHM_mpi_ialltoall_t mpi_ialltoall; + MPIDI_SHM_mpi_ialltoallv_t mpi_ialltoallv; + MPIDI_SHM_mpi_ialltoallw_t mpi_ialltoallw; + MPIDI_SHM_mpi_iexscan_t mpi_iexscan; + MPIDI_SHM_mpi_igather_t mpi_igather; + MPIDI_SHM_mpi_igatherv_t mpi_igatherv; + MPIDI_SHM_mpi_ireduce_scatter_block_t mpi_ireduce_scatter_block; + MPIDI_SHM_mpi_ireduce_scatter_t mpi_ireduce_scatter; + MPIDI_SHM_mpi_ireduce_t mpi_ireduce; + MPIDI_SHM_mpi_iscan_t mpi_iscan; + MPIDI_SHM_mpi_iscatter_t mpi_iscatter; + MPIDI_SHM_mpi_iscatterv_t mpi_iscatterv; } MPIDI_SHM_native_funcs_t; extern MPIDI_SHM_funcs_t *MPIDI_SHM_funcs[]; @@ -511,30 +527,30 @@ extern MPIDI_SHM_native_funcs_t *MPIDI_SHM_native_func; extern int MPIDI_num_shms; extern char MPIDI_SHM_strings[][MPIDI_MAX_SHM_STRING_LEN]; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_init(int rank, int size) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_finalize(void) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_init(int rank, int size) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_finalize(void) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_progress(int blocking) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_am_reg_handler(int handler_id, MPIDI_SHM_am_origin_handler_fn origin_handler_fn, MPIDI_SHM_am_target_handler_fn target_handler_fn) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_comm_connect(const char *port_name, MPIR_Info * info, - int root, MPIR_Comm * comm, - MPIR_Comm ** - newcomm_ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_comm_disconnect(MPIR_Comm * - comm_ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_open_port(MPIR_Info * info_ptr, - char *port_name) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_close_port(const char *port_name) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_comm_accept(const char *port_name, MPIR_Info * info, - int root, MPIR_Comm * comm, - MPIR_Comm ** - newcomm_ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_am_send_hdr(int rank, MPIR_Comm * comm, - int handler_id, const void *am_hdr, - size_t am_hdr_sz, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_comm_connect(const char *port_name, MPIR_Info * info, + int root, MPIR_Comm * comm, + MPIR_Comm ** + newcomm_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_comm_disconnect(MPIR_Comm * + comm_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_open_port(MPIR_Info * info_ptr, + char *port_name) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_close_port(const char *port_name) + MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_comm_accept(const char *port_name, MPIR_Info * info, + int root, MPIR_Comm * comm, + MPIR_Comm ** + newcomm_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_am_send_hdr(int rank, MPIR_Comm * comm, int handler_id, + const void *am_hdr, size_t am_hdr_sz, void *shm_context) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_am_isend(int rank, MPIR_Comm * comm, int handler_id, const void *am_hdr, size_t am_hdr_sz, @@ -556,26 +572,24 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_inject_amv(int rank, MPIR_Comm * comm, in const void *data, MPI_Count count, MPI_Datatype datatype, void *shm_context) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_am_send_hdr_reply(MPIR_Context_id_t context_id, - int src_rank, int handler_id, - const void *am_hdr, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_am_send_hdr_reply(MPIR_Context_id_t context_id, int src_rank, + int handler_id, const void *am_hdr, size_t am_hdr_sz) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_am_isend_reply(MPIR_Context_id_t context_id, - int src_rank, int handler_id, - const void *am_hdr, size_t am_hdr_sz, - const void *data, MPI_Count count, - MPI_Datatype datatype, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_am_isend_reply(MPIR_Context_id_t context_id, int src_rank, + int handler_id, const void *am_hdr, + size_t am_hdr_sz, const void *data, + MPI_Count count, MPI_Datatype datatype, MPIR_Request * sreq) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_inject_am_reply(MPIR_Context_id_t context_id, - int src_rank, int handler_id, - const void *am_hdr, size_t am_hdr_sz, - const void *data, MPI_Count count, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_inject_am_reply(MPIR_Context_id_t context_id, int src_rank, + int handler_id, const void *am_hdr, + size_t am_hdr_sz, const void *data, + MPI_Count count, MPI_Datatype datatype) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_inject_amv_reply(MPIR_Context_id_t context_id, - int src_rank, int handler_id, - struct iovec *am_hdrs, size_t iov_len, - const void *data, MPI_Count count, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_inject_amv_reply(MPIR_Context_id_t context_id, int src_rank, + int handler_id, struct iovec *am_hdrs, + size_t iov_len, const void *data, + MPI_Count count, MPI_Datatype datatype) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX size_t MPIDI_SHM_am_hdr_max_sz(void) MPL_STATIC_INLINE_SUFFIX; @@ -600,450 +614,466 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_create_intercomm_from_lpids(MPIR_Comm * n int size, const int lpids[]) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_comm_create_hook(MPIR_Comm * comm) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_comm_free_hook(MPIR_Comm * comm) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_type_create_hook(MPIR_Datatype * - type) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_type_free_hook(MPIR_Datatype * - type) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_op_create_hook(MPIR_Op * op) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_op_free_hook(MPIR_Op * op) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_comm_create_hook(MPIR_Comm * + comm) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_comm_free_hook(MPIR_Comm * + comm) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_type_create_hook(MPIR_Datatype * + type) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_type_free_hook(MPIR_Datatype * + type) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_op_create_hook(MPIR_Op * op) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_op_free_hook(MPIR_Op * op) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX void MPIDI_SHM_am_request_init(MPIR_Request * req) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX void MPIDI_SHM_am_request_finalize(MPIR_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_send(const void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ssend(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_startall(int count, - MPIR_Request * requests[]) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_send_init(const void *buf, int count, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_send(const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, + MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ssend(const void *buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ssend_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_rsend_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_bsend_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_startall(int count, + MPIR_Request * + requests[]) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_send_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** + request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ssend_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** + request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_rsend_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** + request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_bsend_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** + request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_isend(const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, + MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_issend(const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_isend(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_issend(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_cancel_send(MPIR_Request * sreq) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_recv_init(void *buf, int count, MPI_Datatype datatype, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_cancel_send(MPIR_Request * + sreq) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, + MPIR_Request ** + request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_recv(void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPI_Status * status, + MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_irecv(void *buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_recv(void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, MPI_Status * status, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_irecv(void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_imrecv(void *buf, int count, MPI_Datatype datatype, - MPIR_Request * message, - MPIR_Request ** rreqp) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_cancel_recv(MPIR_Request * rreq) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX void *MPIDI_SHM_alloc_mem(size_t size, - MPIR_Info * info_ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_free_mem(void *ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_improbe(int source, int tag, MPIR_Comm * comm, - int context_offset, int *flag, - MPIR_Request ** message, - MPI_Status * status) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iprobe(int source, int tag, MPIR_Comm * comm, - int context_offset, int *flag, - MPI_Status * status) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_set_info(MPIR_Win * win, - MPIR_Info * info) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_shared_query(MPIR_Win * win, int rank, - MPI_Aint * size, int *disp_unit, - void *baseptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_put(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_start(MPIR_Group * group, int assert, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_complete(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_post(MPIR_Group * group, int assert, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_wait(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_test(MPIR_Win * win, int *flag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_lock(int lock_type, int rank, int assert, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_unlock(int rank, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_get_info(MPIR_Win * win, - MPIR_Info ** info_p_p) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_get(void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_free(MPIR_Win ** win_ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_fence(int assert, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_create(void *base, MPI_Aint length, int disp_unit, - MPIR_Info * info, MPIR_Comm * comm_ptr, - MPIR_Win ** win_ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_accumulate(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, - int target_rank, MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_attach(MPIR_Win * win, void *base, - MPI_Aint size) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_allocate_shared(MPI_Aint size, int disp_unit, - MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, - void **base_ptr, - MPIR_Win ** - win_ptr) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_rput(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_flush_local(int rank, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_detach(MPIR_Win * win, - const void *base) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_compare_and_swap(const void *origin_addr, - const void *compare_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_raccumulate(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, - int target_rank, MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win, - MPIR_Request ** - request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_rget_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - void *result_addr, int result_count, - MPI_Datatype result_datatype, - int target_rank, MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win, - MPIR_Request ** - request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_fetch_and_op(const void *origin_addr, - void *result_addr, MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, - MPI_Op op, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_imrecv(void *buf, int count, MPI_Datatype datatype, + MPIR_Request * message, + MPIR_Request ** rreqp) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_cancel_recv(MPIR_Request * + rreq) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX void *MPIDI_SHM_mpi_alloc_mem(size_t size, + MPIR_Info * + info_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_free_mem(void *ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_improbe(int source, int tag, MPIR_Comm * comm, + int context_offset, int *flag, + MPIR_Request ** message, + MPI_Status * status) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iprobe(int source, int tag, MPIR_Comm * comm, + int context_offset, int *flag, + MPI_Status * status) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_set_info(MPIR_Win * win, + MPIR_Info * info) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_shared_query(MPIR_Win * win, int rank, + MPI_Aint * size, int *disp_unit, + void *baseptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_put(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_start(MPIR_Group * group, int assert, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_complete(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_post(MPIR_Group * group, int assert, MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_allocate(MPI_Aint size, int disp_unit, - MPIR_Info * info, MPIR_Comm * comm, - void *baseptr, - MPIR_Win ** win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_flush(int rank, MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_flush_local_all(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_unlock_all(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, - MPIR_Win ** win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_rget(void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win, - MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_sync(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_flush_all(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_get_accumulate(const void *origin_addr, - int origin_count, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_wait(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_test(MPIR_Win * win, + int *flag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_lock(int lock_type, int rank, int assert, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_unlock(int rank, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_get_info(MPIR_Win * win, + MPIR_Info ** + info_p_p) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_get(void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_free(MPIR_Win ** win_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_fence(int assert, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_create(void *base, MPI_Aint length, int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_lock_all(int assert, - MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_barrier(MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_bcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_allreduce(const void *sendbuf, void *recvbuf, - int count, MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_attach(MPIR_Win * win, void *base, + MPI_Aint size) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_allocate_shared(MPI_Aint size, int disp_unit, + MPIR_Info * info_ptr, + MPIR_Comm * comm_ptr, + void **base_ptr, + MPIR_Win ** + win_ptr) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_rput(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win, + MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_flush_local(int rank, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_detach(MPIR_Win * win, + const void *base) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_compare_and_swap(const void *origin_addr, + const void *compare_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp, + MPIR_Win * + win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_raccumulate(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win, + MPIR_Request ** + request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_rget_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, int result_count, + MPI_Datatype result_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win, + MPIR_Request ** + request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_fetch_and_op(const void *origin_addr, void *result_addr, + MPI_Datatype datatype, int target_rank, + MPI_Aint target_disp, MPI_Op op, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_allocate(MPI_Aint size, int disp_unit, + MPIR_Info * info, MPIR_Comm * comm, + void *baseptr, + MPIR_Win ** win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_flush(int rank, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_flush_local_all(MPIR_Win * + win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_unlock_all(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, + MPIR_Win ** + win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_rget(void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win, + MPIR_Request ** request) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_sync(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_flush_all(MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_get_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, int result_count, + MPI_Datatype result_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_lock_all(int assert, + MPIR_Win * win) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_barrier(MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_bcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_allgatherv(const void *sendbuf, int sendcount, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_allreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_scatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_scatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm_ptr, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_scatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_scatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_gather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_gatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_alltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_alltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, - const MPI_Datatype sendtypes[], - void *recvbuf, const int *recvcounts, - const int *rdispls, - const MPI_Datatype recvtypes[], - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_reduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_reduce_scatter(const void *sendbuf, void *recvbuf, - const int *recvcounts, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, - MPIR_Errflag_t * - errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_reduce_scatter_block(const void *sendbuf, - void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, - MPIR_Errflag_t * - errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_scan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_exscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_neighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, - MPIR_Comm * comm, - MPIR_Errflag_t * - errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_neighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, - void *recvbuf, - const int *recvcounts, - const int *displs, - MPI_Datatype recvtype, - MPIR_Comm * comm, - MPIR_Errflag_t * - errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_neighbor_alltoallv(const void *sendbuf, - const int *sendcounts, - const int *sdispls, - MPI_Datatype sendtype, - void *recvbuf, - const int *recvcounts, - const int *rdispls, - MPI_Datatype recvtype, - MPIR_Comm * comm, - MPIR_Errflag_t * - errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_neighbor_alltoallw(const void *sendbuf, - const int *sendcounts, - const MPI_Aint * sdispls, - const MPI_Datatype * sendtypes, - void *recvbuf, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_gatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_alltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_alltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, + const MPI_Datatype sendtypes[], void *recvbuf, + const int *recvcounts, const int *rdispls, + const MPI_Datatype recvtypes[], + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_reduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_reduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcounts, - const MPI_Aint * rdispls, - const MPI_Datatype * recvtypes, - MPIR_Comm * comm, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_neighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, - MPIR_Errflag_t * - errflag) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ineighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * - req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ineighbor_allgatherv(const void *sendbuf, - int sendcount, - MPI_Datatype sendtype, - void *recvbuf, - const int *recvcounts, - const int *displs, - MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * - req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ineighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * - req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ineighbor_alltoallv(const void *sendbuf, - const int *sendcounts, - const int *sdispls, - MPI_Datatype sendtype, - void *recvbuf, - const int *recvcounts, - const int *rdispls, - MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * - req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ineighbor_alltoallw(const void *sendbuf, - const int *sendcounts, - const MPI_Aint * sdispls, - const MPI_Datatype * sendtypes, - void *recvbuf, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_reduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm_ptr, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_scan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, + MPIR_Errflag_t * errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_exscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_neighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_neighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, + const int *displs, + MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_neighbor_alltoallv(const void *sendbuf, + const int *sendcounts, + const int *sdispls, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, + const int *rdispls, + MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_neighbor_alltoallw(const void *sendbuf, + const int *sendcounts, + const MPI_Aint * sdispls, + const MPI_Datatype * sendtypes, + void *recvbuf, const int *recvcounts, + const MPI_Aint * rdispls, + const MPI_Datatype * recvtypes, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_neighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * + errflag) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ineighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * + req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ineighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, + void *recvbuf, + const int *recvcounts, + const int *displs, + MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * + req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ineighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * + req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ineighbor_alltoallv(const void *sendbuf, + const int *sendcounts, + const int *sdispls, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, + const int *rdispls, + MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * + req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ineighbor_alltoallw(const void *sendbuf, + const int *sendcounts, + const MPI_Aint * sdispls, + const MPI_Datatype * sendtypes, + void *recvbuf, const int *recvcounts, + const MPI_Aint * rdispls, + const MPI_Datatype * recvtypes, + MPIR_Comm * comm, + MPI_Request * + req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ibarrier(MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ibcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iallgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iallgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iallreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ialltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ialltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ialltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, + const MPI_Datatype sendtypes[], void *recvbuf, + const int *recvcounts, const int *rdispls, + const MPI_Datatype recvtypes[], + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iexscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_igather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_igatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ireduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, + MPI_Request * + req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ireduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcounts, - const MPI_Aint * rdispls, - const MPI_Datatype * recvtypes, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ibarrier(MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ibcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iallgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iallgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ireduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iallreduce(const void *sendbuf, void *recvbuf, - int count, MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ialltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ialltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ialltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, - const MPI_Datatype sendtypes[], - void *recvbuf, const int *recvcounts, - const int *rdispls, - const MPI_Datatype recvtypes[], - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iexscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_igather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_igatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ireduce_scatter_block(const void *sendbuf, - void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPI_Request * - req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ireduce_scatter(const void *sendbuf, void *recvbuf, - const int *recvcounts, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ireduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iscatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm, - MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iscatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm_ptr, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iscatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iscatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm_ptr, + MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; #endif /* SHM_PROTOTYPES_H_INCLUDED */ diff --git a/src/mpid/ch4/shm/include/shm_impl.h b/src/mpid/ch4/shm/include/shm_impl.h index b563ae2..ad23af0 100644 --- a/src/mpid/ch4/shm/include/shm_impl.h +++ b/src/mpid/ch4/shm/include/shm_impl.h @@ -15,14 +15,14 @@ #ifndef SHM_DIRECT #ifndef SHM_DISABLE_INLINES -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_init(int rank, int size) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_init(int rank, int size) { - return MPIDI_SHM_func->init(rank, size); + return MPIDI_SHM_func->mpi_init(rank, size); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_finalize(void) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_finalize(void) { - return MPIDI_SHM_func->finalize(); + return MPIDI_SHM_func->mpi_finalize(); }; MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_progress(int blocking) @@ -39,33 +39,33 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_am_reg_handler(int handler_id, return MPIDI_SHM_func->am_reg_handler(handler_id, origin_handler_fn, target_handler_fn); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_comm_connect(const char *port_name, MPIR_Info * info, - int root, MPIR_Comm * comm, - MPIR_Comm ** newcomm_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_comm_connect(const char *port_name, MPIR_Info * info, + int root, MPIR_Comm * comm, + MPIR_Comm ** newcomm_ptr) { - return MPIDI_SHM_func->comm_connect(port_name, info, root, comm, newcomm_ptr); + return MPIDI_SHM_func->mpi_comm_connect(port_name, info, root, comm, newcomm_ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_comm_disconnect(MPIR_Comm * comm_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_comm_disconnect(MPIR_Comm * comm_ptr) { - return MPIDI_SHM_func->comm_disconnect(comm_ptr); + return MPIDI_SHM_func->mpi_comm_disconnect(comm_ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_open_port(MPIR_Info * info_ptr, char *port_name) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_open_port(MPIR_Info * info_ptr, char *port_name) { - return MPIDI_SHM_func->open_port(info_ptr, port_name); + return MPIDI_SHM_func->mpi_open_port(info_ptr, port_name); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_close_port(const char *port_name) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_close_port(const char *port_name) { - return MPIDI_SHM_func->close_port(port_name); + return MPIDI_SHM_func->mpi_close_port(port_name); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_comm_accept(const char *port_name, MPIR_Info * info, - int root, MPIR_Comm * comm, - MPIR_Comm ** newcomm_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_comm_accept(const char *port_name, MPIR_Info * info, + int root, MPIR_Comm * comm, + MPIR_Comm ** newcomm_ptr) { - return MPIDI_SHM_func->comm_accept(port_name, info, root, comm, newcomm_ptr); + return MPIDI_SHM_func->mpi_comm_accept(port_name, info, root, comm, newcomm_ptr); }; MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_am_send_hdr(int rank, MPIR_Comm * comm, @@ -204,34 +204,34 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_create_intercomm_from_lpids(MPIR_Comm * n return MPIDI_SHM_func->create_intercomm_from_lpids(newcomm_ptr, size, lpids); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_comm_create_hook(MPIR_Comm * comm) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_comm_create_hook(MPIR_Comm * comm) { - return MPIDI_SHM_func->comm_create_hook(comm); + return MPIDI_SHM_func->mpi_comm_create_hook(comm); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_comm_free_hook(MPIR_Comm * comm) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_comm_free_hook(MPIR_Comm * comm) { - return MPIDI_SHM_func->comm_free_hook(comm); + return MPIDI_SHM_func->mpi_comm_free_hook(comm); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_type_create_hook(MPIR_Datatype * type) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_type_create_hook(MPIR_Datatype * type) { - return MPIDI_SHM_func->type_create_hook(type); + return MPIDI_SHM_func->mpi_type_create_hook(type); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_type_free_hook(MPIR_Datatype * type) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_type_free_hook(MPIR_Datatype * type) { - return MPIDI_SHM_func->type_free_hook(type); + return MPIDI_SHM_func->mpi_type_free_hook(type); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_op_create_hook(MPIR_Op * op) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_op_create_hook(MPIR_Op * op) { - return MPIDI_SHM_func->op_create_hook(op); + return MPIDI_SHM_func->mpi_op_create_hook(op); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_op_free_hook(MPIR_Op * op) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_op_free_hook(MPIR_Op * op) { - return MPIDI_SHM_func->op_free_hook(op); + return MPIDI_SHM_func->mpi_op_free_hook(op); }; MPL_STATIC_INLINE_PREFIX void MPIDI_SHM_am_request_init(MPIR_Request * req) @@ -244,817 +244,827 @@ MPL_STATIC_INLINE_PREFIX void MPIDI_SHM_am_request_finalize(MPIR_Request * req) return MPIDI_SHM_func->am_request_finalize(req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_send(const void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_send(const void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { - return MPIDI_SHM_native_func->send(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_SHM_native_func->mpi_send(buf, count, datatype, rank, tag, comm, context_offset, + request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ssend(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) -{ - return MPIDI_SHM_native_func->ssend(buf, count, datatype, rank, tag, comm, context_offset, - request); -}; - -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_startall(int count, MPIR_Request * requests[]) -{ - return MPIDI_SHM_native_func->startall(count, requests); -}; - -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_send_init(const void *buf, int count, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ssend(const void *buf, int count, MPI_Datatype datatype, int rank, int tag, MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { - return MPIDI_SHM_native_func->send_init(buf, count, datatype, rank, tag, comm, context_offset, + return MPIDI_SHM_native_func->mpi_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ssend_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_startall(int count, MPIR_Request * requests[]) { - return MPIDI_SHM_native_func->ssend_init(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_SHM_native_func->mpi_startall(count, requests); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_rsend_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_send_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_SHM_native_func->rsend_init(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_SHM_native_func->mpi_send_init(buf, count, datatype, rank, tag, comm, + context_offset, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_bsend_init(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ssend_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_SHM_native_func->bsend_init(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_SHM_native_func->mpi_ssend_init(buf, count, datatype, rank, tag, comm, + context_offset, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_isend(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_rsend_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_SHM_native_func->isend(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_SHM_native_func->mpi_rsend_init(buf, count, datatype, rank, tag, comm, + context_offset, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_issend(const void *buf, int count, - MPI_Datatype datatype, int rank, int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_bsend_init(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_SHM_native_func->issend(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_SHM_native_func->mpi_bsend_init(buf, count, datatype, rank, tag, comm, + context_offset, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_cancel_send(MPIR_Request * sreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_isend(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_SHM_native_func->cancel_send(sreq); + return MPIDI_SHM_native_func->mpi_isend(buf, count, datatype, rank, tag, comm, context_offset, + request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_recv_init(void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_issend(const void *buf, int count, + MPI_Datatype datatype, int rank, int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { - return MPIDI_SHM_native_func->recv_init(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_SHM_native_func->mpi_issend(buf, count, datatype, rank, tag, comm, context_offset, + request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_recv(void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, MPI_Status * status, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_cancel_send(MPIR_Request * sreq) { - return MPIDI_SHM_native_func->recv(buf, count, datatype, rank, tag, comm, context_offset, - status, request); + return MPIDI_SHM_native_func->mpi_cancel_send(sreq); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_irecv(void *buf, int count, MPI_Datatype datatype, - int rank, int tag, MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_recv_init(void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { - return MPIDI_SHM_native_func->irecv(buf, count, datatype, rank, tag, comm, context_offset, - request); + return MPIDI_SHM_native_func->mpi_recv_init(buf, count, datatype, rank, tag, comm, + context_offset, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_imrecv(void *buf, int count, MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_recv(void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPI_Status * status, + MPIR_Request ** request) { - return MPIDI_SHM_native_func->imrecv(buf, count, datatype, message, rreqp); + return MPIDI_SHM_native_func->mpi_recv(buf, count, datatype, rank, tag, comm, context_offset, + status, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_cancel_recv(MPIR_Request * rreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_irecv(void *buf, int count, MPI_Datatype datatype, + int rank, int tag, MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { - return MPIDI_SHM_native_func->cancel_recv(rreq); + return MPIDI_SHM_native_func->mpi_irecv(buf, count, datatype, rank, tag, comm, context_offset, + request); }; -MPL_STATIC_INLINE_PREFIX void *MPIDI_SHM_alloc_mem(size_t size, MPIR_Info * info_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_imrecv(void *buf, int count, MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp) { - return MPIDI_SHM_native_func->alloc_mem(size, info_ptr); + return MPIDI_SHM_native_func->mpi_imrecv(buf, count, datatype, message, rreqp); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_free_mem(void *ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_cancel_recv(MPIR_Request * rreq) { - return MPIDI_SHM_native_func->free_mem(ptr); + return MPIDI_SHM_native_func->mpi_cancel_recv(rreq); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_improbe(int source, int tag, MPIR_Comm * comm, - int context_offset, int *flag, - MPIR_Request ** message, MPI_Status * status) +MPL_STATIC_INLINE_PREFIX void *MPIDI_SHM_mpi_alloc_mem(size_t size, MPIR_Info * info_ptr) { - return MPIDI_SHM_native_func->improbe(source, tag, comm, context_offset, flag, message, status); + return MPIDI_SHM_native_func->mpi_alloc_mem(size, info_ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iprobe(int source, int tag, MPIR_Comm * comm, - int context_offset, int *flag, MPI_Status * status) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_free_mem(void *ptr) { - return MPIDI_SHM_native_func->iprobe(source, tag, comm, context_offset, flag, status); + return MPIDI_SHM_native_func->mpi_free_mem(ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_set_info(MPIR_Win * win, MPIR_Info * info) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_improbe(int source, int tag, MPIR_Comm * comm, + int context_offset, int *flag, + MPIR_Request ** message, MPI_Status * status) { - return MPIDI_SHM_native_func->win_set_info(win, info); + return MPIDI_SHM_native_func->mpi_improbe(source, tag, comm, context_offset, flag, message, + status); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_shared_query(MPIR_Win * win, int rank, - MPI_Aint * size, int *disp_unit, - void *baseptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iprobe(int source, int tag, MPIR_Comm * comm, + int context_offset, int *flag, + MPI_Status * status) { - return MPIDI_SHM_native_func->win_shared_query(win, rank, size, disp_unit, baseptr); + return MPIDI_SHM_native_func->mpi_iprobe(source, tag, comm, context_offset, flag, status); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_put(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_set_info(MPIR_Win * win, MPIR_Info * info) { - return MPIDI_SHM_native_func->put(origin_addr, origin_count, origin_datatype, target_rank, - target_disp, target_count, target_datatype, win); + return MPIDI_SHM_native_func->mpi_win_set_info(win, info); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_start(MPIR_Group * group, int assert, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_shared_query(MPIR_Win * win, int rank, + MPI_Aint * size, int *disp_unit, + void *baseptr) { - return MPIDI_SHM_native_func->win_start(group, assert, win); + return MPIDI_SHM_native_func->mpi_win_shared_query(win, rank, size, disp_unit, baseptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_complete(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_put(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win) { - return MPIDI_SHM_native_func->win_complete(win); + return MPIDI_SHM_native_func->mpi_put(origin_addr, origin_count, origin_datatype, target_rank, + target_disp, target_count, target_datatype, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_post(MPIR_Group * group, int assert, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_start(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_SHM_native_func->win_post(group, assert, win); + return MPIDI_SHM_native_func->mpi_win_start(group, assert, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_wait(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_complete(MPIR_Win * win) { - return MPIDI_SHM_native_func->win_wait(win); + return MPIDI_SHM_native_func->mpi_win_complete(win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_test(MPIR_Win * win, int *flag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_post(MPIR_Group * group, int assert, MPIR_Win * win) { - return MPIDI_SHM_native_func->win_test(win, flag); + return MPIDI_SHM_native_func->mpi_win_post(group, assert, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_wait(MPIR_Win * win) { - return MPIDI_SHM_native_func->win_lock(lock_type, rank, assert, win); + return MPIDI_SHM_native_func->mpi_win_wait(win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_unlock(int rank, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_test(MPIR_Win * win, int *flag) { - return MPIDI_SHM_native_func->win_unlock(rank, win); + return MPIDI_SHM_native_func->mpi_win_test(win, flag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_lock(int lock_type, int rank, int assert, + MPIR_Win * win) { - return MPIDI_SHM_native_func->win_get_info(win, info_p_p); + return MPIDI_SHM_native_func->mpi_win_lock(lock_type, rank, assert, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_get(void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_unlock(int rank, MPIR_Win * win) { - return MPIDI_SHM_native_func->get(origin_addr, origin_count, origin_datatype, target_rank, - target_disp, target_count, target_datatype, win); + return MPIDI_SHM_native_func->mpi_win_unlock(rank, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_free(MPIR_Win ** win_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) { - return MPIDI_SHM_native_func->win_free(win_ptr); + return MPIDI_SHM_native_func->mpi_win_get_info(win, info_p_p); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_fence(int assert, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_get(void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win) { - return MPIDI_SHM_native_func->win_fence(assert, win); + return MPIDI_SHM_native_func->mpi_get(origin_addr, origin_count, origin_datatype, target_rank, + target_disp, target_count, target_datatype, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_create(void *base, MPI_Aint length, int disp_unit, - MPIR_Info * info, MPIR_Comm * comm_ptr, - MPIR_Win ** win_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_free(MPIR_Win ** win_ptr) { - return MPIDI_SHM_native_func->win_create(base, length, disp_unit, info, comm_ptr, win_ptr); + return MPIDI_SHM_native_func->mpi_win_free(win_ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_accumulate(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, - int target_rank, MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_fence(int assert, MPIR_Win * win) { - return MPIDI_SHM_native_func->accumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win); + return MPIDI_SHM_native_func->mpi_win_fence(assert, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_attach(MPIR_Win * win, void *base, MPI_Aint size) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_create(void *base, MPI_Aint length, int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr) { - return MPIDI_SHM_native_func->win_attach(win, base, size); + return MPIDI_SHM_native_func->mpi_win_create(base, length, disp_unit, info, comm_ptr, win_ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_allocate_shared(MPI_Aint size, int disp_unit, - MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, - void **base_ptr, MPIR_Win ** win_ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_accumulate(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) { - return MPIDI_SHM_native_func->win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, base_ptr, - win_ptr); + return MPIDI_SHM_native_func->mpi_accumulate(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_rput(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_attach(MPIR_Win * win, void *base, MPI_Aint size) { - return MPIDI_SHM_native_func->rput(origin_addr, origin_count, origin_datatype, target_rank, - target_disp, target_count, target_datatype, win, request); + return MPIDI_SHM_native_func->mpi_win_attach(win, base, size); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_flush_local(int rank, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_allocate_shared(MPI_Aint size, int disp_unit, + MPIR_Info * info_ptr, + MPIR_Comm * comm_ptr, + void **base_ptr, MPIR_Win ** win_ptr) { - return MPIDI_SHM_native_func->win_flush_local(rank, win); + return MPIDI_SHM_native_func->mpi_win_allocate_shared(size, disp_unit, info_ptr, comm_ptr, + base_ptr, win_ptr); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_detach(MPIR_Win * win, const void *base) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_rput(const void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win, + MPIR_Request ** request) { - return MPIDI_SHM_native_func->win_detach(win, base); + return MPIDI_SHM_native_func->mpi_rput(origin_addr, origin_count, origin_datatype, target_rank, + target_disp, target_count, target_datatype, win, + request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_compare_and_swap(const void *origin_addr, - const void *compare_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, - MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_flush_local(int rank, MPIR_Win * win) +{ + return MPIDI_SHM_native_func->mpi_win_flush_local(rank, win); +}; + +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_detach(MPIR_Win * win, const void *base) { - return MPIDI_SHM_native_func->compare_and_swap(origin_addr, compare_addr, result_addr, datatype, - target_rank, target_disp, win); + return MPIDI_SHM_native_func->mpi_win_detach(win, base); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_raccumulate(const void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, - int target_rank, MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_compare_and_swap(const void *origin_addr, + const void *compare_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp, + MPIR_Win * win) { - return MPIDI_SHM_native_func->raccumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win, request); + return MPIDI_SHM_native_func->mpi_compare_and_swap(origin_addr, compare_addr, result_addr, + datatype, target_rank, target_disp, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_rget_accumulate(const void *origin_addr, - int origin_count, +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win, - MPIR_Request ** request) + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win, MPIR_Request ** request) { - return MPIDI_SHM_native_func->rget_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, + return MPIDI_SHM_native_func->mpi_raccumulate(origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, op, win, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_fetch_and_op(const void *origin_addr, - void *result_addr, MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, - MPI_Op op, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_rget_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, int result_count, + MPI_Datatype result_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, + MPIR_Request ** request) { - return MPIDI_SHM_native_func->fetch_and_op(origin_addr, result_addr, datatype, target_rank, - target_disp, op, win); + return MPIDI_SHM_native_func->mpi_rget_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win, request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_allocate(MPI_Aint size, int disp_unit, - MPIR_Info * info, MPIR_Comm * comm, - void *baseptr, MPIR_Win ** win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_fetch_and_op(const void *origin_addr, + void *result_addr, MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp, + MPI_Op op, MPIR_Win * win) { - return MPIDI_SHM_native_func->win_allocate(size, disp_unit, info, comm, baseptr, win); + return MPIDI_SHM_native_func->mpi_fetch_and_op(origin_addr, result_addr, datatype, target_rank, + target_disp, op, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_flush(int rank, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_allocate(MPI_Aint size, int disp_unit, + MPIR_Info * info, MPIR_Comm * comm, + void *baseptr, MPIR_Win ** win) { - return MPIDI_SHM_native_func->win_flush(rank, win); + return MPIDI_SHM_native_func->mpi_win_allocate(size, disp_unit, info, comm, baseptr, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_flush_local_all(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_flush(int rank, MPIR_Win * win) { - return MPIDI_SHM_native_func->win_flush_local_all(win); + return MPIDI_SHM_native_func->mpi_win_flush(rank, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_unlock_all(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_flush_local_all(MPIR_Win * win) { - return MPIDI_SHM_native_func->win_unlock_all(win); + return MPIDI_SHM_native_func->mpi_win_flush_local_all(win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, - MPIR_Win ** win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_unlock_all(MPIR_Win * win) { - return MPIDI_SHM_native_func->win_create_dynamic(info, comm, win); + return MPIDI_SHM_native_func->mpi_win_unlock_all(win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_rget(void *origin_addr, int origin_count, - MPI_Datatype origin_datatype, int target_rank, - MPI_Aint target_disp, int target_count, - MPI_Datatype target_datatype, MPIR_Win * win, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, + MPIR_Win ** win) { - return MPIDI_SHM_native_func->rget(origin_addr, origin_count, origin_datatype, target_rank, - target_disp, target_count, target_datatype, win, request); + return MPIDI_SHM_native_func->mpi_win_create_dynamic(info, comm, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_sync(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_rget(void *origin_addr, int origin_count, + MPI_Datatype origin_datatype, int target_rank, + MPI_Aint target_disp, int target_count, + MPI_Datatype target_datatype, MPIR_Win * win, + MPIR_Request ** request) { - return MPIDI_SHM_native_func->win_sync(win); + return MPIDI_SHM_native_func->mpi_rget(origin_addr, origin_count, origin_datatype, target_rank, + target_disp, target_count, target_datatype, win, + request); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_flush_all(MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_sync(MPIR_Win * win) { - return MPIDI_SHM_native_func->win_flush_all(win); + return MPIDI_SHM_native_func->mpi_win_sync(win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_get_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - void *result_addr, int result_count, - MPI_Datatype result_datatype, - int target_rank, MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_flush_all(MPIR_Win * win) { - return MPIDI_SHM_native_func->get_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win); + return MPIDI_SHM_native_func->mpi_win_flush_all(win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_win_lock_all(int assert, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_get_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, int result_count, + MPI_Datatype result_datatype, + int target_rank, MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) { - return MPIDI_SHM_native_func->win_lock_all(assert, win); + return MPIDI_SHM_native_func->mpi_get_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_barrier(MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_win_lock_all(int assert, MPIR_Win * win) { - return MPIDI_SHM_native_func->barrier(comm, errflag); + return MPIDI_SHM_native_func->mpi_win_lock_all(assert, win); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_bcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_barrier(MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->bcast(buffer, count, datatype, root, comm, errflag); + return MPIDI_SHM_native_func->mpi_barrier(comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_allreduce(const void *sendbuf, void *recvbuf, - int count, MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_bcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm, + MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->allreduce(sendbuf, recvbuf, count, datatype, op, comm, errflag); + return MPIDI_SHM_native_func->mpi_bcast(buffer, count, datatype, root, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_allreduce(const void *sendbuf, void *recvbuf, + int count, MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, comm, errflag); + return MPIDI_SHM_native_func->mpi_allreduce(sendbuf, recvbuf, count, datatype, op, comm, + errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, - displs, recvtype, comm, errflag); + return MPIDI_SHM_native_func->mpi_allgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_scatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, root, comm, errflag); + return MPIDI_SHM_native_func->mpi_allgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_scatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_scatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, - recvcount, recvtype, root, comm_ptr, errflag); + return MPIDI_SHM_native_func->mpi_scatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_gather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_scatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->gather(sendbuf, sendcount, sendtype, recvbuf, recvcount, recvtype, - root, comm, errflag); + return MPIDI_SHM_native_func->mpi_scatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, + recvcount, recvtype, root, comm_ptr, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_gatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_gather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, displs, - recvtype, root, comm, errflag); + return MPIDI_SHM_native_func->mpi_gather(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_gatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->alltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, comm, errflag); + return MPIDI_SHM_native_func->mpi_gatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, root, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_alltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, - recvcounts, rdispls, recvtype, comm, errflag); + return MPIDI_SHM_native_func->mpi_alltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_alltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, - const MPI_Datatype sendtypes[], - void *recvbuf, const int *recvcounts, - const int *rdispls, - const MPI_Datatype recvtypes[], - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_alltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, - recvcounts, rdispls, recvtypes, comm, errflag); + return MPIDI_SHM_native_func->mpi_alltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, + recvcounts, rdispls, recvtype, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_reduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_alltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, + const MPI_Datatype sendtypes[], + void *recvbuf, const int *recvcounts, + const int *rdispls, + const MPI_Datatype recvtypes[], + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->reduce(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, - errflag); + return MPIDI_SHM_native_func->mpi_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, + recvcounts, rdispls, recvtypes, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_reduce_scatter(const void *sendbuf, void *recvbuf, - const int *recvcounts, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_reduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->reduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, - comm_ptr, errflag); + return MPIDI_SHM_native_func->mpi_reduce(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, + errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_reduce_scatter_block(const void *sendbuf, - void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_reduce_scatter(const void *sendbuf, void *recvbuf, + const int *recvcounts, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->reduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, - comm_ptr, errflag); + return MPIDI_SHM_native_func->mpi_reduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, + comm_ptr, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_scan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_reduce_scatter_block(const void *sendbuf, + void *recvbuf, int recvcount, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->scan(sendbuf, recvbuf, count, datatype, op, comm, errflag); + return MPIDI_SHM_native_func->mpi_reduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, + op, comm_ptr, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_exscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_scan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->exscan(sendbuf, recvbuf, count, datatype, op, comm, errflag); + return MPIDI_SHM_native_func->mpi_scan(sendbuf, recvbuf, count, datatype, op, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_neighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_exscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->neighbor_allgather(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, comm, errflag); + return MPIDI_SHM_native_func->mpi_exscan(sendbuf, recvbuf, count, datatype, op, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_neighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, - void *recvbuf, - const int *recvcounts, - const int *displs, - MPI_Datatype recvtype, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_neighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->neighbor_allgatherv(sendbuf, sendcount, sendtype, recvbuf, - recvcounts, displs, recvtype, comm, errflag); + return MPIDI_SHM_native_func->mpi_neighbor_allgather(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_neighbor_alltoallv(const void *sendbuf, - const int *sendcounts, - const int *sdispls, - MPI_Datatype sendtype, - void *recvbuf, - const int *recvcounts, - const int *rdispls, - MPI_Datatype recvtype, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_neighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, + void *recvbuf, + const int *recvcounts, + const int *displs, + MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->neighbor_alltoallv(sendbuf, sendcounts, sdispls, sendtype, - recvbuf, recvcounts, rdispls, recvtype, comm, - errflag); + return MPIDI_SHM_native_func->mpi_neighbor_allgatherv(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, comm, + errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_neighbor_alltoallw(const void *sendbuf, - const int *sendcounts, - const MPI_Aint * sdispls, - const MPI_Datatype * sendtypes, - void *recvbuf, - const int *recvcounts, - const MPI_Aint * rdispls, - const MPI_Datatype * recvtypes, - MPIR_Comm * comm, - MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_neighbor_alltoallv(const void *sendbuf, + const int *sendcounts, + const int *sdispls, + MPI_Datatype sendtype, + void *recvbuf, + const int *recvcounts, + const int *rdispls, + MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->neighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, - recvbuf, recvcounts, rdispls, recvtypes, comm, - errflag); + return MPIDI_SHM_native_func->mpi_neighbor_alltoallv(sendbuf, sendcounts, sdispls, sendtype, + recvbuf, recvcounts, rdispls, recvtype, + comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_neighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPIR_Errflag_t * errflag) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_neighbor_alltoallw(const void *sendbuf, + const int *sendcounts, + const MPI_Aint * sdispls, + const MPI_Datatype * sendtypes, + void *recvbuf, + const int *recvcounts, + const MPI_Aint * rdispls, + const MPI_Datatype * recvtypes, + MPIR_Comm * comm, + MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->neighbor_alltoall(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, comm, errflag); + return MPIDI_SHM_native_func->mpi_neighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, + recvbuf, recvcounts, rdispls, recvtypes, + comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ineighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_neighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, + MPIR_Errflag_t * errflag) { - return MPIDI_SHM_native_func->ineighbor_allgather(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, comm, req); + return MPIDI_SHM_native_func->mpi_neighbor_alltoall(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, errflag); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ineighbor_allgatherv(const void *sendbuf, - int sendcount, - MPI_Datatype sendtype, - void *recvbuf, - const int *recvcounts, - const int *displs, - MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ineighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->ineighbor_allgatherv(sendbuf, sendcount, sendtype, recvbuf, - recvcounts, displs, recvtype, comm, req); + return MPIDI_SHM_native_func->mpi_ineighbor_allgather(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ineighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ineighbor_allgatherv(const void *sendbuf, + int sendcount, + MPI_Datatype sendtype, + void *recvbuf, + const int *recvcounts, + const int *displs, + MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->ineighbor_alltoall(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, comm, req); + return MPIDI_SHM_native_func->mpi_ineighbor_allgatherv(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ineighbor_alltoallv(const void *sendbuf, - const int *sendcounts, - const int *sdispls, - MPI_Datatype sendtype, - void *recvbuf, - const int *recvcounts, - const int *rdispls, - MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ineighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->ineighbor_alltoallv(sendbuf, sendcounts, sdispls, sendtype, - recvbuf, recvcounts, rdispls, recvtype, comm, - req); + return MPIDI_SHM_native_func->mpi_ineighbor_alltoall(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ineighbor_alltoallw(const void *sendbuf, - const int *sendcounts, - const MPI_Aint * sdispls, - const MPI_Datatype * sendtypes, - void *recvbuf, - const int *recvcounts, - const MPI_Aint * rdispls, - const MPI_Datatype * recvtypes, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ineighbor_alltoallv(const void *sendbuf, + const int *sendcounts, + const int *sdispls, + MPI_Datatype sendtype, + void *recvbuf, + const int *recvcounts, + const int *rdispls, + MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->ineighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, - recvbuf, recvcounts, rdispls, recvtypes, comm, - req); + return MPIDI_SHM_native_func->mpi_ineighbor_alltoallv(sendbuf, sendcounts, sdispls, sendtype, + recvbuf, recvcounts, rdispls, recvtype, + comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ibarrier(MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ineighbor_alltoallw(const void *sendbuf, + const int *sendcounts, + const MPI_Aint * sdispls, + const MPI_Datatype * sendtypes, + void *recvbuf, + const int *recvcounts, + const MPI_Aint * rdispls, + const MPI_Datatype * recvtypes, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->ibarrier(comm, req); + return MPIDI_SHM_native_func->mpi_ineighbor_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, + recvbuf, recvcounts, rdispls, recvtypes, + comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ibcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ibarrier(MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->ibcast(buffer, count, datatype, root, comm, req); + return MPIDI_SHM_native_func->mpi_ibarrier(comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iallgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ibcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->iallgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, comm, req); + return MPIDI_SHM_native_func->mpi_ibcast(buffer, count, datatype, root, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iallgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm, - MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iallgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->iallgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, - displs, recvtype, comm, req); + return MPIDI_SHM_native_func->mpi_iallgather(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iallreduce(const void *sendbuf, void *recvbuf, - int count, MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iallgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm, + MPI_Request * req) { - return MPIDI_SHM_native_func->iallreduce(sendbuf, recvbuf, count, datatype, op, comm, req); + return MPIDI_SHM_native_func->mpi_iallgatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ialltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iallreduce(const void *sendbuf, void *recvbuf, + int count, MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, MPI_Request * req) +{ + return MPIDI_SHM_native_func->mpi_iallreduce(sendbuf, recvbuf, count, datatype, op, comm, req); +}; + +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ialltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->ialltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, comm, req); + return MPIDI_SHM_native_func->mpi_ialltoall(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ialltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ialltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->ialltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, - recvcounts, rdispls, recvtype, comm, req); + return MPIDI_SHM_native_func->mpi_ialltoallv(sendbuf, sendcounts, sdispls, sendtype, recvbuf, + recvcounts, rdispls, recvtype, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ialltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, - const MPI_Datatype sendtypes[], - void *recvbuf, const int *recvcounts, - const int *rdispls, - const MPI_Datatype recvtypes[], - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ialltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, + const MPI_Datatype sendtypes[], + void *recvbuf, const int *recvcounts, + const int *rdispls, + const MPI_Datatype recvtypes[], + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->ialltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, - recvcounts, rdispls, recvtypes, comm, req); + return MPIDI_SHM_native_func->mpi_ialltoallw(sendbuf, sendcounts, sdispls, sendtypes, recvbuf, + recvcounts, rdispls, recvtypes, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iexscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iexscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->iexscan(sendbuf, recvbuf, count, datatype, op, comm, req); + return MPIDI_SHM_native_func->mpi_iexscan(sendbuf, recvbuf, count, datatype, op, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_igather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_igather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->igather(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, root, comm, req); + return MPIDI_SHM_native_func->mpi_igather(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_igatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_igatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->igatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, - displs, recvtype, root, comm, req); + return MPIDI_SHM_native_func->mpi_igatherv(sendbuf, sendcount, sendtype, recvbuf, recvcounts, + displs, recvtype, root, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ireduce_scatter_block(const void *sendbuf, - void *recvbuf, int recvcount, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ireduce_scatter_block(const void *sendbuf, + void *recvbuf, int recvcount, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, + MPI_Request * req) { - return MPIDI_SHM_native_func->ireduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, - comm, req); + return MPIDI_SHM_native_func->mpi_ireduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, + op, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ireduce_scatter(const void *sendbuf, void *recvbuf, - const int *recvcounts, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ireduce_scatter(const void *sendbuf, void *recvbuf, + const int *recvcounts, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->ireduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm, - req); + return MPIDI_SHM_native_func->mpi_ireduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, + comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_ireduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_ireduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPI_Request * req) { - return MPIDI_SHM_native_func->ireduce(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, - req); + return MPIDI_SHM_native_func->mpi_ireduce(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, + req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->iscan(sendbuf, recvbuf, count, datatype, op, comm, req); + return MPIDI_SHM_native_func->mpi_iscan(sendbuf, recvbuf, count, datatype, op, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iscatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iscatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_SHM_native_func->iscatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, - recvtype, root, comm, req); + return MPIDI_SHM_native_func->mpi_iscatter(sendbuf, sendcount, sendtype, recvbuf, recvcount, + recvtype, root, comm, req); }; -MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_iscatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm_ptr, MPI_Request * req) +MPL_STATIC_INLINE_PREFIX int MPIDI_SHM_mpi_iscatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm_ptr, MPI_Request * req) { - return MPIDI_SHM_native_func->iscatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, - recvcount, recvtype, root, comm_ptr, req); + return MPIDI_SHM_native_func->mpi_iscatterv(sendbuf, sendcounts, displs, sendtype, recvbuf, + recvcount, recvtype, root, comm_ptr, req); }; #endif /* SHM_DISABLE_INLINES */ diff --git a/src/mpid/ch4/shm/posix/func_table.c b/src/mpid/ch4/shm/posix/func_table.c index 3319e3a..24e9709 100644 --- a/src/mpid/ch4/shm/posix/func_table.c +++ b/src/mpid/ch4/shm/posix/func_table.c @@ -13,15 +13,15 @@ #include <mpidimpl.h> #include "shm_direct.h" MPIDI_SHM_funcs_t MPIDI_SHM_posix_funcs = { - MPIDI_SHM_init, - MPIDI_SHM_finalize, + MPIDI_SHM_mpi_init, + MPIDI_SHM_mpi_finalize, MPIDI_SHM_progress, MPIDI_SHM_am_reg_handler, - MPIDI_SHM_comm_connect, - MPIDI_SHM_comm_disconnect, - MPIDI_SHM_open_port, - MPIDI_SHM_close_port, - MPIDI_SHM_comm_accept, + MPIDI_SHM_mpi_comm_connect, + MPIDI_SHM_mpi_comm_disconnect, + MPIDI_SHM_mpi_open_port, + MPIDI_SHM_mpi_close_port, + MPIDI_SHM_mpi_comm_accept, MPIDI_SHM_am_send_hdr, MPIDI_SHM_am_isend, MPIDI_SHM_inject_am, @@ -41,113 +41,113 @@ MPIDI_SHM_funcs_t MPIDI_SHM_posix_funcs = { MPIDI_SHM_getallincomm, MPIDI_SHM_gpid_tolpidarray, MPIDI_SHM_create_intercomm_from_lpids, - MPIDI_SHM_comm_create_hook, - MPIDI_SHM_comm_free_hook, - MPIDI_SHM_type_create_hook, - MPIDI_SHM_type_free_hook, - MPIDI_SHM_op_create_hook, - MPIDI_SHM_op_free_hook, + MPIDI_SHM_mpi_comm_create_hook, + MPIDI_SHM_mpi_comm_free_hook, + MPIDI_SHM_mpi_type_create_hook, + MPIDI_SHM_mpi_type_free_hook, + MPIDI_SHM_mpi_op_create_hook, + MPIDI_SHM_mpi_op_free_hook, MPIDI_SHM_am_request_init, }; MPIDI_SHM_native_funcs_t MPIDI_SHM_native_posix_funcs = { - MPIDI_SHM_send, - MPIDI_SHM_ssend, - MPIDI_SHM_startall, - MPIDI_SHM_send_init, - MPIDI_SHM_ssend_init, - MPIDI_SHM_rsend_init, - MPIDI_SHM_bsend_init, - MPIDI_SHM_isend, - MPIDI_SHM_issend, - MPIDI_SHM_cancel_send, - MPIDI_SHM_recv_init, - MPIDI_SHM_recv, - MPIDI_SHM_irecv, - MPIDI_SHM_imrecv, - MPIDI_SHM_cancel_recv, - MPIDI_SHM_alloc_mem, - MPIDI_SHM_free_mem, - MPIDI_SHM_improbe, - MPIDI_SHM_iprobe, - MPIDI_SHM_win_set_info, - MPIDI_SHM_win_shared_query, - MPIDI_SHM_put, - MPIDI_SHM_win_start, - MPIDI_SHM_win_complete, - MPIDI_SHM_win_post, - MPIDI_SHM_win_wait, - MPIDI_SHM_win_test, - MPIDI_SHM_win_lock, - MPIDI_SHM_win_unlock, - MPIDI_SHM_win_get_info, - MPIDI_SHM_get, - MPIDI_SHM_win_free, - MPIDI_SHM_win_fence, - MPIDI_SHM_win_create, - MPIDI_SHM_accumulate, - MPIDI_SHM_win_attach, - MPIDI_SHM_win_allocate_shared, - MPIDI_SHM_rput, - MPIDI_SHM_win_flush_local, - MPIDI_SHM_win_detach, - MPIDI_SHM_compare_and_swap, - MPIDI_SHM_raccumulate, - MPIDI_SHM_rget_accumulate, - MPIDI_SHM_fetch_and_op, - MPIDI_SHM_win_allocate, - MPIDI_SHM_win_flush, - MPIDI_SHM_win_flush_local_all, - MPIDI_SHM_win_unlock_all, - MPIDI_SHM_win_create_dynamic, - MPIDI_SHM_rget, - MPIDI_SHM_win_sync, - MPIDI_SHM_win_flush_all, - MPIDI_SHM_get_accumulate, - MPIDI_SHM_win_lock_all, - MPIDI_SHM_barrier, - MPIDI_SHM_bcast, - MPIDI_SHM_allreduce, - MPIDI_SHM_allgather, - MPIDI_SHM_allgatherv, - MPIDI_SHM_scatter, - MPIDI_SHM_scatterv, - MPIDI_SHM_gather, - MPIDI_SHM_gatherv, - MPIDI_SHM_alltoall, - MPIDI_SHM_alltoallv, - MPIDI_SHM_alltoallw, - MPIDI_SHM_reduce, - MPIDI_SHM_reduce_scatter, - MPIDI_SHM_reduce_scatter_block, - MPIDI_SHM_scan, - MPIDI_SHM_exscan, - MPIDI_SHM_neighbor_allgather, - MPIDI_SHM_neighbor_allgatherv, - MPIDI_SHM_neighbor_alltoall, - MPIDI_SHM_neighbor_alltoallv, - MPIDI_SHM_neighbor_alltoallw, - MPIDI_SHM_ineighbor_allgather, - MPIDI_SHM_ineighbor_allgatherv, - MPIDI_SHM_ineighbor_alltoall, - MPIDI_SHM_ineighbor_alltoallv, - MPIDI_SHM_ineighbor_alltoallw, - MPIDI_SHM_ibarrier, - MPIDI_SHM_ibcast, - MPIDI_SHM_iallgather, - MPIDI_SHM_iallgatherv, - MPIDI_SHM_iallreduce, - MPIDI_SHM_ialltoall, - MPIDI_SHM_ialltoallv, - MPIDI_SHM_ialltoallw, - MPIDI_SHM_iexscan, - MPIDI_SHM_igather, - MPIDI_SHM_igatherv, - MPIDI_SHM_ireduce_scatter_block, - MPIDI_SHM_ireduce_scatter, - MPIDI_SHM_ireduce, - MPIDI_SHM_iscan, - MPIDI_SHM_iscatter, - MPIDI_SHM_iscatterv, + MPIDI_SHM_mpi_send, + MPIDI_SHM_mpi_ssend, + MPIDI_SHM_mpi_startall, + MPIDI_SHM_mpi_send_init, + MPIDI_SHM_mpi_ssend_init, + MPIDI_SHM_mpi_rsend_init, + MPIDI_SHM_mpi_bsend_init, + MPIDI_SHM_mpi_isend, + MPIDI_SHM_mpi_issend, + MPIDI_SHM_mpi_cancel_send, + MPIDI_SHM_mpi_recv_init, + MPIDI_SHM_mpi_recv, + MPIDI_SHM_mpi_irecv, + MPIDI_SHM_mpi_imrecv, + MPIDI_SHM_mpi_cancel_recv, + MPIDI_SHM_mpi_alloc_mem, + MPIDI_SHM_mpi_free_mem, + MPIDI_SHM_mpi_improbe, + MPIDI_SHM_mpi_iprobe, + MPIDI_SHM_mpi_win_set_info, + MPIDI_SHM_mpi_win_shared_query, + MPIDI_SHM_mpi_put, + MPIDI_SHM_mpi_win_start, + MPIDI_SHM_mpi_win_complete, + MPIDI_SHM_mpi_win_post, + MPIDI_SHM_mpi_win_wait, + MPIDI_SHM_mpi_win_test, + MPIDI_SHM_mpi_win_lock, + MPIDI_SHM_mpi_win_unlock, + MPIDI_SHM_mpi_win_get_info, + MPIDI_SHM_mpi_get, + MPIDI_SHM_mpi_win_free, + MPIDI_SHM_mpi_win_fence, + MPIDI_SHM_mpi_win_create, + MPIDI_SHM_mpi_accumulate, + MPIDI_SHM_mpi_win_attach, + MPIDI_SHM_mpi_win_allocate_shared, + MPIDI_SHM_mpi_rput, + MPIDI_SHM_mpi_win_flush_local, + MPIDI_SHM_mpi_win_detach, + MPIDI_SHM_mpi_compare_and_swap, + MPIDI_SHM_mpi_raccumulate, + MPIDI_SHM_mpi_rget_accumulate, + MPIDI_SHM_mpi_fetch_and_op, + MPIDI_SHM_mpi_win_allocate, + MPIDI_SHM_mpi_win_flush, + MPIDI_SHM_mpi_win_flush_local_all, + MPIDI_SHM_mpi_win_unlock_all, + MPIDI_SHM_mpi_win_create_dynamic, + MPIDI_SHM_mpi_rget, + MPIDI_SHM_mpi_win_sync, + MPIDI_SHM_mpi_win_flush_all, + MPIDI_SHM_mpi_get_accumulate, + MPIDI_SHM_mpi_win_lock_all, + MPIDI_SHM_mpi_barrier, + MPIDI_SHM_mpi_bcast, + MPIDI_SHM_mpi_allreduce, + MPIDI_SHM_mpi_allgather, + MPIDI_SHM_mpi_allgatherv, + MPIDI_SHM_mpi_scatter, + MPIDI_SHM_mpi_scatterv, + MPIDI_SHM_mpi_gather, + MPIDI_SHM_mpi_gatherv, + MPIDI_SHM_mpi_alltoall, + MPIDI_SHM_mpi_alltoallv, + MPIDI_SHM_mpi_alltoallw, + MPIDI_SHM_mpi_reduce, + MPIDI_SHM_mpi_reduce_scatter, + MPIDI_SHM_mpi_reduce_scatter_block, + MPIDI_SHM_mpi_scan, + MPIDI_SHM_mpi_exscan, + MPIDI_SHM_mpi_neighbor_allgather, + MPIDI_SHM_mpi_neighbor_allgatherv, + MPIDI_SHM_mpi_neighbor_alltoall, + MPIDI_SHM_mpi_neighbor_alltoallv, + MPIDI_SHM_mpi_neighbor_alltoallw, + MPIDI_SHM_mpi_ineighbor_allgather, + MPIDI_SHM_mpi_ineighbor_allgatherv, + MPIDI_SHM_mpi_ineighbor_alltoall, + MPIDI_SHM_mpi_ineighbor_alltoallv, + MPIDI_SHM_mpi_ineighbor_alltoallw, + MPIDI_SHM_mpi_ibarrier, + MPIDI_SHM_mpi_ibcast, + MPIDI_SHM_mpi_iallgather, + MPIDI_SHM_mpi_iallgatherv, + MPIDI_SHM_mpi_iallreduce, + MPIDI_SHM_mpi_ialltoall, + MPIDI_SHM_mpi_ialltoallv, + MPIDI_SHM_mpi_ialltoallw, + MPIDI_SHM_mpi_iexscan, + MPIDI_SHM_mpi_igather, + MPIDI_SHM_mpi_igatherv, + MPIDI_SHM_mpi_ireduce_scatter_block, + MPIDI_SHM_mpi_ireduce_scatter, + MPIDI_SHM_mpi_ireduce, + MPIDI_SHM_mpi_iscan, + MPIDI_SHM_mpi_iscatter, + MPIDI_SHM_mpi_iscatterv, }; #endif diff --git a/src/mpid/ch4/shm/posix/posix_coll.h b/src/mpid/ch4/shm/posix/posix_coll.h index 52e3228..bc754a5 100644 --- a/src/mpid/ch4/shm/posix/posix_coll.h +++ b/src/mpid/ch4/shm/posix/posix_coll.h @@ -15,10 +15,10 @@ #include "ch4_impl.h" #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_barrier +#define FUNCNAME MPIDI_SHM_mpi_barrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_BARRIER); @@ -31,11 +31,11 @@ static inline int MPIDI_SHM_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errfl } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_bcast +#define FUNCNAME MPIDI_SHM_mpi_bcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_bcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_bcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_BCAST); @@ -48,12 +48,12 @@ static inline int MPIDI_SHM_bcast(void *buffer, int count, MPI_Datatype datatype } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_allreduce +#define FUNCNAME MPIDI_SHM_mpi_allreduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_allreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_allreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_ALLREDUCE); @@ -66,12 +66,12 @@ static inline int MPIDI_SHM_allreduce(const void *sendbuf, void *recvbuf, int co } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_allgather +#define FUNCNAME MPIDI_SHM_mpi_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_ALLGATHER); @@ -85,13 +85,14 @@ static inline int MPIDI_SHM_allgather(const void *sendbuf, int sendcount, MPI_Da } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_allgatherv +#define FUNCNAME MPIDI_SHM_mpi_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_ALLGATHERV); @@ -105,12 +106,12 @@ static inline int MPIDI_SHM_allgatherv(const void *sendbuf, int sendcount, MPI_D } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_gather +#define FUNCNAME MPIDI_SHM_mpi_gather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_GATHER); @@ -124,13 +125,13 @@ static inline int MPIDI_SHM_gather(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_gatherv +#define FUNCNAME MPIDI_SHM_mpi_gatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_GATHERV); @@ -144,12 +145,12 @@ static inline int MPIDI_SHM_gatherv(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_scatter +#define FUNCNAME MPIDI_SHM_mpi_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_SCATTER); @@ -163,13 +164,13 @@ static inline int MPIDI_SHM_scatter(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_scatterv +#define FUNCNAME MPIDI_SHM_mpi_scatterv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_scatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_scatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_SCATTERV); @@ -183,12 +184,12 @@ static inline int MPIDI_SHM_scatterv(const void *sendbuf, const int *sendcounts, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_alltoall +#define FUNCNAME MPIDI_SHM_mpi_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_ALLTOALL); @@ -202,14 +203,14 @@ static inline int MPIDI_SHM_alltoall(const void *sendbuf, int sendcount, MPI_Dat } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_alltoallv +#define FUNCNAME MPIDI_SHM_mpi_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_alltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_alltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_ALLTOALLV); @@ -222,14 +223,14 @@ static inline int MPIDI_SHM_alltoallv(const void *sendbuf, const int *sendcounts } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_alltoallw +#define FUNCNAME MPIDI_SHM_mpi_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_alltoallw(const void *sendbuf, const int sendcounts[], - const int sdispls[], const MPI_Datatype sendtypes[], - void *recvbuf, const int recvcounts[], - const int rdispls[], const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_alltoallw(const void *sendbuf, const int sendcounts[], + const int sdispls[], const MPI_Datatype sendtypes[], + void *recvbuf, const int recvcounts[], + const int rdispls[], const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_ALLTOALLW); @@ -243,12 +244,12 @@ static inline int MPIDI_SHM_alltoallw(const void *sendbuf, const int sendcounts[ } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_reduce +#define FUNCNAME MPIDI_SHM_mpi_reduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_reduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_reduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_REDUCE); @@ -261,13 +262,13 @@ static inline int MPIDI_SHM_reduce(const void *sendbuf, void *recvbuf, int count } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_reduce_scatter +#define FUNCNAME MPIDI_SHM_mpi_reduce_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_reduce_scatter(const void *sendbuf, void *recvbuf, - const int recvcounts[], MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_reduce_scatter(const void *sendbuf, void *recvbuf, + const int recvcounts[], MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_REDUCE_SCATTER); @@ -280,13 +281,13 @@ static inline int MPIDI_SHM_reduce_scatter(const void *sendbuf, void *recvbuf, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_reduce_scatter_block +#define FUNCNAME MPIDI_SHM_mpi_reduce_scatter_block #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_reduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_reduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_REDUCE_SCATTER_BLOCK); @@ -300,12 +301,12 @@ static inline int MPIDI_SHM_reduce_scatter_block(const void *sendbuf, void *recv } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_scan +#define FUNCNAME MPIDI_SHM_mpi_scan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_scan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_scan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_SCAN); @@ -318,12 +319,12 @@ static inline int MPIDI_SHM_scan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_exscan +#define FUNCNAME MPIDI_SHM_mpi_exscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_exscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_exscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_EXSCAN); @@ -336,13 +337,13 @@ static inline int MPIDI_SHM_exscan(const void *sendbuf, void *recvbuf, int count } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_neighbor_allgather +#define FUNCNAME MPIDI_SHM_mpi_neighbor_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_neighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_neighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_NEIGHBOR_ALLGATHER); @@ -357,14 +358,14 @@ static inline int MPIDI_SHM_neighbor_allgather(const void *sendbuf, int sendcoun } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_neighbor_allgatherv +#define FUNCNAME MPIDI_SHM_mpi_neighbor_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_neighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_neighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_NEIGHBOR_ALLGATHERV); @@ -378,13 +379,13 @@ static inline int MPIDI_SHM_neighbor_allgatherv(const void *sendbuf, int sendcou } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_neighbor_alltoall +#define FUNCNAME MPIDI_SHM_mpi_neighbor_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_neighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_neighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_NEIGHBOR_ALLTOALL); @@ -398,14 +399,14 @@ static inline int MPIDI_SHM_neighbor_alltoall(const void *sendbuf, int sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_neighbor_alltoallv +#define FUNCNAME MPIDI_SHM_mpi_neighbor_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_neighbor_alltoallv(const void *sendbuf, const int sendcounts[], - const int sdispls[], MPI_Datatype sendtype, - void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_neighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_NEIGHBOR_ALLTOALLV); @@ -419,15 +420,15 @@ static inline int MPIDI_SHM_neighbor_alltoallv(const void *sendbuf, const int se } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_neighbor_alltoallw +#define FUNCNAME MPIDI_SHM_mpi_neighbor_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_neighbor_alltoallw(const void *sendbuf, const int sendcounts[], - const MPI_Aint sdispls[], - const MPI_Datatype sendtypes[], void *recvbuf, - const int recvcounts[], const MPI_Aint rdispls[], - const MPI_Datatype recvtypes[], MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_neighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, + const int recvcounts[], const MPI_Aint rdispls[], + const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_NEIGHBOR_ALLTOALLW); @@ -441,13 +442,13 @@ static inline int MPIDI_SHM_neighbor_alltoallw(const void *sendbuf, const int se } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ineighbor_allgather +#define FUNCNAME MPIDI_SHM_mpi_ineighbor_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ineighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_ineighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_INEIGHBOR_ALLGATHER); @@ -461,14 +462,14 @@ static inline int MPIDI_SHM_ineighbor_allgather(const void *sendbuf, int sendcou } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ineighbor_allgatherv +#define FUNCNAME MPIDI_SHM_mpi_ineighbor_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ineighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_ineighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_INEIGHBOR_ALLGATHERV); @@ -483,13 +484,13 @@ static inline int MPIDI_SHM_ineighbor_allgatherv(const void *sendbuf, int sendco } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ineighbor_alltoall +#define FUNCNAME MPIDI_SHM_mpi_ineighbor_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ineighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ineighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_INEIGHBOR_ALLTOALL); @@ -503,14 +504,14 @@ static inline int MPIDI_SHM_ineighbor_alltoall(const void *sendbuf, int sendcoun } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ineighbor_alltoallv +#define FUNCNAME MPIDI_SHM_mpi_ineighbor_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], - const int sdispls[], MPI_Datatype sendtype, - void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_INEIGHBOR_ALLTOALLV); @@ -525,15 +526,16 @@ static inline int MPIDI_SHM_ineighbor_alltoallv(const void *sendbuf, const int s } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ineighbor_alltoallw +#define FUNCNAME MPIDI_SHM_mpi_ineighbor_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], - const MPI_Aint sdispls[], - const MPI_Datatype sendtypes[], void *recvbuf, - const int recvcounts[], const MPI_Aint rdispls[], - const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, + const int recvcounts[], + const MPI_Aint rdispls[], + const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_INEIGHBOR_ALLTOALLW); @@ -548,10 +550,10 @@ static inline int MPIDI_SHM_ineighbor_alltoallw(const void *sendbuf, const int s } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ibarrier +#define FUNCNAME MPIDI_SHM_mpi_ibarrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IBARRIER); @@ -564,11 +566,11 @@ static inline int MPIDI_SHM_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ibcast +#define FUNCNAME MPIDI_SHM_mpi_ibcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ibcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ibcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IBCAST); @@ -581,12 +583,13 @@ static inline int MPIDI_SHM_ibcast(void *buffer, int count, MPI_Datatype datatyp } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iallgather +#define FUNCNAME MPIDI_SHM_mpi_iallgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_iallgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, int recvcount, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IALLGATHER); @@ -600,13 +603,14 @@ static inline int MPIDI_SHM_iallgather(const void *sendbuf, int sendcount, MPI_D } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iallgatherv +#define FUNCNAME MPIDI_SHM_mpi_iallgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_iallgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IALLGATHERV); @@ -620,12 +624,12 @@ static inline int MPIDI_SHM_iallgatherv(const void *sendbuf, int sendcount, MPI_ } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ialltoall +#define FUNCNAME MPIDI_SHM_mpi_ialltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IALLTOALL); @@ -639,14 +643,14 @@ static inline int MPIDI_SHM_ialltoall(const void *sendbuf, int sendcount, MPI_Da } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ialltoallv +#define FUNCNAME MPIDI_SHM_mpi_ialltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ialltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ialltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IALLTOALLV); @@ -661,14 +665,14 @@ static inline int MPIDI_SHM_ialltoallv(const void *sendbuf, const int *sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ialltoallw +#define FUNCNAME MPIDI_SHM_mpi_ialltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ialltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, const MPI_Datatype sendtypes[], - void *recvbuf, const int *recvcounts, - const int *rdispls, const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ialltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, const MPI_Datatype sendtypes[], + void *recvbuf, const int *recvcounts, + const int *rdispls, const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IALLTOALLW); @@ -683,12 +687,12 @@ static inline int MPIDI_SHM_ialltoallw(const void *sendbuf, const int *sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iexscan +#define FUNCNAME MPIDI_SHM_mpi_iexscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iexscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_iexscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IEXSCAN); @@ -701,12 +705,12 @@ static inline int MPIDI_SHM_iexscan(const void *sendbuf, void *recvbuf, int coun } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_igather +#define FUNCNAME MPIDI_SHM_mpi_igather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IGATHER); @@ -720,13 +724,13 @@ static inline int MPIDI_SHM_igather(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_igatherv +#define FUNCNAME MPIDI_SHM_mpi_igatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IGATHERV); @@ -740,13 +744,13 @@ static inline int MPIDI_SHM_igatherv(const void *sendbuf, int sendcount, MPI_Dat } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ireduce_scatter_block +#define FUNCNAME MPIDI_SHM_mpi_ireduce_scatter_block #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ireduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_ireduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IREDUCE_SCATTER_BLOCK); @@ -760,12 +764,12 @@ static inline int MPIDI_SHM_ireduce_scatter_block(const void *sendbuf, void *rec } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ireduce_scatter +#define FUNCNAME MPIDI_SHM_mpi_ireduce_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ireduce_scatter(const void *sendbuf, void *recvbuf, - const int recvcounts[], MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ireduce_scatter(const void *sendbuf, void *recvbuf, + const int recvcounts[], MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IREDUCE_SCATTER); @@ -779,12 +783,12 @@ static inline int MPIDI_SHM_ireduce_scatter(const void *sendbuf, void *recvbuf, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ireduce +#define FUNCNAME MPIDI_SHM_mpi_ireduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ireduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ireduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IREDUCE); @@ -797,12 +801,12 @@ static inline int MPIDI_SHM_ireduce(const void *sendbuf, void *recvbuf, int coun } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iallreduce +#define FUNCNAME MPIDI_SHM_mpi_iallreduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iallreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_iallreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_IALLREDUCE); @@ -815,12 +819,12 @@ static inline int MPIDI_SHM_iallreduce(const void *sendbuf, void *recvbuf, int c } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iscan +#define FUNCNAME MPIDI_SHM_mpi_iscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_iscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_ISCAN); @@ -833,13 +837,13 @@ static inline int MPIDI_SHM_iscan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iscatter +#define FUNCNAME MPIDI_SHM_mpi_iscatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iscatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm, MPI_Request * request) +static inline int MPIDI_SHM_mpi_iscatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_ISCATTER); @@ -853,14 +857,14 @@ static inline int MPIDI_SHM_iscatter(const void *sendbuf, int sendcount, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iscatterv +#define FUNCNAME MPIDI_SHM_mpi_iscatterv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iscatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * request) +static inline int MPIDI_SHM_mpi_iscatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_ISCATTERV); diff --git a/src/mpid/ch4/shm/posix/posix_comm.h b/src/mpid/ch4/shm/posix/posix_comm.h index 0aaf6ef..f0637c3 100644 --- a/src/mpid/ch4/shm/posix/posix_comm.h +++ b/src/mpid/ch4/shm/posix/posix_comm.h @@ -14,10 +14,10 @@ #include "mpl_utlist.h" #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_comm_create_hook +#define FUNCNAME MPIDI_SHM_mpi_comm_create_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_comm_create_hook(MPIR_Comm * comm) +static inline int MPIDI_SHM_mpi_comm_create_hook(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_COMM_CREATE); @@ -28,10 +28,10 @@ static inline int MPIDI_SHM_comm_create_hook(MPIR_Comm * comm) } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_comm_free_hook +#define FUNCNAME MPIDI_SHM_mpi_comm_free_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_comm_free_hook(MPIR_Comm * comm) +static inline int MPIDI_SHM_mpi_comm_free_hook(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_COMM_DESTROY); diff --git a/src/mpid/ch4/shm/posix/posix_init.h b/src/mpid/ch4/shm/posix/posix_init.h index c07cbb9..1f2754b 100644 --- a/src/mpid/ch4/shm/posix/posix_init.h +++ b/src/mpid/ch4/shm/posix/posix_init.h @@ -22,8 +22,8 @@ extern MPIDI_POSIX_mem_region_t MPIDI_POSIX_mem_region; extern char *MPIDI_POSIX_asym_base_addr; #undef FCNAME -#define FCNAME DECL_FUNC(MPIDI_SHM_init) -static inline int MPIDI_SHM_init(int rank, int size) +#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_init) +static inline int MPIDI_SHM_mpi_init(int rank, int size) { int mpi_errno = MPI_SUCCESS; int num_local = 0; @@ -229,8 +229,8 @@ static inline int MPIDI_SHM_init(int rank, int size) } #undef FCNAME -#define FCNAME DECL_FUNC(MPIDI_SHM_finalize) -static inline int MPIDI_SHM_finalize(void) +#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_finalize) +static inline int MPIDI_SHM_mpi_finalize(void) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_SHM_FINALIZE); @@ -264,13 +264,13 @@ static inline int MPIDI_SHM_finalize(void) goto fn_exit; } -static inline void *MPIDI_SHM_alloc_mem(size_t size, MPIR_Info * info_ptr) +static inline void *MPIDI_SHM_mpi_alloc_mem(size_t size, MPIR_Info * info_ptr) { MPIR_Assert(0); return NULL; } -static inline int MPIDI_SHM_free_mem(void *ptr) +static inline int MPIDI_SHM_mpi_free_mem(void *ptr) { MPIR_Assert(0); return MPI_SUCCESS; @@ -322,10 +322,10 @@ static inline int MPIDI_SHM_create_intercomm_from_lpids(MPIR_Comm * newcomm_ptr, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_type_create_hook +#define FUNCNAME MPIDI_SHM_mpi_type_create_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_type_create_hook(MPIR_Datatype * type) +static inline int MPIDI_SHM_mpi_type_create_hook(MPIR_Datatype * type) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_TYPE_CREATE_HOOK); @@ -336,10 +336,10 @@ static inline int MPIDI_SHM_type_create_hook(MPIR_Datatype * type) } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_type_free_hook +#define FUNCNAME MPIDI_SHM_mpi_type_free_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_type_free_hook(MPIR_Datatype * type) +static inline int MPIDI_SHM_mpi_type_free_hook(MPIR_Datatype * type) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_TYPE_FREE_HOOK); @@ -350,10 +350,10 @@ static inline int MPIDI_SHM_type_free_hook(MPIR_Datatype * type) } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_op_create_hook +#define FUNCNAME MPIDI_SHM_mpi_op_create_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_op_create_hook(MPIR_Op * op) +static inline int MPIDI_SHM_mpi_op_create_hook(MPIR_Op * op) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_OP_CREATE_HOOK); @@ -364,10 +364,10 @@ static inline int MPIDI_SHM_op_create_hook(MPIR_Op * op) } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_op_free_hook +#define FUNCNAME MPIDI_SHM_mpi_op_free_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_op_free_hook(MPIR_Op * op) +static inline int MPIDI_SHM_mpi_op_free_hook(MPIR_Op * op) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_OP_FREE_HOOK); diff --git a/src/mpid/ch4/shm/posix/posix_probe.h b/src/mpid/ch4/shm/posix/posix_probe.h index 5fe8e11..757c5e4 100644 --- a/src/mpid/ch4/shm/posix/posix_probe.h +++ b/src/mpid/ch4/shm/posix/posix_probe.h @@ -14,11 +14,11 @@ #include "posix_impl.h" -static inline int MPIDI_SHM_improbe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, - int *flag, MPIR_Request ** message, MPI_Status * status) +static inline int MPIDI_SHM_mpi_improbe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, + int *flag, MPIR_Request ** message, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; MPIR_Request *req, *matched_req = NULL; @@ -94,10 +94,10 @@ static inline int MPIDI_SHM_improbe(int source, return mpi_errno; } -static inline int MPIDI_SHM_iprobe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, int *flag, MPI_Status * status) +static inline int MPIDI_SHM_mpi_iprobe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, int *flag, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; MPIR_Request *req, *matched_req = NULL; diff --git a/src/mpid/ch4/shm/posix/posix_recv.h b/src/mpid/ch4/shm/posix/posix_recv.h index d51e8e4..a0c43d4 100644 --- a/src/mpid/ch4/shm/posix/posix_recv.h +++ b/src/mpid/ch4/shm/posix/posix_recv.h @@ -93,14 +93,15 @@ static inline int MPIDI_POSIX_do_irecv(void *buf, } #undef FCNAME -#define FCNAME DECL_FUNC(MPIDI_SHM_recv) -static inline int MPIDI_SHM_recv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPI_Status * status, MPIR_Request ** request) +#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_recv) +static inline int MPIDI_SHM_mpi_recv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPI_Status * status, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS, dt_contig __attribute__ ((__unused__)); size_t data_sz __attribute__ ((__unused__)); @@ -118,13 +119,14 @@ static inline int MPIDI_SHM_recv(void *buf, } #undef FCNAME -#define FCNAME DECL_FUNC(MPIDI_SHM_recv) -static inline int MPIDI_SHM_recv_init(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_recv) +static inline int MPIDI_SHM_mpi_recv_init(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_Request *rreq = NULL; @@ -150,10 +152,10 @@ static inline int MPIDI_SHM_recv_init(void *buf, } -static inline int MPIDI_SHM_imrecv(void *buf, - int count, - MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp) +static inline int MPIDI_SHM_mpi_imrecv(void *buf, + int count, + MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp) { int mpi_errno = MPI_SUCCESS; int dt_contig; @@ -293,13 +295,13 @@ static inline int MPIDI_SHM_imrecv(void *buf, } #undef FCNAME -#define FCNAME DECL_FUNC(MPIDI_SHM_irecv) -static inline int MPIDI_SHM_irecv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_irecv) +static inline int MPIDI_SHM_mpi_irecv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPIDI_SHM_IRECV); @@ -314,8 +316,8 @@ static inline int MPIDI_SHM_irecv(void *buf, } #undef FCNAME -#define FCNAME DECL_FUNC(MPIDI_SHM_cancel_recv) -static inline int MPIDI_SHM_cancel_recv(MPIR_Request * rreq) +#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_cancel_recv) +static inline int MPIDI_SHM_mpi_cancel_recv(MPIR_Request * rreq) { MPID_THREAD_CS_ENTER(POBJ, MPIDI_POSIX_SHM_MUTEX); MPIR_Request *req = MPIDI_POSIX_recvq_posted.head; diff --git a/src/mpid/ch4/shm/posix/posix_rma.h b/src/mpid/ch4/shm/posix/posix_rma.h index 8ea78bf..321ed73 100644 --- a/src/mpid/ch4/shm/posix/posix_rma.h +++ b/src/mpid/ch4/shm/posix/posix_rma.h @@ -13,71 +13,56 @@ #include "posix_impl.h" -static inline int MPIDI_SHM_put(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_put(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_get(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_get(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_rput(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_rput(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_compare_and_swap(const void *origin_addr, - const void *compare_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, MPIR_Win * win) -{ - MPIR_Assert(0); - return MPI_SUCCESS; -} - -static inline int MPIDI_SHM_raccumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_compare_and_swap(const void *origin_addr, + const void *compare_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp, + MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_rget_accumulate(const void *origin_addr, +static inline int MPIDI_SHM_mpi_raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, @@ -88,37 +73,66 @@ static inline int MPIDI_SHM_rget_accumulate(const void *origin_addr, return MPI_SUCCESS; } -static inline int MPIDI_SHM_fetch_and_op(const void *origin_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, - MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_rget_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +{ + MPIR_Assert(0); + return MPI_SUCCESS; +} + +static inline int MPIDI_SHM_mpi_fetch_and_op(const void *origin_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, + MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_rget(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_rget(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_get_accumulate(const void *origin_addr, +static inline int MPIDI_SHM_mpi_get_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) +{ + MPIR_Assert(0); + return MPI_SUCCESS; +} + +static inline int MPIDI_SHM_mpi_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, @@ -128,16 +142,4 @@ static inline int MPIDI_SHM_get_accumulate(const void *origin_addr, return MPI_SUCCESS; } -static inline int MPIDI_SHM_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) -{ - MPIR_Assert(0); - return MPI_SUCCESS; -} - #endif /* SHM_POSIX_RMA_H_INCLUDED */ diff --git a/src/mpid/ch4/shm/posix/posix_send.h b/src/mpid/ch4/shm/posix/posix_send.h index afde708..0e9baf2 100644 --- a/src/mpid/ch4/shm/posix/posix_send.h +++ b/src/mpid/ch4/shm/posix/posix_send.h @@ -90,12 +90,12 @@ static inline int MPIDI_POSIX_do_isend(const void *buf, #undef FCNAME #define FCNAME DECL_FUNC(MPIDI_SHM_SEND) -static inline int MPIDI_SHM_send(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_send(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { int dt_contig __attribute__ ((__unused__)), mpi_errno = MPI_SUCCESS; MPI_Aint dt_true_lb; @@ -167,12 +167,12 @@ static inline int MPIDI_SHM_irsend(const void *buf, #undef FCNAME #define FCNAME DECL_FUNC(MPIDI_SHM_SSEND) -static inline int MPIDI_SHM_ssend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_ssend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_SHM_SSEND); @@ -189,7 +189,7 @@ static inline int MPIDI_SHM_ssend(const void *buf, #undef FCNAME #define FCNAME DECL_FUNC(MPIDI_SHM_STARTALL) -static inline int MPIDI_SHM_startall(int count, MPIR_Request * requests[]) +static inline int MPIDI_SHM_mpi_startall(int count, MPIR_Request * requests[]) { int i, mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_SHM_STARTALL); @@ -264,12 +264,13 @@ static inline int MPIDI_SHM_startall(int count, MPIR_Request * requests[]) #undef FCNAME #define FCNAME DECL_FUNC(MPIDI_SHM_SEND_INIT) -static inline int MPIDI_SHM_send_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_send_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_Request *sreq = NULL; @@ -297,13 +298,13 @@ static inline int MPIDI_SHM_send_init(const void *buf, #undef FCNAME #define FCNAME DECL_FUNC(MPIDI_SHM_SSEND_INIT) -static inline int MPIDI_SHM_ssend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_ssend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_Request *sreq = NULL; @@ -328,13 +329,13 @@ static inline int MPIDI_SHM_ssend_init(const void *buf, return mpi_errno; } -static inline int MPIDI_SHM_bsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_bsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_Request *sreq = NULL; @@ -359,13 +360,13 @@ static inline int MPIDI_SHM_bsend_init(const void *buf, return mpi_errno; } -static inline int MPIDI_SHM_rsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_rsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_Request *sreq = NULL; @@ -392,13 +393,13 @@ static inline int MPIDI_SHM_rsend_init(const void *buf, } #undef FCNAME -#define FCNAME DECL_FUNC(MPIDI_SHM_isend) -static inline int MPIDI_SHM_isend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_isend) +static inline int MPIDI_SHM_mpi_isend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_SHM_ISEND); @@ -413,12 +414,13 @@ static inline int MPIDI_SHM_isend(const void *buf, return mpi_errno; } -static inline int MPIDI_SHM_issend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_issend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_SHM_ISSEND); @@ -433,7 +435,7 @@ static inline int MPIDI_SHM_issend(const void *buf, return mpi_errno; } -static inline int MPIDI_SHM_cancel_send(MPIR_Request * sreq) +static inline int MPIDI_SHM_mpi_cancel_send(MPIR_Request * sreq) { MPID_THREAD_CS_ENTER(POBJ, MPIDI_POSIX_SHM_MUTEX); MPIR_Request *req = MPIDI_POSIX_sendq.head; diff --git a/src/mpid/ch4/shm/posix/posix_spawn.h b/src/mpid/ch4/shm/posix/posix_spawn.h index 2a2e001..e7862d6 100644 --- a/src/mpid/ch4/shm/posix/posix_spawn.h +++ b/src/mpid/ch4/shm/posix/posix_spawn.h @@ -13,35 +13,35 @@ #include "posix_impl.h" -static inline int MPIDI_SHM_comm_connect(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) +static inline int MPIDI_SHM_mpi_comm_connect(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_comm_disconnect(MPIR_Comm * comm_ptr) +static inline int MPIDI_SHM_mpi_comm_disconnect(MPIR_Comm * comm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_open_port(MPIR_Info * info_ptr, char *port_name) +static inline int MPIDI_SHM_mpi_open_port(MPIR_Info * info_ptr, char *port_name) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_close_port(const char *port_name) +static inline int MPIDI_SHM_mpi_close_port(const char *port_name) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_comm_accept(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) +static inline int MPIDI_SHM_mpi_comm_accept(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; diff --git a/src/mpid/ch4/shm/posix/posix_win.h b/src/mpid/ch4/shm/posix/posix_win.h index aeac908..2b86292 100644 --- a/src/mpid/ch4/shm/posix/posix_win.h +++ b/src/mpid/ch4/shm/posix/posix_win.h @@ -13,169 +13,171 @@ #include "posix_impl.h" -static inline int MPIDI_SHM_win_set_info(MPIR_Win * win, MPIR_Info * info) +static inline int MPIDI_SHM_mpi_win_set_info(MPIR_Win * win, MPIR_Info * info) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_start(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_start(MPIR_Group * group, int assert, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_complete(MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_complete(MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_post(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_post(MPIR_Group * group, int assert, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_wait(MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_wait(MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_test(MPIR_Win * win, int *flag) +static inline int MPIDI_SHM_mpi_win_test(MPIR_Win * win, int *flag) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_unlock(int rank, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_unlock(int rank, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) +static inline int MPIDI_SHM_mpi_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_free(MPIR_Win ** win_ptr) +static inline int MPIDI_SHM_mpi_win_free(MPIR_Win ** win_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_fence(int assert, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_fence(int assert, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_create(void *base, - MPI_Aint length, - int disp_unit, - MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_SHM_mpi_win_create(void *base, + MPI_Aint length, + int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_attach(MPIR_Win * win, void *base, MPI_Aint size) +static inline int MPIDI_SHM_mpi_win_attach(MPIR_Win * win, void *base, MPI_Aint size) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_allocate_shared(MPI_Aint size, - int disp_unit, - MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, - void **base_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_SHM_mpi_win_allocate_shared(MPI_Aint size, + int disp_unit, + MPIR_Info * info_ptr, + MPIR_Comm * comm_ptr, + void **base_ptr, MPIR_Win ** win_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_detach(MPIR_Win * win, const void *base) +static inline int MPIDI_SHM_mpi_win_detach(MPIR_Win * win, const void *base) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_shared_query(MPIR_Win * win, - int rank, - MPI_Aint * size, int *disp_unit, void *baseptr) +static inline int MPIDI_SHM_mpi_win_shared_query(MPIR_Win * win, + int rank, + MPI_Aint * size, int *disp_unit, void *baseptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_allocate(MPI_Aint size, - int disp_unit, - MPIR_Info * info, - MPIR_Comm * comm, void *baseptr, MPIR_Win ** win) +static inline int MPIDI_SHM_mpi_win_allocate(MPI_Aint size, + int disp_unit, + MPIR_Info * info, + MPIR_Comm * comm, void *baseptr, MPIR_Win ** win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_flush(int rank, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_flush(int rank, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_flush_local_all(MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_flush_local_all(MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_unlock_all(MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_unlock_all(MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, MPIR_Win ** win) +static inline int MPIDI_SHM_mpi_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, + MPIR_Win ** win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_flush_local(int rank, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_flush_local(int rank, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_sync(MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_sync(MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_flush_all(MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_flush_all(MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_lock_all(int assert, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_lock_all(int assert, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; diff --git a/src/mpid/ch4/shm/stubshm/func_table.c b/src/mpid/ch4/shm/stubshm/func_table.c index 44a89c5..acb9672 100644 --- a/src/mpid/ch4/shm/stubshm/func_table.c +++ b/src/mpid/ch4/shm/stubshm/func_table.c @@ -13,15 +13,15 @@ #include <mpidimpl.h> #include "shm_direct.h" MPIDI_SHM_funcs_t MPIDI_SHM_stubshm_funcs = { - MPIDI_SHM_init, - MPIDI_SHM_finalize, + MPIDI_SHM_mpi_init, + MPIDI_SHM_mpi_finalize, MPIDI_SHM_progress, MPIDI_SHM_am_reg_handler, - MPIDI_SHM_comm_connect, - MPIDI_SHM_comm_disconnect, - MPIDI_SHM_open_port, - MPIDI_SHM_close_port, - MPIDI_SHM_comm_accept, + MPIDI_SHM_mpi_comm_connect, + MPIDI_SHM_mpi_comm_disconnect, + MPIDI_SHM_mpi_open_port, + MPIDI_SHM_mpi_close_port, + MPIDI_SHM_mpi_comm_accept, MPIDI_SHM_am_send_hdr, MPIDI_SHM_am_isend, MPIDI_SHM_inject_am, @@ -41,113 +41,113 @@ MPIDI_SHM_funcs_t MPIDI_SHM_stubshm_funcs = { MPIDI_SHM_getallincomm, MPIDI_SHM_gpid_tolpidarray, MPIDI_SHM_create_intercomm_from_lpids, - MPIDI_SHM_comm_create_hook, - MPIDI_SHM_comm_free_hook, - MPIDI_SHM_type_create_hook, - MPIDI_SHM_type_free_hook, - MPIDI_SHM_op_create_hook, - MPIDI_SHM_op_free_hook, + MPIDI_SHM_mpi_comm_create_hook, + MPIDI_SHM_mpi_comm_free_hook, + MPIDI_SHM_mpi_type_create_hook, + MPIDI_SHM_mpi_type_free_hook, + MPIDI_SHM_mpi_op_create_hook, + MPIDI_SHM_mpi_op_free_hook, MPIDI_SHM_am_request_init, }; MPIDI_SHM_native_funcs_t MPIDI_SHM_native_stubshm_funcs = { - MPIDI_SHM_send, - MPIDI_SHM_ssend, - MPIDI_SHM_startall, - MPIDI_SHM_send_init, - MPIDI_SHM_ssend_init, - MPIDI_SHM_rsend_init, - MPIDI_SHM_bsend_init, - MPIDI_SHM_isend, - MPIDI_SHM_issend, - MPIDI_SHM_cancel_send, - MPIDI_SHM_recv_init, - MPIDI_SHM_recv, - MPIDI_SHM_irecv, - MPIDI_SHM_imrecv, - MPIDI_SHM_cancel_recv, - MPIDI_SHM_alloc_mem, - MPIDI_SHM_free_mem, - MPIDI_SHM_improbe, - MPIDI_SHM_iprobe, - MPIDI_SHM_win_set_info, - MPIDI_SHM_win_shared_query, - MPIDI_SHM_put, - MPIDI_SHM_win_start, - MPIDI_SHM_win_complete, - MPIDI_SHM_win_post, - MPIDI_SHM_win_wait, - MPIDI_SHM_win_test, - MPIDI_SHM_win_lock, - MPIDI_SHM_win_unlock, - MPIDI_SHM_win_get_info, - MPIDI_SHM_get, - MPIDI_SHM_win_free, - MPIDI_SHM_win_fence, - MPIDI_SHM_win_create, - MPIDI_SHM_accumulate, - MPIDI_SHM_win_attach, - MPIDI_SHM_win_allocate_shared, - MPIDI_SHM_rput, - MPIDI_SHM_win_flush_local, - MPIDI_SHM_win_detach, - MPIDI_SHM_compare_and_swap, - MPIDI_SHM_raccumulate, - MPIDI_SHM_rget_accumulate, - MPIDI_SHM_fetch_and_op, - MPIDI_SHM_win_allocate, - MPIDI_SHM_win_flush, - MPIDI_SHM_win_flush_local_all, - MPIDI_SHM_win_unlock_all, - MPIDI_SHM_win_create_dynamic, - MPIDI_SHM_rget, - MPIDI_SHM_win_sync, - MPIDI_SHM_win_flush_all, - MPIDI_SHM_get_accumulate, - MPIDI_SHM_win_lock_all, - MPIDI_SHM_barrier, - MPIDI_SHM_bcast, - MPIDI_SHM_allreduce, - MPIDI_SHM_allgather, - MPIDI_SHM_allgatherv, - MPIDI_SHM_scatter, - MPIDI_SHM_scatterv, - MPIDI_SHM_gather, - MPIDI_SHM_gatherv, - MPIDI_SHM_alltoall, - MPIDI_SHM_alltoallv, - MPIDI_SHM_alltoallw, - MPIDI_SHM_reduce, - MPIDI_SHM_reduce_scatter, - MPIDI_SHM_reduce_scatter_block, - MPIDI_SHM_scan, - MPIDI_SHM_exscan, - MPIDI_SHM_neighbor_allgather, - MPIDI_SHM_neighbor_allgatherv, - MPIDI_SHM_neighbor_alltoall, - MPIDI_SHM_neighbor_alltoallv, - MPIDI_SHM_neighbor_alltoallw, - MPIDI_SHM_ineighbor_allgather, - MPIDI_SHM_ineighbor_allgatherv, - MPIDI_SHM_ineighbor_alltoall, - MPIDI_SHM_ineighbor_alltoallv, - MPIDI_SHM_ineighbor_alltoallw, - MPIDI_SHM_ibarrier, - MPIDI_SHM_ibcast, - MPIDI_SHM_iallgather, - MPIDI_SHM_iallgatherv, - MPIDI_SHM_iallreduce, - MPIDI_SHM_ialltoall, - MPIDI_SHM_ialltoallv, - MPIDI_SHM_ialltoallw, - MPIDI_SHM_iexscan, - MPIDI_SHM_igather, - MPIDI_SHM_igatherv, - MPIDI_SHM_ireduce_scatter_block, - MPIDI_SHM_ireduce_scatter, - MPIDI_SHM_ireduce, - MPIDI_SHM_iscan, - MPIDI_SHM_iscatter, - MPIDI_SHM_iscatterv, + MPIDI_SHM_mpi_send, + MPIDI_SHM_mpi_ssend, + MPIDI_SHM_mpi_startall, + MPIDI_SHM_mpi_send_init, + MPIDI_SHM_mpi_ssend_init, + MPIDI_SHM_mpi_rsend_init, + MPIDI_SHM_mpi_bsend_init, + MPIDI_SHM_mpi_isend, + MPIDI_SHM_mpi_issend, + MPIDI_SHM_mpi_cancel_send, + MPIDI_SHM_mpi_recv_init, + MPIDI_SHM_mpi_recv, + MPIDI_SHM_mpi_irecv, + MPIDI_SHM_mpi_imrecv, + MPIDI_SHM_mpi_cancel_recv, + MPIDI_SHM_mpi_alloc_mem, + MPIDI_SHM_mpi_free_mem, + MPIDI_SHM_mpi_improbe, + MPIDI_SHM_mpi_iprobe, + MPIDI_SHM_mpi_win_set_info, + MPIDI_SHM_mpi_win_shared_query, + MPIDI_SHM_mpi_put, + MPIDI_SHM_mpi_win_start, + MPIDI_SHM_mpi_win_complete, + MPIDI_SHM_mpi_win_post, + MPIDI_SHM_mpi_win_wait, + MPIDI_SHM_mpi_win_test, + MPIDI_SHM_mpi_win_lock, + MPIDI_SHM_mpi_win_unlock, + MPIDI_SHM_mpi_win_get_info, + MPIDI_SHM_mpi_get, + MPIDI_SHM_mpi_win_free, + MPIDI_SHM_mpi_win_fence, + MPIDI_SHM_mpi_win_create, + MPIDI_SHM_mpi_accumulate, + MPIDI_SHM_mpi_win_attach, + MPIDI_SHM_mpi_win_allocate_shared, + MPIDI_SHM_mpi_rput, + MPIDI_SHM_mpi_win_flush_local, + MPIDI_SHM_mpi_win_detach, + MPIDI_SHM_mpi_compare_and_swap, + MPIDI_SHM_mpi_raccumulate, + MPIDI_SHM_mpi_rget_accumulate, + MPIDI_SHM_mpi_fetch_and_op, + MPIDI_SHM_mpi_win_allocate, + MPIDI_SHM_mpi_win_flush, + MPIDI_SHM_mpi_win_flush_local_all, + MPIDI_SHM_mpi_win_unlock_all, + MPIDI_SHM_mpi_win_create_dynamic, + MPIDI_SHM_mpi_rget, + MPIDI_SHM_mpi_win_sync, + MPIDI_SHM_mpi_win_flush_all, + MPIDI_SHM_mpi_get_accumulate, + MPIDI_SHM_mpi_win_lock_all, + MPIDI_SHM_mpi_barrier, + MPIDI_SHM_mpi_bcast, + MPIDI_SHM_mpi_allreduce, + MPIDI_SHM_mpi_allgather, + MPIDI_SHM_mpi_allgatherv, + MPIDI_SHM_mpi_scatter, + MPIDI_SHM_mpi_scatterv, + MPIDI_SHM_mpi_gather, + MPIDI_SHM_mpi_gatherv, + MPIDI_SHM_mpi_alltoall, + MPIDI_SHM_mpi_alltoallv, + MPIDI_SHM_mpi_alltoallw, + MPIDI_SHM_mpi_reduce, + MPIDI_SHM_mpi_reduce_scatter, + MPIDI_SHM_mpi_reduce_scatter_block, + MPIDI_SHM_mpi_scan, + MPIDI_SHM_mpi_exscan, + MPIDI_SHM_mpi_neighbor_allgather, + MPIDI_SHM_mpi_neighbor_allgatherv, + MPIDI_SHM_mpi_neighbor_alltoall, + MPIDI_SHM_mpi_neighbor_alltoallv, + MPIDI_SHM_mpi_neighbor_alltoallw, + MPIDI_SHM_mpi_ineighbor_allgather, + MPIDI_SHM_mpi_ineighbor_allgatherv, + MPIDI_SHM_mpi_ineighbor_alltoall, + MPIDI_SHM_mpi_ineighbor_alltoallv, + MPIDI_SHM_mpi_ineighbor_alltoallw, + MPIDI_SHM_mpi_ibarrier, + MPIDI_SHM_mpi_ibcast, + MPIDI_SHM_mpi_iallgather, + MPIDI_SHM_mpi_iallgatherv, + MPIDI_SHM_mpi_iallreduce, + MPIDI_SHM_mpi_ialltoall, + MPIDI_SHM_mpi_ialltoallv, + MPIDI_SHM_mpi_ialltoallw, + MPIDI_SHM_mpi_iexscan, + MPIDI_SHM_mpi_igather, + MPIDI_SHM_mpi_igatherv, + MPIDI_SHM_mpi_ireduce_scatter_block, + MPIDI_SHM_mpi_ireduce_scatter, + MPIDI_SHM_mpi_ireduce, + MPIDI_SHM_mpi_iscan, + MPIDI_SHM_mpi_iscatter, + MPIDI_SHM_mpi_iscatterv, }; #endif diff --git a/src/mpid/ch4/shm/stubshm/stubshm_coll.h b/src/mpid/ch4/shm/stubshm/stubshm_coll.h index 73ef4e8..3866a4d 100644 --- a/src/mpid/ch4/shm/stubshm/stubshm_coll.h +++ b/src/mpid/ch4/shm/stubshm/stubshm_coll.h @@ -15,10 +15,10 @@ #include "ch4_impl.h" #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_barrier +#define FUNCNAME MPIDI_SHM_mpi_barrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -28,11 +28,11 @@ static inline int MPIDI_SHM_barrier(MPIR_Comm * comm_ptr, MPIR_Errflag_t * errfl } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_bcast +#define FUNCNAME MPIDI_SHM_mpi_bcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_bcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_bcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -42,12 +42,12 @@ static inline int MPIDI_SHM_bcast(void *buffer, int count, MPI_Datatype datatype } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_allreduce +#define FUNCNAME MPIDI_SHM_mpi_allreduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_allreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_allreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -57,12 +57,12 @@ static inline int MPIDI_SHM_allreduce(const void *sendbuf, void *recvbuf, int co } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_allgather +#define FUNCNAME MPIDI_SHM_mpi_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -72,13 +72,14 @@ static inline int MPIDI_SHM_allgather(const void *sendbuf, int sendcount, MPI_Da } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_allgatherv +#define FUNCNAME MPIDI_SHM_mpi_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -88,12 +89,12 @@ static inline int MPIDI_SHM_allgatherv(const void *sendbuf, int sendcount, MPI_D } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_gather +#define FUNCNAME MPIDI_SHM_mpi_gather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -103,13 +104,13 @@ static inline int MPIDI_SHM_gather(const void *sendbuf, int sendcount, MPI_Datat } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_gatherv +#define FUNCNAME MPIDI_SHM_mpi_gatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -119,12 +120,12 @@ static inline int MPIDI_SHM_gatherv(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_scatter +#define FUNCNAME MPIDI_SHM_mpi_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -134,13 +135,13 @@ static inline int MPIDI_SHM_scatter(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_scatterv +#define FUNCNAME MPIDI_SHM_mpi_scatterv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_scatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_scatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -150,12 +151,12 @@ static inline int MPIDI_SHM_scatterv(const void *sendbuf, const int *sendcounts, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_alltoall +#define FUNCNAME MPIDI_SHM_mpi_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -165,14 +166,14 @@ static inline int MPIDI_SHM_alltoall(const void *sendbuf, int sendcount, MPI_Dat } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_alltoallv +#define FUNCNAME MPIDI_SHM_mpi_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_alltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_alltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -181,14 +182,14 @@ static inline int MPIDI_SHM_alltoallv(const void *sendbuf, const int *sendcounts } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_alltoallw +#define FUNCNAME MPIDI_SHM_mpi_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_alltoallw(const void *sendbuf, const int sendcounts[], - const int sdispls[], const MPI_Datatype sendtypes[], - void *recvbuf, const int recvcounts[], - const int rdispls[], const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_alltoallw(const void *sendbuf, const int sendcounts[], + const int sdispls[], const MPI_Datatype sendtypes[], + void *recvbuf, const int recvcounts[], + const int rdispls[], const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; MPIR_Assert(0); @@ -196,12 +197,12 @@ static inline int MPIDI_SHM_alltoallw(const void *sendbuf, const int sendcounts[ } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_reduce +#define FUNCNAME MPIDI_SHM_mpi_reduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_reduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_reduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -211,13 +212,13 @@ static inline int MPIDI_SHM_reduce(const void *sendbuf, void *recvbuf, int count } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_reduce_scatter +#define FUNCNAME MPIDI_SHM_mpi_reduce_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_reduce_scatter(const void *sendbuf, void *recvbuf, - const int recvcounts[], MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_reduce_scatter(const void *sendbuf, void *recvbuf, + const int recvcounts[], MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; MPIR_Assert(0); @@ -225,13 +226,13 @@ static inline int MPIDI_SHM_reduce_scatter(const void *sendbuf, void *recvbuf, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_reduce_scatter_block +#define FUNCNAME MPIDI_SHM_mpi_reduce_scatter_block #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_reduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_reduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; MPIR_Assert(0); @@ -239,12 +240,12 @@ static inline int MPIDI_SHM_reduce_scatter_block(const void *sendbuf, void *recv } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_scan +#define FUNCNAME MPIDI_SHM_mpi_scan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_scan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_scan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -254,12 +255,12 @@ static inline int MPIDI_SHM_scan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_exscan +#define FUNCNAME MPIDI_SHM_mpi_exscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_exscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_exscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -269,13 +270,13 @@ static inline int MPIDI_SHM_exscan(const void *sendbuf, void *recvbuf, int count } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_neighbor_allgather +#define FUNCNAME MPIDI_SHM_mpi_neighbor_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_neighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_neighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -285,14 +286,14 @@ static inline int MPIDI_SHM_neighbor_allgather(const void *sendbuf, int sendcoun } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_neighbor_allgatherv +#define FUNCNAME MPIDI_SHM_mpi_neighbor_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_neighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_neighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -302,13 +303,13 @@ static inline int MPIDI_SHM_neighbor_allgatherv(const void *sendbuf, int sendcou } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_neighbor_alltoall +#define FUNCNAME MPIDI_SHM_mpi_neighbor_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_neighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_neighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -318,14 +319,14 @@ static inline int MPIDI_SHM_neighbor_alltoall(const void *sendbuf, int sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_neighbor_alltoallv +#define FUNCNAME MPIDI_SHM_mpi_neighbor_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_neighbor_alltoallv(const void *sendbuf, const int sendcounts[], - const int sdispls[], MPI_Datatype sendtype, - void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_neighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -335,15 +336,15 @@ static inline int MPIDI_SHM_neighbor_alltoallv(const void *sendbuf, const int se } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_neighbor_alltoallw +#define FUNCNAME MPIDI_SHM_mpi_neighbor_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_neighbor_alltoallw(const void *sendbuf, const int sendcounts[], - const MPI_Aint sdispls[], - const MPI_Datatype sendtypes[], void *recvbuf, - const int recvcounts[], const MPI_Aint rdispls[], - const MPI_Datatype recvtypes[], MPIR_Comm * comm_ptr, - MPIR_Errflag_t * errflag) +static inline int MPIDI_SHM_mpi_neighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, + const int recvcounts[], const MPI_Aint rdispls[], + const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { int mpi_errno = MPI_SUCCESS; @@ -353,13 +354,13 @@ static inline int MPIDI_SHM_neighbor_alltoallw(const void *sendbuf, const int se } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ineighbor_allgather +#define FUNCNAME MPIDI_SHM_mpi_ineighbor_allgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ineighbor_allgather(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, int recvcount, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_ineighbor_allgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -369,14 +370,14 @@ static inline int MPIDI_SHM_ineighbor_allgather(const void *sendbuf, int sendcou } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ineighbor_allgatherv +#define FUNCNAME MPIDI_SHM_mpi_ineighbor_allgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ineighbor_allgatherv(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - const int recvcounts[], const int displs[], - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_ineighbor_allgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int recvcounts[], const int displs[], + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -386,13 +387,13 @@ static inline int MPIDI_SHM_ineighbor_allgatherv(const void *sendbuf, int sendco } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ineighbor_alltoall +#define FUNCNAME MPIDI_SHM_mpi_ineighbor_alltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ineighbor_alltoall(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ineighbor_alltoall(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -402,14 +403,14 @@ static inline int MPIDI_SHM_ineighbor_alltoall(const void *sendbuf, int sendcoun } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ineighbor_alltoallv +#define FUNCNAME MPIDI_SHM_mpi_ineighbor_alltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], - const int sdispls[], MPI_Datatype sendtype, - void *recvbuf, const int recvcounts[], - const int rdispls[], MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ineighbor_alltoallv(const void *sendbuf, const int sendcounts[], + const int sdispls[], MPI_Datatype sendtype, + void *recvbuf, const int recvcounts[], + const int rdispls[], MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -419,15 +420,16 @@ static inline int MPIDI_SHM_ineighbor_alltoallv(const void *sendbuf, const int s } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ineighbor_alltoallw +#define FUNCNAME MPIDI_SHM_mpi_ineighbor_alltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], - const MPI_Aint sdispls[], - const MPI_Datatype sendtypes[], void *recvbuf, - const int recvcounts[], const MPI_Aint rdispls[], - const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ineighbor_alltoallw(const void *sendbuf, const int sendcounts[], + const MPI_Aint sdispls[], + const MPI_Datatype sendtypes[], void *recvbuf, + const int recvcounts[], + const MPI_Aint rdispls[], + const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -437,10 +439,10 @@ static inline int MPIDI_SHM_ineighbor_alltoallw(const void *sendbuf, const int s } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ibarrier +#define FUNCNAME MPIDI_SHM_mpi_ibarrier #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -450,11 +452,11 @@ static inline int MPIDI_SHM_ibarrier(MPIR_Comm * comm_ptr, MPI_Request * req) } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ibcast +#define FUNCNAME MPIDI_SHM_mpi_ibcast #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ibcast(void *buffer, int count, MPI_Datatype datatype, - int root, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ibcast(void *buffer, int count, MPI_Datatype datatype, + int root, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -464,12 +466,13 @@ static inline int MPIDI_SHM_ibcast(void *buffer, int count, MPI_Datatype datatyp } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iallgather +#define FUNCNAME MPIDI_SHM_mpi_iallgather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_iallgather(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, int recvcount, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -479,13 +482,14 @@ static inline int MPIDI_SHM_iallgather(const void *sendbuf, int sendcount, MPI_D } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iallgatherv +#define FUNCNAME MPIDI_SHM_mpi_iallgatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_iallgatherv(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + const int *recvcounts, const int *displs, + MPI_Datatype recvtype, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -495,12 +499,12 @@ static inline int MPIDI_SHM_iallgatherv(const void *sendbuf, int sendcount, MPI_ } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ialltoall +#define FUNCNAME MPIDI_SHM_mpi_ialltoall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -510,14 +514,14 @@ static inline int MPIDI_SHM_ialltoall(const void *sendbuf, int sendcount, MPI_Da } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ialltoallv +#define FUNCNAME MPIDI_SHM_mpi_ialltoallv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ialltoallv(const void *sendbuf, const int *sendcounts, - const int *sdispls, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, - const int *rdispls, MPI_Datatype recvtype, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ialltoallv(const void *sendbuf, const int *sendcounts, + const int *sdispls, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, + const int *rdispls, MPI_Datatype recvtype, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -527,14 +531,14 @@ static inline int MPIDI_SHM_ialltoallv(const void *sendbuf, const int *sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ialltoallw +#define FUNCNAME MPIDI_SHM_mpi_ialltoallw #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ialltoallw(const void *sendbuf, const int *sendcounts, - const int *sdispls, const MPI_Datatype sendtypes[], - void *recvbuf, const int *recvcounts, - const int *rdispls, const MPI_Datatype recvtypes[], - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ialltoallw(const void *sendbuf, const int *sendcounts, + const int *sdispls, const MPI_Datatype sendtypes[], + void *recvbuf, const int *recvcounts, + const int *rdispls, const MPI_Datatype recvtypes[], + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno = MPI_SUCCESS; MPIR_Assert(0); @@ -542,12 +546,12 @@ static inline int MPIDI_SHM_ialltoallw(const void *sendbuf, const int *sendcount } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iexscan +#define FUNCNAME MPIDI_SHM_mpi_iexscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iexscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_iexscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -557,12 +561,12 @@ static inline int MPIDI_SHM_iexscan(const void *sendbuf, void *recvbuf, int coun } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_igather +#define FUNCNAME MPIDI_SHM_mpi_igather #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -572,13 +576,13 @@ static inline int MPIDI_SHM_igather(const void *sendbuf, int sendcount, MPI_Data } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_igatherv +#define FUNCNAME MPIDI_SHM_mpi_igatherv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, - void *recvbuf, const int *recvcounts, const int *displs, - MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, + void *recvbuf, const int *recvcounts, const int *displs, + MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -588,13 +592,13 @@ static inline int MPIDI_SHM_igatherv(const void *sendbuf, int sendcount, MPI_Dat } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ireduce_scatter_block +#define FUNCNAME MPIDI_SHM_mpi_ireduce_scatter_block #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ireduce_scatter_block(const void *sendbuf, void *recvbuf, - int recvcount, MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_ireduce_scatter_block(const void *sendbuf, void *recvbuf, + int recvcount, MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -604,12 +608,12 @@ static inline int MPIDI_SHM_ireduce_scatter_block(const void *sendbuf, void *rec } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ireduce_scatter +#define FUNCNAME MPIDI_SHM_mpi_ireduce_scatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ireduce_scatter(const void *sendbuf, void *recvbuf, - const int recvcounts[], MPI_Datatype datatype, - MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ireduce_scatter(const void *sendbuf, void *recvbuf, + const int recvcounts[], MPI_Datatype datatype, + MPI_Op op, MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -619,12 +623,12 @@ static inline int MPIDI_SHM_ireduce_scatter(const void *sendbuf, void *recvbuf, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_ireduce +#define FUNCNAME MPIDI_SHM_mpi_ireduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_ireduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, int root, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_ireduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, int root, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -634,12 +638,12 @@ static inline int MPIDI_SHM_ireduce(const void *sendbuf, void *recvbuf, int coun } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iallreduce +#define FUNCNAME MPIDI_SHM_mpi_iallreduce #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iallreduce(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, - MPIR_Comm * comm_ptr, MPI_Request * req) +static inline int MPIDI_SHM_mpi_iallreduce(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, + MPIR_Comm * comm_ptr, MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -649,12 +653,12 @@ static inline int MPIDI_SHM_iallreduce(const void *sendbuf, void *recvbuf, int c } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iscan +#define FUNCNAME MPIDI_SHM_mpi_iscan #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iscan(const void *sendbuf, void *recvbuf, int count, - MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, - MPI_Request * req) +static inline int MPIDI_SHM_mpi_iscan(const void *sendbuf, void *recvbuf, int count, + MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm_ptr, + MPI_Request * req) { int mpi_errno = MPI_SUCCESS; @@ -664,13 +668,13 @@ static inline int MPIDI_SHM_iscan(const void *sendbuf, void *recvbuf, int count, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iscatter +#define FUNCNAME MPIDI_SHM_mpi_iscatter #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iscatter(const void *sendbuf, int sendcount, - MPI_Datatype sendtype, void *recvbuf, - int recvcount, MPI_Datatype recvtype, - int root, MPIR_Comm * comm, MPI_Request * request) +static inline int MPIDI_SHM_mpi_iscatter(const void *sendbuf, int sendcount, + MPI_Datatype sendtype, void *recvbuf, + int recvcount, MPI_Datatype recvtype, + int root, MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; MPIR_Assert(0); @@ -678,14 +682,14 @@ static inline int MPIDI_SHM_iscatter(const void *sendbuf, int sendcount, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_iscatterv +#define FUNCNAME MPIDI_SHM_mpi_iscatterv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_iscatterv(const void *sendbuf, const int *sendcounts, - const int *displs, MPI_Datatype sendtype, - void *recvbuf, int recvcount, - MPI_Datatype recvtype, int root, - MPIR_Comm * comm, MPI_Request * request) +static inline int MPIDI_SHM_mpi_iscatterv(const void *sendbuf, const int *sendcounts, + const int *displs, MPI_Datatype sendtype, + void *recvbuf, int recvcount, + MPI_Datatype recvtype, int root, + MPIR_Comm * comm, MPI_Request * request) { int mpi_errno = MPI_SUCCESS; MPIR_Assert(0); diff --git a/src/mpid/ch4/shm/stubshm/stubshm_comm.h b/src/mpid/ch4/shm/stubshm/stubshm_comm.h index 99ae077..498e4b4 100644 --- a/src/mpid/ch4/shm/stubshm/stubshm_comm.h +++ b/src/mpid/ch4/shm/stubshm/stubshm_comm.h @@ -11,14 +11,14 @@ #define SHM_STUBSHM_COMM_H_INCLUDED #include "stubshm_impl.h" -static inline int MPIDI_SHM_comm_create_hook(MPIR_Comm * comm) +static inline int MPIDI_SHM_mpi_comm_create_hook(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; MPIR_Assert(0); return mpi_errno; } -static inline int MPIDI_SHM_comm_free_hook(MPIR_Comm * comm) +static inline int MPIDI_SHM_mpi_comm_free_hook(MPIR_Comm * comm) { int mpi_errno = MPI_SUCCESS; MPIR_Assert(0); diff --git a/src/mpid/ch4/shm/stubshm/stubshm_init.h b/src/mpid/ch4/shm/stubshm/stubshm_init.h index f101951..6b61d99 100644 --- a/src/mpid/ch4/shm/stubshm/stubshm_init.h +++ b/src/mpid/ch4/shm/stubshm/stubshm_init.h @@ -13,25 +13,25 @@ #include "stubshm_impl.h" -static inline int MPIDI_SHM_init(int rank, int size) +static inline int MPIDI_SHM_mpi_init(int rank, int size) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_finalize(void) +static inline int MPIDI_SHM_mpi_finalize(void) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline void *MPIDI_SHM_alloc_mem(size_t size, MPIR_Info * info_ptr) +static inline void *MPIDI_SHM_mpi_alloc_mem(size_t size, MPIR_Info * info_ptr) { MPIR_Assert(0); return NULL; } -static inline int MPIDI_SHM_free_mem(void *ptr) +static inline int MPIDI_SHM_mpi_free_mem(void *ptr) { MPIR_Assert(0); return MPI_SUCCESS; @@ -83,10 +83,10 @@ static inline int MPIDI_SHM_create_intercomm_from_lpids(MPIR_Comm * newcomm_ptr, } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_type_create_hook +#define FUNCNAME MPIDI_SHM_mpi_type_create_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_type_create_hook(MPIR_Datatype * type) +static inline int MPIDI_SHM_mpi_type_create_hook(MPIR_Datatype * type) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_TYPE_CREATE_HOOK); @@ -97,10 +97,10 @@ static inline int MPIDI_SHM_type_create_hook(MPIR_Datatype * type) } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_type_free_hook +#define FUNCNAME MPIDI_SHM_mpi_type_free_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_type_free_hook(MPIR_Datatype * type) +static inline int MPIDI_SHM_mpi_type_free_hook(MPIR_Datatype * type) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_TYPE_FREE_HOOK); @@ -111,10 +111,10 @@ static inline int MPIDI_SHM_type_free_hook(MPIR_Datatype * type) } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_op_create_hook +#define FUNCNAME MPIDI_SHM_mpi_op_create_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_op_create_hook(MPIR_Op * op) +static inline int MPIDI_SHM_mpi_op_create_hook(MPIR_Op * op) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_OP_CREATE_HOOK); @@ -125,10 +125,10 @@ static inline int MPIDI_SHM_op_create_hook(MPIR_Op * op) } #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_op_free_hook +#define FUNCNAME MPIDI_SHM_mpi_op_free_hook #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_SHM_op_free_hook(MPIR_Op * op) +static inline int MPIDI_SHM_mpi_op_free_hook(MPIR_Op * op) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_SHM_OP_FREE_HOOK); diff --git a/src/mpid/ch4/shm/stubshm/stubshm_probe.h b/src/mpid/ch4/shm/stubshm/stubshm_probe.h index 0ba72f6..726735f 100644 --- a/src/mpid/ch4/shm/stubshm/stubshm_probe.h +++ b/src/mpid/ch4/shm/stubshm/stubshm_probe.h @@ -14,20 +14,20 @@ #include "stubshm_impl.h" -static inline int MPIDI_SHM_improbe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, - int *flag, MPIR_Request ** message, MPI_Status * status) +static inline int MPIDI_SHM_mpi_improbe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, + int *flag, MPIR_Request ** message, MPI_Status * status) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_iprobe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, int *flag, MPI_Status * status) +static inline int MPIDI_SHM_mpi_iprobe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, int *flag, MPI_Status * status) { MPIR_Assert(0); return MPI_SUCCESS; diff --git a/src/mpid/ch4/shm/stubshm/stubshm_recv.h b/src/mpid/ch4/shm/stubshm/stubshm_recv.h index 63eaf7a..eb16842 100644 --- a/src/mpid/ch4/shm/stubshm/stubshm_recv.h +++ b/src/mpid/ch4/shm/stubshm/stubshm_recv.h @@ -14,54 +14,56 @@ #include "stubshm_impl.h" #undef FCNAME -#define FCNAME DECL_FUNC(MPIDI_SHM_recv) -static inline int MPIDI_SHM_recv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPI_Status * status, MPIR_Request ** request) +#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_recv) +static inline int MPIDI_SHM_mpi_recv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPI_Status * status, + MPIR_Request ** request) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_recv_init(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_recv_init(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_imrecv(void *buf, - int count, - MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp) +static inline int MPIDI_SHM_mpi_imrecv(void *buf, + int count, + MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp) { MPIR_Assert(0); return MPI_SUCCESS; } #undef FCNAME -#define FCNAME DECL_FUNC(MPIDI_SHM_irecv) -static inline int MPIDI_SHM_irecv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_irecv) +static inline int MPIDI_SHM_mpi_irecv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_cancel_recv(MPIR_Request * rreq) +static inline int MPIDI_SHM_mpi_cancel_recv(MPIR_Request * rreq) { MPIR_Assert(0); return MPI_SUCCESS; diff --git a/src/mpid/ch4/shm/stubshm/stubshm_rma.h b/src/mpid/ch4/shm/stubshm/stubshm_rma.h index 34256d1..447b0f1 100644 --- a/src/mpid/ch4/shm/stubshm/stubshm_rma.h +++ b/src/mpid/ch4/shm/stubshm/stubshm_rma.h @@ -13,71 +13,56 @@ #include "stubshm_impl.h" -static inline int MPIDI_SHM_put(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_put(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_get(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_get(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_rput(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_rput(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_compare_and_swap(const void *origin_addr, - const void *compare_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, MPI_Aint target_disp, MPIR_Win * win) -{ - MPIR_Assert(0); - return MPI_SUCCESS; -} - -static inline int MPIDI_SHM_raccumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_compare_and_swap(const void *origin_addr, + const void *compare_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, MPI_Aint target_disp, + MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_rget_accumulate(const void *origin_addr, +static inline int MPIDI_SHM_mpi_raccumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, @@ -88,37 +73,66 @@ static inline int MPIDI_SHM_rget_accumulate(const void *origin_addr, return MPI_SUCCESS; } -static inline int MPIDI_SHM_fetch_and_op(const void *origin_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, - MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_rget_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, MPIR_Request ** request) +{ + MPIR_Assert(0); + return MPI_SUCCESS; +} + +static inline int MPIDI_SHM_mpi_fetch_and_op(const void *origin_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, + MPI_Aint target_disp, MPI_Op op, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_rget(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_rget(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_get_accumulate(const void *origin_addr, +static inline int MPIDI_SHM_mpi_get_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) +{ + MPIR_Assert(0); + return MPI_SUCCESS; +} + +static inline int MPIDI_SHM_mpi_accumulate(const void *origin_addr, int origin_count, MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, int target_rank, MPI_Aint target_disp, int target_count, @@ -128,16 +142,4 @@ static inline int MPIDI_SHM_get_accumulate(const void *origin_addr, return MPI_SUCCESS; } -static inline int MPIDI_SHM_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, MPIR_Win * win) -{ - MPIR_Assert(0); - return MPI_SUCCESS; -} - #endif /* SHM_STUBSHM_RMA_H_INCLUDED */ diff --git a/src/mpid/ch4/shm/stubshm/stubshm_send.h b/src/mpid/ch4/shm/stubshm/stubshm_send.h index 446959f..1d0e1d0 100644 --- a/src/mpid/ch4/shm/stubshm/stubshm_send.h +++ b/src/mpid/ch4/shm/stubshm/stubshm_send.h @@ -13,12 +13,12 @@ #include "stubshm_impl.h" -static inline int MPIDI_SHM_send(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_send(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { int err = MPI_SUCCESS; MPIR_Assert(0); @@ -39,12 +39,12 @@ static inline int MPIDI_SHM_irsend(const void *buf, return MPI_SUCCESS; } -static inline int MPIDI_SHM_ssend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_ssend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { int err = MPI_SUCCESS; MPIR_Assert(0); @@ -52,86 +52,88 @@ static inline int MPIDI_SHM_ssend(const void *buf, return err; } -static inline int MPIDI_SHM_startall(int count, MPIR_Request * requests[]) +static inline int MPIDI_SHM_mpi_startall(int count, MPIR_Request * requests[]) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_send_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_send_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_ssend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_ssend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_bsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_bsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_rsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_rsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { MPIR_Assert(0); return MPI_SUCCESS; } #undef FCNAME -#define FCNAME DECL_FUNC(MPIDI_SHM_isend) -static inline int MPIDI_SHM_isend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +#define FCNAME DECL_FUNC(MPIDI_SHM_mpi_isend) +static inline int MPIDI_SHM_mpi_isend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, MPIR_Request ** request) { int err = MPI_SUCCESS; MPIR_Assert(0); return err; } -static inline int MPIDI_SHM_issend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, MPIR_Request ** request) +static inline int MPIDI_SHM_mpi_issend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { int err = MPI_SUCCESS; MPIR_Assert(0); return err; } -static inline int MPIDI_SHM_cancel_send(MPIR_Request * sreq) +static inline int MPIDI_SHM_mpi_cancel_send(MPIR_Request * sreq) { MPIR_Assert(0); return MPI_SUCCESS; diff --git a/src/mpid/ch4/shm/stubshm/stubshm_spawn.h b/src/mpid/ch4/shm/stubshm/stubshm_spawn.h index cedb3f4..5995d0e 100644 --- a/src/mpid/ch4/shm/stubshm/stubshm_spawn.h +++ b/src/mpid/ch4/shm/stubshm/stubshm_spawn.h @@ -13,35 +13,35 @@ #include "stubshm_impl.h" -static inline int MPIDI_SHM_comm_connect(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) +static inline int MPIDI_SHM_mpi_comm_connect(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_comm_disconnect(MPIR_Comm * comm_ptr) +static inline int MPIDI_SHM_mpi_comm_disconnect(MPIR_Comm * comm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_open_port(MPIR_Info * info_ptr, char *port_name) +static inline int MPIDI_SHM_mpi_open_port(MPIR_Info * info_ptr, char *port_name) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_close_port(const char *port_name) +static inline int MPIDI_SHM_mpi_close_port(const char *port_name) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_comm_accept(const char *port_name, - MPIR_Info * info, - int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) +static inline int MPIDI_SHM_mpi_comm_accept(const char *port_name, + MPIR_Info * info, + int root, MPIR_Comm * comm, MPIR_Comm ** newcomm_ptr) { MPIR_Assert(0); return MPI_SUCCESS; diff --git a/src/mpid/ch4/shm/stubshm/stubshm_win.h b/src/mpid/ch4/shm/stubshm/stubshm_win.h index 24a9b1b..b5ce0c7 100644 --- a/src/mpid/ch4/shm/stubshm/stubshm_win.h +++ b/src/mpid/ch4/shm/stubshm/stubshm_win.h @@ -13,169 +13,171 @@ #include "stubshm_impl.h" -static inline int MPIDI_SHM_win_set_info(MPIR_Win * win, MPIR_Info * info) +static inline int MPIDI_SHM_mpi_win_set_info(MPIR_Win * win, MPIR_Info * info) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_start(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_start(MPIR_Group * group, int assert, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_complete(MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_complete(MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_post(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_post(MPIR_Group * group, int assert, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_wait(MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_wait(MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_test(MPIR_Win * win, int *flag) +static inline int MPIDI_SHM_mpi_win_test(MPIR_Win * win, int *flag) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_unlock(int rank, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_unlock(int rank, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) +static inline int MPIDI_SHM_mpi_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_free(MPIR_Win ** win_ptr) +static inline int MPIDI_SHM_mpi_win_free(MPIR_Win ** win_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_fence(int assert, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_fence(int assert, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_create(void *base, - MPI_Aint length, - int disp_unit, - MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_SHM_mpi_win_create(void *base, + MPI_Aint length, + int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_attach(MPIR_Win * win, void *base, MPI_Aint size) +static inline int MPIDI_SHM_mpi_win_attach(MPIR_Win * win, void *base, MPI_Aint size) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_allocate_shared(MPI_Aint size, - int disp_unit, - MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, - void **base_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_SHM_mpi_win_allocate_shared(MPI_Aint size, + int disp_unit, + MPIR_Info * info_ptr, + MPIR_Comm * comm_ptr, + void **base_ptr, MPIR_Win ** win_ptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_detach(MPIR_Win * win, const void *base) +static inline int MPIDI_SHM_mpi_win_detach(MPIR_Win * win, const void *base) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_shared_query(MPIR_Win * win, - int rank, - MPI_Aint * size, int *disp_unit, void *baseptr) +static inline int MPIDI_SHM_mpi_win_shared_query(MPIR_Win * win, + int rank, + MPI_Aint * size, int *disp_unit, void *baseptr) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_allocate(MPI_Aint size, - int disp_unit, - MPIR_Info * info, - MPIR_Comm * comm, void *baseptr, MPIR_Win ** win) +static inline int MPIDI_SHM_mpi_win_allocate(MPI_Aint size, + int disp_unit, + MPIR_Info * info, + MPIR_Comm * comm, void *baseptr, MPIR_Win ** win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_flush(int rank, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_flush(int rank, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_flush_local_all(MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_flush_local_all(MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_unlock_all(MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_unlock_all(MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, MPIR_Win ** win) +static inline int MPIDI_SHM_mpi_win_create_dynamic(MPIR_Info * info, MPIR_Comm * comm, + MPIR_Win ** win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_flush_local(int rank, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_flush_local(int rank, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_sync(MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_sync(MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_flush_all(MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_flush_all(MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; } -static inline int MPIDI_SHM_win_lock_all(int assert, MPIR_Win * win) +static inline int MPIDI_SHM_mpi_win_lock_all(int assert, MPIR_Win * win) { MPIR_Assert(0); return MPI_SUCCESS; diff --git a/src/mpid/ch4/src/ch4_coll.h b/src/mpid/ch4/src/ch4_coll.h index 595b176..3d9bbaf 100644 --- a/src/mpid/ch4/src/ch4_coll.h +++ b/src/mpid/ch4/src/ch4_coll.h @@ -16,20 +16,20 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Barrier(MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_barrier(comm, errflag); + return MPIDI_NM_mpi_barrier(comm, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_bcast(buffer, count, datatype, root, comm, errflag); + return MPIDI_NM_mpi_bcast(buffer, count, datatype, root, comm, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_allreduce(sendbuf, recvbuf, count, datatype, op, comm, errflag); + return MPIDI_NM_mpi_allreduce(sendbuf, recvbuf, count, datatype, op, comm, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Allgather(const void *sendbuf, int sendcount, @@ -37,8 +37,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype recvtype, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_allgather(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, comm, errflag); + return MPIDI_NM_mpi_allgather(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Allgatherv(const void *sendbuf, int sendcount, @@ -47,8 +47,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Allgatherv(const void *sendbuf, int sendcount MPI_Datatype recvtype, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_allgatherv(sendbuf, sendcount, sendtype, recvbuf, - recvcounts, displs, recvtype, comm, errflag); + return MPIDI_NM_mpi_allgatherv(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, comm, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Scatter(const void *sendbuf, int sendcount, @@ -56,8 +56,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype recvtype, int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_scatter(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, root, comm, errflag); + return MPIDI_NM_mpi_scatter(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, root, comm, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Scatterv(const void *sendbuf, const int *sendcounts, @@ -66,16 +66,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Scatterv(const void *sendbuf, const int *send int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { - return MPIDI_NM_scatterv(sendbuf, sendcounts, displs, sendtype, - recvbuf, recvcount, recvtype, root, comm_ptr, errflag); + return MPIDI_NM_mpi_scatterv(sendbuf, sendcounts, displs, sendtype, + recvbuf, recvcount, recvtype, root, comm_ptr, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_gather(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, root, comm, errflag); + return MPIDI_NM_mpi_gather(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, root, comm, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Gatherv(const void *sendbuf, int sendcount, @@ -84,8 +84,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype recvtype, int root, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_gatherv(sendbuf, sendcount, sendtype, recvbuf, - recvcounts, displs, recvtype, root, comm, errflag); + return MPIDI_NM_mpi_gatherv(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, root, comm, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Alltoall(const void *sendbuf, int sendcount, @@ -93,8 +93,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype recvtype, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_alltoall(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, comm, errflag); + return MPIDI_NM_mpi_alltoall(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Alltoallv(const void *sendbuf, const int *sendcounts, @@ -103,8 +103,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Alltoallv(const void *sendbuf, const int *sen const int *rdispls, MPI_Datatype recvtype, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_alltoallv(sendbuf, sendcounts, sdispls, sendtype, - recvbuf, recvcounts, rdispls, recvtype, comm, errflag); + return MPIDI_NM_mpi_alltoallv(sendbuf, sendcounts, sdispls, sendtype, + recvbuf, recvcounts, rdispls, recvtype, comm, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Alltoallw(const void *sendbuf, const int sendcounts[], @@ -113,15 +113,15 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Alltoallw(const void *sendbuf, const int send const int rdispls[], const MPI_Datatype recvtypes[], MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { - return MPIDI_NM_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, - recvbuf, recvcounts, rdispls, recvtypes, comm_ptr, errflag); + return MPIDI_NM_mpi_alltoallw(sendbuf, sendcounts, sdispls, sendtypes, + recvbuf, recvcounts, rdispls, recvtypes, comm_ptr, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { - return MPIDI_NM_reduce(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, errflag); + return MPIDI_NM_mpi_reduce(sendbuf, recvbuf, count, datatype, op, root, comm_ptr, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Reduce_scatter(const void *sendbuf, void *recvbuf, @@ -129,7 +129,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Reduce_scatter(const void *sendbuf, void *rec MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { - return MPIDI_NM_reduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm_ptr, errflag); + return MPIDI_NM_mpi_reduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm_ptr, + errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, @@ -137,22 +138,22 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Reduce_scatter_block(const void *sendbuf, voi MPI_Op op, MPIR_Comm * comm_ptr, MPIR_Errflag_t * errflag) { - return MPIDI_NM_reduce_scatter_block(sendbuf, recvbuf, recvcount, - datatype, op, comm_ptr, errflag); + return MPIDI_NM_mpi_reduce_scatter_block(sendbuf, recvbuf, recvcount, + datatype, op, comm_ptr, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_scan(sendbuf, recvbuf, count, datatype, op, comm, errflag); + return MPIDI_NM_mpi_scan(sendbuf, recvbuf, count, datatype, op, comm, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPIR_Errflag_t * errflag) { - return MPIDI_NM_exscan(sendbuf, recvbuf, count, datatype, op, comm, errflag); + return MPIDI_NM_mpi_exscan(sendbuf, recvbuf, count, datatype, op, comm, errflag); } MPL_STATIC_INLINE_PREFIX int MPIDI_Neighbor_allgather(const void *sendbuf, int sendcount, @@ -160,8 +161,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Neighbor_allgather(const void *sendbuf, int s int recvcount, MPI_Datatype recvtype, MPIR_Comm * comm) { - return MPIDI_NM_neighbor_allgather(sendbuf, sendcount, sendtype, - recvbuf, recvcount, recvtype, comm); + return MPIDI_NM_mpi_neighbor_allgather(sendbuf, sendcount, sendtype, + recvbuf, recvcount, recvtype, comm); } MPL_STATIC_INLINE_PREFIX int MPIDI_Neighbor_allgatherv(const void *sendbuf, int sendcount, @@ -169,8 +170,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Neighbor_allgatherv(const void *sendbuf, int const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPIR_Comm * comm) { - return MPIDI_NM_neighbor_allgatherv(sendbuf, sendcount, sendtype, - recvbuf, recvcounts, displs, recvtype, comm); + return MPIDI_NM_mpi_neighbor_allgatherv(sendbuf, sendcount, sendtype, + recvbuf, recvcounts, displs, recvtype, comm); } MPL_STATIC_INLINE_PREFIX int MPIDI_Neighbor_alltoallv(const void *sendbuf, const int *sendcounts, @@ -179,8 +180,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Neighbor_alltoallv(const void *sendbuf, const const int *rdispls, MPI_Datatype recvtype, MPIR_Comm * comm) { - return MPIDI_NM_neighbor_alltoallv(sendbuf, sendcounts, sdispls, - sendtype, recvbuf, recvcounts, rdispls, recvtype, comm); + return MPIDI_NM_mpi_neighbor_alltoallv(sendbuf, sendcounts, sdispls, + sendtype, recvbuf, recvcounts, rdispls, recvtype, comm); } MPL_STATIC_INLINE_PREFIX int MPIDI_Neighbor_alltoallw(const void *sendbuf, const int *sendcounts, @@ -191,8 +192,9 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Neighbor_alltoallw(const void *sendbuf, const const MPI_Datatype * recvtypes, MPIR_Comm * comm) { - return MPIDI_NM_neighbor_alltoallw(sendbuf, sendcounts, sdispls, - sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm); + return MPIDI_NM_mpi_neighbor_alltoallw(sendbuf, sendcounts, sdispls, + sendtypes, recvbuf, recvcounts, rdispls, recvtypes, + comm); } MPL_STATIC_INLINE_PREFIX int MPIDI_Neighbor_alltoall(const void *sendbuf, int sendcount, @@ -200,8 +202,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Neighbor_alltoall(const void *sendbuf, int se int recvcount, MPI_Datatype recvtype, MPIR_Comm * comm) { - return MPIDI_NM_neighbor_alltoall(sendbuf, sendcount, sendtype, - recvbuf, recvcount, recvtype, comm); + return MPIDI_NM_mpi_neighbor_alltoall(sendbuf, sendcount, sendtype, + recvbuf, recvcount, recvtype, comm); } MPL_STATIC_INLINE_PREFIX int MPIDI_Ineighbor_allgather(const void *sendbuf, int sendcount, @@ -209,8 +211,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Ineighbor_allgather(const void *sendbuf, int int recvcount, MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_ineighbor_allgather(sendbuf, sendcount, sendtype, - recvbuf, recvcount, recvtype, comm, req); + return MPIDI_NM_mpi_ineighbor_allgather(sendbuf, sendcount, sendtype, + recvbuf, recvcount, recvtype, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Ineighbor_allgatherv(const void *sendbuf, int sendcount, @@ -219,8 +221,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Ineighbor_allgatherv(const void *sendbuf, int MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_ineighbor_allgatherv(sendbuf, sendcount, sendtype, - recvbuf, recvcounts, displs, recvtype, comm, req); + return MPIDI_NM_mpi_ineighbor_allgatherv(sendbuf, sendcount, sendtype, + recvbuf, recvcounts, displs, recvtype, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Ineighbor_alltoall(const void *sendbuf, int sendcount, @@ -228,8 +230,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Ineighbor_alltoall(const void *sendbuf, int s int recvcount, MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_ineighbor_alltoall(sendbuf, sendcount, sendtype, - recvbuf, recvcount, recvtype, comm, req); + return MPIDI_NM_mpi_ineighbor_alltoall(sendbuf, sendcount, sendtype, + recvbuf, recvcount, recvtype, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Ineighbor_alltoallv(const void *sendbuf, const int *sendcounts, @@ -238,9 +240,9 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Ineighbor_alltoallv(const void *sendbuf, cons const int *rdispls, MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_ineighbor_alltoallv(sendbuf, sendcounts, sdispls, - sendtype, recvbuf, recvcounts, rdispls, recvtype, comm, - req); + return MPIDI_NM_mpi_ineighbor_alltoallv(sendbuf, sendcounts, sdispls, + sendtype, recvbuf, recvcounts, rdispls, recvtype, comm, + req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Ineighbor_alltoallw(const void *sendbuf, const int *sendcounts, @@ -251,20 +253,20 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Ineighbor_alltoallw(const void *sendbuf, cons const MPI_Datatype * recvtypes, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_ineighbor_alltoallw(sendbuf, sendcounts, sdispls, - sendtypes, recvbuf, recvcounts, rdispls, recvtypes, comm, - req); + return MPIDI_NM_mpi_ineighbor_alltoallw(sendbuf, sendcounts, sdispls, + sendtypes, recvbuf, recvcounts, rdispls, recvtypes, + comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Ibarrier(MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_ibarrier(comm, req); + return MPIDI_NM_mpi_ibarrier(comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_ibcast(buffer, count, datatype, root, comm, req); + return MPIDI_NM_mpi_ibcast(buffer, count, datatype, root, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Iallgather(const void *sendbuf, int sendcount, @@ -272,8 +274,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Iallgather(const void *sendbuf, int sendcount MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_iallgather(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, comm, req); + return MPIDI_NM_mpi_iallgather(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Iallgatherv(const void *sendbuf, int sendcount, @@ -282,15 +284,15 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Iallgatherv(const void *sendbuf, int sendcoun MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_iallgatherv(sendbuf, sendcount, sendtype, recvbuf, - recvcounts, displs, recvtype, comm, req); + return MPIDI_NM_mpi_iallgatherv(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Iallreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_iallreduce(sendbuf, recvbuf, count, datatype, op, comm, req); + return MPIDI_NM_mpi_iallreduce(sendbuf, recvbuf, count, datatype, op, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Ialltoall(const void *sendbuf, int sendcount, @@ -298,8 +300,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_ialltoall(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, comm, req); + return MPIDI_NM_mpi_ialltoall(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Ialltoallv(const void *sendbuf, const int *sendcounts, @@ -308,8 +310,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Ialltoallv(const void *sendbuf, const int *se const int *rdispls, MPI_Datatype recvtype, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_ialltoallv(sendbuf, sendcounts, sdispls, sendtype, - recvbuf, recvcounts, rdispls, recvtype, comm, req); + return MPIDI_NM_mpi_ialltoallv(sendbuf, sendcounts, sdispls, sendtype, + recvbuf, recvcounts, rdispls, recvtype, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Ialltoallw(const void *sendbuf, const int *sendcounts, @@ -318,15 +320,15 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Ialltoallw(const void *sendbuf, const int *se const int *rdispls, const MPI_Datatype * recvtypes, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_ialltoallw(sendbuf, sendcounts, sdispls, sendtypes, - recvbuf, recvcounts, rdispls, recvtypes, comm, req); + return MPIDI_NM_mpi_ialltoallw(sendbuf, sendcounts, sdispls, sendtypes, + recvbuf, recvcounts, rdispls, recvtypes, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_iexscan(sendbuf, recvbuf, count, datatype, op, comm, req); + return MPIDI_NM_mpi_iexscan(sendbuf, recvbuf, count, datatype, op, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Igather(const void *sendbuf, int sendcount, @@ -334,8 +336,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Igather(const void *sendbuf, int sendcount, MPI_Datatype recvtype, int root, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_igather(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, root, comm, req); + return MPIDI_NM_mpi_igather(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, root, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Igatherv(const void *sendbuf, int sendcount, @@ -344,8 +346,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype recvtype, int root, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_igatherv(sendbuf, sendcount, sendtype, recvbuf, - recvcounts, displs, recvtype, root, comm, req); + return MPIDI_NM_mpi_igatherv(sendbuf, sendcount, sendtype, recvbuf, + recvcounts, displs, recvtype, root, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, @@ -353,28 +355,28 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Ireduce_scatter_block(const void *sendbuf, vo MPI_Op op, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_ireduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, comm, req); + return MPIDI_NM_mpi_ireduce_scatter_block(sendbuf, recvbuf, recvcount, datatype, op, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int *recvcounts, MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_ireduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm, req); + return MPIDI_NM_mpi_ireduce_scatter(sendbuf, recvbuf, recvcounts, datatype, op, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_ireduce(sendbuf, recvbuf, count, datatype, op, root, comm, req); + return MPIDI_NM_mpi_ireduce(sendbuf, recvbuf, count, datatype, op, root, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_iscan(sendbuf, recvbuf, count, datatype, op, comm, req); + return MPIDI_NM_mpi_iscan(sendbuf, recvbuf, count, datatype, op, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Iscatter(const void *sendbuf, int sendcount, @@ -382,8 +384,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype recvtype, int root, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_iscatter(sendbuf, sendcount, sendtype, recvbuf, - recvcount, recvtype, root, comm, req); + return MPIDI_NM_mpi_iscatter(sendbuf, sendcount, sendtype, recvbuf, + recvcount, recvtype, root, comm, req); } MPL_STATIC_INLINE_PREFIX int MPIDI_Iscatterv(const void *sendbuf, const int *sendcounts, @@ -391,8 +393,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Iscatterv(const void *sendbuf, const int *sen void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm * comm, MPI_Request * req) { - return MPIDI_NM_iscatterv(sendbuf, sendcounts, displs, sendtype, - recvbuf, recvcount, recvtype, root, comm, req); + return MPIDI_NM_mpi_iscatterv(sendbuf, sendcounts, displs, sendtype, + recvbuf, recvcount, recvtype, root, comm, req); } #endif /* CH4_COLL_H_INCLUDED */ diff --git a/src/mpid/ch4/src/ch4_comm.h b/src/mpid/ch4/src/ch4_comm.h index f849329..6ae26b1 100644 --- a/src/mpid/ch4/src/ch4_comm.h +++ b/src/mpid/ch4/src/ch4_comm.h @@ -106,12 +106,12 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Comm_create_hook(MPIR_Comm * comm) int max_n_avts; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_COMM_CREATE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_COMM_CREATE); - mpi_errno = MPIDI_NM_comm_create_hook(comm); + mpi_errno = MPIDI_NM_mpi_comm_create_hook(comm); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } #if defined(MPIDI_BUILD_CH4_SHM) - mpi_errno = MPIDI_SHM_comm_create_hook(comm); + mpi_errno = MPIDI_SHM_mpi_comm_create_hook(comm); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -217,12 +217,12 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Comm_free_hook(MPIR_Comm * comm) MPIDIU_avt_release_ref(MPIDII_COMM(comm, local_map).avtid); } - mpi_errno = MPIDI_NM_comm_free_hook(comm); + mpi_errno = MPIDI_NM_mpi_comm_free_hook(comm); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } #if defined(MPIDI_BUILD_CH4_SHM) - mpi_errno = MPIDI_SHM_comm_free_hook(comm); + mpi_errno = MPIDI_SHM_mpi_comm_free_hook(comm); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } diff --git a/src/mpid/ch4/src/ch4_init.h b/src/mpid/ch4/src/ch4_init.h index ca88320..6613e82 100644 --- a/src/mpid/ch4/src/ch4_init.h +++ b/src/mpid/ch4/src/ch4_init.h @@ -248,9 +248,9 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Init(int *argc, MPIR_Process.attrs.tag_ub = (1ULL << MPIDI_CH4U_TAG_SHIFT) - 1; /* discuss */ - mpi_errno = MPIDI_NM_init(rank, size, appnum, &MPIR_Process.attrs.tag_ub, - MPIR_Process.comm_world, - MPIR_Process.comm_self, has_parent, 1, &netmod_contexts); + mpi_errno = MPIDI_NM_mpi_init(rank, size, appnum, &MPIR_Process.attrs.tag_ub, + MPIR_Process.comm_world, + MPIR_Process.comm_self, has_parent, 1, &netmod_contexts); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POPFATAL(mpi_errno); } @@ -279,7 +279,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Init(int *argc, #endif #ifdef MPIDI_BUILD_CH4_SHM - mpi_errno = MPIDI_SHM_init(rank, size); + mpi_errno = MPIDI_SHM_mpi_init(rank, size); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POPFATAL(mpi_errno); @@ -346,11 +346,11 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Finalize(void) MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_FINALIZE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_FINALIZE); - mpi_errno = MPIDI_NM_finalize(); + mpi_errno = MPIDI_NM_mpi_finalize(); if (mpi_errno) MPIR_ERR_POP(mpi_errno); #ifdef MPIDI_BUILD_CH4_SHM - mpi_errno = MPIDI_SHM_finalize(); + mpi_errno = MPIDI_SHM_mpi_finalize(); if (mpi_errno) MPIR_ERR_POP(mpi_errno); #endif @@ -502,7 +502,7 @@ MPL_STATIC_INLINE_PREFIX void *MPIDI_Alloc_mem(size_t size, MPIR_Info * info_ptr MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_ALLOC_MEM); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_ALLOC_MEM); - p = MPIDI_NM_alloc_mem(size, info_ptr); + p = MPIDI_NM_mpi_alloc_mem(size, info_ptr); MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_CH4_ALLOC_MEM); return p; @@ -517,7 +517,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Free_mem(void *ptr) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_FREE_MEM); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_FREE_MEM); - mpi_errno = MPIDI_NM_free_mem(ptr); + mpi_errno = MPIDI_NM_mpi_free_mem(ptr); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); @@ -761,13 +761,13 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Type_create_hook(MPIR_Datatype * type) MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_TYPE_CREATE_HOOK); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDI_TYPE_CREATE_HOOK); - mpi_errno = MPIDI_NM_type_create_hook(type); + mpi_errno = MPIDI_NM_mpi_type_create_hook(type); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } #if defined(MPIDI_BUILD_CH4_SHM) - mpi_errno = MPIDI_SHM_type_create_hook(type); + mpi_errno = MPIDI_SHM_mpi_type_create_hook(type); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -791,13 +791,13 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Type_free_hook(MPIR_Datatype * type) MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_TYPE_FREE_HOOK); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDI_TYPE_FREE_HOOK); - mpi_errno = MPIDI_NM_type_free_hook(type); + mpi_errno = MPIDI_NM_mpi_type_free_hook(type); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } #if defined(MPIDI_BUILD_CH4_SHM) - mpi_errno = MPIDI_SHM_type_free_hook(type); + mpi_errno = MPIDI_SHM_mpi_type_free_hook(type); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -821,13 +821,13 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Op_create_hook(MPIR_Op * op) MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_OP_CREATE_HOOK); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDI_OP_CREATE_HOOK); - mpi_errno = MPIDI_NM_op_create_hook(op); + mpi_errno = MPIDI_NM_mpi_op_create_hook(op); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } #if defined(MPIDI_BUILD_CH4_SHM) - mpi_errno = MPIDI_SHM_op_create_hook(op); + mpi_errno = MPIDI_SHM_mpi_op_create_hook(op); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -851,13 +851,13 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Op_free_hook(MPIR_Op * op) MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_OP_FREE_HOOK); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDI_OP_FREE_HOOK); - mpi_errno = MPIDI_NM_op_free_hook(op); + mpi_errno = MPIDI_NM_mpi_op_free_hook(op); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } #if defined(MPIDI_BUILD_CH4_SHM) - mpi_errno = MPIDI_SHM_op_free_hook(op); + mpi_errno = MPIDI_SHM_mpi_op_free_hook(op); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } diff --git a/src/mpid/ch4/src/ch4_probe.h b/src/mpid/ch4/src/ch4_probe.h index 2e43468..9a44e77 100644 --- a/src/mpid/ch4/src/ch4_probe.h +++ b/src/mpid/ch4/src/ch4_probe.h @@ -33,17 +33,17 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Probe(int source, while (!flag) { #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_iprobe(source, tag, comm, context_offset, &flag, status); + mpi_errno = MPIDI_NM_mpi_iprobe(source, tag, comm, context_offset, &flag, status); #else if (unlikely(source == MPI_ANY_SOURCE)) { - mpi_errno = MPIDI_SHM_iprobe(source, tag, comm, context_offset, &flag, status); + mpi_errno = MPIDI_SHM_mpi_iprobe(source, tag, comm, context_offset, &flag, status); if (!flag) - mpi_errno = MPIDI_NM_iprobe(source, tag, comm, context_offset, &flag, status); + mpi_errno = MPIDI_NM_mpi_iprobe(source, tag, comm, context_offset, &flag, status); } else if (MPIDI_CH4_rank_is_local(source, comm)) - mpi_errno = MPIDI_SHM_iprobe(source, tag, comm, context_offset, &flag, status); + mpi_errno = MPIDI_SHM_mpi_iprobe(source, tag, comm, context_offset, &flag, status); else - mpi_errno = MPIDI_NM_iprobe(source, tag, comm, context_offset, &flag, status); + mpi_errno = MPIDI_NM_mpi_iprobe(source, tag, comm, context_offset, &flag, status); #endif if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); @@ -92,20 +92,21 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Mprobe(int source, while (!flag) { #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_improbe(source, tag, comm, context_offset, &flag, message, status); + mpi_errno = MPIDI_NM_mpi_improbe(source, tag, comm, context_offset, &flag, message, status); #else if (unlikely(source == MPI_ANY_SOURCE)) { mpi_errno = - MPIDI_SHM_improbe(source, tag, comm, context_offset, &flag, message, status); + MPIDI_SHM_mpi_improbe(source, tag, comm, context_offset, &flag, message, status); if (!flag) mpi_errno = - MPIDI_NM_improbe(source, tag, comm, context_offset, &flag, message, status); + MPIDI_NM_mpi_improbe(source, tag, comm, context_offset, &flag, message, status); } else if (MPIDI_CH4_rank_is_local(source, comm)) mpi_errno = - MPIDI_SHM_improbe(source, tag, comm, context_offset, &flag, message, status); + MPIDI_SHM_mpi_improbe(source, tag, comm, context_offset, &flag, message, status); else - mpi_errno = MPIDI_NM_improbe(source, tag, comm, context_offset, &flag, message, status); + mpi_errno = + MPIDI_NM_mpi_improbe(source, tag, comm, context_offset, &flag, message, status); #endif if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); @@ -153,17 +154,18 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Improbe(int source, } #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_improbe(source, tag, comm, context_offset, flag, message, status); + mpi_errno = MPIDI_NM_mpi_improbe(source, tag, comm, context_offset, flag, message, status); #else if (unlikely(source == MPI_ANY_SOURCE)) { - mpi_errno = MPIDI_SHM_improbe(source, tag, comm, context_offset, flag, message, status); + mpi_errno = MPIDI_SHM_mpi_improbe(source, tag, comm, context_offset, flag, message, status); if (!*flag) - mpi_errno = MPIDI_NM_improbe(source, tag, comm, context_offset, flag, message, status); + mpi_errno = + MPIDI_NM_mpi_improbe(source, tag, comm, context_offset, flag, message, status); } else if (MPIDI_CH4_rank_is_local(source, comm)) - mpi_errno = MPIDI_SHM_improbe(source, tag, comm, context_offset, flag, message, status); + mpi_errno = MPIDI_SHM_mpi_improbe(source, tag, comm, context_offset, flag, message, status); else - mpi_errno = MPIDI_NM_improbe(source, tag, comm, context_offset, flag, message, status); + mpi_errno = MPIDI_NM_mpi_improbe(source, tag, comm, context_offset, flag, message, status); #endif if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); @@ -197,17 +199,17 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Iprobe(int source, } #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_iprobe(source, tag, comm, context_offset, flag, status); + mpi_errno = MPIDI_NM_mpi_iprobe(source, tag, comm, context_offset, flag, status); #else if (unlikely(source == MPI_ANY_SOURCE)) { - mpi_errno = MPIDI_SHM_iprobe(source, tag, comm, context_offset, flag, status); + mpi_errno = MPIDI_SHM_mpi_iprobe(source, tag, comm, context_offset, flag, status); if (!*flag) - mpi_errno = MPIDI_NM_iprobe(source, tag, comm, context_offset, flag, status); + mpi_errno = MPIDI_NM_mpi_iprobe(source, tag, comm, context_offset, flag, status); } else if (MPIDI_CH4_rank_is_local(source, comm)) - mpi_errno = MPIDI_SHM_iprobe(source, tag, comm, context_offset, flag, status); + mpi_errno = MPIDI_SHM_mpi_iprobe(source, tag, comm, context_offset, flag, status); else - mpi_errno = MPIDI_NM_iprobe(source, tag, comm, context_offset, flag, status); + mpi_errno = MPIDI_NM_mpi_iprobe(source, tag, comm, context_offset, flag, status); #endif if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); diff --git a/src/mpid/ch4/src/ch4_recv.h b/src/mpid/ch4/src/ch4_recv.h index 74aafb3..a660536 100644 --- a/src/mpid/ch4/src/ch4_recv.h +++ b/src/mpid/ch4/src/ch4_recv.h @@ -43,17 +43,18 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Recv(void *buf, #ifndef MPIDI_CH4_EXCLUSIVE_SHM mpi_errno = - MPIDI_NM_recv(buf, count, datatype, rank, tag, comm, context_offset, status, request); + MPIDI_NM_mpi_recv(buf, count, datatype, rank, tag, comm, context_offset, status, request); #else if (unlikely(rank == MPI_ANY_SOURCE)) { - mpi_errno = MPIDI_SHM_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_SHM_mpi_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } - mpi_errno = MPIDI_NM_irecv(buf, count, datatype, rank, tag, comm, context_offset, - &(MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request))); + mpi_errno = MPIDI_NM_mpi_irecv(buf, count, datatype, rank, tag, comm, context_offset, + &(MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request))); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); @@ -61,7 +62,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Recv(void *buf, /* cancel the shm request if netmod/am handles the request from unexpected queue. */ else if (*request) { if (MPIR_Request_is_complete(MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request))) { - mpi_errno = MPIDI_SHM_cancel_recv(*request); + mpi_errno = MPIDI_SHM_mpi_cancel_recv(*request); if (MPIR_STATUS_GET_CANCEL_BIT((*request)->status)) { (*request)->status = MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request)->status; } @@ -79,12 +80,12 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Recv(void *buf, int r; if ((r = MPIDI_CH4_rank_is_local(rank, comm))) mpi_errno = - MPIDI_SHM_recv(buf, count, datatype, rank, tag, comm, context_offset, status, - request); + MPIDI_SHM_mpi_recv(buf, count, datatype, rank, tag, comm, context_offset, status, + request); else mpi_errno = - MPIDI_NM_recv(buf, count, datatype, rank, tag, comm, context_offset, status, - request); + MPIDI_NM_mpi_recv(buf, count, datatype, rank, tag, comm, context_offset, status, + request); if (mpi_errno == MPI_SUCCESS && *request) { MPIDI_CH4I_REQUEST(*request, is_local) = r; MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request) = NULL; @@ -118,20 +119,21 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Recv_init(void *buf, MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_RECV_INIT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_RECV_INIT); #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_recv_init(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_NM_mpi_recv_init(buf, count, datatype, rank, tag, comm, context_offset, request); MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_CH4_RECV_INIT); return mpi_errno; #else if (unlikely(rank == MPI_ANY_SOURCE)) { mpi_errno = - MPIDI_SHM_recv_init(buf, count, datatype, rank, tag, comm, context_offset, request); + MPIDI_SHM_mpi_recv_init(buf, count, datatype, rank, tag, comm, context_offset, request); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } - mpi_errno = MPIDI_NM_recv_init(buf, count, datatype, rank, tag, comm, context_offset, - &(MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request))); + mpi_errno = MPIDI_NM_mpi_recv_init(buf, count, datatype, rank, tag, comm, context_offset, + &(MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request))); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); @@ -146,11 +148,11 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Recv_init(void *buf, else { int r; if ((r = MPIDI_CH4_rank_is_local(rank, comm))) - mpi_errno = MPIDI_SHM_recv_init(buf, count, datatype, rank, tag, - comm, context_offset, request); + mpi_errno = MPIDI_SHM_mpi_recv_init(buf, count, datatype, rank, tag, + comm, context_offset, request); else - mpi_errno = MPIDI_NM_recv_init(buf, count, datatype, rank, tag, - comm, context_offset, request); + mpi_errno = MPIDI_NM_mpi_recv_init(buf, count, datatype, rank, tag, + comm, context_offset, request); if (mpi_errno == MPI_SUCCESS) { MPIDI_CH4I_REQUEST(*request, is_local) = r; MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request) = NULL; @@ -200,19 +202,19 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Mrecv(void *buf, } #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_imrecv(buf, count, datatype, message, &rreq); + mpi_errno = MPIDI_NM_mpi_imrecv(buf, count, datatype, message, &rreq); #else if (unlikely(message->status.MPI_SOURCE == MPI_ANY_SOURCE)) { - mpi_errno = MPIDI_SHM_imrecv(buf, count, datatype, message, &rreq); + mpi_errno = MPIDI_SHM_mpi_imrecv(buf, count, datatype, message, &rreq); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } mpi_errno = - MPIDI_NM_imrecv(buf, count, datatype, message, - &(MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(rreq))); + MPIDI_NM_mpi_imrecv(buf, count, datatype, message, + &(MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(rreq))); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); @@ -225,9 +227,9 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Mrecv(void *buf, else { int local = MPIDI_CH4_rank_is_local(message->status.MPI_SOURCE, message->comm); if (local) - mpi_errno = MPIDI_SHM_imrecv(buf, count, datatype, message, &rreq); + mpi_errno = MPIDI_SHM_mpi_imrecv(buf, count, datatype, message, &rreq); else - mpi_errno = MPIDI_NM_imrecv(buf, count, datatype, message, &rreq); + mpi_errno = MPIDI_NM_mpi_imrecv(buf, count, datatype, message, &rreq); if (mpi_errno == MPI_SUCCESS) { MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(rreq) = NULL; @@ -287,14 +289,14 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Imrecv(void *buf, } #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_imrecv(buf, count, datatype, message, rreqp); + mpi_errno = MPIDI_NM_mpi_imrecv(buf, count, datatype, message, rreqp); #else { int local = MPIDI_CH4_rank_is_local(message->status.MPI_SOURCE, message->comm); if (local) - mpi_errno = MPIDI_SHM_imrecv(buf, count, datatype, message, rreqp); + mpi_errno = MPIDI_SHM_mpi_imrecv(buf, count, datatype, message, rreqp); else - mpi_errno = MPIDI_NM_imrecv(buf, count, datatype, message, rreqp); + mpi_errno = MPIDI_NM_mpi_imrecv(buf, count, datatype, message, rreqp); if (mpi_errno == MPI_SUCCESS) { MPIDI_CH4I_REQUEST(*rreqp, is_local) = local; MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*rreqp) = NULL; @@ -339,17 +341,18 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Irecv(void *buf, } #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = MPIDI_NM_mpi_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); #else if (unlikely(rank == MPI_ANY_SOURCE)) { - mpi_errno = MPIDI_SHM_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_SHM_mpi_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } - mpi_errno = MPIDI_NM_irecv(buf, count, datatype, rank, tag, comm, context_offset, - &(MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request))); + mpi_errno = MPIDI_NM_mpi_irecv(buf, count, datatype, rank, tag, comm, context_offset, + &(MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request))); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); @@ -366,10 +369,10 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Irecv(void *buf, int r; if ((r = MPIDI_CH4_rank_is_local(rank, comm))) mpi_errno = - MPIDI_SHM_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); + MPIDI_SHM_mpi_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); else mpi_errno = - MPIDI_NM_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); + MPIDI_NM_mpi_irecv(buf, count, datatype, rank, tag, comm, context_offset, request); if (mpi_errno == MPI_SUCCESS && *request) { MPIDI_CH4I_REQUEST(*request, is_local) = r; MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request) = NULL; @@ -396,12 +399,12 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Cancel_recv(MPIR_Request * rreq) MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_CANCEL_RECV); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_CANCEL_RECV); #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_cancel_recv(rreq); + mpi_errno = MPIDI_NM_mpi_cancel_recv(rreq); #else if (MPIDI_CH4I_REQUEST(rreq, is_local)) - mpi_errno = MPIDI_SHM_cancel_recv(rreq); + mpi_errno = MPIDI_SHM_mpi_cancel_recv(rreq); else - mpi_errno = MPIDI_NM_cancel_recv(rreq); + mpi_errno = MPIDI_NM_mpi_cancel_recv(rreq); #endif if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); diff --git a/src/mpid/ch4/src/ch4_rma.h b/src/mpid/ch4/src/ch4_rma.h index 7eabd9d..6534ee0 100644 --- a/src/mpid/ch4/src/ch4_rma.h +++ b/src/mpid/ch4/src/ch4_rma.h @@ -28,8 +28,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Put(const void *origin_addr, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_PUT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_PUT); - mpi_errno = MPIDI_NM_put(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + mpi_errno = MPIDI_NM_mpi_put(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -55,8 +55,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Get(void *origin_addr, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_GET); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_GET); - mpi_errno = MPIDI_NM_get(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, target_datatype, win); + mpi_errno = MPIDI_NM_mpi_get(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, target_datatype, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -83,9 +83,9 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Accumulate(const void *origin_addr, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_ACCUMULATE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_ACCUMULATE); - mpi_errno = MPIDI_NM_accumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win); + mpi_errno = MPIDI_NM_mpi_accumulate(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -110,8 +110,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Compare_and_swap(const void *origin_addr, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_COMPARE_AND_SWAP); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_COMPARE_AND_SWAP); - mpi_errno = MPIDI_NM_compare_and_swap(origin_addr, compare_addr, result_addr, - datatype, target_rank, target_disp, win); + mpi_errno = MPIDI_NM_mpi_compare_and_swap(origin_addr, compare_addr, result_addr, + datatype, target_rank, target_disp, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -138,9 +138,9 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Raccumulate(const void *origin_addr, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_RACCUMULATE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_RACCUMULATE); - mpi_errno = MPIDI_NM_raccumulate(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win, request); + mpi_errno = MPIDI_NM_mpi_raccumulate(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win, request); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -171,10 +171,10 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Rget_accumulate(const void *origin_addr, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_RGET_ACCUMULATE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_RGET_ACCUMULATE); - mpi_errno = MPIDI_NM_rget_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, - target_rank, target_disp, target_count, - target_datatype, op, win, request); + mpi_errno = MPIDI_NM_mpi_rget_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, + target_datatype, op, win, request); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -198,8 +198,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Fetch_and_op(const void *origin_addr, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_FETCH_AND_OP); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_FETCH_AND_OP); - mpi_errno = MPIDI_NM_fetch_and_op(origin_addr, result_addr, - datatype, target_rank, target_disp, op, win); + mpi_errno = MPIDI_NM_mpi_fetch_and_op(origin_addr, result_addr, + datatype, target_rank, target_disp, op, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -227,9 +227,9 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Rget(void *origin_addr, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_RGET); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_RGET); - mpi_errno = MPIDI_NM_rget(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, - target_datatype, win, request); + mpi_errno = MPIDI_NM_mpi_rget(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, + target_datatype, win, request); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -256,9 +256,9 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Rput(const void *origin_addr, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_RPUT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_RPUT); - mpi_errno = MPIDI_NM_rput(origin_addr, origin_count, origin_datatype, - target_rank, target_disp, target_count, - target_datatype, win, request); + mpi_errno = MPIDI_NM_mpi_rput(origin_addr, origin_count, origin_datatype, + target_rank, target_disp, target_count, + target_datatype, win, request); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -288,10 +288,10 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Get_accumulate(const void *origin_addr, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_GET_ACCUMULATE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_GET_ACCUMULATE); - mpi_errno = MPIDI_NM_get_accumulate(origin_addr, origin_count, origin_datatype, - result_addr, result_count, result_datatype, - target_rank, target_disp, target_count, target_datatype, - op, win); + mpi_errno = MPIDI_NM_mpi_get_accumulate(origin_addr, origin_count, origin_datatype, + result_addr, result_count, result_datatype, + target_rank, target_disp, target_count, target_datatype, + op, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } diff --git a/src/mpid/ch4/src/ch4_send.h b/src/mpid/ch4/src/ch4_send.h index c719115..ac5c9e9 100644 --- a/src/mpid/ch4/src/ch4_send.h +++ b/src/mpid/ch4/src/ch4_send.h @@ -39,13 +39,15 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Send(const void *buf, } #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_send(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = MPIDI_NM_mpi_send(buf, count, datatype, rank, tag, comm, context_offset, request); #else int r; if ((r = MPIDI_CH4_rank_is_local(rank, comm))) - mpi_errno = MPIDI_SHM_send(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_SHM_mpi_send(buf, count, datatype, rank, tag, comm, context_offset, request); else - mpi_errno = MPIDI_NM_send(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_NM_mpi_send(buf, count, datatype, rank, tag, comm, context_offset, request); if (mpi_errno == MPI_SUCCESS && *request) MPIDI_CH4I_REQUEST(*request, is_local) = r; #endif @@ -85,13 +87,15 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Isend(const void *buf, } #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_isend(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = MPIDI_NM_mpi_isend(buf, count, datatype, rank, tag, comm, context_offset, request); #else int r; if ((r = MPIDI_CH4_rank_is_local(rank, comm))) - mpi_errno = MPIDI_SHM_isend(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_SHM_mpi_isend(buf, count, datatype, rank, tag, comm, context_offset, request); else - mpi_errno = MPIDI_NM_isend(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_NM_mpi_isend(buf, count, datatype, rank, tag, comm, context_offset, request); if (mpi_errno == MPI_SUCCESS) MPIDI_CH4I_REQUEST(*request, is_local) = r; #endif @@ -132,13 +136,15 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Rsend(const void *buf, } #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_send(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = MPIDI_NM_mpi_send(buf, count, datatype, rank, tag, comm, context_offset, request); #else int r; if ((r = MPIDI_CH4_rank_is_local(rank, comm))) - mpi_errno = MPIDI_SHM_send(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_SHM_mpi_send(buf, count, datatype, rank, tag, comm, context_offset, request); else - mpi_errno = MPIDI_NM_send(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_NM_mpi_send(buf, count, datatype, rank, tag, comm, context_offset, request); if (mpi_errno == MPI_SUCCESS && *request) MPIDI_CH4I_REQUEST(*request, is_local) = r; #endif @@ -179,13 +185,15 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Irsend(const void *buf, } #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_isend(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = MPIDI_NM_mpi_isend(buf, count, datatype, rank, tag, comm, context_offset, request); #else int r; if ((r = MPIDI_CH4_rank_is_local(rank, comm))) - mpi_errno = MPIDI_SHM_isend(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_SHM_mpi_isend(buf, count, datatype, rank, tag, comm, context_offset, request); else - mpi_errno = MPIDI_NM_isend(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_NM_mpi_isend(buf, count, datatype, rank, tag, comm, context_offset, request); if (mpi_errno == MPI_SUCCESS) MPIDI_CH4I_REQUEST(*request, is_local) = r; #endif @@ -225,13 +233,15 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Ssend(const void *buf, } #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = MPIDI_NM_mpi_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); #else int r; if ((r = MPIDI_CH4_rank_is_local(rank, comm))) - mpi_errno = MPIDI_SHM_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_SHM_mpi_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); else - mpi_errno = MPIDI_NM_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_NM_mpi_ssend(buf, count, datatype, rank, tag, comm, context_offset, request); if (mpi_errno == MPI_SUCCESS && *request) MPIDI_CH4I_REQUEST(*request, is_local) = r; #endif @@ -271,14 +281,15 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Issend(const void *buf, } #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_issend(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = MPIDI_NM_mpi_issend(buf, count, datatype, rank, tag, comm, context_offset, request); #else int r; if ((r = MPIDI_CH4_rank_is_local(rank, comm))) mpi_errno = - MPIDI_SHM_issend(buf, count, datatype, rank, tag, comm, context_offset, request); + MPIDI_SHM_mpi_issend(buf, count, datatype, rank, tag, comm, context_offset, request); else - mpi_errno = MPIDI_NM_issend(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_NM_mpi_issend(buf, count, datatype, rank, tag, comm, context_offset, request); if (mpi_errno == MPI_SUCCESS) MPIDI_CH4I_REQUEST(*request, is_local) = r; #endif @@ -302,16 +313,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Startall(int count, MPIR_Request * requests[] MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_STARTALL); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_STARTALL); #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_startall(count, requests); + mpi_errno = MPIDI_NM_mpi_startall(count, requests); #else int i; for (i = 0; i < count; i++) { /* This is sub-optimal, can we do better? */ if (MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(requests[i])) { - mpi_errno = MPIDI_SHM_startall(1, &requests[i]); + mpi_errno = MPIDI_SHM_mpi_startall(1, &requests[i]); if (mpi_errno == MPI_SUCCESS) { mpi_errno = - MPIDI_NM_startall(1, &MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(requests[i])); + MPIDI_NM_mpi_startall(1, &MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(requests[i])); MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(requests[i]->u.persist.real_request) = MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(requests[i])->u.persist.real_request; MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER @@ -320,9 +331,9 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Startall(int count, MPIR_Request * requests[] } } else if (MPIDI_CH4I_REQUEST(requests[i], is_local)) - mpi_errno = MPIDI_SHM_startall(1, &requests[i]); + mpi_errno = MPIDI_SHM_mpi_startall(1, &requests[i]); else - mpi_errno = MPIDI_NM_startall(1, &requests[i]); + mpi_errno = MPIDI_NM_mpi_startall(1, &requests[i]); } #endif if (mpi_errno != MPI_SUCCESS) { @@ -351,15 +362,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Send_init(const void *buf, MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_SEND_INIT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_SEND_INIT); #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_send_init(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_NM_mpi_send_init(buf, count, datatype, rank, tag, comm, context_offset, request); #else int r; if ((r = MPIDI_CH4_rank_is_local(rank, comm))) - mpi_errno = MPIDI_SHM_send_init(buf, count, datatype, rank, tag, - comm, context_offset, request); + mpi_errno = MPIDI_SHM_mpi_send_init(buf, count, datatype, rank, tag, + comm, context_offset, request); else - mpi_errno = MPIDI_NM_send_init(buf, count, datatype, rank, tag, - comm, context_offset, request); + mpi_errno = MPIDI_NM_mpi_send_init(buf, count, datatype, rank, tag, + comm, context_offset, request); if (mpi_errno == MPI_SUCCESS) MPIDI_CH4I_REQUEST(*request, is_local) = r; MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request) = NULL; @@ -390,15 +402,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Ssend_init(const void *buf, MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_SSEND_INIT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_SSEND_INIT); #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_ssend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_NM_mpi_ssend_init(buf, count, datatype, rank, tag, comm, context_offset, request); #else int r; if ((r = MPIDI_CH4_rank_is_local(rank, comm))) - mpi_errno = MPIDI_SHM_ssend_init(buf, count, datatype, rank, tag, - comm, context_offset, request); + mpi_errno = MPIDI_SHM_mpi_ssend_init(buf, count, datatype, rank, tag, + comm, context_offset, request); else - mpi_errno = MPIDI_NM_ssend_init(buf, count, datatype, rank, tag, - comm, context_offset, request); + mpi_errno = MPIDI_NM_mpi_ssend_init(buf, count, datatype, rank, tag, + comm, context_offset, request); if (mpi_errno == MPI_SUCCESS && *request) { MPIDI_CH4I_REQUEST(*request, is_local) = r; MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request) = NULL; @@ -430,15 +443,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Bsend_init(const void *buf, MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_BSEND_INIT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_BSEND_INIT); #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_bsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_NM_mpi_bsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); #else int r; if ((r = MPIDI_CH4_rank_is_local(rank, comm))) - mpi_errno = MPIDI_SHM_bsend_init(buf, count, datatype, rank, tag, - comm, context_offset, request); + mpi_errno = MPIDI_SHM_mpi_bsend_init(buf, count, datatype, rank, tag, + comm, context_offset, request); else - mpi_errno = MPIDI_NM_bsend_init(buf, count, datatype, rank, tag, - comm, context_offset, request); + mpi_errno = MPIDI_NM_mpi_bsend_init(buf, count, datatype, rank, tag, + comm, context_offset, request); if (mpi_errno == MPI_SUCCESS && *request) { MPIDI_CH4I_REQUEST(*request, is_local) = r; MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request) = NULL; @@ -470,15 +484,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Rsend_init(const void *buf, MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_RSEND_INIT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_RSEND_INIT); #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_rsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); + mpi_errno = + MPIDI_NM_mpi_rsend_init(buf, count, datatype, rank, tag, comm, context_offset, request); #else int r; if ((r = MPIDI_CH4_rank_is_local(rank, comm))) - mpi_errno = MPIDI_SHM_rsend_init(buf, count, datatype, rank, tag, - comm, context_offset, request); + mpi_errno = MPIDI_SHM_mpi_rsend_init(buf, count, datatype, rank, tag, + comm, context_offset, request); else - mpi_errno = MPIDI_NM_rsend_init(buf, count, datatype, rank, tag, - comm, context_offset, request); + mpi_errno = MPIDI_NM_mpi_rsend_init(buf, count, datatype, rank, tag, + comm, context_offset, request); if (mpi_errno == MPI_SUCCESS && *request) { MPIDI_CH4I_REQUEST(*request, is_local) = r; MPIDI_CH4I_REQUEST_ANYSOURCE_PARTNER(*request) = NULL; @@ -505,12 +520,12 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Cancel_send(MPIR_Request * sreq) MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_CANCEL_SEND); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_CANCEL_SEND); #ifndef MPIDI_CH4_EXCLUSIVE_SHM - mpi_errno = MPIDI_NM_cancel_send(sreq); + mpi_errno = MPIDI_NM_mpi_cancel_send(sreq); #else if (MPIDI_CH4I_REQUEST(sreq, is_local)) - mpi_errno = MPIDI_SHM_cancel_send(sreq); + mpi_errno = MPIDI_SHM_mpi_cancel_send(sreq); else - mpi_errno = MPIDI_NM_cancel_send(sreq); + mpi_errno = MPIDI_NM_mpi_cancel_send(sreq); #endif if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); diff --git a/src/mpid/ch4/src/ch4_spawn.h b/src/mpid/ch4/src/ch4_spawn.h index c7d7921..c92c0bf 100644 --- a/src/mpid/ch4/src/ch4_spawn.h +++ b/src/mpid/ch4/src/ch4_spawn.h @@ -214,7 +214,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Comm_connect(const char *port_name, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_COMM_CONNECT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_COMM_CONNECT); - mpi_errno = MPIDI_NM_comm_connect(port_name, info, root, comm, newcomm_ptr); + mpi_errno = MPIDI_NM_mpi_comm_connect(port_name, info, root, comm, newcomm_ptr); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); @@ -236,7 +236,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Comm_disconnect(MPIR_Comm * comm_ptr) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_COMM_DISCONNECT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_COMM_DISCONNECT); - mpi_errno = MPIDI_NM_comm_disconnect(comm_ptr); + mpi_errno = MPIDI_NM_mpi_comm_disconnect(comm_ptr); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); @@ -258,7 +258,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Open_port(MPIR_Info * info_ptr, char *port_na int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_OPEN_PORT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_OPEN_PORT); - mpi_errno = MPIDI_NM_open_port(info_ptr, port_name); + mpi_errno = MPIDI_NM_mpi_open_port(info_ptr, port_name); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); @@ -280,7 +280,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Close_port(const char *port_name) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_CLOSE_PORT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_CLOSE_PORT); - mpi_errno = MPIDI_NM_close_port(port_name); + mpi_errno = MPIDI_NM_mpi_close_port(port_name); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); @@ -304,7 +304,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Comm_accept(const char *port_name, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_COMM_ACCEPT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_COMM_ACCEPT); - mpi_errno = MPIDI_NM_comm_accept(port_name, info, root, comm, newcomm_ptr); + mpi_errno = MPIDI_NM_mpi_comm_accept(port_name, info, root, comm, newcomm_ptr); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); diff --git a/src/mpid/ch4/src/ch4_win.h b/src/mpid/ch4/src/ch4_win.h index 12f899d..9e0861f 100644 --- a/src/mpid/ch4/src/ch4_win.h +++ b/src/mpid/ch4/src/ch4_win.h @@ -22,7 +22,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_set_info(MPIR_Win * win, MPIR_Info * info int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_SET_INFO); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_SET_INFO); - mpi_errno = MPIDI_NM_win_set_info(win, info); + mpi_errno = MPIDI_NM_mpi_win_set_info(win, info); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -42,7 +42,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_start(MPIR_Group * group, int assert, MPI int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_START); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_START); - mpi_errno = MPIDI_NM_win_start(group, assert, win); + mpi_errno = MPIDI_NM_mpi_win_start(group, assert, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -62,7 +62,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_complete(MPIR_Win * win) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_COMPLETE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_COMPLETE); - mpi_errno = MPIDI_NM_win_complete(win); + mpi_errno = MPIDI_NM_mpi_win_complete(win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -82,7 +82,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_post(MPIR_Group * group, int assert, MPIR int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_POST); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_POST); - mpi_errno = MPIDI_NM_win_post(group, assert, win); + mpi_errno = MPIDI_NM_mpi_win_post(group, assert, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -102,7 +102,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_wait(MPIR_Win * win) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_WAIT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_WAIT); - mpi_errno = MPIDI_NM_win_wait(win); + mpi_errno = MPIDI_NM_mpi_win_wait(win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -123,7 +123,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_test(MPIR_Win * win, int *flag) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_TEST); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_TEST); - mpi_errno = MPIDI_NM_win_test(win, flag); + mpi_errno = MPIDI_NM_mpi_win_test(win, flag); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -143,7 +143,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_lock(int lock_type, int rank, int assert, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_LOCK); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_LOCK); - mpi_errno = MPIDI_NM_win_lock(lock_type, rank, assert, win); + mpi_errno = MPIDI_NM_mpi_win_lock(lock_type, rank, assert, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -163,7 +163,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_unlock(int rank, MPIR_Win * win) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_UNLOCK); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_UNLOCK); - mpi_errno = MPIDI_NM_win_unlock(rank, win); + mpi_errno = MPIDI_NM_mpi_win_unlock(rank, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -183,7 +183,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_get_info(MPIR_Win * win, MPIR_Info ** inf int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_GET_INFO); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_GET_INFO); - mpi_errno = MPIDI_NM_win_get_info(win, info_p_p); + mpi_errno = MPIDI_NM_mpi_win_get_info(win, info_p_p); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -203,7 +203,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_free(MPIR_Win ** win_ptr) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_FREE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_FREE); - mpi_errno = MPIDI_NM_win_free(win_ptr); + mpi_errno = MPIDI_NM_mpi_win_free(win_ptr); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -223,7 +223,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_fence(int assert, MPIR_Win * win) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_FENCE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_FENCE); - mpi_errno = MPIDI_NM_win_fence(assert, win); + mpi_errno = MPIDI_NM_mpi_win_fence(assert, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -247,7 +247,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_create(void *base, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_CREATE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_CREATE); - mpi_errno = MPIDI_NM_win_create(base, length, disp_unit, info, comm_ptr, win_ptr); + mpi_errno = MPIDI_NM_mpi_win_create(base, length, disp_unit, info, comm_ptr, win_ptr); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -267,7 +267,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_attach(MPIR_Win * win, void *base, MPI_Ai int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_ATTACH); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_ATTACH); - mpi_errno = MPIDI_NM_win_attach(win, base, size); + mpi_errno = MPIDI_NM_mpi_win_attach(win, base, size); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -291,8 +291,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_allocate_shared(MPI_Aint size, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_ALLOCATE_SHARED); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_ALLOCATE_SHARED); - mpi_errno = MPIDI_NM_win_allocate_shared(size, disp_unit, - info_ptr, comm_ptr, base_ptr, win_ptr); + mpi_errno = MPIDI_NM_mpi_win_allocate_shared(size, disp_unit, + info_ptr, comm_ptr, base_ptr, win_ptr); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -312,7 +312,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_flush_local(int rank, MPIR_Win * win) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_FLUSH_LOCAL); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_FLUSH_LOCAL); - mpi_errno = MPIDI_NM_win_flush_local(rank, win); + mpi_errno = MPIDI_NM_mpi_win_flush_local(rank, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -332,7 +332,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_detach(MPIR_Win * win, const void *base) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_DETACH); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_DETACH); - mpi_errno = MPIDI_NM_win_detach(win, base); + mpi_errno = MPIDI_NM_mpi_win_detach(win, base); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -355,7 +355,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_shared_query(MPIR_Win * win, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_SHARED_QUERY); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_SHARED_QUERY); - mpi_errno = MPIDI_NM_win_shared_query(win, rank, size, disp_unit, baseptr); + mpi_errno = MPIDI_NM_mpi_win_shared_query(win, rank, size, disp_unit, baseptr); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -378,7 +378,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_allocate(MPI_Aint size, int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_ALLOCATE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_ALLOCATE); - mpi_errno = MPIDI_NM_win_allocate(size, disp_unit, info, comm, baseptr, win); + mpi_errno = MPIDI_NM_mpi_win_allocate(size, disp_unit, info, comm, baseptr, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -398,7 +398,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_flush(int rank, MPIR_Win * win) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_FLUSH); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_FLUSH); - mpi_errno = MPIDI_NM_win_flush(rank, win); + mpi_errno = MPIDI_NM_mpi_win_flush(rank, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -418,7 +418,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_flush_local_all(MPIR_Win * win) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_FLUSH_LOCAL_ALL); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_FLUSH_LOCAL_ALL); - mpi_errno = MPIDI_NM_win_flush_local_all(win); + mpi_errno = MPIDI_NM_mpi_win_flush_local_all(win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -438,7 +438,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_unlock_all(MPIR_Win * win) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_UNLOCK_ALL); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_UNLOCK_ALL); - mpi_errno = MPIDI_NM_win_unlock_all(win); + mpi_errno = MPIDI_NM_mpi_win_unlock_all(win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -459,7 +459,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_create_dynamic(MPIR_Info * info, MPIR_Com int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_CREATE_DYNAMIC); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_CREATE_DYNAMIC); - mpi_errno = MPIDI_NM_win_create_dynamic(info, comm, win); + mpi_errno = MPIDI_NM_mpi_win_create_dynamic(info, comm, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -479,7 +479,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_sync(MPIR_Win * win) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_SYNC); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_SYNC); - mpi_errno = MPIDI_NM_win_sync(win); + mpi_errno = MPIDI_NM_mpi_win_sync(win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -499,7 +499,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_flush_all(MPIR_Win * win) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_FLUSH_ALL); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_FLUSH_ALL); - mpi_errno = MPIDI_NM_win_flush_all(win); + mpi_errno = MPIDI_NM_mpi_win_flush_all(win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } @@ -519,7 +519,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Win_lock_all(int assert, MPIR_Win * win) int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_WIN_LOCK_ALL); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_WIN_LOCK_ALL); - mpi_errno = MPIDI_NM_win_lock_all(assert, win); + mpi_errno = MPIDI_NM_mpi_win_lock_all(assert, win); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); } diff --git a/src/mpid/ch4/src/ch4r_init.h b/src/mpid/ch4/src/ch4r_init.h index 0089861..5861605 100644 --- a/src/mpid/ch4/src/ch4r_init.h +++ b/src/mpid/ch4/src/ch4r_init.h @@ -32,7 +32,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_init_comm(MPIR_Comm * comm) /* * Prevents double initialization of some special communicators. * - * comm_world and comm_self may exhibit this function twice, first during MPIDI_CH4U_init + * comm_world and comm_self may exhibit this function twice, first during MPIDI_CH4U_mpi_init * and the second during MPIR_Comm_commit in MPIDI_Init. * If there is an early arrival of an unexpected message before the second visit, * the following code will wipe out the unexpected queue andthe message is lost forever. @@ -101,11 +101,11 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_destroy_comm(MPIR_Comm * comm) #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_init +#define FUNCNAME MPIDI_CH4U_mpi_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_init(MPIR_Comm * comm_world, MPIR_Comm * comm_self, - int num_contexts, void **netmod_contexts) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_init(MPIR_Comm * comm_world, MPIR_Comm * comm_self, + int num_contexts, void **netmod_contexts) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_INIT); @@ -319,10 +319,10 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_init(MPIR_Comm * comm_world, MPIR_Comm * } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_init +#define FUNCNAME MPIDI_CH4U_mpi_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX void MPIDI_CH4U_finalize() +MPL_STATIC_INLINE_PREFIX void MPIDI_CH4U_mpi_finalize() { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_FINALIZE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4U_FINALIZE); @@ -334,10 +334,10 @@ MPL_STATIC_INLINE_PREFIX void MPIDI_CH4U_finalize() } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_alloc_mem +#define FUNCNAME MPIDI_CH4U_mpi_alloc_mem #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX void *MPIDI_CH4U_alloc_mem(size_t size, MPIR_Info * info_ptr) +MPL_STATIC_INLINE_PREFIX void *MPIDI_CH4U_mpi_alloc_mem(size_t size, MPIR_Info * info_ptr) { MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_ALLOC_MEM); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4U_ALLOC_MEM); @@ -348,10 +348,10 @@ MPL_STATIC_INLINE_PREFIX void *MPIDI_CH4U_alloc_mem(size_t size, MPIR_Info * inf } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_free_mem +#define FUNCNAME MPIDI_CH4U_mpi_free_mem #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_free_mem(void *ptr) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_free_mem(void *ptr) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_FREE_MEM); diff --git a/src/mpid/ch4/src/ch4r_probe.h b/src/mpid/ch4/src/ch4r_probe.h index 015a274..a473ddb 100644 --- a/src/mpid/ch4/src/ch4r_probe.h +++ b/src/mpid/ch4/src/ch4r_probe.h @@ -14,13 +14,14 @@ #include "ch4_impl.h" #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_iprobe +#define FUNCNAME MPIDI_CH4U_mpi_iprobe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_iprobe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, int *flag, MPI_Status * status) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_iprobe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, int *flag, + MPI_Status * status) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *root_comm; @@ -79,7 +80,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_probe(int source, MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4U_PROBE); while (!flag) { - mpi_errno = MPIDI_CH4U_iprobe(source, tag, comm, context_offset, &flag, status); + mpi_errno = MPIDI_CH4U_mpi_iprobe(source, tag, comm, context_offset, &flag, status); if (mpi_errno) MPIR_ERR_POP(mpi_errno); } @@ -92,15 +93,15 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_probe(int source, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_improbe +#define FUNCNAME MPIDI_CH4U_mpi_improbe #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_improbe(int source, - int tag, - MPIR_Comm * comm, - int context_offset, - int *flag, MPIR_Request ** message, - MPI_Status * status) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_improbe(int source, + int tag, + MPIR_Comm * comm, + int context_offset, + int *flag, MPIR_Request ** message, + MPI_Status * status) { int mpi_errno = MPI_SUCCESS; MPIR_Comm *root_comm; @@ -169,7 +170,8 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mprobe(int source, MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4_MPROBE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4_MPROBE); while (!flag) { - mpi_errno = MPIDI_CH4U_improbe(source, tag, comm, context_offset, &flag, message, status); + mpi_errno = + MPIDI_CH4U_mpi_improbe(source, tag, comm, context_offset, &flag, message, status); } MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_CH4_MPROBE); return mpi_errno; diff --git a/src/mpid/ch4/src/ch4r_recv.h b/src/mpid/ch4/src/ch4r_recv.h index 4672198..addb8fa 100644 --- a/src/mpid/ch4/src/ch4r_recv.h +++ b/src/mpid/ch4/src/ch4r_recv.h @@ -210,17 +210,17 @@ static inline int MPIDI_CH4I_do_irecv(void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_recv +#define FUNCNAME MPIDI_CH4U_mpi_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_recv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPI_Status * status, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_recv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPI_Status * status, + MPIR_Request ** request) { int mpi_errno; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_RECV); @@ -239,16 +239,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_recv(void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_recv_init +#define FUNCNAME MPIDI_CH4U_mpi_recv_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_recv_init(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_recv_init(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_Request *rreq; @@ -277,13 +277,13 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_recv_init(void *buf, #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_imrecv +#define FUNCNAME MPIDI_CH4U_mpi_imrecv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_imrecv(void *buf, - int count, - MPI_Datatype datatype, - MPIR_Request * message, MPIR_Request ** rreqp) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_imrecv(void *buf, + int count, + MPI_Datatype datatype, + MPIR_Request * message, MPIR_Request ** rreqp) { int mpi_errno = MPI_SUCCESS; MPIR_Request *rreq; @@ -367,16 +367,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mrecv(void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_irecv +#define FUNCNAME MPIDI_CH4U_mpi_irecv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_irecv(void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_irecv(void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_IRECV); @@ -394,10 +394,10 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_irecv(void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_cancel_recv +#define FUNCNAME MPIDI_CH4U_mpi_cancel_recv #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_cancel_recv(MPIR_Request * rreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_cancel_recv(MPIR_Request * rreq) { int mpi_errno = MPI_SUCCESS, found; MPIR_Comm *root_comm; diff --git a/src/mpid/ch4/src/ch4r_request.h b/src/mpid/ch4/src/ch4r_request.h index 0308b09..08ba7e4 100644 --- a/src/mpid/ch4/src/ch4r_request.h +++ b/src/mpid/ch4/src/ch4r_request.h @@ -98,7 +98,7 @@ static inline int MPIDI_CH4R_anysource_matched(MPIR_Request * rreq, int caller, if (MPIDI_CH4R_NETMOD == caller) { #ifdef MPIDI_BUILD_CH4_SHM - mpi_errno = MPIDI_SHM_cancel_recv(rreq); + mpi_errno = MPIDI_SHM_mpi_cancel_recv(rreq); /* If the netmod is cancelling the request, then shared memory will * just copy the status from the shared memory side because the netmod @@ -112,7 +112,7 @@ static inline int MPIDI_CH4R_anysource_matched(MPIR_Request * rreq, int caller, *continue_matching = 0; } else if (MPIDI_CH4R_SHM == caller) { - mpi_errno = MPIDI_NM_cancel_recv(rreq); + mpi_errno = MPIDI_NM_mpi_cancel_recv(rreq); /* If the netmod has already matched this request, shared memory will * lose and should stop matching this request */ diff --git a/src/mpid/ch4/src/ch4r_rma.h b/src/mpid/ch4/src/ch4r_rma.h index 39bf2cf..eb55e4f 100644 --- a/src/mpid/ch4/src/ch4r_rma.h +++ b/src/mpid/ch4/src/ch4r_rma.h @@ -250,16 +250,16 @@ static inline int MPIDI_CH4I_do_get(void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_put +#define FUNCNAME MPIDI_CH4U_mpi_put #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_put(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, - MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_put(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, + MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_PUT); @@ -278,17 +278,17 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_put(const void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_rput +#define FUNCNAME MPIDI_CH4U_mpi_rput #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_rput(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_rput(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_RPUT); @@ -308,16 +308,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_rput(const void *origin_addr, #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_get +#define FUNCNAME MPIDI_CH4U_mpi_get #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_get(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, MPI_Datatype target_datatype, - MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_get(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, MPI_Datatype target_datatype, + MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_GET); @@ -336,17 +336,17 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_get(void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_rget +#define FUNCNAME MPIDI_CH4U_mpi_rget #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_rget(void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPIR_Win * win, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_rget(void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPIR_Win * win, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_RGET); @@ -509,18 +509,18 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4I_do_accumulate(const void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_raccumulate +#define FUNCNAME MPIDI_CH4U_mpi_raccumulate #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_raccumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_raccumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_Request *sreq; @@ -551,27 +551,28 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_raccumulate(const void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_accumulate +#define FUNCNAME MPIDI_CH4U_mpi_accumulate #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, MPI_Op op, - MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, MPI_Op op, + MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_ACCUMULATE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4U_ACCUMULATE); - mpi_errno = MPIDI_CH4U_raccumulate(origin_addr, - origin_count, - origin_datatype, - target_rank, - target_disp, target_count, target_datatype, op, win, NULL); + mpi_errno = MPIDI_CH4U_mpi_raccumulate(origin_addr, + origin_count, + origin_datatype, + target_rank, + target_disp, target_count, target_datatype, op, win, + NULL); if (mpi_errno) MPIR_ERR_POP(mpi_errno); @@ -583,21 +584,21 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_accumulate(const void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_rget_accumulate +#define FUNCNAME MPIDI_CH4U_mpi_rget_accumulate #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_rget_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_rget_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_Request *sreq; @@ -634,34 +635,34 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_rget_accumulate(const void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_get_accumulate +#define FUNCNAME MPIDI_CH4U_mpi_get_accumulate #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_get_accumulate(const void *origin_addr, - int origin_count, - MPI_Datatype origin_datatype, - void *result_addr, - int result_count, - MPI_Datatype result_datatype, - int target_rank, - MPI_Aint target_disp, - int target_count, - MPI_Datatype target_datatype, - MPI_Op op, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_get_accumulate(const void *origin_addr, + int origin_count, + MPI_Datatype origin_datatype, + void *result_addr, + int result_count, + MPI_Datatype result_datatype, + int target_rank, + MPI_Aint target_disp, + int target_count, + MPI_Datatype target_datatype, + MPI_Op op, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_GET_ACCUMULATE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4U_GET_ACCUMULATE); - mpi_errno = MPIDI_CH4U_rget_accumulate(origin_addr, - origin_count, - origin_datatype, - result_addr, - result_count, - result_datatype, - target_rank, - target_disp, - target_count, target_datatype, op, win, NULL); + mpi_errno = MPIDI_CH4U_mpi_rget_accumulate(origin_addr, + origin_count, + origin_datatype, + result_addr, + result_count, + result_datatype, + target_rank, + target_disp, + target_count, target_datatype, op, win, NULL); if (mpi_errno) MPIR_ERR_POP(mpi_errno); fn_exit: @@ -672,15 +673,15 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_get_accumulate(const void *origin_addr, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_compare_and_swap +#define FUNCNAME MPIDI_CH4U_mpi_compare_and_swap #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_compare_and_swap(const void *origin_addr, - const void *compare_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, - MPI_Aint target_disp, MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_compare_and_swap(const void *origin_addr, + const void *compare_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, + MPI_Aint target_disp, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS, c; MPIR_Request *sreq = NULL; @@ -740,23 +741,23 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_compare_and_swap(const void *origin_addr } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_fetch_and_op +#define FUNCNAME MPIDI_CH4U_mpi_fetch_and_op #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_fetch_and_op(const void *origin_addr, - void *result_addr, - MPI_Datatype datatype, - int target_rank, - MPI_Aint target_disp, MPI_Op op, - MPIR_Win * win) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_fetch_and_op(const void *origin_addr, + void *result_addr, + MPI_Datatype datatype, + int target_rank, + MPI_Aint target_disp, MPI_Op op, + MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_FETCH_AND_OP); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_CH4U_FETCH_AND_OP); - mpi_errno = MPIDI_CH4U_get_accumulate(origin_addr, 1, datatype, - result_addr, 1, datatype, - target_rank, target_disp, 1, datatype, op, win); + mpi_errno = MPIDI_CH4U_mpi_get_accumulate(origin_addr, 1, datatype, + result_addr, 1, datatype, + target_rank, target_disp, 1, datatype, op, win); if (mpi_errno) MPIR_ERR_POP(mpi_errno); fn_exit: diff --git a/src/mpid/ch4/src/ch4r_send.h b/src/mpid/ch4/src/ch4r_send.h index 57f50cb..236ad88 100644 --- a/src/mpid/ch4/src/ch4r_send.h +++ b/src/mpid/ch4/src/ch4r_send.h @@ -137,16 +137,16 @@ static inline int MPIDI_CH4I_psend(const void *buf, #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_send +#define FUNCNAME MPIDI_CH4U_mpi_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_send(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_send(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_SEND); @@ -158,16 +158,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_send(const void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_isend +#define FUNCNAME MPIDI_CH4U_mpi_isend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_isend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_isend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_ISEND); @@ -224,16 +224,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_irsend(const void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_ssend +#define FUNCNAME MPIDI_CH4U_mpi_ssend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_ssend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_ssend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_SSEND); @@ -245,16 +245,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_ssend(const void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_issend +#define FUNCNAME MPIDI_CH4U_mpi_issend #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_issend(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, int context_offset, - MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_issend(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, int context_offset, + MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_ISSEND); @@ -266,10 +266,10 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_issend(const void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_startall +#define FUNCNAME MPIDI_CH4U_mpi_startall #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_startall(int count, MPIR_Request * requests[]) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_startall(int count, MPIR_Request * requests[]) { int mpi_errno = MPI_SUCCESS, i; int rank, tag, context_offset; @@ -294,10 +294,11 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_startall(int count, MPIR_Request * reque case MPIDI_PTYPE_RECV: #ifdef MPIDI_BUILD_CH4_SHM - mpi_errno = MPIDI_NM_irecv(MPIDI_CH4U_REQUEST(preq, buffer), - MPIDI_CH4U_REQUEST(preq, count), - datatype, rank, tag, - preq->comm, context_offset, &preq->u.persist.real_request); + mpi_errno = MPIDI_NM_mpi_irecv(MPIDI_CH4U_REQUEST(preq, buffer), + MPIDI_CH4U_REQUEST(preq, count), + datatype, rank, tag, + preq->comm, context_offset, + &preq->u.persist.real_request); #else mpi_errno = MPIDI_Irecv(MPIDI_CH4U_REQUEST(preq, buffer), MPIDI_CH4U_REQUEST(preq, count), @@ -308,10 +309,11 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_startall(int count, MPIR_Request * reque case MPIDI_PTYPE_SEND: #ifdef MPIDI_BUILD_CH4_SHM - mpi_errno = MPIDI_NM_isend(MPIDI_CH4U_REQUEST(preq, buffer), - MPIDI_CH4U_REQUEST(preq, count), - datatype, rank, tag, - preq->comm, context_offset, &preq->u.persist.real_request); + mpi_errno = MPIDI_NM_mpi_isend(MPIDI_CH4U_REQUEST(preq, buffer), + MPIDI_CH4U_REQUEST(preq, count), + datatype, rank, tag, + preq->comm, context_offset, + &preq->u.persist.real_request); #else mpi_errno = MPIDI_Isend(MPIDI_CH4U_REQUEST(preq, buffer), MPIDI_CH4U_REQUEST(preq, count), @@ -322,10 +324,11 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_startall(int count, MPIR_Request * reque case MPIDI_PTYPE_SSEND: #ifdef MPIDI_BUILD_CH4_SHM - mpi_errno = MPIDI_NM_issend(MPIDI_CH4U_REQUEST(preq, buffer), - MPIDI_CH4U_REQUEST(preq, count), - datatype, rank, tag, - preq->comm, context_offset, &preq->u.persist.real_request); + mpi_errno = MPIDI_NM_mpi_issend(MPIDI_CH4U_REQUEST(preq, buffer), + MPIDI_CH4U_REQUEST(preq, count), + datatype, rank, tag, + preq->comm, context_offset, + &preq->u.persist.real_request); #else mpi_errno = MPIDI_Issend(MPIDI_CH4U_REQUEST(preq, buffer), MPIDI_CH4U_REQUEST(preq, count), @@ -374,16 +377,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_startall(int count, MPIR_Request * reque } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_send_init +#define FUNCNAME MPIDI_CH4U_mpi_send_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_send_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_send_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_SEND_INIT); @@ -395,16 +398,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_send_init(const void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_ssend_init +#define FUNCNAME MPIDI_CH4U_mpi_ssend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_ssend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_ssend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_SSEND_INIT); @@ -416,16 +419,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_ssend_init(const void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_bsend_init +#define FUNCNAME MPIDI_CH4U_mpi_bsend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_bsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_bsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_BSEND_INIT); @@ -437,16 +440,16 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_bsend_init(const void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_rsend_init +#define FUNCNAME MPIDI_CH4U_mpi_rsend_init #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_rsend_init(const void *buf, - int count, - MPI_Datatype datatype, - int rank, - int tag, - MPIR_Comm * comm, - int context_offset, MPIR_Request ** request) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_rsend_init(const void *buf, + int count, + MPI_Datatype datatype, + int rank, + int tag, + MPIR_Comm * comm, + int context_offset, MPIR_Request ** request) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_RSEND_INIT); @@ -458,10 +461,10 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_rsend_init(const void *buf, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4U_cancel_send +#define FUNCNAME MPIDI_CH4U_mpi_cancel_send #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_cancel_send(MPIR_Request * sreq) +MPL_STATIC_INLINE_PREFIX int MPIDI_CH4U_mpi_cancel_send(MPIR_Request * sreq) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4U_CANCEL_SEND); diff --git a/src/mpid/ch4/src/ch4r_win.h b/src/mpid/ch4/src/ch4r_win.h index 064fa89..12b078a 100644 --- a/src/mpid/ch4/src/ch4r_win.h +++ b/src/mpid/ch4/src/ch4r_win.h @@ -21,10 +21,10 @@ #endif /* HAVE_SYS_MMAN_H */ #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_set_info +#define FUNCNAME MPIDI_CH4R_mpi_win_set_info #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_set_info(MPIR_Win * win, MPIR_Info * info) +static inline int MPIDI_CH4R_mpi_win_set_info(MPIR_Win * win, MPIR_Info * info) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -127,7 +127,7 @@ static inline int MPIDI_CH4R_win_init(MPI_Aint length, win->copySize = 0; MPIDI_CH4U_WIN(win, shared_table) = NULL; if ((info != NULL) && ((int *) info != (int *) MPI_INFO_NULL)) { - mpi_errno = MPIDI_CH4R_win_set_info(win, info); + mpi_errno = MPIDI_CH4R_mpi_win_set_info(win, info); MPIR_Assert(mpi_errno == 0); } @@ -218,10 +218,10 @@ static inline int MPIDI_CH4I_progress_win_fence(MPIR_Win * win) #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_start +#define FUNCNAME MPIDI_CH4R_mpi_win_start #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_start(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_start(MPIR_Group * group, int assert, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; @@ -248,10 +248,10 @@ static inline int MPIDI_CH4R_win_start(MPIR_Group * group, int assert, MPIR_Win } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_complete +#define FUNCNAME MPIDI_CH4R_mpi_win_complete #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_complete(MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_complete(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIDI_CH4U_win_cntrl_msg_t msg; @@ -302,10 +302,10 @@ static inline int MPIDI_CH4R_win_complete(MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_post +#define FUNCNAME MPIDI_CH4R_mpi_win_post #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_post(MPIR_Group * group, int assert, MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_post(MPIR_Group * group, int assert, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIDI_CH4U_win_cntrl_msg_t msg; @@ -352,10 +352,10 @@ static inline int MPIDI_CH4R_win_post(MPIR_Group * group, int assert, MPIR_Win * } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_wait +#define FUNCNAME MPIDI_CH4R_mpi_win_wait #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_wait(MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_wait(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_Group *group; @@ -380,10 +380,10 @@ static inline int MPIDI_CH4R_win_wait(MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_test +#define FUNCNAME MPIDI_CH4R_mpi_win_test #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_test(MPIR_Win * win, int *flag) +static inline int MPIDI_CH4R_mpi_win_test(MPIR_Win * win, int *flag) { int mpi_errno = MPI_SUCCESS; @@ -415,10 +415,10 @@ static inline int MPIDI_CH4R_win_test(MPIR_Win * win, int *flag) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_lock +#define FUNCNAME MPIDI_CH4R_mpi_win_lock #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_lock(int lock_type, int rank, int assert, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; unsigned locked; @@ -454,10 +454,10 @@ static inline int MPIDI_CH4R_win_lock(int lock_type, int rank, int assert, MPIR_ } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_unlock +#define FUNCNAME MPIDI_CH4R_mpi_win_unlock #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_unlock(int rank, MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_unlock(int rank, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; unsigned unlocked; @@ -500,10 +500,10 @@ static inline int MPIDI_CH4R_win_unlock(int rank, MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_get_info +#define FUNCNAME MPIDI_CH4R_mpi_win_get_info #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) +static inline int MPIDI_CH4R_mpi_win_get_info(MPIR_Win * win, MPIR_Info ** info_p_p) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4I_WIN_GET_INFO); @@ -616,10 +616,10 @@ static inline int MPIDI_CH4R_win_finalize(MPIR_Win ** win_ptr) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_free +#define FUNCNAME MPIDI_CH4R_mpi_win_free #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_free(MPIR_Win ** win_ptr) +static inline int MPIDI_CH4R_mpi_win_free(MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -641,10 +641,10 @@ static inline int MPIDI_CH4R_win_free(MPIR_Win ** win_ptr) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_fence +#define FUNCNAME MPIDI_CH4R_mpi_win_fence #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_fence(int massert, MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_fence(int massert, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -679,13 +679,14 @@ static inline int MPIDI_CH4R_win_fence(int massert, MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_create +#define FUNCNAME MPIDI_CH4R_mpi_win_create #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_create(void *base, - MPI_Aint length, - int disp_unit, - MPIR_Info * info, MPIR_Comm * comm_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_CH4R_mpi_win_create(void *base, + MPI_Aint length, + int disp_unit, + MPIR_Info * info, MPIR_Comm * comm_ptr, + MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -718,10 +719,10 @@ static inline int MPIDI_CH4R_win_create(void *base, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_attach +#define FUNCNAME MPIDI_CH4R_mpi_win_attach #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_attach(MPIR_Win * win, void *base, MPI_Aint size) +static inline int MPIDI_CH4R_mpi_win_attach(MPIR_Win * win, void *base, MPI_Aint size) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4I_WIN_ATTACH); @@ -737,14 +738,14 @@ static inline int MPIDI_CH4R_win_attach(MPIR_Win * win, void *base, MPI_Aint siz } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_allocate_shared +#define FUNCNAME MPIDI_CH4R_mpi_win_allocate_shared #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_allocate_shared(MPI_Aint size, - int disp_unit, - MPIR_Info * info_ptr, - MPIR_Comm * comm_ptr, - void **base_ptr, MPIR_Win ** win_ptr) +static inline int MPIDI_CH4R_mpi_win_allocate_shared(MPI_Aint size, + int disp_unit, + MPIR_Info * info_ptr, + MPIR_Comm * comm_ptr, + void **base_ptr, MPIR_Win ** win_ptr) { int i = 0, fd = -1, rc, first = 0, mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -892,10 +893,10 @@ static inline int MPIDI_CH4R_win_allocate_shared(MPI_Aint size, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_detach +#define FUNCNAME MPIDI_CH4R_mpi_win_detach #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_detach(MPIR_Win * win, const void *base) +static inline int MPIDI_CH4R_mpi_win_detach(MPIR_Win * win, const void *base) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4I_WIN_DETACH); @@ -910,12 +911,12 @@ static inline int MPIDI_CH4R_win_detach(MPIR_Win * win, const void *base) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_shared_query +#define FUNCNAME MPIDI_CH4R_mpi_win_shared_query #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_shared_query(MPIR_Win * win, - int rank, - MPI_Aint * size, int *disp_unit, void *baseptr) +static inline int MPIDI_CH4R_mpi_win_shared_query(MPIR_Win * win, + int rank, + MPI_Aint * size, int *disp_unit, void *baseptr) { int mpi_errno = MPI_SUCCESS; uintptr_t base = (uintptr_t) MPIDI_CH4U_WIN(win, mmap_addr); @@ -942,13 +943,13 @@ static inline int MPIDI_CH4R_win_shared_query(MPIR_Win * win, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_allocate +#define FUNCNAME MPIDI_CH4R_mpi_win_allocate #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_allocate(MPI_Aint size, - int disp_unit, - MPIR_Info * info, - MPIR_Comm * comm, void *baseptr, MPIR_Win ** win_ptr) +static inline int MPIDI_CH4R_mpi_win_allocate(MPI_Aint size, + int disp_unit, + MPIR_Info * info, + MPIR_Comm * comm, void *baseptr, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; MPIR_Errflag_t errflag = MPIR_ERR_NONE; @@ -986,10 +987,10 @@ static inline int MPIDI_CH4R_win_allocate(MPI_Aint size, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_flush +#define FUNCNAME MPIDI_CH4R_mpi_win_flush #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_flush(int rank, MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_flush(int rank, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4I_WIN_FLUSH); @@ -1008,10 +1009,10 @@ static inline int MPIDI_CH4R_win_flush(int rank, MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_flush_local_all +#define FUNCNAME MPIDI_CH4R_mpi_win_flush_local_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_flush_local_all(MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_flush_local_all(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4I_WIN_FLUSH_LOCAL_ALL); @@ -1031,10 +1032,10 @@ static inline int MPIDI_CH4R_win_flush_local_all(MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_unlock_all +#define FUNCNAME MPIDI_CH4R_mpi_win_unlock_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_unlock_all(MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_unlock_all(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4I_WIN_UNLOCK_ALL); @@ -1083,11 +1084,11 @@ static inline int MPIDI_CH4R_win_unlock_all(MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_create_dynamic +#define FUNCNAME MPIDI_CH4R_mpi_win_create_dynamic #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_create_dynamic(MPIR_Info * info, - MPIR_Comm * comm, MPIR_Win ** win_ptr) +static inline int MPIDI_CH4R_mpi_win_create_dynamic(MPIR_Info * info, + MPIR_Comm * comm, MPIR_Win ** win_ptr) { int mpi_errno = MPI_SUCCESS; int rc = MPI_SUCCESS; @@ -1120,10 +1121,10 @@ static inline int MPIDI_CH4R_win_create_dynamic(MPIR_Info * info, } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_flush_local +#define FUNCNAME MPIDI_CH4R_mpi_win_flush_local #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_flush_local(int rank, MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_flush_local(int rank, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4I_WIN_FLUSH_LOCAL); @@ -1143,10 +1144,10 @@ static inline int MPIDI_CH4R_win_flush_local(int rank, MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_sync +#define FUNCNAME MPIDI_CH4R_mpi_win_sync #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_sync(MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_sync(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4I_WIN_SYNC); @@ -1163,10 +1164,10 @@ static inline int MPIDI_CH4R_win_sync(MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_flush_all +#define FUNCNAME MPIDI_CH4R_mpi_win_flush_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_flush_all(MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_flush_all(MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_CH4I_WIN_FLUSH_ALL); @@ -1186,10 +1187,10 @@ static inline int MPIDI_CH4R_win_flush_all(MPIR_Win * win) } #undef FUNCNAME -#define FUNCNAME MPIDI_CH4R_win_lock_all +#define FUNCNAME MPIDI_CH4R_mpi_win_lock_all #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -static inline int MPIDI_CH4R_win_lock_all(int assert, MPIR_Win * win) +static inline int MPIDI_CH4R_mpi_win_lock_all(int assert, MPIR_Win * win) { int mpi_errno = MPI_SUCCESS; http://git.mpich.org/mpich.git/commitdiff/7adf2a94c124f6b5a5ecbd0f77c9ca70a… commit 7adf2a94c124f6b5a5ecbd0f77c9ca70a8ed8451 Author: Pavan Balaji <balaji(a)anl.gov> Date: Fri Sep 9 11:00:21 2016 -0500 CH4: Whitespace cleanup Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/ch4/netmod/ofi/ofi_init.h b/src/mpid/ch4/netmod/ofi/ofi_init.h index 9ea0a18..149f159 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_init.h +++ b/src/mpid/ch4/netmod/ofi/ofi_init.h @@ -289,7 +289,7 @@ static inline int MPIDI_OFI_init_generic(int rank, else { av_attr.type = FI_AV_MAP; } - mapped_table = (fi_addr_t *) MPL_malloc(size * sizeof(fi_addr_t)); + mapped_table = (fi_addr_t *) MPL_malloc(size * sizeof(fi_addr_t)); av_attr.rx_ctx_bits = MPIDI_OFI_MAX_ENDPOINTS_BITS; diff --git a/src/mpid/ch4/netmod/ofi/ofi_win.h b/src/mpid/ch4/netmod/ofi/ofi_win.h index 2bb045d..32e7520 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_win.h +++ b/src/mpid/ch4/netmod/ofi/ofi_win.h @@ -154,9 +154,7 @@ static inline int MPIDI_OFI_win_init_generic(MPI_Aint length, MPIR_Assert(finfo); finfo->ep_attr->tx_ctx_cnt = FI_SHARED_CONTEXT; /* Request a shared context */ MPIDI_OFI_CALL_RETURN(fi_endpoint(MPIDI_Global.domain, - finfo, - &MPIDI_OFI_WIN(win).ep, - NULL), ret); + finfo, &MPIDI_OFI_WIN(win).ep, NULL), ret); if (ret < 0) { MPL_DBG_MSG(MPIDI_CH4_DBG_GENERAL, VERBOSE, "Failed to create per-window EP (with completion), " @@ -183,9 +181,7 @@ static inline int MPIDI_OFI_win_init_generic(MPI_Aint length, MPIDI_OFI_CALL(fi_ep_bind(MPIDI_OFI_WIN(win).ep, &MPIDI_Global.av->fid, 0), bind); MPIDI_OFI_CALL_RETURN(fi_endpoint(MPIDI_Global.domain, - finfo, - &MPIDI_OFI_WIN(win).ep_nocmpl, - NULL), ret); + finfo, &MPIDI_OFI_WIN(win).ep_nocmpl, NULL), ret); fi_freeinfo(finfo); if (ret < 0) { MPL_DBG_MSG(MPIDI_CH4_DBG_GENERAL, VERBOSE, @@ -199,10 +195,8 @@ static inline int MPIDI_OFI_win_init_generic(MPI_Aint length, MPIDI_OFI_CALL(fi_ep_bind(MPIDI_OFI_WIN(win).ep_nocmpl, &MPIDI_Global.stx_ctx->fid, 0), bind); MPIDI_OFI_CALL(fi_ep_bind(MPIDI_OFI_WIN(win).ep_nocmpl, - &MPIDI_OFI_WIN(win).cmpl_cntr->fid, - FI_READ | FI_WRITE), bind); - MPIDI_OFI_CALL(fi_ep_bind(MPIDI_OFI_WIN(win).ep_nocmpl, - &MPIDI_Global.av->fid, 0), bind); + &MPIDI_OFI_WIN(win).cmpl_cntr->fid, FI_READ | FI_WRITE), bind); + MPIDI_OFI_CALL(fi_ep_bind(MPIDI_OFI_WIN(win).ep_nocmpl, &MPIDI_Global.av->fid, 0), bind); MPIDI_OFI_CALL(fi_enable(MPIDI_OFI_WIN(win).ep), ep_enable); MPIDI_OFI_CALL(fi_enable(MPIDI_OFI_WIN(win).ep_nocmpl), ep_enable); diff --git a/src/mpid/ch4/src/ch4_spawn.h b/src/mpid/ch4/src/ch4_spawn.h index 07290cc..c7d7921 100644 --- a/src/mpid/ch4/src/ch4_spawn.h +++ b/src/mpid/ch4/src/ch4_spawn.h @@ -129,7 +129,7 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_Comm_spawn_multiple(int count, preput_keyval_vector.val = port_name; pmi_errno = PMI_Spawn_multiple(count, (const char **) commands, - (const char ** *) argvs, + (const char ***) argvs, maxprocs, info_keyval_sizes, (const PMI_keyval_t **) info_keyval_vectors, 1, &preput_keyval_vector, pmi_errcodes); ----------------------------------------------------------------------- Summary of changes: src/include/mpir_request.h | 4 +- src/mpid/ch3/include/mpidpre.h | 4 +- src/mpid/ch3/src/ch3u_request.c | 6 +- src/mpid/ch4/include/mpid_ticketlock.h | 22 +- src/mpid/ch4/include/mpidpost.h | 4 +- src/mpid/ch4/include/mpidpre.h | 6 +- src/mpid/ch4/netmod/include/netmod.h | 1623 +++++++++++++------------ src/mpid/ch4/netmod/include/netmod_impl.h | 1050 ++++++++-------- src/mpid/ch4/netmod/ofi/func_table.c | 222 ++-- src/mpid/ch4/netmod/ofi/ofi_am_probe.h | 22 +- src/mpid/ch4/netmod/ofi/ofi_am_recv.h | 61 +- src/mpid/ch4/netmod/ofi/ofi_am_rma.h | 185 ++-- src/mpid/ch4/netmod/ofi/ofi_am_send.h | 127 +- src/mpid/ch4/netmod/ofi/ofi_am_spawn.h | 18 +- src/mpid/ch4/netmod/ofi/ofi_am_win.h | 127 +- src/mpid/ch4/netmod/ofi/ofi_coll.h | 408 ++++--- src/mpid/ch4/netmod/ofi/ofi_comm.h | 8 +- src/mpid/ch4/netmod/ofi/ofi_datatype.h | 4 +- src/mpid/ch4/netmod/ofi/ofi_events.h | 73 +- src/mpid/ch4/netmod/ofi/ofi_impl.h | 57 +- src/mpid/ch4/netmod/ofi/ofi_init.h | 28 +- src/mpid/ch4/netmod/ofi/ofi_op.h | 4 +- src/mpid/ch4/netmod/ofi/ofi_probe.h | 22 +- src/mpid/ch4/netmod/ofi/ofi_progress.h | 2 +- src/mpid/ch4/netmod/ofi/ofi_recv.h | 79 +- src/mpid/ch4/netmod/ofi/ofi_rma.h | 255 ++-- src/mpid/ch4/netmod/ofi/ofi_send.h | 85 +- src/mpid/ch4/netmod/ofi/ofi_spawn.h | 22 +- src/mpid/ch4/netmod/ofi/ofi_win.h | 145 ++-- src/mpid/ch4/netmod/portals4/func_table.c | 222 ++-- src/mpid/ch4/netmod/portals4/ptl_coll.h | 408 ++++--- src/mpid/ch4/netmod/portals4/ptl_comm.h | 8 +- src/mpid/ch4/netmod/portals4/ptl_datatype.h | 4 +- src/mpid/ch4/netmod/portals4/ptl_init.h | 30 +- src/mpid/ch4/netmod/portals4/ptl_op.h | 4 +- src/mpid/ch4/netmod/portals4/ptl_probe.h | 22 +- src/mpid/ch4/netmod/portals4/ptl_recv.h | 55 +- src/mpid/ch4/netmod/portals4/ptl_rma.h | 185 ++-- src/mpid/ch4/netmod/portals4/ptl_send.h | 127 +- src/mpid/ch4/netmod/portals4/ptl_spawn.h | 18 +- src/mpid/ch4/netmod/portals4/ptl_win.h | 127 +- src/mpid/ch4/netmod/stubnm/globals.c | 223 ++-- src/mpid/ch4/netmod/stubnm/stubnm_coll.h | 408 ++++--- src/mpid/ch4/netmod/stubnm/stubnm_comm.h | 8 +- src/mpid/ch4/netmod/stubnm/stubnm_datatype.h | 4 +- src/mpid/ch4/netmod/stubnm/stubnm_init.h | 24 +- src/mpid/ch4/netmod/stubnm/stubnm_op.h | 4 +- src/mpid/ch4/netmod/stubnm/stubnm_probe.h | 22 +- src/mpid/ch4/netmod/stubnm/stubnm_recv.h | 50 +- src/mpid/ch4/netmod/stubnm/stubnm_rma.h | 185 ++-- src/mpid/ch4/netmod/stubnm/stubnm_send.h | 127 +- src/mpid/ch4/netmod/stubnm/stubnm_spawn.h | 18 +- src/mpid/ch4/netmod/stubnm/stubnm_win.h | 127 +- src/mpid/ch4/netmod/ucx/func_table.c | 222 ++-- src/mpid/ch4/netmod/ucx/ucx_am_recv.h | 61 +- src/mpid/ch4/netmod/ucx/ucx_am_rma.h | 185 ++-- src/mpid/ch4/netmod/ucx/ucx_am_send.h | 127 +- src/mpid/ch4/netmod/ucx/ucx_am_win.h | 127 +- src/mpid/ch4/netmod/ucx/ucx_coll.h | 408 ++++--- src/mpid/ch4/netmod/ucx/ucx_comm.h | 8 +- src/mpid/ch4/netmod/ucx/ucx_datatype.h | 4 +- src/mpid/ch4/netmod/ucx/ucx_init.h | 30 +- src/mpid/ch4/netmod/ucx/ucx_op.h | 4 +- src/mpid/ch4/netmod/ucx/ucx_probe.h | 18 +- src/mpid/ch4/netmod/ucx/ucx_recv.h | 81 +- src/mpid/ch4/netmod/ucx/ucx_rma.h | 193 ++-- src/mpid/ch4/netmod/ucx/ucx_send.h | 169 ++-- src/mpid/ch4/netmod/ucx/ucx_spawn.h | 22 +- src/mpid/ch4/netmod/ucx/ucx_win.h | 122 +- src/mpid/ch4/shm/include/shm.h | 1694 +++++++++++++------------- src/mpid/ch4/shm/include/shm_impl.h | 1102 +++++++++--------- src/mpid/ch4/shm/posix/func_table.c | 222 ++-- src/mpid/ch4/shm/posix/posix_coll.h | 418 ++++---- src/mpid/ch4/shm/posix/posix_comm.h | 8 +- src/mpid/ch4/shm/posix/posix_init.h | 28 +- src/mpid/ch4/shm/posix/posix_probe.h | 18 +- src/mpid/ch4/shm/posix/posix_recv.h | 58 +- src/mpid/ch4/shm/posix/posix_rma.h | 144 ++-- src/mpid/ch4/shm/posix/posix_send.h | 110 +- src/mpid/ch4/shm/posix/posix_spawn.h | 18 +- src/mpid/ch4/shm/posix/posix_win.h | 76 +- src/mpid/ch4/shm/stubshm/func_table.c | 222 ++-- src/mpid/ch4/shm/stubshm/stubshm_coll.h | 418 ++++---- src/mpid/ch4/shm/stubshm/stubshm_comm.h | 4 +- src/mpid/ch4/shm/stubshm/stubshm_init.h | 24 +- src/mpid/ch4/shm/stubshm/stubshm_probe.h | 18 +- src/mpid/ch4/shm/stubshm/stubshm_recv.h | 54 +- src/mpid/ch4/shm/stubshm/stubshm_rma.h | 144 ++-- src/mpid/ch4/shm/stubshm/stubshm_send.h | 110 +- src/mpid/ch4/shm/stubshm/stubshm_spawn.h | 18 +- src/mpid/ch4/shm/stubshm/stubshm_win.h | 76 +- src/mpid/ch4/src/ch4_coll.h | 152 ++-- src/mpid/ch4/src/ch4_comm.h | 8 +- src/mpid/ch4/src/ch4_init.h | 32 +- src/mpid/ch4/src/ch4_probe.h | 42 +- src/mpid/ch4/src/ch4_recv.h | 73 +- src/mpid/ch4/src/ch4_rma.h | 56 +- src/mpid/ch4/src/ch4_send.h | 107 +- src/mpid/ch4/src/ch4_spawn.h | 12 +- src/mpid/ch4/src/ch4_win.h | 52 +- src/mpid/ch4/src/ch4r_init.h | 20 +- src/mpid/ch4/src/ch4r_probe.h | 30 +- src/mpid/ch4/src/ch4r_recv.h | 64 +- src/mpid/ch4/src/ch4r_request.h | 4 +- src/mpid/ch4/src/ch4r_rma.h | 219 ++-- src/mpid/ch4/src/ch4r_send.h | 163 ++-- src/mpid/ch4/src/ch4r_win.h | 129 +- 107 files changed, 7646 insertions(+), 7365 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-431-g5a604db
by noreply＠mpich.org 09 Sep '16

09 Sep '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 5a604db4c16372bf67d3dabfaa049e4bdd774f0e (commit) from d45513d4ee4ad34cc8860943f21650718ddbdaa8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/5a604db4c16372bf67d3dabfaa049e4bd… commit 5a604db4c16372bf67d3dabfaa049e4bdd774f0e Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Sep 7 20:34:15 2016 -0500 CH4: Improve check for random_r support The previous configure check for random_r functionality did not address whether the random_data struct was available. Use m4 from GNU portability library (http://www.gnu.org/software/gnulib/) to test for all that is needed. Fixes an issue with CH4 strict builds. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/confdb/random_r.m4 b/confdb/random_r.m4 new file mode 100644 index 0000000..8d04a27 --- /dev/null +++ b/confdb/random_r.m4 @@ -0,0 +1,43 @@ +# serial 5 +dnl Copyright (C) 2008-2016 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_RANDOM_R], +[ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + AC_REQUIRE([AC_CANONICAL_HOST]) + + AC_CHECK_HEADERS([random.h], [], [], [AC_INCLUDES_DEFAULT]) + if test $ac_cv_header_random_h = no; then + HAVE_RANDOM_H=0 + fi + + AC_CHECK_TYPES([struct random_data], + [], [HAVE_STRUCT_RANDOM_DATA=0], + [[#include <stdlib.h> + #if HAVE_RANDOM_H + # include <random.h> + #endif + ]]) + + dnl On AIX and OSF/1, these functions exist, but with different declarations. + dnl Override them all. + case "$host_os" in + aix* | osf*) + REPLACE_RANDOM_R=1 + ;; + *) + AC_CHECK_FUNCS([random_r]) + if test $ac_cv_func_random_r = no; then + HAVE_RANDOM_R=0 + fi + ;; + esac +]) + +# Prerequisites of lib/random_r.c. +AC_DEFUN([gl_PREREQ_RANDOM_R], [ + : +]) diff --git a/confdb/stdlib_h.m4 b/confdb/stdlib_h.m4 new file mode 100644 index 0000000..19107c4 --- /dev/null +++ b/confdb/stdlib_h.m4 @@ -0,0 +1,119 @@ +# stdlib_h.m4 serial 42 +dnl Copyright (C) 2007-2016 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_STDLIB_H], +[ + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + gl_NEXT_HEADERS([stdlib.h]) + + dnl Check for declarations of anything we want to poison if the + dnl corresponding gnulib module is not in use, and which is not + dnl guaranteed by C89. + gl_WARN_ON_USE_PREPARE([[#include <stdlib.h> +#if HAVE_SYS_LOADAVG_H +# include <sys/loadavg.h> +#endif +#if HAVE_RANDOM_H +# include <random.h> +#endif + ]], [_Exit atoll canonicalize_file_name getloadavg getsubopt grantpt + initstate initstate_r mkdtemp mkostemp mkostemps mkstemp mkstemps + posix_openpt ptsname ptsname_r random random_r realpath rpmatch + secure_getenv setenv setstate setstate_r srandom srandom_r + strtod strtoll strtoull unlockpt unsetenv]) +]) + +AC_DEFUN([gl_STDLIB_MODULE_INDICATOR], +[ + dnl Use AC_REQUIRE here, so that the default settings are expanded once only. + AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) +]) + +AC_DEFUN([gl_STDLIB_H_DEFAULTS], +[ + GNULIB__EXIT=0; AC_SUBST([GNULIB__EXIT]) + GNULIB_ATOLL=0; AC_SUBST([GNULIB_ATOLL]) + GNULIB_CALLOC_POSIX=0; AC_SUBST([GNULIB_CALLOC_POSIX]) + GNULIB_CANONICALIZE_FILE_NAME=0; AC_SUBST([GNULIB_CANONICALIZE_FILE_NAME]) + GNULIB_GETLOADAVG=0; AC_SUBST([GNULIB_GETLOADAVG]) + GNULIB_GETSUBOPT=0; AC_SUBST([GNULIB_GETSUBOPT]) + GNULIB_GRANTPT=0; AC_SUBST([GNULIB_GRANTPT]) + GNULIB_MALLOC_POSIX=0; AC_SUBST([GNULIB_MALLOC_POSIX]) + GNULIB_MBTOWC=0; AC_SUBST([GNULIB_MBTOWC]) + GNULIB_MKDTEMP=0; AC_SUBST([GNULIB_MKDTEMP]) + GNULIB_MKOSTEMP=0; AC_SUBST([GNULIB_MKOSTEMP]) + GNULIB_MKOSTEMPS=0; AC_SUBST([GNULIB_MKOSTEMPS]) + GNULIB_MKSTEMP=0; AC_SUBST([GNULIB_MKSTEMP]) + GNULIB_MKSTEMPS=0; AC_SUBST([GNULIB_MKSTEMPS]) + GNULIB_POSIX_OPENPT=0; AC_SUBST([GNULIB_POSIX_OPENPT]) + GNULIB_PTSNAME=0; AC_SUBST([GNULIB_PTSNAME]) + GNULIB_PTSNAME_R=0; AC_SUBST([GNULIB_PTSNAME_R]) + GNULIB_PUTENV=0; AC_SUBST([GNULIB_PUTENV]) + GNULIB_QSORT_R=0; AC_SUBST([GNULIB_QSORT_R]) + GNULIB_RANDOM=0; AC_SUBST([GNULIB_RANDOM]) + GNULIB_RANDOM_R=0; AC_SUBST([GNULIB_RANDOM_R]) + GNULIB_REALLOC_POSIX=0; AC_SUBST([GNULIB_REALLOC_POSIX]) + GNULIB_REALPATH=0; AC_SUBST([GNULIB_REALPATH]) + GNULIB_RPMATCH=0; AC_SUBST([GNULIB_RPMATCH]) + GNULIB_SECURE_GETENV=0; AC_SUBST([GNULIB_SECURE_GETENV]) + GNULIB_SETENV=0; AC_SUBST([GNULIB_SETENV]) + GNULIB_STRTOD=0; AC_SUBST([GNULIB_STRTOD]) + GNULIB_STRTOLL=0; AC_SUBST([GNULIB_STRTOLL]) + GNULIB_STRTOULL=0; AC_SUBST([GNULIB_STRTOULL]) + GNULIB_SYSTEM_POSIX=0; AC_SUBST([GNULIB_SYSTEM_POSIX]) + GNULIB_UNLOCKPT=0; AC_SUBST([GNULIB_UNLOCKPT]) + GNULIB_UNSETENV=0; AC_SUBST([GNULIB_UNSETENV]) + GNULIB_WCTOMB=0; AC_SUBST([GNULIB_WCTOMB]) + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE__EXIT=1; AC_SUBST([HAVE__EXIT]) + HAVE_ATOLL=1; AC_SUBST([HAVE_ATOLL]) + HAVE_CANONICALIZE_FILE_NAME=1; AC_SUBST([HAVE_CANONICALIZE_FILE_NAME]) + HAVE_DECL_GETLOADAVG=1; AC_SUBST([HAVE_DECL_GETLOADAVG]) + HAVE_GETSUBOPT=1; AC_SUBST([HAVE_GETSUBOPT]) + HAVE_GRANTPT=1; AC_SUBST([HAVE_GRANTPT]) + HAVE_MKDTEMP=1; AC_SUBST([HAVE_MKDTEMP]) + HAVE_MKOSTEMP=1; AC_SUBST([HAVE_MKOSTEMP]) + HAVE_MKOSTEMPS=1; AC_SUBST([HAVE_MKOSTEMPS]) + HAVE_MKSTEMP=1; AC_SUBST([HAVE_MKSTEMP]) + HAVE_MKSTEMPS=1; AC_SUBST([HAVE_MKSTEMPS]) + HAVE_POSIX_OPENPT=1; AC_SUBST([HAVE_POSIX_OPENPT]) + HAVE_PTSNAME=1; AC_SUBST([HAVE_PTSNAME]) + HAVE_PTSNAME_R=1; AC_SUBST([HAVE_PTSNAME_R]) + HAVE_RANDOM=1; AC_SUBST([HAVE_RANDOM]) + HAVE_RANDOM_H=1; AC_SUBST([HAVE_RANDOM_H]) + HAVE_RANDOM_R=1; AC_SUBST([HAVE_RANDOM_R]) + HAVE_REALPATH=1; AC_SUBST([HAVE_REALPATH]) + HAVE_RPMATCH=1; AC_SUBST([HAVE_RPMATCH]) + HAVE_SECURE_GETENV=1; AC_SUBST([HAVE_SECURE_GETENV]) + HAVE_SETENV=1; AC_SUBST([HAVE_SETENV]) + HAVE_DECL_SETENV=1; AC_SUBST([HAVE_DECL_SETENV]) + HAVE_STRTOD=1; AC_SUBST([HAVE_STRTOD]) + HAVE_STRTOLL=1; AC_SUBST([HAVE_STRTOLL]) + HAVE_STRTOULL=1; AC_SUBST([HAVE_STRTOULL]) + HAVE_STRUCT_RANDOM_DATA=1; AC_SUBST([HAVE_STRUCT_RANDOM_DATA]) + HAVE_SYS_LOADAVG_H=0; AC_SUBST([HAVE_SYS_LOADAVG_H]) + HAVE_UNLOCKPT=1; AC_SUBST([HAVE_UNLOCKPT]) + HAVE_DECL_UNSETENV=1; AC_SUBST([HAVE_DECL_UNSETENV]) + REPLACE_CALLOC=0; AC_SUBST([REPLACE_CALLOC]) + REPLACE_CANONICALIZE_FILE_NAME=0; AC_SUBST([REPLACE_CANONICALIZE_FILE_NAME]) + REPLACE_MALLOC=0; AC_SUBST([REPLACE_MALLOC]) + REPLACE_MBTOWC=0; AC_SUBST([REPLACE_MBTOWC]) + REPLACE_MKSTEMP=0; AC_SUBST([REPLACE_MKSTEMP]) + REPLACE_PTSNAME=0; AC_SUBST([REPLACE_PTSNAME]) + REPLACE_PTSNAME_R=0; AC_SUBST([REPLACE_PTSNAME_R]) + REPLACE_PUTENV=0; AC_SUBST([REPLACE_PUTENV]) + REPLACE_QSORT_R=0; AC_SUBST([REPLACE_QSORT_R]) + REPLACE_RANDOM_R=0; AC_SUBST([REPLACE_RANDOM_R]) + REPLACE_REALLOC=0; AC_SUBST([REPLACE_REALLOC]) + REPLACE_REALPATH=0; AC_SUBST([REPLACE_REALPATH]) + REPLACE_SETENV=0; AC_SUBST([REPLACE_SETENV]) + REPLACE_STRTOD=0; AC_SUBST([REPLACE_STRTOD]) + REPLACE_UNSETENV=0; AC_SUBST([REPLACE_UNSETENV]) + REPLACE_WCTOMB=0; AC_SUBST([REPLACE_WCTOMB]) +]) diff --git a/src/mpid/ch4/subconfigure.m4 b/src/mpid/ch4/subconfigure.m4 index f4ca5c5..7d6f8cc 100644 --- a/src/mpid/ch4/subconfigure.m4 +++ b/src/mpid/ch4/subconfigure.m4 @@ -376,9 +376,8 @@ AM_CONDITIONAL([BUILD_CH4_SHM],[test "$ch4_shm_level" = "yes" -o "$ch4_shm_level AC_CHECK_HEADERS(sys/mman.h sys/stat.h fcntl.h) -found_rand_funcs=no -AC_CHECK_FUNCS(random_r initstate_r, found_rand_funcs=yes) -if test "$found_rand_funcs" = yes ; then +gl_FUNC_RANDOM_R +if test "$HAVE_RANDOM_R" = "1" -a "$HAVE_STRUCT_RANDOM_DATA" = "1" ; then AC_DEFINE(USE_SYM_HEAP,1,[Define if we can use a symmetric heap]) AC_MSG_NOTICE([Using a symmetric heap]) else ----------------------------------------------------------------------- Summary of changes: confdb/random_r.m4 | 43 +++++++++++++++ confdb/stdlib_h.m4 | 119 ++++++++++++++++++++++++++++++++++++++++++ src/mpid/ch4/subconfigure.m4 | 5 +- 3 files changed, 164 insertions(+), 3 deletions(-) create mode 100644 confdb/random_r.m4 create mode 100644 confdb/stdlib_h.m4 hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-430-gd45513d
by noreply＠mpich.org 07 Sep '16

07 Sep '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via d45513d4ee4ad34cc8860943f21650718ddbdaa8 (commit) via 0671ef921c44fa25da2f8dff14b6b64c6678f31a (commit) via 497920f65c9f10539bd0d158825ed5936bf6bae3 (commit) from 524aeedc0918261477c46b736fa2ce72085d5115 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/d45513d4ee4ad34cc8860943f21650718… commit d45513d4ee4ad34cc8860943f21650718ddbdaa8 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Aug 24 16:05:22 2016 -0500 binding/mpif_h: Remove unused defines Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/binding/fortran/mpif_h/mpi_fortimpl.h b/src/binding/fortran/mpif_h/mpi_fortimpl.h index e8dcb8e..fbaea21 100644 --- a/src/binding/fortran/mpif_h/mpi_fortimpl.h +++ b/src/binding/fortran/mpif_h/mpi_fortimpl.h @@ -202,17 +202,6 @@ typedef char *MPID_FCHAR_T; #include <stdlib.h> #endif -/* Temporary patch for the space routines. Eventually, this should use - (FIXME) *just* the memory definitions currently in mpiimpl.h */ -/* style: allow:malloc:1 sig:0 */ -/* style: allow:free:1 sig:0 */ -/* style: allow:calloc:1 sig:0 */ -#ifndef MPL_malloc -#define MPL_malloc(a) malloc((unsigned)(a)) -#define MPL_calloc(a,b) calloc((unsigned)(a),(unsigned)(b)) -#define MPL_free(a) free((void *)(a)) -#endif - /* To avoid constant allocation/deallocation of temporary arrays, define a small default, predefined array size. */ #ifndef MPIR_USE_LOCAL_ARRAY http://git.mpich.org/mpich.git/commitdiff/0671ef921c44fa25da2f8dff14b6b64c6… commit 0671ef921c44fa25da2f8dff14b6b64c6678f31a Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Sep 6 13:47:31 2016 -0500 CH4: Fix incorrect type accumulate_ordering is defined as an int. Fix type used to temporarily store the value. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpid/ch4/src/ch4r_win.h b/src/mpid/ch4/src/ch4r_win.h index 035e125..064fa89 100644 --- a/src/mpid/ch4/src/ch4r_win.h +++ b/src/mpid/ch4/src/ch4r_win.h @@ -33,7 +33,7 @@ static inline int MPIDI_CH4R_win_set_info(MPIR_Win * win, MPIR_Info * info) MPIR_Info *curr_ptr; char *value, *token, *savePtr; - uint save_ordering; + int save_ordering; curr_ptr = info->next; @@ -45,7 +45,7 @@ static inline int MPIDI_CH4R_win_set_info(MPIR_Win * win, MPIR_Info * info) MPIDI_CH4U_WIN(win, info_args).no_locks = 0; } else if (!strcmp(curr_ptr->key, "accumulate_ordering")) { - save_ordering = (uint) MPIDI_CH4U_WIN(win, info_args).accumulate_ordering; + save_ordering = MPIDI_CH4U_WIN(win, info_args).accumulate_ordering; MPIDI_CH4U_WIN(win, info_args).accumulate_ordering = 0; value = curr_ptr->value; token = (char *) strtok_r(value, ",", &savePtr); http://git.mpich.org/mpich.git/commitdiff/497920f65c9f10539bd0d158825ed5936… commit 497920f65c9f10539bd0d158825ed5936bf6bae3 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Sep 6 13:44:15 2016 -0500 CH4: Remove unused variable Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/src/mpid/ch4/src/ch4i_comm.h b/src/mpid/ch4/src/ch4i_comm.h index d837115..305770a 100644 --- a/src/mpid/ch4/src/ch4i_comm.h +++ b/src/mpid/ch4/src/ch4i_comm.h @@ -893,13 +893,10 @@ static inline int MPIDII_set_map(MPIDII_rank_map_t * src_rmap, int src_comm_size, int total_mapper_size, int mapper_offset) { int mpi_errno = MPI_SUCCESS; - MPIDII_rank_map_mode src_mode; MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDII_SET_MAP); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDII_SET_MAP); - src_mode = src_rmap->mode; - /* Simplest case: MAP_DUP, exact duplication of src_comm */ if (mapper->type == MPIR_COMM_MAP_TYPE__DUP && src_comm_size == total_mapper_size) { MPIDII_direct_of_src_rmap(src_rmap, dest_rmap, mapper); @@ -931,7 +928,7 @@ static inline int MPIDII_set_map(MPIDII_rank_map_t * src_rmap, MPIDII_src_mlut_to_mlut(src_rmap, dest_rmap, mapper, total_mapper_size, mapper_offset); } - else { /* src_mode != MPIDII_RANK_MAP_MLUT */ + else { MPIDII_src_map_to_lut(src_rmap, dest_rmap, mapper, mapper->src_mapping_size, mapper_offset); } ----------------------------------------------------------------------- Summary of changes: src/binding/fortran/mpif_h/mpi_fortimpl.h | 11 ----------- src/mpid/ch4/src/ch4i_comm.h | 5 +---- src/mpid/ch4/src/ch4r_win.h | 4 ++-- 3 files changed, 3 insertions(+), 17 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-427-g524aeed
by noreply＠mpich.org 02 Sep '16

02 Sep '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 524aeedc0918261477c46b736fa2ce72085d5115 (commit) via 710d18392e4356593ebeea34bf5c1f28e1747645 (commit) via 4f0d6c12a6f20387db09d1e6557ed71fe9882fae (commit) via 532430583eb9ec01d2c20aefafad15874c0da00f (commit) via e049ef4358cdcbab8f3e6ac4da3cefa7cc88ce62 (commit) via 7ededee9220b263f87668b991e8d1c642ff76072 (commit) from 1c63de860856b416864625ef7be4b379e729d99a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/524aeedc0918261477c46b736fa2ce720… commit 524aeedc0918261477c46b736fa2ce72085d5115 Author: Min Si <msi(a)anl.gov> Date: Thu Jun 23 18:01:48 2016 -0500 Added empty symbol for dynamic process routines. In original code, the dynamic process routine can be disabled by setting MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS. Functions exposed to external code must have empty symbols to avoid compiling failure. Signed-off-by: Yanfei Guo <yguo(a)anl.gov> diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 44e05b2..f6959ad 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -1016,6 +1016,7 @@ typedef struct MPIDI_Port_Ops { #define MPIDI_PORTFNS_VERSION 1 int MPIDI_CH3_PortFnsInit( MPIDI_PortFns * ); +#ifndef MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS /* Utility routines provided in src/ch3u_port.c for working with connection queues */ int MPIDI_CH3I_Acceptq_enqueue(MPIDI_VC_t * vc, int port_name_tag); @@ -1023,6 +1024,15 @@ int MPIDI_Port_finalize(void); int MPIDI_CH3I_Port_init(int port_name_tag); int MPIDI_CH3I_Port_destroy(int port_name_tag); +#else +/* Need empty symbols to avoid failure at compile time if defined + * MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS. */ +#define MPIDI_CH3I_Acceptq_enqueue(vc, port_name_tag) (MPI_SUCCESS) +#define MPIDI_Port_finalize() (MPI_SUCCESS) + +#define MPIDI_CH3I_Port_init(port_name_tag) (MPI_SUCCESS) +#define MPIDI_CH3I_Port_destroy(port_name_tag) (MPI_SUCCESS) +#endif /*-------------------------- END MPI PORT SECTION --------------------------*/ @@ -1661,8 +1671,14 @@ int MPIDI_CH3_InitCompleted( void ); #endif /* Routines in support of ch3 */ +#ifndef MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS /* Routine to return the tag associated with a port */ int MPIDI_GetTagFromPort( const char *, int * ); +#else +/* Need empty symbol to avoid failure at compile time if defined + * MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS. */ +#define MPIDI_GetTagFromPort(port_name, port_name_tag) (MPI_SUCCESS) +#endif /* Here are the packet handlers */ int MPIDI_CH3_PktHandler_EagerSend( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, http://git.mpich.org/mpich.git/commitdiff/710d18392e4356593ebeea34bf5c1f28e… commit 710d18392e4356593ebeea34bf5c1f28e1747645 Author: Min Si <msi(a)anl.gov> Date: Fri Jun 17 18:08:09 2016 -0500 Added info "timeout" (in seconds) for MPI_Comm_connect. The default threshold of connection timeout is set by MPIR_CVAR_CH3_COMM_CONNECT_TIMEOUT. User code can specify per connect threshold through "timeout" info (in seconds). Signed-off-by: Yanfei Guo <yguo(a)anl.gov> diff --git a/src/mpid/ch3/errnames.txt b/src/mpid/ch3/errnames.txt index 3cd2831..9204942 100644 --- a/src/mpid/ch3/errnames.txt +++ b/src/mpid/ch3/errnames.txt @@ -33,6 +33,7 @@ **ch3|pmi_finalize:PMI_Finalize failed **ch3|pmi_finalize %d:PMI_Finalize failed, error %d **ch3|conntimeout:Connection timed out +**ch3|conntimeout %d:Connection timed out in %d seconds **ch3|portclose:Port is unexpectedly closed # diff --git a/src/mpid/ch3/src/ch3u_port.c b/src/mpid/ch3/src/ch3u_port.c index 8dab65d..6fb1ed0 100644 --- a/src/mpid/ch3/src/ch3u_port.c +++ b/src/mpid/ch3/src/ch3u_port.c @@ -252,7 +252,7 @@ static MPIDI_CH3I_Port_connreq_q_t revoked_connreq_q = {NULL, NULL, 0}; #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) static int MPIDI_Create_inter_root_communicator_connect(const char *port_name, - MPIR_Comm **comm_pptr, + int timeout, MPIR_Comm **comm_pptr, MPIDI_VC_t **vc_pptr) { int mpi_errno = MPI_SUCCESS; @@ -290,6 +290,9 @@ static int MPIDI_Create_inter_root_communicator_connect(const char *port_name, MPID_Time_t time_sta, time_now; double time_gap = 0; + MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT, VERBOSE, + (MPL_DBG_FDEST, "connect: waiting accept in %d(s)", timeout)); + MPID_Wtime(&time_sta); do { mpi_errno = MPID_Progress_poke(); @@ -300,7 +303,7 @@ static int MPIDI_Create_inter_root_communicator_connect(const char *port_name, MPID_Wtime_diff(&time_sta, &time_now, &time_gap); /* FIXME: not thread-safe */ } while (connreq->stat == MPIDI_CH3I_PORT_CONNREQ_INITED - && (int) time_gap < MPIR_CVAR_CH3_COMM_CONNECT_TIMEOUT); + && (int) time_gap < timeout); } switch (connreq->stat) { @@ -317,7 +320,8 @@ static int MPIDI_Create_inter_root_communicator_connect(const char *port_name, MPIDI_CH3I_Port_connreq_q_enqueue(&revoked_connreq_q, connreq); MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, REVOKE); - MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_PORT, "**ch3|conntimeout"); + MPIR_ERR_SETANDJUMP1(mpi_errno, MPI_ERR_PORT, "**ch3|conntimeout", + "**ch3|conntimeout %d", timeout); break; case MPIDI_CH3I_PORT_CONNREQ_ERR_CLOSE: @@ -627,10 +631,22 @@ int MPIDI_Comm_connect(const char *port_name, MPIR_Info *info, int root, if (rank == root) { + int timeout = MPIR_CVAR_CH3_COMM_CONNECT_TIMEOUT; + + /* Check if user specifies timeout threshold. */ + if (info != NULL) { + int info_flag = 0; + char info_value[MPI_MAX_INFO_VAL + 1]; + MPIR_Info_get_impl(info, "timeout", MPI_MAX_INFO_VAL, info_value, &info_flag); + if (info_flag) { + timeout = atoi(info_value); + } + } + /* Establish a communicator to communicate with the root on the other side. */ mpi_errno = MPIDI_Create_inter_root_communicator_connect( - port_name, &tmp_comm, &new_vc); + port_name, timeout, &tmp_comm, &new_vc); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP_LABEL(mpi_errno, no_port); } http://git.mpich.org/mpich.git/commitdiff/4f0d6c12a6f20387db09d1e6557ed71fe… commit 4f0d6c12a6f20387db09d1e6557ed71fe9882fae Author: Min Si <msi(a)anl.gov> Date: Fri Jun 17 17:36:10 2016 -0500 Removed unused function declaration. Signed-off-by: Yanfei Guo <yguo(a)anl.gov> diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 2202130..44e05b2 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -1019,11 +1019,6 @@ int MPIDI_CH3_PortFnsInit( MPIDI_PortFns * ); /* Utility routines provided in src/ch3u_port.c for working with connection queues */ int MPIDI_CH3I_Acceptq_enqueue(MPIDI_VC_t * vc, int port_name_tag); -#ifdef MPIDI_CH3_CHANNEL_AVOIDS_SELECT -int MPIDI_CH3_Complete_Acceptq_dequeue(MPIDI_VC_t * vc); -#else -#define MPIDI_CH3_Complete_Acceptq_dequeue(vc) MPI_SUCCESS -#endif int MPIDI_Port_finalize(void); int MPIDI_CH3I_Port_init(int port_name_tag); http://git.mpich.org/mpich.git/commitdiff/532430583eb9ec01d2c20aefafad15874… commit 532430583eb9ec01d2c20aefafad15874c0da00f Author: Min Si <msi(a)anl.gov> Date: Fri Jun 17 17:06:35 2016 -0500 Added support for MPI_Comm_connect timeout. To support connection timeout (defined in standard), we add additional handshake protocol in the vc establishing step in accept/connect routines. If no matching accept issued on the server process, the connect call on client process can return after specified threshold MPIR_CVAR_CH3_COMM_CONNECT_TIMEOUT. An MPI error MPI_ERR_PORT will be returned. Detailed algorithm is described at the beginning of ch3u_port.c. Signed-off-by: Yanfei Guo <yguo(a)anl.gov> diff --git a/src/mpid/ch3/errnames.txt b/src/mpid/ch3/errnames.txt index a3308bc..3cd2831 100644 --- a/src/mpid/ch3/errnames.txt +++ b/src/mpid/ch3/errnames.txt @@ -32,6 +32,8 @@ **ch3|close_progress:an error occurred while the device was waiting for all open connections to close **ch3|pmi_finalize:PMI_Finalize failed **ch3|pmi_finalize %d:PMI_Finalize failed, error %d +**ch3|conntimeout:Connection timed out +**ch3|portclose:Port is unexpectedly closed # # RMA errors diff --git a/src/mpid/ch3/include/mpid_port.h b/src/mpid/ch3/include/mpid_port.h new file mode 100644 index 0000000..4463d39 --- /dev/null +++ b/src/mpid/ch3/include/mpid_port.h @@ -0,0 +1,200 @@ +/* -*- Mode: C; c-basic-offset:4 ; -*- */ +/* + * (C) 2016 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ +#ifndef MPID_PORT_H_ +#define MPID_PORT_H_ + +#include "mpl_utlist.h" + +#ifndef MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS + +/* Header file only used by port connect/accept routines (ch3u_port.c) */ + +typedef enum { + MPIDI_CH3I_PORT_CONNREQ_INITED, /* Connection request initialized. */ + MPIDI_CH3I_PORT_CONNREQ_REVOKE, /* Client started revoking a timed out connection request. */ + MPIDI_CH3I_PORT_CONNREQ_ACCEPT, /* Server started accepting a connection request. */ + MPIDI_CH3I_PORT_CONNREQ_ACCEPTED, /* Server successfully accepted this request (i.e., + * client does not revoke it). */ + MPIDI_CH3I_PORT_CONNREQ_ERR_CLOSE, /* Error state -- Server closed unexpectedly. + * (called close_port or finalize while client is + * still waiting acceptance). + * Note: revoke-state request will be directly + * changed to free-state. */ + MPIDI_CH3I_PORT_CONNREQ_FREE, /* Started freeing a connection request. + * (VC has been locally closed and ready for blocking + * wait on termination). + * A connection request can be eventually freed when: + * (1) connection normally completed; + * (2) a timed out connection (revoke) request received + * accept packet; + * (3) server closed unexpectedly.*/ +} MPIDI_CH3I_Port_connreq_stat_t; + +typedef struct MPIDI_CH3I_Port_connreq { + MPIDI_VC_t *vc; + MPIDI_CH3I_Port_connreq_stat_t stat; + struct MPIDI_CH3I_Port_connreq *next; +} MPIDI_CH3I_Port_connreq_t; + +typedef struct MPIDI_CH3I_Port_connreq_q { + MPIDI_CH3I_Port_connreq_t *head; + MPIDI_CH3I_Port_connreq_t *tail; + int size; +} MPIDI_CH3I_Port_connreq_q_t; + +typedef struct MPIDI_CH3I_Port { + int port_name_tag; + MPIDI_CH3I_Port_connreq_q_t accept_connreq_q; + struct MPIDI_CH3I_Port *next; +} MPIDI_CH3I_Port_t; + +typedef struct MPIDI_CH3I_Port_q { + MPIDI_CH3I_Port_t *head; + MPIDI_CH3I_Port_t *tail; + int size; +} MPIDI_CH3I_Port_q_t; + +#define MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, new_stat) \ + (connreq->stat = MPIDI_CH3I_PORT_CONNREQ_##new_stat) + + +/* Start VC closing protocol -- locally close VC. + * It is the 1st step of VC closing protocol (see ch3u_handle_connection.c): + * local_closed / remote_closed -> close_acked -> closed. */ +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3I_Port_local_close_vc +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPIDI_CH3I_Port_local_close_vc(MPIDI_VC_t * vc) +{ + int mpi_errno = MPI_SUCCESS; + + /* Note that this routine is usually called in comm_release after matched in + * an accept call. Here we do not have comm for the VC, thus just close it + * with a dummy rank (this parameter is only for debugging) */ + if (vc->state == MPIDI_VC_STATE_ACTIVE || vc->state == MPIDI_VC_STATE_REMOTE_CLOSE) { + mpi_errno = MPIDI_CH3U_VC_SendClose(vc, 0 /* dummy rank */); + } + + return mpi_errno; +} + +/*** Utility routines for connection request queues ***/ + +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3I_Port_connreq_q_enqueue +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline void MPIDI_CH3I_Port_connreq_q_enqueue(MPIDI_CH3I_Port_connreq_q_t * connreq_q, + MPIDI_CH3I_Port_connreq_t * connreq) +{ + MPL_LL_APPEND(connreq_q->head, connreq_q->tail, connreq); + connreq_q->size++; +} + +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3I_Port_connreq_q_dequeue +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline void MPIDI_CH3I_Port_connreq_q_dequeue(MPIDI_CH3I_Port_connreq_q_t * connreq_q, + MPIDI_CH3I_Port_connreq_t ** connreq_ptr) +{ + MPIDI_CH3I_Port_connreq_t *connreq = NULL; + + /* delete head */ + if (connreq_q->head != NULL) { + connreq = connreq_q->head; + + MPL_LL_DELETE(connreq_q->head, connreq_q->tail, connreq); + connreq_q->size--; + } + + (*connreq_ptr) = connreq; +} + +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3I_Port_connreq_q_delete +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline void MPIDI_CH3I_Port_connreq_q_delete(MPIDI_CH3I_Port_connreq_q_t * connreq_q, + MPIDI_CH3I_Port_connreq_t * connreq) +{ + MPL_LL_DELETE(connreq_q->head, connreq_q->tail, connreq); + connreq_q->size--; +} + + + +/*** Utility routines for issuing ACK packets in accept/connect routine ***/ + +/* Reply ACK packet to server accept routine. Client replies this packet after + * received an accept packet from server. Handled in MPIDI_CH3_PktHandler_AcceptAck. + * ACK - True means client matched with server acceptance; + * ACK - False means client already started revoking, thus acceptance fails. */ +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3I_Port_issue_accept_ack +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPIDI_CH3I_Port_issue_accept_ack(MPIDI_VC_t * vc, int ack) +{ + int mpi_errno = MPI_SUCCESS; + MPIR_Request *req_ptr = NULL; + MPIDI_CH3_Pkt_t spkt; + MPIDI_CH3_Pkt_accept_ack_t *ack_pkt = &spkt.accept_ack; + + MPIDI_Pkt_init(ack_pkt, MPIDI_CH3_PKT_ACCEPT_ACK); + ack_pkt->ack = ack; + + MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT, VERBOSE, + (MPL_DBG_FDEST, "issuing accpet_ack packet to vc %p, ack=%d", vc, ack)); + + mpi_errno = MPIDI_CH3_iStartMsg(vc, ack_pkt, sizeof(MPIDI_CH3_Pkt_t), &req_ptr); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + + if (req_ptr != NULL) + MPIR_Request_free(req_ptr); /* Only reduce reference, released after pkt sent. */ + + return mpi_errno; +} + +/* Reply ACK packet to client connect routine. Server replies this packet in + * accept call for dequeued connection request, or replies immediately when + * received a request for non-existing port. Handled in MPIDI_CH3_PktHandler_ConnAck + * on client. + * ACK - True means server started accepting this connection request; + * ACK - False means port does not exist or being closed on server, thus connection + * fails. */ +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3I_Port_issue_conn_ack +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static inline int MPIDI_CH3I_Port_issue_conn_ack(MPIDI_VC_t * vc, int ack) +{ + int mpi_errno = MPI_SUCCESS; + MPIR_Request *req_ptr = NULL; + MPIDI_CH3_Pkt_t spkt; + MPIDI_CH3_Pkt_conn_ack_t *ack_pkt = &spkt.conn_ack; + + MPIDI_Pkt_init(ack_pkt, MPIDI_CH3_PKT_CONN_ACK); + ack_pkt->ack = ack; + + MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT, VERBOSE, + (MPL_DBG_FDEST, "issuing conn_ack packet to vc %p, ack=%d", vc, ack)); + + mpi_errno = MPIDI_CH3_iStartMsg(vc, ack_pkt, sizeof(MPIDI_CH3_Pkt_t), &req_ptr); + if (mpi_errno != MPI_SUCCESS) + return mpi_errno; + + if (req_ptr != NULL) + MPIR_Request_free(req_ptr); /* Only reduce reference, released after pkt sent. */ + + return mpi_errno; +} + +#endif /* MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS */ + +#endif /* MPID_PORT_H_ */ diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index e7d2456..2202130 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -694,6 +694,10 @@ typedef struct MPIDI_VC /* port name tag */ int port_name_tag; /* added to handle dynamic process mgmt */ +#ifndef MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS + void *connreq_obj; /* pointer to dynamic connection mgmt object */ +#endif + #if defined(MPID_USE_SEQUENCE_NUMBERS) /* Sequence number of the next packet to be sent */ MPID_Seqnum_t seqnum_send; @@ -1015,12 +1019,15 @@ int MPIDI_CH3_PortFnsInit( MPIDI_PortFns * ); /* Utility routines provided in src/ch3u_port.c for working with connection queues */ int MPIDI_CH3I_Acceptq_enqueue(MPIDI_VC_t * vc, int port_name_tag); -int MPIDI_CH3I_Acceptq_dequeue(MPIDI_VC_t ** vc, int port_name_tag); #ifdef MPIDI_CH3_CHANNEL_AVOIDS_SELECT int MPIDI_CH3_Complete_Acceptq_dequeue(MPIDI_VC_t * vc); #else #define MPIDI_CH3_Complete_Acceptq_dequeue(vc) MPI_SUCCESS #endif +int MPIDI_Port_finalize(void); + +int MPIDI_CH3I_Port_init(int port_name_tag); +int MPIDI_CH3I_Port_destroy(int port_name_tag); /*-------------------------- END MPI PORT SECTION --------------------------*/ @@ -1723,6 +1730,15 @@ int MPIDI_CH3_PktHandler_FlowCntlUpdate( MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_Close( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, intptr_t *, MPIR_Request ** ); + +#ifndef MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS +/* packet handlers used in dynamic process connection. */ +int MPIDI_CH3_PktHandler_ConnAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, + intptr_t * buflen, MPIR_Request ** rreqp); +int MPIDI_CH3_PktHandler_AcceptAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, + intptr_t * buflen, MPIR_Request ** rreqp); +#endif /* end of MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS */ + int MPIDI_CH3_PktHandler_EndCH3( MPIDI_VC_t *, MPIDI_CH3_Pkt_t *, intptr_t *, MPIR_Request ** ); int MPIDI_CH3_PktHandler_Revoke(MPIDI_VC_t *vc, MPIDI_CH3_Pkt_t *pkt, diff --git a/src/mpid/ch3/include/mpidpkt.h b/src/mpid/ch3/include/mpidpkt.h index 1abc133..5566589 100644 --- a/src/mpid/ch3/include/mpidpkt.h +++ b/src/mpid/ch3/include/mpidpkt.h @@ -103,6 +103,11 @@ typedef enum { MPIDI_CH3_PKT_FLOW_CNTL_UPDATE, /* FIXME: Unused */ MPIDI_CH3_PKT_CLOSE, MPIDI_CH3_PKT_REVOKE, +#ifndef MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS + /* Dynamic Connection Management */ + MPIDI_CH3_PKT_CONN_ACK, + MPIDI_CH3_PKT_ACCEPT_ACK, +#endif MPIDI_CH3_PKT_END_CH3, /* The channel can define additional types by defining the value * MPIDI_CH3_PKT_ENUM */ @@ -840,6 +845,16 @@ typedef struct MPIDI_CH3_Pkt_close { int ack; } MPIDI_CH3_Pkt_close_t; +#ifndef MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS +/* packet types used in dynamic process connection. */ +typedef struct MPIDI_CH3_Pkt_conn_ack { + MPIDI_CH3_Pkt_type_t type; + int ack; +} MPIDI_CH3_Pkt_conn_ack_t; + +typedef MPIDI_CH3_Pkt_conn_ack_t MPIDI_CH3_Pkt_accept_ack_t; +#endif /* end of MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS */ + typedef struct MPIDI_CH3_Pkt_revoke { MPIDI_CH3_Pkt_type_t type; MPIR_Context_id_t revoked_comm; @@ -872,6 +887,10 @@ typedef union MPIDI_CH3_Pkt { MPIDI_CH3_Pkt_ack_t ack; MPIDI_CH3_Pkt_decr_at_counter_t decr_at_cnt; MPIDI_CH3_Pkt_close_t close; +#ifndef MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS + MPIDI_CH3_Pkt_conn_ack_t conn_ack; + MPIDI_CH3_Pkt_accept_ack_t accept_ack; +#endif MPIDI_CH3_Pkt_cas_t cas; MPIDI_CH3_Pkt_cas_resp_t cas_resp; MPIDI_CH3_Pkt_fop_t fop; diff --git a/src/mpid/ch3/src/ch3u_handle_recv_pkt.c b/src/mpid/ch3/src/ch3u_handle_recv_pkt.c index 9f0673e..e66c6d6 100644 --- a/src/mpid/ch3/src/ch3u_handle_recv_pkt.c +++ b/src/mpid/ch3/src/ch3u_handle_recv_pkt.c @@ -563,6 +563,13 @@ int MPIDI_CH3_PktHandler_Init( MPIDI_CH3_PktHandler_Fcn *pktArray[], pktArray[MPIDI_CH3_PKT_CLOSE] = MPIDI_CH3_PktHandler_Close; +#ifndef MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS + /* Dynamic Connection Management */ + pktArray[MPIDI_CH3_PKT_CONN_ACK] = + MPIDI_CH3_PktHandler_ConnAck; + pktArray[MPIDI_CH3_PKT_ACCEPT_ACK] = + MPIDI_CH3_PktHandler_AcceptAck; +#endif /* Provision for flow control */ pktArray[MPIDI_CH3_PKT_FLOW_CNTL_UPDATE] = 0; diff --git a/src/mpid/ch3/src/ch3u_port.c b/src/mpid/ch3/src/ch3u_port.c index a24d350..8dab65d 100644 --- a/src/mpid/ch3/src/ch3u_port.c +++ b/src/mpid/ch3/src/ch3u_port.c @@ -5,6 +5,27 @@ */ #include "mpidi_ch3_impl.h" +#include "mpid_port.h" + +/* +=== BEGIN_MPI_T_CVAR_INFO_BLOCK === + +cvars: + - name : MPIR_CVAR_CH3_COMM_CONNECT_TIMEOUT + category : CH3 + type : int + default : 180 + class : none + verbosity : MPI_T_VERBOSITY_USER_BASIC + scope : MPI_T_SCOPE_GROUP_EQ + description : >- + The default time out period in seconds for a connection attempt to the + server communicator where the named port exists but no pending accept. + User can change the value for a specified connection through its info + argument. + +=== END_MPI_T_CVAR_INFO_BLOCK === +*/ /* * This file replaces ch3u_comm_connect.c and ch3u_comm_accept.c . These @@ -50,6 +71,17 @@ static int SetupNewIntercomm( MPIR_Comm *comm_ptr, int remote_comm_size, MPIR_Comm *intercomm ); static int MPIDI_CH3I_Initialize_tmp_comm(MPIR_Comm **comm_pptr, MPIDI_VC_t *vc_ptr, int is_low_group, int context_id_offset); + +static int MPIDI_CH3I_Acceptq_dequeue(MPIDI_CH3I_Port_connreq_t ** connreq_ptr, int port_name_tag); +static int MPIDI_CH3I_Acceptq_cleanup(MPIDI_CH3I_Port_connreq_q_t * accept_connreq_q); + +static int MPIDI_CH3I_Revokeq_cleanup(void); + +static int MPIDI_CH3I_Port_connreq_create(MPIDI_VC_t * vc, + MPIDI_CH3I_Port_connreq_t ** connreq_ptr); +static int MPIDI_CH3I_Port_connreq_free(MPIDI_CH3I_Port_connreq_t * connreq); + + /* ------------------------------------------------------------------------- */ /* * Structure of this file and the connect/accept algorithm: @@ -78,6 +110,98 @@ static int MPIDI_CH3I_Initialize_tmp_comm(MPIR_Comm **comm_pptr, * routine MPIDI_CH3I_Acceptq_dequeue). This routine returns the matched * virtual connection (VC). * + * ----------------------------------------------------------------------------- + * To support connection timeout, we add additional handshake protocol in above + * VC establishing step. The implementation includes init/destroy processing in + * port open/close routine and MPI_Finalize, packet handlers, and modified code + * in following subroutines: + * - MPIDI_Create_inter_root_communicator_connect + * - and MPIDI_Create_inter_root_communicator_accept + * + * 1. Every connection attempt is described as an *request object* on both sides, + * with following state change (see MPIDI_CH3I_Port_connreq_stat_t). + * - Connecting side: INITED -> REVOKE / ACCEPTED / ERR_CLOSE -> FREE + * - Accepting side : INITED -> ACCEPT -> (ACCEPTED) -> FREE + * + * 2. Handshake protocol: + * I. Connecting side: + * a. After VC is created, a connection *request object* is created with + * INITED state, then we pokes progress to wait the state being changed + * in specified timeout period (default CVAR). + * b. If waiting time exceeded threshold, set state to REVOKE. + * c. Progress engine receives a MPIDI_CH3_PKT_CONN_ACK packet indicating + * whether the other side could accept the request. + * - ACK (TRUE): if request state is INITED, then set to ACCEPTED and + * reply a MPIDI_CH3_PKT_ACCEPT_ACK packet with TRUE ACK; otherwise + * such request is already being revoked, then set to FREE and reply + * packet with FALSE ACK. + * - ACK (FALSE): if request state is INITED, then set to ERR_CLOSE; + * otherwise set to FREE (see MPIDI_CH3_PktHandler_ConnAck). + * d. If the process is still waiting, then it checks the changed state: + * if request is ACCEPTED, then continue connection; otherwise report + * MPI_ERR_PORT -- unexpected port closing. + * + * II. Accepting side: + * a. If port exists, the new VC is enqueued into the accept_queue and + * described as a *request object* with INITED state; otherwise, reply a + * MPIDI_CH3_PKT_CONN_ACK packet with FALSE ACK (closed port) + * (see MPIDI_CH3I_Acceptq_dequeue routine). + * b. After VC is dequeued in accept routine, send a MPIDI_CH3_PKT_CONN_ACK + * packet with TRUE ACK to connecting side and change state to ACCEPT. + * Then we poll progress to wait for state change. + * c. Progress engine receives a MPIDI_CH3_PKT_ACCEPT_ACK packet indicating + * whether the other side can match the acceptance (not being revoked). + * - ACK (TRUE): change request state to ACCEPTED + * - ACK (FALSE): set state to FREE + * (see MPIDI_CH3_PktHandler_AcceptAck). + * d. In accept routine, process checks the changed state. If it became + * ACCEPTED, then finish acceptance; otherwise free this request and VC + * and then wait for next coming request. + * + * 3. Resource cleanup. In case of timed out connection, following user code + * shall be considered as correct program (no description in standard yet). + * Thus the resource of first connect must be cleaned up before exit. + * ================================================ + * Server: Client: + * open_port(); connect(); ** timed out ** + * accept(); connect(); + * close_port(); + * ================================================ + * (* The most critical part is closing VC because of closing synchronization + * with the other side (see note in MPIDI_CH3I_Port_local_close_vc and + * ch3u_handle_connection.c), VC object cannot be freed before it became + * INACTIVE state, otherwise segfault !) + * + * Here is the design to ensure resource cleanup. It also covers most + * incorrect user code (e.g., no accept, no close_port), except no finalize. + * I. Connecting side : + * (use revoked_connreq_q) + * a. A REVOKE state request is enqueued to revoked_connreq_q (in 2-I-b). + * b. If request changed state INITED->ERR_CLOSE in 2-I-c, we free such + * request in the connect call before return (step 2-I-d). + * c. If REVOKE->FREE in step 2-I-c, we start VC closing in packet handler, + * and free request and VC at finalize (see MPIDI_CH3I_Revokeq_cleanup). + * d. For any REVOKE state request at finalize, both request object and VC + * will be eventually freed once the other side started finalize. + * + * II. Accepting side : + * (use port_queue, port->accept_queue, global unexpected_queue) + * a. We create a port object for every opened port and each of them holds + * a separate accept queue (to ensure no mess in multiple-ports). + * b. If request becomes FREE in 2-II-a, we start VC closing there and + * enqueue it to global unexpected_queue. + * c. If request updated state ACCEPT->FREE in 2-II-c, we start VC closing + * in packet handler and free both request and VC in accept call (2-II-d). + * d. For any requests still in port->accept_queue at close_port or finalize, + * issue MPIDI_CH3_PKT_CONN_ACK packet with FALSE ACK to the other side, + * then blocking free both VC and request object there. It also ensures + * 3-I-d (see MPIDI_CH3I_Acceptq_cleanup). + * e. For any requests in global unexpected_queue, we blocking free both VC + * and request at finalize (see MPIDI_Port_finalize). + * + * - END of connection timeout support. + * ----------------------------------------------------------------------------- + * * Once both sides have established there VC, they both invoke * MPIDI_CH3I_Initialize_tmp_comm to create a temporary intercommunicator. * A temporary intercommunicator is constructed so that we can use @@ -102,7 +226,21 @@ static int MPIDI_CH3I_Initialize_tmp_comm(MPIR_Comm **comm_pptr, */ /* ------------------------------------------------------------------------- */ -/* + +/*** Queues for supporting connection timeout ***/ + +/* Server side queues + * - unexpected connection requests queue (global) + * - active port queue */ +static MPIDI_CH3I_Port_connreq_q_t unexpt_connreq_q = {NULL, NULL, 0}; +static MPIDI_CH3I_Port_q_t active_portq = {NULL, NULL, 0}; + +/* Client side queue + * - revoked connection requests (i.e., timeout) */ +static MPIDI_CH3I_Port_connreq_q_t revoked_connreq_q = {NULL, NULL, 0}; + + +/* * These next two routines are used to create a virtual connection * (VC) and a temporary intercommunicator that can be used to * communicate between the two "root" processes for the @@ -121,6 +259,8 @@ static int MPIDI_Create_inter_root_communicator_connect(const char *port_name, MPIR_Comm *tmp_comm; MPIDI_VC_t *connect_vc = NULL; int port_name_tag; + MPIDI_CH3I_Port_connreq_t *connreq = NULL; + MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_CREATE_INTER_ROOT_COMMUNICATOR_CONNECT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDI_CREATE_INTER_ROOT_COMMUNICATOR_CONNECT); @@ -140,6 +280,67 @@ static int MPIDI_Create_inter_root_communicator_connect(const char *port_name, MPIR_ERR_POP(mpi_errno); } + mpi_errno = MPIDI_CH3I_Port_connreq_create(connect_vc, &connreq); + MPIR_ERR_CHKINTERNAL(mpi_errno, mpi_errno, "Can't create communicator connection object."); + + /* Poke progress to wait server response for the connection request + * before timed out. The response is handled in MPIDI_CH3_PktHandler_ConnResp + * in progress.*/ + { + MPID_Time_t time_sta, time_now; + double time_gap = 0; + + MPID_Wtime(&time_sta); + do { + mpi_errno = MPID_Progress_poke(); + if (mpi_errno != MPI_SUCCESS) + MPIR_ERR_POP(mpi_errno); + + MPID_Wtime(&time_now); + MPID_Wtime_diff(&time_sta, &time_now, &time_gap); + /* FIXME: not thread-safe */ + } while (connreq->stat == MPIDI_CH3I_PORT_CONNREQ_INITED + && (int) time_gap < MPIR_CVAR_CH3_COMM_CONNECT_TIMEOUT); + } + + switch (connreq->stat) { + case MPIDI_CH3I_PORT_CONNREQ_ACCEPTED: + /* Successfully matched an acceptance, then finish connection. */ + MPL_DBG_MSG(MPIDI_CH3_DBG_CONNECT, VERBOSE, "Matched with server accept"); + break; + + case MPIDI_CH3I_PORT_CONNREQ_INITED: + /* Connection timed out. + * Enqueue to revoked queue. Packet handler will notify server when + * when server starts on it. The request will be released at finalize. */ + MPL_DBG_MSG(MPIDI_CH3_DBG_CONNECT, VERBOSE, "Connection timed out"); + + MPIDI_CH3I_Port_connreq_q_enqueue(&revoked_connreq_q, connreq); + MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, REVOKE); + MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_PORT, "**ch3|conntimeout"); + break; + + case MPIDI_CH3I_PORT_CONNREQ_ERR_CLOSE: + /* Unexpected port closing on server. + * The same as no port case, return MPI_ERR_PORT. Now we caught the error, + * close vc and free connection request at fn_fail. */ + MPL_DBG_MSG(MPIDI_CH3_DBG_CONNECT, VERBOSE, + "Error - remote closed without matching this connection"); + + mpi_errno = MPIDI_CH3I_Port_local_close_vc(connreq->vc); + if (mpi_errno != MPI_SUCCESS) + MPIR_ERR_POP(mpi_errno); + + MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, FREE); + MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_PORT, "**ch3|portclose"); + break; + + default: + /* Unexpected status, internal error. */ + MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_INTERN, "**unknown"); + break; + } + mpi_errno = MPIDI_CH3I_Initialize_tmp_comm(&tmp_comm, connect_vc, 1, port_name_tag); if (mpi_errno != MPI_SUCCESS) { MPIR_ERR_POP(mpi_errno); @@ -148,10 +349,18 @@ static int MPIDI_Create_inter_root_communicator_connect(const char *port_name, *comm_pptr = tmp_comm; *vc_pptr = connect_vc; + MPL_free(connreq); + fn_exit: MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_MPIDI_CREATE_INTER_ROOT_COMMUNICATOR_CONNECT); return mpi_errno; fn_fail: + if (connreq != NULL) { + int mpi_errno2 = MPI_SUCCESS; + mpi_errno2 = MPIDI_CH3I_Port_connreq_free(connreq); + if (mpi_errno2) + MPIR_ERR_ADD(mpi_errno, mpi_errno2); + } goto fn_exit; } @@ -171,6 +380,8 @@ static int MPIDI_Create_inter_root_communicator_accept(const char *port_name, MPIDI_VC_t *new_vc = NULL; MPID_Progress_state progress_state; int port_name_tag; + MPIDI_CH3I_Port_connreq_t *connreq = NULL; + MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_CREATE_INTER_ROOT_COMMUNICATOR_ACCEPT); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDI_CREATE_INTER_ROOT_COMMUNICATOR_ACCEPT); @@ -183,28 +394,77 @@ static int MPIDI_Create_inter_root_communicator_accept(const char *port_name, /* FIXME: Describe the algorithm used here, and what routine is user on the other side of this connection */ - /* dequeue the accept queue to see if a connection with the - root on the connect side has been formed in the progress - engine (the connection is returned in the form of a vc). If - not, poke the progress engine. */ + /* dequeue the accept queue to see if a connection request with + * the root on the connect side has been formed in the progress + * engine. If not, poke the progress engine; If a new connection + * request has be found, then we start accepting such request by + * sending an ACK packet to client; Pork progress engine unless + * we get response from client (state changed). */ MPID_Progress_start(&progress_state); - for(;;) - { - MPIDI_CH3I_Acceptq_dequeue(&new_vc, port_name_tag); - if (new_vc != NULL) - { - break; - } + for (;;) { + int matched = 0; - mpi_errno = MPID_Progress_wait(&progress_state); - /* --BEGIN ERROR HANDLING-- */ - if (mpi_errno) - { - MPID_Progress_end(&progress_state); - MPIR_ERR_POP(mpi_errno); - } - /* --END ERROR HANDLING-- */ + if (connreq == NULL) { + mpi_errno = MPIDI_CH3I_Acceptq_dequeue(&connreq, port_name_tag); + if (mpi_errno) + MPIR_ERR_POP(mpi_errno); + } + + if (connreq != NULL && connreq->stat == MPIDI_CH3I_PORT_CONNREQ_INITED) { + new_vc = connreq->vc; + + /* locally accept */ + MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, ACCEPT); + + /* Send connection ACK: accept to client */ + mpi_errno = MPIDI_CH3I_Port_issue_conn_ack(connreq->vc, TRUE /*accept*/); + MPIR_ERR_CHKINTERNAL(mpi_errno, mpi_errno, "Cannot issue acceptance packet"); + + MPL_DBG_MSG(MPIDI_CH3_DBG_CONNECT, VERBOSE, + "Sent acceptance to client, waiting for ACK"); + } + + /* Wait either new connection request or response packet for existing one. */ + mpi_errno = MPID_Progress_wait(&progress_state); + /* --BEGIN ERROR HANDLING-- */ + if (mpi_errno != MPI_SUCCESS) { + MPID_Progress_end(&progress_state); + MPIR_ERR_POP(mpi_errno); + } + /* --END ERROR HANDLING-- */ + + /* Packet handler received response from client, check updated state */ + if (connreq != NULL && connreq->stat != MPIDI_CH3I_PORT_CONNREQ_ACCEPT) { + switch (connreq->stat) { + case MPIDI_CH3I_PORT_CONNREQ_ACCEPTED: + /* Matched, now finish acceptance. */ + MPL_DBG_MSG(MPIDI_CH3_DBG_CONNECT, VERBOSE, "Matched with client connect"); + matched = 1; /* leave loop */ + break; + + case MPIDI_CH3I_PORT_CONNREQ_FREE: + /* Client revoked, free connection request.*/ + MPL_DBG_MSG(MPIDI_CH3_DBG_CONNECT, VERBOSE, + "Connection is already closed on client"); + + /* Client already started vc closing process, thus it is safe to + * blocking wait here till vc freed. */ + mpi_errno = MPIDI_CH3I_Port_connreq_free(connreq); + if (mpi_errno != MPI_SUCCESS) + MPIR_ERR_POP(mpi_errno); + + connreq = NULL; + break; /* continue while loop */ + default: + /* report internal error -- unexpected state */ + MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_INTERN, "**unknown"); + break; + } + } + + if (matched) + break; } MPID_Progress_end(&progress_state); @@ -216,6 +476,8 @@ static int MPIDI_Create_inter_root_communicator_accept(const char *port_name, *comm_pptr = tmp_comm; *vc_pptr = new_vc; + MPL_free(connreq); + MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT,VERBOSE,(MPL_DBG_FDEST, "new_vc=%p", new_vc)); @@ -224,6 +486,12 @@ fn_exit: return mpi_errno; fn_fail: + if(connreq != NULL) { + int mpi_errno2 = MPI_SUCCESS; + mpi_errno2 = MPIDI_CH3I_Port_connreq_free(connreq); + if (mpi_errno2) + MPIR_ERR_ADD(mpi_errno, mpi_errno2); + } goto fn_exit; } @@ -537,6 +805,7 @@ int MPIDI_Comm_connect(const char *port_name, MPIR_Info *info, int root, } no_port: { + int mpi_errno_noport = MPI_SUCCESS; int mpi_errno2 = MPI_SUCCESS; /* broadcast error notification to other processes */ @@ -544,7 +813,11 @@ int MPIDI_Comm_connect(const char *port_name, MPIR_Info *info, int root, recv_ints[0] = -1; recv_ints[1] = -1; recv_ints[2] = -1; - MPIR_ERR_SET1(mpi_errno, MPI_ERR_PORT, "**portexist", "**portexist %s", port_name); + + /* append no port error message */ + MPIR_ERR_SET1(mpi_errno_noport, MPI_ERR_PORT, "**portexist", "**portexist %s", port_name); + MPIR_ERR_ADD(mpi_errno_noport, mpi_errno); + mpi_errno = mpi_errno_noport; /* notify other processes to return an error */ MPL_DBG_MSG(MPIDI_CH3_DBG_CONNECT,VERBOSE,"broadcasting 3 ints: error case"); @@ -1250,18 +1523,11 @@ static int FreeNewVC( MPIDI_VC_t *new_vc ) designed and documented. */ -typedef struct MPIDI_CH3I_Acceptq_s -{ - struct MPIDI_VC *vc; - int port_name_tag; - struct MPIDI_CH3I_Acceptq_s *next; -} -MPIDI_CH3I_Acceptq_t; - -static MPIDI_CH3I_Acceptq_t * acceptq_head=0; -static int maxAcceptQueueSize = 0; -static int AcceptQueueSize = 0; - +/* Enqueue a connection request from client. This routine is called from netmod + * (i.e., TCP) if received dynamic connection from others. If port exists, we + * enqueue the request to that port's accept queue to wait for an accept call to + * serve it; otherwise, such request should be discarded, thus we immediately send + * nack back to client and start closing. */ #undef FUNCNAME #define FUNCNAME MPIDI_CH3I_Acceptq_enqueue #undef FCNAME @@ -1269,91 +1535,501 @@ static int AcceptQueueSize = 0; int MPIDI_CH3I_Acceptq_enqueue(MPIDI_VC_t * vc, int port_name_tag ) { int mpi_errno=MPI_SUCCESS; - MPIDI_CH3I_Acceptq_t *q_item; - MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_CH3I_ACCEPTQ_ENQUEUE); + MPIDI_CH3I_Port_connreq_t *connreq = NULL; + MPIDI_CH3I_Port_t *port = NULL; + MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_CH3I_ACCEPTQ_ENQUEUE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDI_CH3I_ACCEPTQ_ENQUEUE); - /* FIXME: Use CHKPMEM */ - q_item = (MPIDI_CH3I_Acceptq_t *) - MPL_malloc(sizeof(MPIDI_CH3I_Acceptq_t)); - /* --BEGIN ERROR HANDLING-- */ - if (q_item == NULL) - { - mpi_errno = MPIR_Err_create_code(MPI_SUCCESS, MPIR_ERR_FATAL, FCNAME, __LINE__, MPI_ERR_OTHER, "**nomem", "**nomem %s", "MPIDI_CH3I_Acceptq_t" ); - goto fn_exit; - } - /* --END ERROR HANDLING-- */ + MPL_LL_SEARCH_SCALAR(active_portq.head, port, port_name_tag, port_name_tag); + + /* Find port object by using port_name_tag. */ + mpi_errno = MPIDI_CH3I_Port_connreq_create(vc, &connreq); + MPIR_ERR_CHKINTERNAL(mpi_errno, mpi_errno, "Can't create communicator connection object."); - q_item->vc = vc; - q_item->port_name_tag = port_name_tag; + /* No port exists if port is not opened or already closed (incorrect user code). + * Thus we just start closing VC here. */ + if (port == NULL) { + /* Notify connecting client. */ + mpi_errno = MPIDI_CH3I_Port_issue_conn_ack(connreq->vc, FALSE /* closed port */); + if (mpi_errno != MPI_SUCCESS) + MPIR_ERR_POP(mpi_errno); - /* Keep some statistics on the accept queue */ - AcceptQueueSize++; - if (AcceptQueueSize > maxAcceptQueueSize) - maxAcceptQueueSize = AcceptQueueSize; + /* Start VC closing protocol. */ + mpi_errno = MPIDI_CH3I_Port_local_close_vc(connreq->vc); + if (mpi_errno != MPI_SUCCESS) + MPIR_ERR_POP(mpi_errno); - /* FIXME: Stack or queue? */ - MPL_DBG_MSG_P(MPIDI_CH3_DBG_CONNECT,TYPICAL,"vc=%p:Enqueuing accept connection",vc); - q_item->next = acceptq_head; - acceptq_head = q_item; - - fn_exit: + MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, FREE); + + /* Enqueue unexpected VC to avoid waiting progress recursively. + * these VCs will be freed in finalize. */ + MPIDI_CH3I_Port_connreq_q_enqueue(&unexpt_connreq_q, connreq); + MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT, VERBOSE, + (MPL_DBG_FDEST, "Enqueued conn %p to unexpected queue with tag %d, vc=%p", + connreq, port_name_tag, vc)); + } + else { + /* Enqueue to accept queue, thus next accept call can serve it. */ + MPIDI_CH3I_Port_connreq_q_enqueue(&port->accept_connreq_q, connreq); + MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT, VERBOSE, + (MPL_DBG_FDEST, "Enqueued conn %p to accept queue with tag %d, vc=%p", + connreq, port_name_tag, vc)); + + /* signal for new enqueued VC, thus progress wait can return in accept. */ + MPIDI_CH3_Progress_signal_completion(); + } + + fn_exit: MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_MPIDI_CH3I_ACCEPTQ_ENQUEUE); return mpi_errno; + fn_fail: + if (connreq) + MPIDI_CH3I_Port_connreq_free(connreq); + goto fn_exit; } -/* Attempt to dequeue a vc from the accept queue. If the queue is - empty or the port_name_tag doesn't match, return a NULL vc. */ +/* Attempt to dequeue a connection request from the accept queue. If the queue + * is empty return a NULL object. */ #undef FUNCNAME #define FUNCNAME MPIDI_CH3I_Acceptq_dequeue #undef FCNAME #define FCNAME MPL_QUOTE(FUNCNAME) -int MPIDI_CH3I_Acceptq_dequeue(MPIDI_VC_t ** vc, int port_name_tag) +int MPIDI_CH3I_Acceptq_dequeue(MPIDI_CH3I_Port_connreq_t ** connreq_ptr, int port_name_tag) { int mpi_errno=MPI_SUCCESS; - MPIDI_CH3I_Acceptq_t *q_item, *prev; - MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_CH3I_ACCEPTQ_DEQUEUE); + MPIDI_CH3I_Port_t *port = NULL; + MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_CH3I_ACCEPTQ_DEQUEUE); MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDI_CH3I_ACCEPTQ_DEQUEUE); - *vc = NULL; - q_item = acceptq_head; - prev = q_item; + /* Find port object by using port_name_tag. */ + MPL_LL_SEARCH_SCALAR(active_portq.head, port, port_name_tag, port_name_tag); + MPIR_Assert(port != NULL); /* Port is always initialized in open_port. */ - while (q_item != NULL) - { - if (q_item->port_name_tag == port_name_tag) - { - *vc = q_item->vc; + MPIDI_CH3I_Port_connreq_q_dequeue(&port->accept_connreq_q, connreq_ptr); + if ((*connreq_ptr) != NULL) { + MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT, VERBOSE, + (MPL_DBG_FDEST, "conn=%p:Dequeued accept connection with tag %d, vc=%p", + (*connreq_ptr), port_name_tag, (*connreq_ptr)->vc)); + } - if ( q_item == acceptq_head ) - acceptq_head = q_item->next; - else - prev->next = q_item->next; + MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_MPIDI_CH3I_ACCEPTQ_DEQUEUE); + return mpi_errno; +} - MPL_free(q_item); - AcceptQueueSize--; - break;; - } - else - { - prev = q_item; - q_item = q_item->next; - } +/* Clean up received new VCs that are not accepted or closed in accept + * calls (e.g., mismatching accept and connect).This routine is called in + * MPIDI_CH3I_Port_destroy(close_port) and MPIDI_Port_finalize (finalize). + * Note that we already deleted port from active_port queue before cleaning up + * its accept queue, thus no new VC can be enqueued concurrently. */ +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3I_Acceptq_cleanup +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static int MPIDI_CH3I_Acceptq_cleanup(MPIDI_CH3I_Port_connreq_q_t * accept_connreq_q) +{ + int mpi_errno = MPI_SUCCESS; + MPIDI_CH3I_Port_connreq_t *connreq = NULL, *connreq_tmp = NULL; + + MPL_LL_FOREACH_SAFE(accept_connreq_q->head, connreq, connreq_tmp) { + MPIDI_CH3I_Port_connreq_q_delete(accept_connreq_q, connreq); + + /* Notify connecting client. */ + mpi_errno = MPIDI_CH3I_Port_issue_conn_ack(connreq->vc, FALSE /* closed port */); + if (mpi_errno != MPI_SUCCESS) + MPIR_ERR_POP(mpi_errno); + + /* Start VC closing protocol. */ + mpi_errno = MPIDI_CH3I_Port_local_close_vc(connreq->vc); + if (mpi_errno != MPI_SUCCESS) + MPIR_ERR_POP(mpi_errno); + + MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, FREE); + + /* Free connection request (blocking wait till VC closed). */ + mpi_errno = MPIDI_CH3I_Port_connreq_free(connreq); + if (mpi_errno != MPI_SUCCESS) + MPIR_ERR_POP(mpi_errno); } - - mpi_errno = MPIDI_CH3_Complete_Acceptq_dequeue(*vc); - MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT,TYPICAL, - (MPL_DBG_FDEST,"vc=%p:Dequeuing accept connection with tag %d", - *vc,port_name_tag)); + MPIR_Assert(accept_connreq_q->size == 0); - MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_MPIDI_CH3I_ACCEPTQ_DEQUEUE); + fn_exit: + return mpi_errno; + fn_fail: + goto fn_exit; +} + + +/*** Utility routines for revoked connection requests ***/ + +/* Clean up revoked requests in connect (e.g., timed out connect). + * We do not want to wait for these VCs being freed in timed out connect, + * because it is blocked till the server calls a matching accept or close_port. + * This routine is called in finalize on client process. */ +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3I_Revokeq_cleanup +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static int MPIDI_CH3I_Revokeq_cleanup(void) +{ + int mpi_errno = MPI_SUCCESS; + MPIDI_CH3I_Port_connreq_t *connreq = NULL, *connreq_tmp = NULL; + + MPL_LL_FOREACH_SAFE(revoked_connreq_q.head, connreq, connreq_tmp) { + MPID_Progress_state progress_state; + MPIDI_CH3I_Port_connreq_q_delete(&revoked_connreq_q, connreq); + + /* Blocking wait till the request is freed on server. */ + if (connreq->stat != MPIDI_CH3I_PORT_CONNREQ_FREE) { + MPID_Progress_start(&progress_state); + do { + mpi_errno = MPID_Progress_wait(&progress_state); + /* --BEGIN ERROR HANDLING-- */ + if (mpi_errno != MPI_SUCCESS) { + MPID_Progress_end(&progress_state); + MPIR_ERR_POP(mpi_errno); + } + /* --END ERROR HANDLING-- */ + } while (connreq->stat != MPIDI_CH3I_PORT_CONNREQ_FREE); + MPID_Progress_end(&progress_state); + } + + /* Release connection (blocking wait till VC closed). */ + MPIDI_CH3I_Port_connreq_free(connreq); + } + + MPIR_Assert(revoked_connreq_q.size == 0); + + fn_exit: + return mpi_errno; + fn_fail: + goto fn_exit; +} + +/*** Packet handlers exposed to progress engine ***/ + +/* Packet handler to handle response (connection ACK) on client process. */ +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3_PktHandler_ConnAck +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPIDI_CH3_PktHandler_ConnAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, + intptr_t * buflen, MPIR_Request ** rreqp) +{ + MPIDI_CH3_Pkt_conn_ack_t *ack_pkt = &pkt->conn_ack; + MPIDI_CH3I_Port_connreq_t *connreq = (MPIDI_CH3I_Port_connreq_t *) (vc->connreq_obj); + int mpi_errno = MPI_SUCCESS; + + MPIR_Assert(connreq != NULL); + + /* Report unknown error, unexpectedly get response for remote + * revoked connection. */ + if (connreq->stat != MPIDI_CH3I_PORT_CONNREQ_INITED && + connreq->stat != MPIDI_CH3I_PORT_CONNREQ_REVOKE) + MPIR_ERR_SETANDJUMP(mpi_errno, MPI_ERR_INTERN, "**unknown"); + + if (ack_pkt->ack == TRUE) { + if (connreq->stat == MPIDI_CH3I_PORT_CONNREQ_INITED) { + MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT, VERBOSE, + (MPL_DBG_FDEST, "received ACK true for vc %p: inited->accepted", vc)); + + /* Reply to server */ + mpi_errno = MPIDI_CH3I_Port_issue_accept_ack(connreq->vc, TRUE /* accept matched */); + MPIR_ERR_CHKINTERNAL(mpi_errno, mpi_errno, "Cannot issue accept-matched packet"); + + MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, ACCEPTED); + } + else if (connreq->stat == MPIDI_CH3I_PORT_CONNREQ_REVOKE) { + MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT, VERBOSE, + (MPL_DBG_FDEST, "received ACK true for vc %p: revoke->free", vc)); + + /* Reply to server */ + mpi_errno = MPIDI_CH3I_Port_issue_accept_ack(connreq->vc, FALSE /* locally revoked */); + MPIR_ERR_CHKINTERNAL(mpi_errno, mpi_errno, "Cannot issue revoke packet"); + + /* Start freeing connection request. + * Note that we do not blocking close VC here, instead, we close VC + * in MPIDI_CH3I_Revokeq_cleanup at finalize. This is because + * VC close packets might be received following this packet, thus if + * we blocked here we can never read that packet. */ + mpi_errno = MPIDI_CH3I_Port_local_close_vc(connreq->vc); + MPIR_ERR_CHKINTERNAL(mpi_errno, mpi_errno, "Cannot locally close VC"); + + MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, FREE); + } + } + else { /* ack == FALSE */ + if (connreq->stat == MPIDI_CH3I_PORT_CONNREQ_INITED) { + MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT, VERBOSE, + (MPL_DBG_FDEST, "received ACK false for vc %p: inited->err_close", vc)); + + /* Server closed port without issuing accept, client + * connect call will catch this error and return MPI_ERR_PORT. */ + MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, ERR_CLOSE); + } + else if (connreq->stat == MPIDI_CH3I_PORT_CONNREQ_REVOKE) { + MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT, VERBOSE, + (MPL_DBG_FDEST, "received ACK false for vc %p: revoke->free", vc)); + + /* Start VC closing, and set connection ready-for-free. */ + mpi_errno = MPIDI_CH3I_Port_local_close_vc(connreq->vc); + MPIR_ERR_CHKINTERNAL(mpi_errno, mpi_errno, "Cannot locally close VC"); + + MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, FREE); + } + } + + *buflen = sizeof(MPIDI_CH3_Pkt_t); + *rreqp = NULL; + + fn_exit: + return mpi_errno; + fn_fail: + goto fn_exit; +} + +/* Packet handler to handle response (acceptance ACK) on server process. */ +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3_PktHandler_AcceptAck +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPIDI_CH3_PktHandler_AcceptAck(MPIDI_VC_t * vc, MPIDI_CH3_Pkt_t * pkt, + intptr_t * buflen, MPIR_Request ** rreqp) +{ + MPIDI_CH3_Pkt_accept_ack_t *ack_pkt = &pkt->accept_ack; + MPIDI_CH3I_Port_connreq_t *connreq = (MPIDI_CH3I_Port_connreq_t *) (vc->connreq_obj); + int mpi_errno = MPI_SUCCESS; + + MPIR_Assert(connreq != NULL); + + /* Acceptance matched, finish accept. */ + if (ack_pkt->ack == TRUE) { + MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT, VERBOSE, + (MPL_DBG_FDEST, "received (accept) ACK true for vc %p: accept->match", vc)); + + MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, ACCEPTED); + } + else { + MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_CONNECT, VERBOSE, + (MPL_DBG_FDEST, "received (accept) ACK false for vc %p: accept->close", + vc)); + + /* Client already left, close VC. + * Note that accept call does not return when client timed out, + * thus we only change the state and let accept call handle closing. */ + mpi_errno = MPIDI_CH3I_Port_local_close_vc(connreq->vc); + if (mpi_errno) + MPIR_ERR_POP(mpi_errno); + + MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, FREE); + } + + *buflen = sizeof(MPIDI_CH3_Pkt_t); + *rreqp = NULL; + + fn_exit: + return mpi_errno; + fn_fail: + goto fn_exit; +} + +/*** Routines for connection request creation and freeing ***/ + +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3I_Port_connreq_create +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static int MPIDI_CH3I_Port_connreq_create(MPIDI_VC_t * vc, MPIDI_CH3I_Port_connreq_t ** connreq_ptr) +{ + int mpi_errno = MPI_SUCCESS; + MPIDI_CH3I_Port_connreq_t *connreq = NULL; + + MPIR_CHKPMEM_DECL(1); + MPIR_CHKPMEM_MALLOC(connreq, MPIDI_CH3I_Port_connreq_t *, sizeof(MPIDI_CH3I_Port_connreq_t), + mpi_errno, "comm_conn"); + + connreq->vc = vc; + MPIDI_CH3I_PORT_CONNREQ_SET_STAT(connreq, INITED); + + /* Netmod may not change VC to active when connection established (i.e., sock). + * Instead, it is changed in CH3 layer (e.g., isend, RMA).*/ + if (vc->state == MPIDI_VC_STATE_INACTIVE) + MPIDI_CHANGE_VC_STATE(vc, ACTIVE); + + vc->connreq_obj = (void *) connreq; /* to get connection request in packet handlers */ + *connreq_ptr = connreq; + + fn_exit: + MPIR_CHKPMEM_COMMIT(); return mpi_errno; + fn_fail: + MPIR_CHKPMEM_REAP(); + goto fn_exit; } +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3I_Port_connreq_free +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +static int MPIDI_CH3I_Port_connreq_free(MPIDI_CH3I_Port_connreq_t * connreq) +{ + int mpi_errno = MPI_SUCCESS; + + /* Skip if connection request is still in revoked state. + * Because packet handler may be talking to server. */ + if (connreq->stat == MPIDI_CH3I_PORT_CONNREQ_REVOKE) + return mpi_errno; + + /* Expected free, the remote side should also start closing too, + * thus we blocking close VC here. */ + if (connreq->stat == MPIDI_CH3I_PORT_CONNREQ_FREE) { + mpi_errno = FreeNewVC(connreq->vc); + } + else { + /* Unexpected free, the remote side might not be able to close + * VC at this point. Thus we cannot blocking close VC. */ + mpi_errno = MPIDI_CH3_VC_Destroy(connreq->vc); + } + + /* Always free connection request. + * Because it is only used in connect/accept routine. */ + MPL_free(connreq); + + return mpi_errno; +} + + +/*** Routines to initialize / destroy dynamic connection ***/ + +/* Initialize port's accept queue. It is called in MPIDI_Open_port. */ +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3I_Port_init +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPIDI_CH3I_Port_init(int port_name_tag) +{ + int mpi_errno = MPI_SUCCESS; + MPIDI_CH3I_Port_t *port = NULL; + + MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_CH3I_PORT_INIT); + MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDI_CH3I_PORT_INIT); + + MPIR_CHKPMEM_DECL(1); + MPIR_CHKPMEM_MALLOC(port, MPIDI_CH3I_Port_t *, sizeof(MPIDI_CH3I_Port_t), + mpi_errno, "comm_port"); + + port->port_name_tag = port_name_tag; + port->accept_connreq_q.head = port->accept_connreq_q.tail = 0; + port->accept_connreq_q.size = 0; + port->next = NULL; + + MPL_LL_APPEND(active_portq.head, active_portq.tail, port); + active_portq.size++; + + fn_exit: + MPIR_CHKPMEM_COMMIT(); + MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_MPIDI_CH3I_PORT_INIT); + return mpi_errno; + fn_fail: + MPIR_CHKPMEM_REAP(); + goto fn_exit; +} + +/* Destroy port's accept queue. It is called in MPIDI_Close_port. */ +#undef FUNCNAME +#define FUNCNAME MPIDI_CH3I_Port_destroy +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPIDI_CH3I_Port_destroy(int port_name_tag) +{ + int mpi_errno = MPI_SUCCESS; + MPIDI_CH3I_Port_t *port = NULL; + + MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_CH3I_PORT_DESTROY); + MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDI_CH3I_PORT_DESTROY); + + MPL_LL_SEARCH_SCALAR(active_portq.head, port, port_name_tag, port_name_tag); + if (port != NULL) { + MPL_LL_DELETE(active_portq.head, active_portq.tail, port); + + mpi_errno = MPIDI_CH3I_Acceptq_cleanup(&port->accept_connreq_q); + if (mpi_errno) + MPIR_ERR_POP(mpi_errno); + + MPL_free(port); + active_portq.size--; + } + + fn_exit: + MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_MPIDI_CH3I_PORT_DESTROY); + return mpi_errno; + fn_fail: + goto fn_exit; +} + +/* This routine is called by MPID_Finalize to clean up dynamic connections. */ +#undef FUNCNAME +#define FUNCNAME MPIDI_Port_finalize +#undef FCNAME +#define FCNAME MPL_QUOTE(FUNCNAME) +int MPIDI_Port_finalize(void) +{ + int mpi_errno = MPI_SUCCESS; + + MPIR_FUNC_VERBOSE_STATE_DECL(MPID_STATE_MPIDI_PORT_FINALIZE); + MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPIDI_PORT_FINALIZE); + + /* Server side clean up. */ + + /* - Clean up all active ports. + * Note that if a process is both server and client, we will never + * deadlock here because only server cleanup issues closing packets. + * All closing process on client is handled in progress. */ + { + MPIDI_CH3I_Port_t *port = NULL, *port_tmp = NULL; + + MPL_LL_FOREACH_SAFE(active_portq.head, port, port_tmp) { + /* destroy all opening ports. */ + MPL_LL_DELETE(active_portq.head, active_portq.tail, port); + + mpi_errno = MPIDI_CH3I_Acceptq_cleanup(&port->accept_connreq_q); + MPL_free(port); + active_portq.size--; + } + MPIR_Assert(active_portq.size == 0); + } + + /* - Destroy all unexpected connection requests. + * The closing protocol already started when we got them in acceptq_enqueue, + * so just blocking wait for final release. */ + { + MPIDI_CH3I_Port_connreq_t *connreq = NULL, *connreq_tmp = NULL; + + MPL_LL_FOREACH_SAFE(unexpt_connreq_q.head, connreq, connreq_tmp) { + MPIDI_CH3I_Port_connreq_q_delete(&unexpt_connreq_q, connreq); + mpi_errno = MPIDI_CH3I_Port_connreq_free(connreq); + if (mpi_errno) + MPIR_ERR_POP(mpi_errno); + } + MPIR_Assert(unexpt_connreq_q.size == 0); + } + + /* Client side clean up. */ + + /* - Destroy all revoked connection requests. */ + mpi_errno = MPIDI_CH3I_Revokeq_cleanup(); + if (mpi_errno) + MPIR_ERR_POP(mpi_errno); + + fn_exit: + MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_MPIDI_PORT_FINALIZE); + return mpi_errno; + fn_fail: + goto fn_exit; +} #else /* MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS is defined */ #endif /* MPIDI_CH3_HAS_NO_DYNAMIC_PROCESS */ diff --git a/src/mpid/ch3/src/mpid_finalize.c b/src/mpid/ch3/src/mpid_finalize.c index 0bf8586..a5fe615 100644 --- a/src/mpid/ch3/src/mpid_finalize.c +++ b/src/mpid/ch3/src/mpid_finalize.c @@ -95,6 +95,10 @@ int MPID_Finalize(void) /* Re-enabling the close step because many tests are failing * without it, particularly under gforker */ + + mpi_errno = MPIDI_Port_finalize(); + if (mpi_errno) { MPIR_ERR_POP(mpi_errno); } + #if 1 /* FIXME: The close actions should use the same code as the other connection close code */ diff --git a/src/mpid/ch3/src/mpid_port.c b/src/mpid/ch3/src/mpid_port.c index e306338..7cf4fe1 100644 --- a/src/mpid/ch3/src/mpid_port.c +++ b/src/mpid/ch3/src/mpid_port.c @@ -312,6 +312,8 @@ static int MPIDI_Open_port(MPIR_Info *info_ptr, char *port_name) mpi_errno = MPIDI_CH3_Get_business_card(myRank, port_name, len); MPL_DBG_MSG_FMT(MPIDI_CH3_DBG_OTHER, VERBOSE, (MPL_DBG_FDEST, "port_name = %s", port_name)); + mpi_errno = MPIDI_CH3I_Port_init(port_name_tag); + fn_exit: MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_MPIDI_OPEN_PORT); return mpi_errno; @@ -339,6 +341,8 @@ static int MPIDI_Close_port(const char *port_name) free_port_name_tag(port_name_tag); + mpi_errno = MPIDI_CH3I_Port_destroy(port_name_tag); + fn_exit: MPIR_FUNC_VERBOSE_EXIT(MPID_STATE_MPIDI_CLOSE_PORT); return mpi_errno; http://git.mpich.org/mpich.git/commitdiff/e049ef4358cdcbab8f3e6ac4da3cefa7c… commit e049ef4358cdcbab8f3e6ac4da3cefa7cc88ce62 Author: Min Si <msi(a)anl.gov> Date: Fri Jun 17 17:07:46 2016 -0500 Disable vc state change in tcp if vc started closing. Tcp netmod updated vc to ACTIVE state when connection is established. It can happen in the first message. However, if the first message is vc closing packet, that vc can never be closed. Because, during vc closing, process needs do handshake with remote peer and change state: LOCAL_CLOSE/REMOTE_CLOSE -> CLOSE_ACKED -> CLOSED -> INACTIVE The next state change depends on the current state. If such state is changed LOCAL_CLOSE->ACTIVE in netmod, the closing process can never finish. This patch fixed it. Tcp netmod only updates state when the vc is INACTIVE. Signed-off-by: Yanfei Guo <yguo(a)anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c index 2277dc8..c44b213 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c @@ -800,7 +800,11 @@ int MPID_nem_tcp_connect(struct MPIDI_VC *const vc) /* We have an active connection, start polling more often */ MPID_nem_tcp_skip_polls = MAX_SKIP_POLLS_ACTIVE; - MPIDI_CHANGE_VC_STATE(vc, ACTIVE); + /* only update VC state when it is not being closed. + * Note that we still need change state here if the VC is passively + * connected (i.e., server in dynamic process connection) */ + if (vc->state == MPIDI_VC_STATE_INACTIVE) + MPIDI_CHANGE_VC_STATE(vc, ACTIVE); if (vc_tcp->state == MPID_NEM_TCP_VC_STATE_DISCONNECTED) { struct sockaddr_in *sock_addr; diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c index 135b69e..fc73e8d 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c @@ -213,7 +213,11 @@ int MPID_nem_tcp_conn_est (MPIDI_VC_t *vc) MPIR_FUNC_VERBOSE_ENTER(MPID_STATE_MPID_NEM_TCP_CONN_EST); - MPIDI_CHANGE_VC_STATE(vc, ACTIVE); + /* only update VC state when it is not being closed. + * Note that we still need change state here if the VC is passively + * connected (i.e., server in dynamic process connection) */ + if (vc->state == MPIDI_VC_STATE_INACTIVE) + MPIDI_CHANGE_VC_STATE(vc, ACTIVE); if (!MPIDI_CH3I_Sendq_empty(vc_tcp->send_queue)) { http://git.mpich.org/mpich.git/commitdiff/7ededee9220b263f87668b991e8d1c642… commit 7ededee9220b263f87668b991e8d1c642ff76072 Author: Min Si <msi(a)il.is.s.u-tokyo.ac.jp> Date: Mon May 23 18:31:58 2016 -0500 Added tests to check comm_connect timeout. test/mpi/errors/spawn/connect_timeout.c checks the timeout implementation in MPI_Comm_connect. Two tests are generated: (1) no accept: no accept call on server; (2) mismatch: number of accept calls is less than amount of connect. Signed-off-by: Yanfei Guo <yguo(a)anl.gov> diff --git a/test/mpi/errors/spawn/Makefile.am b/test/mpi/errors/spawn/Makefile.am index c2f956f..a9f1b42 100644 --- a/test/mpi/errors/spawn/Makefile.am +++ b/test/mpi/errors/spawn/Makefile.am @@ -12,5 +12,12 @@ EXTRA_DIST = testlist ## for all programs that are just built from the single corresponding source ## file, we don't need per-target _SOURCES rules, automake will infer them ## correctly -noinst_PROGRAMS = badport unpub lookup_name +noinst_PROGRAMS = badport unpub lookup_name \ + connect_timeout_no_accept \ + connect_timeout_mismatch +connect_timeout_no_accept_SOURCES = connect_timeout.c +connect_timeout_mismatch_SOURCES = connect_timeout.c + +connect_timeout_no_accept_CPPFLAGS = -DTEST_NOACCEPT $(AM_CPPFLAGS) +connect_timeout_mismatch_CPPFLAGS = -DTEST_MISMATCH $(AM_CPPFLAGS) \ No newline at end of file diff --git a/test/mpi/errors/spawn/connect_timeout.c b/test/mpi/errors/spawn/connect_timeout.c new file mode 100644 index 0000000..2bef859 --- /dev/null +++ b/test/mpi/errors/spawn/connect_timeout.c @@ -0,0 +1,225 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2016 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ +#include "mpi.h" +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "mpitest.h" + +#define IF_VERBOSE(cond, a) if (verbose && (cond)) { printf a ; fflush(stdout); } +#define SERVER_GID 0 +#define CLIENT_GID 1 +#define TIMEOUT "5" + +/* This test checks whether a MPI_COMM_CONNECT can eventually time out and return + * an error of class MPI_ERR_PORT when the named port exists but no pending + * MPI_COMM_ACCEPT on server side. We divide all processes into a server group + * and a client group, the client group issues connect to the server group. + * + * Two test cases are performed in separately: + * (1) No_accept: Server only calls open/close_port while client tries to connect. + * Each connect call should return MPI_ERR_PORT. + * (2) Mismatched: Server only issues one accept while client tries twice connect. + * At least one of the connect call should return MPI_ERR_PORT. */ + +int rank, nproc; +int verbose = 0; + +int test_mismatched_accept(MPI_Comm intra_comm, int gid); +int test_no_accept(MPI_Comm intra_comm, int gid); + +#if defined(TEST_MISMATCH) +#define RUN_TEST(comm, gid) test_mismatched_accept(comm, gid) +#else /* no accept by default */ +#define RUN_TEST(comm, gid) test_no_accept(comm, gid) +#endif + +/* Check whether error clase is equal to the expected one. */ +static inline int check_errno(int mpi_errno, int expected_errno) +{ + int errclass = MPI_SUCCESS; + int err = 0; + + MPI_Error_class(mpi_errno, &errclass); + if (errclass != expected_errno) { + char errstring[MPI_MAX_ERROR_STRING]; + char exp_errstring[MPI_MAX_ERROR_STRING]; + int errstrlen = 0; + + err++; + MPI_Error_string(mpi_errno, errstring, &errstrlen); + MPI_Error_string(expected_errno, exp_errstring, &errstrlen); + fprintf(stderr, "Error: returned wrong error class %s, expected %s\n", + errstring, exp_errstring); + } + + return err; +} + +/* The first process in server group opens port and broadcast to all other + * processes in the world. */ +static inline void open_and_bcast_port(int intra_rank, int gid, char (*port)[]) +{ + int server_rank = 0, local_server_rank = 0; + + /* server root opens port */ + if (intra_rank == 0 && gid == SERVER_GID) { + local_server_rank = rank; + + MPI_Open_port(MPI_INFO_NULL, (*port)); + IF_VERBOSE(1, ("server root: opened port1: <%s>\n", (*port))); + } + + /* broadcast world rank of server root, then broadcast port */ + MPI_Allreduce(&local_server_rank, &server_rank, 1, MPI_INT, MPI_SUM, MPI_COMM_WORLD); + MPI_Bcast((*port), MPI_MAX_PORT_NAME, MPI_CHAR, server_rank, MPI_COMM_WORLD); +} + +int test_mismatched_accept(MPI_Comm intra_comm, int gid) +{ + char port[MPI_MAX_PORT_NAME]; + MPI_Comm comm = MPI_COMM_NULL; + int mpi_errno = MPI_SUCCESS; + int errs = 0; + int intra_rank, intra_nproc; + int server_rank = 0, local_server_rank = 0; + + MTEST_VG_MEM_INIT(port, MPI_MAX_PORT_NAME * sizeof(char)); + + MPI_Comm_rank(intra_comm, &intra_rank); + MPI_Comm_size(intra_comm, &intra_nproc); + IF_VERBOSE(intra_rank == 0, ("%s: TEST mismatched accept case, %d nprocs in group\n", + (gid == SERVER_GID) ? "server" : "client", intra_nproc)); + + open_and_bcast_port(intra_rank, gid, &port); + + /* client group */ + if (gid == CLIENT_GID) { + int mpi_errno1 = MPI_SUCCESS, mpi_errno2 = MPI_SUCCESS; + + IF_VERBOSE(intra_rank == 0, ("client: connecting to <%s> with default timeout.\n", port)); + mpi_errno1 = MPI_Comm_connect(port, MPI_INFO_NULL, 0, intra_comm, &comm); + if (mpi_errno1 != MPI_SUCCESS) { + errs += check_errno(mpi_errno1, MPI_ERR_PORT); + } + + /* At least one of the connect calls should return MPI_ERR_PORT */ + IF_VERBOSE(intra_rank == 0, ("client: connecting to <%s> again.\n", port)); + mpi_errno2 = MPI_Comm_connect(port, MPI_INFO_NULL, 0, intra_comm, &comm); + if (mpi_errno1 == MPI_SUCCESS) { + errs += check_errno(mpi_errno2, MPI_ERR_PORT); + } + else { + errs += check_errno(mpi_errno2, MPI_SUCCESS); + } + } + else if (gid == SERVER_GID) { + /* NOTE: if accept hangs, try increase MPIR_CVAR_CH3_COMM_CONN_TIMEOUT. */ + IF_VERBOSE(intra_rank == 0, ("server: accepting connection to <%s>.\n", port)); + MPI_Comm_accept(port, MPI_INFO_NULL, 0, intra_comm, &comm); + } + + if (comm != MPI_COMM_NULL) { + IF_VERBOSE(intra_rank == 0, ("connection matched, freeing communicator.\n")); + MPI_Comm_free(&comm); + } + + if (intra_rank == 0 && gid == SERVER_GID) { + IF_VERBOSE(1, ("server root: closing port.\n")); + MPI_Close_port(port); + } + + return errs; +} + +int test_no_accept(MPI_Comm intra_comm, int gid) +{ + char port[MPI_MAX_PORT_NAME], timeout = 0; + MPI_Info info = MPI_INFO_NULL; + MPI_Comm comm = MPI_COMM_NULL; + int mpi_errno = MPI_SUCCESS; + int errs = 0; + int intra_rank, intra_nproc; + int server_rank = 0, local_server_rank = 0; + + MTEST_VG_MEM_INIT(port, MPI_MAX_PORT_NAME * sizeof(char)); + + MPI_Comm_rank(intra_comm, &intra_rank); + MPI_Comm_size(intra_comm, &intra_nproc); + IF_VERBOSE(intra_rank == 0, ("%s: TEST no accept case, %d nprocs in group\n", + (gid == SERVER_GID) ? "server" : "client", intra_nproc)); + + open_and_bcast_port(intra_rank, gid, &port); + + /* client group */ + if (gid == CLIENT_GID) { + IF_VERBOSE(intra_rank == 0, + ("client: case 1 - connecting to <%s> with default timeout.\n", port)); + mpi_errno = MPI_Comm_connect(port, MPI_INFO_NULL, 0, intra_comm, &comm); + errs += check_errno(mpi_errno, MPI_ERR_PORT); + + MPI_Info_create(&info); + MPI_Info_set(info, "timeout", TIMEOUT); + + IF_VERBOSE(intra_rank == 0, + ("client: case 2 - connecting to <%s> with specified timeout <%s>s.\n", port, + TIMEOUT)); + mpi_errno = MPI_Comm_connect(port, info, 0, intra_comm, &comm); + errs += check_errno(mpi_errno, MPI_ERR_PORT); + + MPI_Info_free(&info); + } + + MPI_Barrier(MPI_COMM_WORLD); + + /* server closes port after client finished connection */ + if (intra_rank == 0 && gid == SERVER_GID) { + IF_VERBOSE(1, ("server root: closing port.\n")); + MPI_Close_port(port); + } + + return errs; +} + + +int main(int argc, char *argv[]) +{ + MPI_Comm intra_comm = MPI_COMM_NULL; + int sub_rank, sub_nproc; + int errs = 0, allerrs = 0; + + if (getenv("MPITEST_VERBOSE")) { + verbose = 1; + } + + MPI_Init(&argc, &argv); + MPI_Comm_size(MPI_COMM_WORLD, &nproc); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + + if (nproc < 2) { + printf("At least two processes needed to run this test.\n"); + goto exit; + } + + /* Separate all processes into a server group and a client group. + * Processes in client group connect to server group. */ + MPI_Comm_split(MPI_COMM_WORLD, rank % 2, rank, &intra_comm); + MPI_Errhandler_set(intra_comm, MPI_ERRORS_RETURN); + + errs = RUN_TEST(intra_comm, rank % 2); + + MPI_Comm_free(&intra_comm); + MPI_Reduce(&errs, &allerrs, 1, MPI_INT, MPI_SUM, 0, MPI_COMM_WORLD); + + if (rank == 0 && allerrs == 0) { + printf(" No Errors\n"); + fflush(stdout); + } + + exit: + MPI_Finalize(); + return 0; +} diff --git a/test/mpi/errors/spawn/testlist.in b/test/mpi/errors/spawn/testlist.in index e8ba5e3..f685b06 100644 --- a/test/mpi/errors/spawn/testlist.in +++ b/test/mpi/errors/spawn/testlist.in @@ -1,3 +1,7 @@ badport 2 @namepub_tests@unpub 1 @namepub_tests@lookup_name 1 +connect_timeout_no_accept 2 env=MPIR_CVAR_CH3_COMM_CONNECT_TIMEOUT=20 +connect_timeout_mismatch 2 env=MPIR_CVAR_CH3_COMM_CONNECT_TIMEOUT=20 +connect_timeout_no_accept 5 env=MPIR_CVAR_CH3_COMM_CONNECT_TIMEOUT=20 +connect_timeout_mismatch 5 env=MPIR_CVAR_CH3_COMM_CONNECT_TIMEOUT=20 ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/netmod/tcp/socksm.c | 6 +- .../ch3/channels/nemesis/netmod/tcp/tcp_send.c | 6 +- src/mpid/ch3/errnames.txt | 3 + src/mpid/ch3/include/mpid_port.h | 200 +++++ src/mpid/ch3/include/mpidimpl.h | 35 +- src/mpid/ch3/include/mpidpkt.h | 19 + src/mpid/ch3/src/ch3u_handle_recv_pkt.c | 7 + src/mpid/ch3/src/ch3u_port.c | 874 ++++++++++++++++++-- src/mpid/ch3/src/mpid_finalize.c | 4 + src/mpid/ch3/src/mpid_port.c | 4 + test/mpi/errors/spawn/Makefile.am | 9 +- test/mpi/errors/spawn/connect_timeout.c | 225 +++++ test/mpi/errors/spawn/testlist.in | 4 + 13 files changed, 1298 insertions(+), 98 deletions(-) create mode 100644 src/mpid/ch3/include/mpid_port.h create mode 100644 test/mpi/errors/spawn/connect_timeout.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-421-g1c63de8
by noreply＠mpich.org 02 Sep '16

02 Sep '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 1c63de860856b416864625ef7be4b379e729d99a (commit) via 4159d8a7fd6d0d5e1efbea8cf1eb825222266fae (commit) from 072a6bf7da26b0fcc7ccbc91cea611eb1ca42a9a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/1c63de860856b416864625ef7be4b379e… commit 1c63de860856b416864625ef7be4b379e729d99a Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Aug 30 10:26:34 2016 -0500 pm/util: Add configure check for time function We should not assume that time is checked for elsewhere in configure. Fixes a build issue with CH4 and alternative process managers like gforker. Signed-off-by: Lena Oden <loden(a)anl.gov> diff --git a/src/pm/util/subconfigure.m4 b/src/pm/util/subconfigure.m4 index ef985c3..16b308f 100644 --- a/src/pm/util/subconfigure.m4 +++ b/src/pm/util/subconfigure.m4 @@ -245,6 +245,7 @@ if test "$ac_cv_func_thread_policy_set" = yes ; then fi AC_CHECK_HEADERS([string.h sys/time.h time.h stdlib.h sys/socket.h wait.h errno.h]) +AC_CHECK_FUNCS(time) # Check for socklen_t . # (note the conditional inclusion of sys/socket.h) AC_CACHE_CHECK([whether socklen_t is defined (in sys/socket.h if present)], http://git.mpich.org/mpich.git/commitdiff/4159d8a7fd6d0d5e1efbea8cf1eb82522… commit 4159d8a7fd6d0d5e1efbea8cf1eb825222266fae Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Mon Aug 29 17:02:38 2016 -0500 CH4/nm: Remove datatype dup hook The dup hook was removed in [b752654a5e44]. Signed-off-by: Lena Oden <loden(a)anl.gov> diff --git a/src/mpid/ch4/netmod/include/netmod.h b/src/mpid/ch4/netmod/include/netmod.h index 6e3457d..e9d4e58 100644 --- a/src/mpid/ch4/netmod/include/netmod.h +++ b/src/mpid/ch4/netmod/include/netmod.h @@ -335,8 +335,6 @@ typedef int (*MPIDI_NM_iscatterv_t) (const void *sendbuf, const int *sendcounts, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, MPI_Request * req); -typedef void (*MPIDI_NM_type_dup_hook_t) (MPIR_Datatype * old_datatype_p, - MPIR_Datatype * new_datatype_p); typedef int (*MPIDI_NM_type_create_hook_t) (MPIR_Datatype * datatype_p); typedef int (*MPIDI_NM_type_free_hook_t) (MPIR_Datatype * datatype_p); typedef int (*MPIDI_NM_op_create_hook_t) (MPIR_Op * op_p); @@ -476,7 +474,6 @@ typedef struct MPIDI_NM_native_funcs { MPIDI_NM_iscatterv_t iscatterv; /* Datatype hooks */ MPIDI_NM_type_create_hook_t type_create_hook; - MPIDI_NM_type_dup_hook_t type_dup_hook; MPIDI_NM_type_free_hook_t type_free_hook; /* Op hooks */ MPIDI_NM_op_create_hook_t op_create_hook; @@ -965,9 +962,6 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iscatterv(const void *sendbuf, const int * MPI_Datatype recvtype, int root, MPIR_Comm * comm_ptr, MPI_Request * req) MPL_STATIC_INLINE_SUFFIX; -MPL_STATIC_INLINE_PREFIX void MPIDI_NM_type_dup_hook(MPIR_Datatype * old_datatype_p, - MPIR_Datatype * - new_datatype_p) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) MPL_STATIC_INLINE_SUFFIX; MPL_STATIC_INLINE_PREFIX int MPIDI_NM_type_free_hook(MPIR_Datatype * diff --git a/src/mpid/ch4/netmod/include/netmod_impl.h b/src/mpid/ch4/netmod/include/netmod_impl.h index 781da99..4ba34a1 100644 --- a/src/mpid/ch4/netmod/include/netmod_impl.h +++ b/src/mpid/ch4/netmod/include/netmod_impl.h @@ -963,12 +963,6 @@ MPL_STATIC_INLINE_PREFIX int MPIDI_NM_iscatterv(const void *sendbuf, const int * recvcount, recvtype, root, comm_ptr, req); }; -MPL_STATIC_INLINE_PREFIX void MPIDI_NM_type_dup_hook(MPIR_Datatype * old_datatype_p, - MPIR_Datatype * new_datatype_p) -{ - return MPIDI_NM_native_func->type_dup_hook(old_datatype_p, new_datatype_p); -}; - MPL_STATIC_INLINE_PREFIX int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) { return MPIDI_NM_native_func->type_create_hook(datatype_p); diff --git a/src/mpid/ch4/netmod/ofi/func_table.c b/src/mpid/ch4/netmod/ofi/func_table.c index bed0f63..f1586d4 100644 --- a/src/mpid/ch4/netmod/ofi/func_table.c +++ b/src/mpid/ch4/netmod/ofi/func_table.c @@ -142,7 +142,6 @@ MPIDI_NM_native_funcs_t MPIDI_NM_native_ofi_funcs = { MPIDI_NM_iscatter, MPIDI_NM_iscatterv, MPIDI_NM_type_create_hook, - MPIDI_NM_type_dup_hook, MPIDI_NM_type_free_hook, MPIDI_NM_op_create_hook, MPIDI_NM_op_free_hook, diff --git a/src/mpid/ch4/netmod/ofi/ofi_datatype.h b/src/mpid/ch4/netmod/ofi/ofi_datatype.h index 8e110ca..7a12b23 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_datatype.h +++ b/src/mpid/ch4/netmod/ofi/ofi_datatype.h @@ -23,9 +23,4 @@ static inline int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) return 0; } -static inline void MPIDI_NM_type_dup_hook(MPIR_Datatype * old_datatype_p, - MPIR_Datatype * new_datatype_p) -{ - return; -} #endif diff --git a/src/mpid/ch4/netmod/portals4/func_table.c b/src/mpid/ch4/netmod/portals4/func_table.c index 8d39e10..59cfe2b 100644 --- a/src/mpid/ch4/netmod/portals4/func_table.c +++ b/src/mpid/ch4/netmod/portals4/func_table.c @@ -142,7 +142,6 @@ MPIDI_NM_native_funcs_t MPIDI_NM_native_portals4_funcs = { MPIDI_NM_iscatter, MPIDI_NM_iscatterv, MPIDI_NM_type_create_hook, - MPIDI_NM_type_dup_hook, MPIDI_NM_type_free_hook, MPIDI_NM_op_create_hook, MPIDI_NM_op_free_hook diff --git a/src/mpid/ch4/netmod/portals4/ptl_datatype.h b/src/mpid/ch4/netmod/portals4/ptl_datatype.h index 95f346a..8f1cc2e 100644 --- a/src/mpid/ch4/netmod/portals4/ptl_datatype.h +++ b/src/mpid/ch4/netmod/portals4/ptl_datatype.h @@ -19,10 +19,4 @@ static inline int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) return 0; } -static inline void MPIDI_NM_type_dup_hook(MPIR_Datatype * old_datatype_p, - MPIR_Datatype * new_datatype_p) -{ - return; -} - #endif /* NETMOD_PTL_DATATYPE_H_INCLUDED */ diff --git a/src/mpid/ch4/netmod/stubnm/globals.c b/src/mpid/ch4/netmod/stubnm/globals.c index 9dc545b..190d561 100644 --- a/src/mpid/ch4/netmod/stubnm/globals.c +++ b/src/mpid/ch4/netmod/stubnm/globals.c @@ -142,7 +142,6 @@ MPIDI_NM_native_funcs_t MPIDI_NM_native_stubnm_funcs = { MPIDI_NM_iscatter, MPIDI_NM_iscatterv, MPIDI_NM_type_create_hook, - MPIDI_NM_type_dup_hook, MPIDI_NM_type_free_hook, MPIDI_NM_op_create_hook, MPIDI_NM_op_free_hook, diff --git a/src/mpid/ch4/netmod/stubnm/stubnm_datatype.h b/src/mpid/ch4/netmod/stubnm/stubnm_datatype.h index 323aa6d..cac199f 100644 --- a/src/mpid/ch4/netmod/stubnm/stubnm_datatype.h +++ b/src/mpid/ch4/netmod/stubnm/stubnm_datatype.h @@ -25,11 +25,4 @@ static inline int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) return 0; } -static inline void MPIDI_NM_type_dup_hook(MPIR_Datatype * old_datatype_p, - MPIR_Datatype * new_datatype_p) -{ - MPIR_Assert(0); - return; -} - #endif diff --git a/src/mpid/ch4/netmod/ucx/func_table.c b/src/mpid/ch4/netmod/ucx/func_table.c index e4801eb..01c9ec5 100644 --- a/src/mpid/ch4/netmod/ucx/func_table.c +++ b/src/mpid/ch4/netmod/ucx/func_table.c @@ -140,7 +140,6 @@ MPIDI_NM_native_funcs_t MPIDI_NM_native_ucx_funcs = { MPIDI_NM_iscatter, MPIDI_NM_iscatterv, MPIDI_NM_type_create_hook, - MPIDI_NM_type_dup_hook, MPIDI_NM_type_free_hook, MPIDI_NM_op_create_hook, MPIDI_NM_op_free_hook diff --git a/src/mpid/ch4/netmod/ucx/ucx_datatype.h b/src/mpid/ch4/netmod/ucx/ucx_datatype.h index eb115f0..ce4f933 100644 --- a/src/mpid/ch4/netmod/ucx/ucx_datatype.h +++ b/src/mpid/ch4/netmod/ucx/ucx_datatype.h @@ -141,10 +141,4 @@ static inline int MPIDI_NM_type_create_hook(MPIR_Datatype * datatype_p) return 0; } -static inline void MPIDI_NM_type_dup_hook(MPIR_Datatype * old_datatype_p, - MPIR_Datatype * new_datatype_p) -{ - return; -} - #endif /* NETMOD_UCX_DATATYPE_H_INCLUDED */ ----------------------------------------------------------------------- Summary of changes: src/mpid/ch4/netmod/include/netmod.h | 6 ------ src/mpid/ch4/netmod/include/netmod_impl.h | 6 ------ src/mpid/ch4/netmod/ofi/func_table.c | 1 - src/mpid/ch4/netmod/ofi/ofi_datatype.h | 5 ----- src/mpid/ch4/netmod/portals4/func_table.c | 1 - src/mpid/ch4/netmod/portals4/ptl_datatype.h | 6 ------ src/mpid/ch4/netmod/stubnm/globals.c | 1 - src/mpid/ch4/netmod/stubnm/stubnm_datatype.h | 7 ------- src/mpid/ch4/netmod/ucx/func_table.c | 1 - src/mpid/ch4/netmod/ucx/ucx_datatype.h | 6 ------ src/pm/util/subconfigure.m4 | 1 + 11 files changed, 1 insertions(+), 40 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2-419-g072a6bf
by noreply＠mpich.org 02 Sep '16

02 Sep '16

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 072a6bf7da26b0fcc7ccbc91cea611eb1ca42a9a (commit) from c5b844ad3397bc654258595dc8bd595b6738296e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/072a6bf7da26b0fcc7ccbc91cea611eb1… commit 072a6bf7da26b0fcc7ccbc91cea611eb1ca42a9a Author: Hajime Fujita <hajime.fujita(a)intel.com> Date: Wed Aug 24 10:44:43 2016 -0500 CH4/OFI: Specify FI_DELIVERY_COMPLETE for RMA FI_DELIVERY_COMPLETE flag has been missing when setting up TX context/issuing fi_*msg functions. This patch makes sure that RMA operations are issued with FI_DELIVERY_COMPLETE flag. Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/mpid/ch4/netmod/ofi/ofi_init.h b/src/mpid/ch4/netmod/ofi/ofi_init.h index 31eceeb..9ea0a18 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_init.h +++ b/src/mpid/ch4/netmod/ofi/ofi_init.h @@ -305,6 +305,7 @@ static inline int MPIDI_OFI_init_generic(int rank, int ret; struct fi_tx_attr tx_attr; memset(&tx_attr, 0, sizeof(tx_attr)); + tx_attr.op_flags = FI_DELIVERY_COMPLETE | FI_COMPLETION; MPIDI_OFI_CALL_RETURN(fi_stx_context(MPIDI_Global.domain, &tx_attr, &MPIDI_Global.stx_ctx, NULL /* context */), ret); diff --git a/src/mpid/ch4/netmod/ofi/ofi_rma.h b/src/mpid/ch4/netmod/ofi/ofi_rma.h index fda3960..0675b18 100644 --- a/src/mpid/ch4/netmod/ofi/ofi_rma.h +++ b/src/mpid/ch4/netmod/ofi/ofi_rma.h @@ -38,12 +38,12 @@ { \ MPIDI_OFI_REQUEST_CREATE((*(sigreq)), MPIR_REQUEST_KIND__RMA); \ MPIR_cc_set((*(sigreq))->cc_ptr, 0); \ - *(flags) = FI_COMPLETION; \ + *(flags) = FI_COMPLETION | FI_DELIVERY_COMPLETE; \ *(ep) = MPIDI_OFI_WIN(win).ep; \ } \ else { \ *(ep) = MPIDI_OFI_WIN(win).ep_nocmpl; \ - *(flags) = 0ULL; \ + *(flags) = FI_DELIVERY_COMPLETE; \ } \ } while (0) ----------------------------------------------------------------------- Summary of changes: src/mpid/ch4/netmod/ofi/ofi_init.h | 1 + src/mpid/ch4/netmod/ofi/ofi_rma.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0