August 2013 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.0.4-432-ge259dcd
by noreply＠mpich.org 02 Aug '13

02 Aug '13

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 e259dcd97ede800b086c96d76f5213fe973ecd2a (commit) from b3049e5a2b300c105bb1970699b74a3826c48e2a (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/e259dcd97ede800b086c96d76f5213fe9… commit e259dcd97ede800b086c96d76f5213fe973ecd2a Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Aug 1 21:12:13 2013 -0500 Check for a NULL string before freeing. Fixes ticket #1862. Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/pm/hydra/include/hydra.h b/src/pm/hydra/include/hydra.h index 5e4a51c..c7cc78f 100644 --- a/src/pm/hydra/include/hydra.h +++ b/src/pm/hydra/include/hydra.h @@ -214,6 +214,8 @@ struct HYD_string_stash { #define HYD_STRING_STASH_FREE(stash) \ do { \ + if ((stash).strlist == NULL) \ + break; \ HYDU_free_strlist((stash).strlist); \ HYDU_FREE((stash).strlist); \ (stash).max_count = 0; \ ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/include/hydra.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-431-gb3049e5
by noreply＠mpich.org 02 Aug '13

02 Aug '13

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 b3049e5a2b300c105bb1970699b74a3826c48e2a (commit) from 602605b67eab52c0d4eaf6b2a3b2580a7f1da0d6 (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/b3049e5a2b300c105bb1970699b74a382… commit b3049e5a2b300c105bb1970699b74a3826c48e2a Author: William Gropp <wgropp(a)illinois.edu> Date: Thu Aug 1 08:31:40 2013 -0500 Added Fortran tests for a few PMPI routines Added test to help check #1815, as weak symbol support is used to implement the PMPI and MPI routines in a single object file, and there are few tests for correct operation of the PMPI routines in the test suite (a more comprehensive test of PMPI could use CPP macros to convert all existing tests to try PMPI, but typically either the PMPI routines are all available, or there is a problem. diff --git a/test/mpi/.gitignore b/test/mpi/.gitignore index 0bdcd15..e5f8917 100644 --- a/test/mpi/.gitignore +++ b/test/mpi/.gitignore @@ -21,6 +21,7 @@ /f90/pt2pt/ /f90/spawn/ /f90/topo/ +/f90/profile /coll/gdb.script /coll/redscat2 /coll/reduce_local diff --git a/test/mpi/configure.ac b/test/mpi/configure.ac index 565842a..574411d 100644 --- a/test/mpi/configure.ac +++ b/test/mpi/configure.ac @@ -1416,6 +1416,7 @@ AC_OUTPUT(maint/testmerge \ f77/io/iooffset.h \ f77/io/iodisp.h \ f77/io/ioaint.h \ + f77/profile/Makefile \ f90/Makefile \ f90/attr/Makefile \ f90/datatype/Makefile \ @@ -1435,6 +1436,7 @@ AC_OUTPUT(maint/testmerge \ f90/ext/testlist \ f90/io/Makefile \ f90/misc/Makefile \ + f90/profile/Makefile \ cxx/Makefile \ cxx/util/Makefile \ cxx/attr/Makefile \ diff --git a/test/mpi/f77/Makefile.am b/test/mpi/f77/Makefile.am index 01d8fba..8261d44 100644 --- a/test/mpi/f77/Makefile.am +++ b/test/mpi/f77/Makefile.am @@ -9,6 +9,6 @@ include $(top_srcdir)/Makefile_f77.mtest EXTRA_DIST = testlist.in -static_subdirs = util attr datatype coll pt2pt info init comm topo ext +static_subdirs = util attr datatype coll pt2pt info init comm topo ext profile SUBDIRS = $(static_subdirs) $(spawndir) $(iodir) $(rmadir) DIST_SUBDIRS = $(static_subdirs) spawn io rma diff --git a/test/mpi/f77/profile/Makefile.am b/test/mpi/f77/profile/Makefile.am new file mode 100644 index 0000000..e55eaad --- /dev/null +++ b/test/mpi/f77/profile/Makefile.am @@ -0,0 +1,21 @@ +# -*- Mode: Makefile; -*- +# vim: set ft=automake : +# +# (C) 2011 by Argonne National Laboratory. +# See COPYRIGHT in top-level directory. +# + +include $(top_srcdir)/Makefile_f77.mtest + +EXTRA_DIST = testlist + +# avoid having to write many "foo_SOURCES = foo.f" lines +AM_DEFAULT_SOURCE_EXT = .f + +noinst_PROGRAMS = profile1f + +## attr1aints.h will be distributed because it's listed in AC_CONFIG_FILES/AC_OUTPUT + +# ensure that dependent tests will be rebuilt when typeaints.h is updated +greqf.$(OBJEXT): attr1aints.h + diff --git a/test/mpi/f77/profile/profile1f.f b/test/mpi/f77/profile/profile1f.f new file mode 100644 index 0000000..f3e4af8 --- /dev/null +++ b/test/mpi/f77/profile/profile1f.f @@ -0,0 +1,101 @@ + program main + include "mpif.h" + integer ierr + integer smsg(3), rmsg(3), toterrs, wsize, wrank + common /myinfo/ calls, amount, rcalls, ramount + integer calls, amount, rcalls, ramount + + toterrs = 0 + call mpi_init( ierr ) + call init_counts() + call mpi_comm_rank( MPI_COMM_WORLD, wrank, ierr ) + call mpi_comm_size( MPI_COMM_WORLD, wsize, ierr ) + + if (wrank .eq. 0) then + smsg(1) = 3 + call mpi_send( smsg, 1, MPI_INT, 1, 0, MPI_COMM_WORLD, ierr ) + else if (wrank .eq. 1) then + call mpi_recv( rmsg, 1, MPI_INT, 0, 0, MPI_COMM_WORLD, + $ MPI_STATUS_IGNORE, ierr ) + if (rmsg(1) .ne. 3) then + toterrs = toterrs + 1 + print *, "Unexpected received value ", rmsg(1) + endif + endif +C +C check that we used the profiling versions of the routines + toterrs = 0 + if (wrank .eq. 0) then + if (calls.ne.1) then + toterrs = toterrs + 1 + print *, "Sender calls is ", calls + endif + if (amount.ne.1) then + toterrs = toterrs + 1 + print *, "Sender amount is ", amount + endif + else if (wrank .eq. 1) then + if (rcalls.ne.1) then + toterrs = toterrs + 1 + print *, "Receiver calls is ", rcalls + endif + if (ramount.ne.1) then + toterrs = toterrs + 1 + print *, "Receiver amount is ", ramount + endif + endif + + call mpi_allreduce( MPI_IN_PLACE, toterrs, 1, MPI_INT, MPI_SUM, + $ MPI_COMM_WORLD, ierr ) + if (wrank .eq. 0) then + if (toterrs .eq. 0) then + print *, " No Errors" + else + print *, " Found ", toterrs, " errors" + endif + endif +C + call mpi_finalize( ierr ) + end +C + subroutine mpi_send( smsg, count, dtype, dest, tag, comm, ierr ) + include "mpif.h" + integer count, dtype, dest, tag, comm, ierr + integer smsg(count) + common /myinfo/ calls, amount, rcalls, ramount + integer calls, amount, rcalls, ramount +c + calls = calls + 1 + amount = amount + count + call pmpi_send( smsg, count, dtype, dest, tag, comm, ierr ) + return + end +C + subroutine mpi_recv( rmsg, count, dtype, src, tag, comm, status, + $ ierr ) + include "mpif.h" + integer count, dtype, src, tag, comm, status(MPI_STATUS_SIZE), + $ ierr + integer rmsg(count) + common /myinfo/ calls, amount, rcalls, ramount + integer calls, amount, rcalls, ramount + rcalls = rcalls + 1 + ramount = ramount + 1 + call pmpi_recv( rmsg, count, dtype, src, tag, comm, status, ierr + $ ) + return + end +C + subroutine init_counts() + common /myinfo/ calls, amount, rcalls, ramount + integer calls, amount, rcalls, ramount + calls = 0 + amount = 0 + rcalls = 0 + ramount = 0 + end +C + subroutine mpi_pcontrol( ierr ) + integer ierr + return + end diff --git a/test/mpi/f77/profile/testlist b/test/mpi/f77/profile/testlist new file mode 100644 index 0000000..27ce085 --- /dev/null +++ b/test/mpi/f77/profile/testlist @@ -0,0 +1 @@ +profile1f 2 diff --git a/test/mpi/f77/testlist.in b/test/mpi/f77/testlist.in index 7ea2b1c..3316809 100644 --- a/test/mpi/f77/testlist.in +++ b/test/mpi/f77/testlist.in @@ -10,3 +10,4 @@ init comm ext topo +profile diff --git a/test/mpi/f90/testlist.in b/test/mpi/f90/testlist.in index e8b64ef..edf311c 100644 --- a/test/mpi/f90/testlist.in +++ b/test/mpi/f90/testlist.in @@ -13,3 +13,4 @@ f90types @spawndir@ timer topo +profile ----------------------------------------------------------------------- Summary of changes: test/mpi/.gitignore | 1 + test/mpi/configure.ac | 2 + test/mpi/f77/Makefile.am | 2 +- test/mpi/f77/{pt2pt => profile}/Makefile.am | 4 +- test/mpi/f77/profile/profile1f.f | 101 +++++++++++++++++++++++++++ test/mpi/f77/profile/testlist | 1 + test/mpi/f77/testlist.in | 1 + test/mpi/f90/testlist.in | 1 + 8 files changed, 109 insertions(+), 4 deletions(-) copy test/mpi/f77/{pt2pt => profile}/Makefile.am (85%) create mode 100644 test/mpi/f77/profile/profile1f.f create mode 100644 test/mpi/f77/profile/testlist hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-430-g602605b
by noreply＠mpich.org 01 Aug '13

01 Aug '13

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 602605b67eab52c0d4eaf6b2a3b2580a7f1da0d6 (commit) from 3e6b4e15c386b8bc6f2e7fea20f1cfc15c55487c (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/602605b67eab52c0d4eaf6b2a3b2580a7… commit 602605b67eab52c0d4eaf6b2a3b2580a7f1da0d6 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Aug 1 14:01:15 2013 -0500 Created a new test for a large number of outstanding RMA operations. This seems to fail with MPICH for >= 4096 back-to-back RMA operations. Signed-off-by: Xin Zhao <xinzhao3(a)illinois.edu> diff --git a/test/mpi/rma/Makefile.am b/test/mpi/rma/Makefile.am index 8c88221..273d921 100644 --- a/test/mpi/rma/Makefile.am +++ b/test/mpi/rma/Makefile.am @@ -69,6 +69,7 @@ noinst_PROGRAMS = \ rmazero \ mixedsync \ manyrma2 \ + manyrma3 \ selfrma \ strided_acc_onelock \ strided_putget_indexed \ diff --git a/test/mpi/rma/manyrma3.c b/test/mpi/rma/manyrma3.c new file mode 100644 index 0000000..ee222a9 --- /dev/null +++ b/test/mpi/rma/manyrma3.c @@ -0,0 +1,35 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * (C) 2010 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ + +#include "mpi.h" +#include <stdio.h> + +#define MAX_COUNT 4096 + +int main(int argc, char *argv[]) +{ + int i, winbuf, one = 1, rank; + MPI_Win win; + + MPI_Init(NULL, NULL); + MPI_Comm_rank(MPI_COMM_WORLD, &rank); + + MPI_Win_create(&winbuf, sizeof(int), sizeof(int), MPI_INFO_NULL, MPI_COMM_WORLD, &win); + + MPI_Win_fence(0, win); + for (i = 0; i < MAX_COUNT; i++) + MPI_Accumulate(&one, 1, MPI_INT, 0, 0, 1, MPI_INT, MPI_SUM, win); + MPI_Win_fence(0, win); + + MPI_Win_free(&win); + + if (rank == 0) + printf(" No Errors\n"); + + MPI_Finalize(); + + return 0; +} diff --git a/test/mpi/rma/testlist b/test/mpi/rma/testlist index d69d4ed..ccc7aca 100644 --- a/test/mpi/rma/testlist +++ b/test/mpi/rma/testlist @@ -65,6 +65,7 @@ put_base 2 put_bottom 2 win_flavors 4 mpiversion=3.0 manyrma2 2 timeLimit=500 +manyrma3 2 win_shared 4 mpiversion=3.0 win_shared_noncontig 4 mpiversion=3.0 win_shared_noncontig_put 4 mpiversion=3.0 ----------------------------------------------------------------------- Summary of changes: test/mpi/rma/Makefile.am | 1 + test/mpi/rma/manyrma3.c | 35 +++++++++++++++++++++++++++++++++++ test/mpi/rma/testlist | 1 + 3 files changed, 37 insertions(+), 0 deletions(-) create mode 100644 test/mpi/rma/manyrma3.c hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-429-g3e6b4e1
by noreply＠mpich.org 01 Aug '13

01 Aug '13

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 3e6b4e15c386b8bc6f2e7fea20f1cfc15c55487c (commit) via f31656cbb6dbfe63c985150bb4a7bd21e99b14bd (commit) via e08bc140542eda7384e7172046312c11010cb561 (commit) via c58cec82601da186ee944d5151df4f5c6e734212 (commit) via a6dae684eacd22d43e275e47e015a8b00054bf7e (commit) via 6a928e7ec1f4c27190959e0e780aec202cad4cd9 (commit) via faa3a51fd280dac9df6ee538c4510dfe06dc0374 (commit) via 8bb4b63034407d8f8e85193617110b5842e25e6f (commit) via 20ff85b8c45d03c0b3f42dda13ed718bf64ab3fb (commit) via 3e23947322ee6257e66eb7d316de01ffbda3ec3c (commit) via 0a338e5dbe6a3589a9da8ba467d4bc18d3f94270 (commit) via 48aaa82295c800f976c49a7aaba4344175d643b5 (commit) via 723e5d5e86d33e5c668dfc3b528618a88587b928 (commit) via 8bf8f815a5105af42fb368f5da4b71854620d90f (commit) via c7bc4694fbb0b10f6a09141794c6e0664a76197a (commit) via a64a1d2ce36c1b0bbf4779734a67aa6643192f30 (commit) via 66221968523896310b3920cbfd44f4c1fd9bc205 (commit) from 08273c868fc7ddd7d81473e153eb3a0f7d38fabf (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/3e6b4e15c386b8bc6f2e7fea20f1cfc15… commit 3e6b4e15c386b8bc6f2e7fea20f1cfc15c55487c Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Thu Aug 1 17:56:26 2013 -0500 Warning squash. diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index e469edc..17162a7 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -533,7 +533,7 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ void *base = NULL; MPI_User_function *uop = NULL; MPID_Datatype *dtp; - int origin_predefined, result_predefined, target_predefined; + int origin_predefined, target_predefined; MPIDI_VC_t *orig_vc, *target_vc; int mpi_errno = MPI_SUCCESS; MPIU_CHKLMEM_DECL(2); @@ -545,7 +545,6 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ if (op != MPI_NO_OP) { MPIDI_CH3I_DATATYPE_IS_PREDEFINED(origin_datatype, origin_predefined); } - MPIDI_CH3I_DATATYPE_IS_PREDEFINED(result_datatype, result_predefined); MPIDI_CH3I_DATATYPE_IS_PREDEFINED(target_datatype, target_predefined); /* FIXME: refer to FIXME in MPIDI_CH3I_Shm_put_op */ diff --git a/src/mpid/ch3/src/ch3u_rma_ops.c b/src/mpid/ch3/src/ch3u_rma_ops.c index dac6398..c690907 100644 --- a/src/mpid/ch3/src/ch3u_rma_ops.c +++ b/src/mpid/ch3/src/ch3u_rma_ops.c @@ -40,10 +40,9 @@ extern void MPIDI_CH3_RMA_InitInstr(void); #define FCNAME MPIDI_QUOTE(FUNCNAME) int MPIDI_Win_free(MPID_Win **win_ptr) { - int mpi_errno=MPI_SUCCESS, total_pt_rma_puts_accs; + int mpi_errno=MPI_SUCCESS; int in_use; MPID_Comm *comm_ptr; - int errflag = FALSE; MPIDI_STATE_DECL(MPID_STATE_MPIDI_WIN_FREE); MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_WIN_FREE); http://git.mpich.org/mpich.git/commitdiff/f31656cbb6dbfe63c985150bb4a7bd21e… commit f31656cbb6dbfe63c985150bb4a7bd21e99b14bd Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Tue Jul 30 23:27:48 2013 -0500 Modify CH3 default MPIDI_Win_shared_query not to use shm_base_addrs. shm_base_addrs is allocated only when shared memory region is allocated in nemesis. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_rma_ops.c b/src/mpid/ch3/src/ch3u_rma_ops.c index ca9589c..dac6398 100644 --- a/src/mpid/ch3/src/ch3u_rma_ops.c +++ b/src/mpid/ch3/src/ch3u_rma_ops.c @@ -98,7 +98,7 @@ int MPIDI_Win_shared_query(MPID_Win *win_ptr, int target_rank, MPI_Aint *size, MPIDI_STATE_DECL(MPID_STATE_MPIDI_WIN_SHARED_QUERY); MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_WIN_SHARED_QUERY); - *(void**) baseptr = win_ptr->shm_base_addrs[0]; + *(void**) baseptr = win_ptr->base; *size = win_ptr->size; *disp_unit = win_ptr->disp_unit; http://git.mpich.org/mpich.git/commitdiff/e08bc140542eda7384e7172046312c110… commit e08bc140542eda7384e7172046312c11010cb561 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Wed Jul 31 16:19:20 2013 -0500 In MPID_Win_allocate_shared, check 'alloc_shm' info. Default set 'alloc_shm' info to TRUE. If 'alloc_shm' is set by user and value is not TRUE, throw an error. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index 731b7b9..35c1b3c 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -214,6 +214,18 @@ int MPID_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info *info, MPID mpi_errno = win_init(size, disp_unit, MPI_WIN_FLAVOR_SHARED, MPI_WIN_UNIFIED, comm_ptr, win_ptr); if (mpi_errno) MPIU_ERR_POP(mpi_errno); + /* FOR ALLOCATE_SHARED, alloc_shm info is default to set to TRUE */ + (*win_ptr)->info_args.alloc_shm = TRUE; + + if (info != NULL) { + int alloc_shm_flag = 0; + char shm_alloc_value[MPI_MAX_INFO_VAL+1]; + MPIR_Info_get_impl(info, "alloc_shm", MPI_MAX_INFO_VAL, shm_alloc_value, &alloc_shm_flag); + /* if value of 'alloc_shm' info is not set to true, throw an error */ + if (alloc_shm_flag == 1 && strncmp(shm_alloc_value, "true", sizeof("true"))) + MPIU_ERR_SETANDJUMP(mpi_errno, MPI_ERR_OTHER, "**infoval"); + } + mpi_errno = MPIDI_CH3U_Win_fns.allocate_shared(size, disp_unit, info, comm_ptr, base_ptr, win_ptr); if (mpi_errno != MPI_SUCCESS) MPIU_ERR_POP(mpi_errno); http://git.mpich.org/mpich.git/commitdiff/c58cec82601da186ee944d5151df4f5c6… commit c58cec82601da186ee944d5151df4f5c6e734212 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Aug 1 14:33:22 2013 -0500 Assign new MPIDI_CH3U_Win_allocate to (*allocate_shared) so that it will be called by MPID_Win_allocate_shared. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_win_fns.c b/src/mpid/ch3/src/ch3u_win_fns.c index 080d7b5..66329cf 100644 --- a/src/mpid/ch3/src/ch3u_win_fns.c +++ b/src/mpid/ch3/src/ch3u_win_fns.c @@ -25,6 +25,7 @@ int MPIDI_Win_fns_init(MPIDI_CH3U_Win_fns_t *win_fns) win_fns->create = MPIDI_CH3U_Win_create; win_fns->allocate = MPIDI_CH3U_Win_allocate; + win_fns->allocate_shared = MPIDI_CH3U_Win_allocate; win_fns->create_dynamic = MPIDI_CH3U_Win_create_dynamic; MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_WIN_FNS_INIT); http://git.mpich.org/mpich.git/commitdiff/a6dae684eacd22d43e275e47e015a8b00… commit a6dae684eacd22d43e275e47e015a8b00054bf7e Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Tue Jul 30 23:22:30 2013 -0500 Implement new MPIDI_CH3U_Win_allocate and call it through function pointer from MPID_Win_allocate. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_win_fns.c b/src/mpid/ch3/src/ch3u_win_fns.c index baf3108..080d7b5 100644 --- a/src/mpid/ch3/src/ch3u_win_fns.c +++ b/src/mpid/ch3/src/ch3u_win_fns.c @@ -214,6 +214,37 @@ int MPIDI_Win_detach(MPID_Win *win, const void *base) #undef FUNCNAME +#define FUNCNAME MPIDI_CH3U_Win_allocate +#undef FCNAME +#define FCNAME MPIDI_QUOTE(FUNCNAME) +int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, + MPID_Comm *comm_ptr, void *baseptr, MPID_Win **win_ptr) +{ + int mpi_errno = MPI_SUCCESS; + MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE); + + MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE); + + if ((*win_ptr)->info_args.alloc_shm == TRUE) { + if (MPIDI_CH3U_Win_fns.allocate_shm != NULL) { + mpi_errno = MPIDI_CH3U_Win_fns.allocate_shm(size, disp_unit, info, comm_ptr, baseptr, win_ptr); + if (mpi_errno != MPI_SUCCESS) MPIU_ERR_POP(mpi_errno); + goto fn_exit; + } + } + + mpi_errno = MPIDI_CH3U_Win_allocate_no_shm(size, disp_unit, info, comm_ptr, baseptr, win_ptr); + if (mpi_errno != MPI_SUCCESS) MPIU_ERR_POP(mpi_errno); + + fn_exit: + MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE); + return mpi_errno; + fn_fail: + goto fn_exit; +} + + +#undef FUNCNAME #define FUNCNAME MPIDI_CH3U_Win_allocate_no_shm #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index 46930d0..731b7b9 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -117,14 +117,8 @@ int MPID_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, (*win_ptr)->info_args.alloc_shm = TRUE; } - if((*win_ptr)->info_args.alloc_shm == TRUE) { - mpi_errno = MPIDI_CH3U_Win_fns.allocate_shared(size, disp_unit, info, comm_ptr, baseptr, win_ptr); - if (mpi_errno != MPI_SUCCESS) MPIU_ERR_POP(mpi_errno); - } - else { - mpi_errno = MPIDI_CH3U_Win_fns.allocate(size, disp_unit, info, comm_ptr, baseptr, win_ptr); - if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } - } + mpi_errno = MPIDI_CH3U_Win_fns.allocate(size, disp_unit, info, comm_ptr, baseptr, win_ptr); + if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } fn_fail: MPIDI_FUNC_EXIT(MPID_STATE_MPID_WIN_ALLOCATE); http://git.mpich.org/mpich.git/commitdiff/6a928e7ec1f4c27190959e0e780aec202… commit 6a928e7ec1f4c27190959e0e780aec202cad4cd9 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Aug 1 15:07:15 2013 -0500 In (*allocate_shared), change type of argument 'base_ptr' from (void**) to (void*). In the code, some places use (void**)base_ptr and some places use (void*)base_ptr which are confusing. We make every win_allocate related function use (void*)base_ptr as the argument and do conversion inside the function, in order to keep the code clear. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 3e2221b..a71e8a3 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -1106,7 +1106,7 @@ int MPIDI_CH3U_Comm_FinishPending( MPID_Comm * ); typedef struct { int (*create)(void *, MPI_Aint, int, MPID_Info *, MPID_Comm *, MPID_Win **); int (*allocate)(MPI_Aint, int, MPID_Info *, MPID_Comm *, void *, MPID_Win **); - int (*allocate_shared)(MPI_Aint, int, MPID_Info *, MPID_Comm *, void **, MPID_Win **); + int (*allocate_shared)(MPI_Aint, int, MPID_Info *, MPID_Comm *, void *, MPID_Win **); int (*allocate_shm)(MPI_Aint, int, MPID_Info *, MPID_Comm *, void *, MPID_Win **); int (*create_dynamic)(MPID_Info *, MPID_Comm *, MPID_Win **); } MPIDI_CH3U_Win_fns_t; http://git.mpich.org/mpich.git/commitdiff/faa3a51fd280dac9df6ee538c4510dfe0… commit faa3a51fd280dac9df6ee538c4510dfe06dc0374 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Tue Jul 30 23:27:12 2013 -0500 Modify MPIDI_Win_free to handle win_allocate and win_allocate_shared in CH3. Because we delete the default MPIDI_SHM_Win_free in CH3, which originally deals with win_allocate_shared in CH3, we need to modify MPIDI_Win_free to handle it. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_rma_ops.c b/src/mpid/ch3/src/ch3u_rma_ops.c index 4382ccc..ca9589c 100644 --- a/src/mpid/ch3/src/ch3u_rma_ops.c +++ b/src/mpid/ch3/src/ch3u_rma_ops.c @@ -66,9 +66,10 @@ int MPIDI_Win_free(MPID_Win **win_ptr) MPIU_Free((*win_ptr)->pt_rma_puts_accs); /* Free the attached buffer for windows created with MPI_Win_allocate() */ - if ((*win_ptr)->create_flavor == MPI_WIN_FLAVOR_ALLOCATE && (*win_ptr)->size > 0) { - if ((*win_ptr)->shm_allocated != TRUE) + if ((*win_ptr)->create_flavor == MPI_WIN_FLAVOR_ALLOCATE || (*win_ptr)->create_flavor == MPI_WIN_FLAVOR_SHARED) { + if ((*win_ptr)->shm_allocated == FALSE && (*win_ptr)->size > 0) { MPIU_Free((*win_ptr)->base); + } } MPIU_Object_release_ref(*win_ptr, &in_use); http://git.mpich.org/mpich.git/commitdiff/8bb4b63034407d8f8e85193617110b584… commit 8bb4b63034407d8f8e85193617110b5842e25e6f Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Tue Jul 30 23:26:48 2013 -0500 delete CH3 default MPIDI_SHM_Win_free. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index ffc03ff..3e2221b 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -1211,7 +1211,6 @@ void *MPIDI_Alloc_mem(size_t size, MPID_Info *info_ptr); int MPIDI_Free_mem(void *ptr); /* internal */ -int MPIDI_SHM_Win_free(MPID_Win **); int MPIDI_CH3I_Release_lock(MPID_Win * win_ptr); int MPIDI_CH3I_Try_acquire_win_lock(MPID_Win * win_ptr, int requested_lock); int MPIDI_CH3I_Send_lock_granted_pkt(MPIDI_VC_t * vc, MPID_Win *win_ptr, int source_win_hdl); diff --git a/src/mpid/ch3/src/ch3u_rma_ops.c b/src/mpid/ch3/src/ch3u_rma_ops.c index ddd6681..4382ccc 100644 --- a/src/mpid/ch3/src/ch3u_rma_ops.c +++ b/src/mpid/ch3/src/ch3u_rma_ops.c @@ -86,37 +86,6 @@ int MPIDI_Win_free(MPID_Win **win_ptr) #undef FUNCNAME -#define FUNCNAME MPIDI_SHM_Win_free -#undef FCNAME -#define FCNAME MPIDI_QUOTE(FUNCNAME) -int MPIDI_SHM_Win_free(MPID_Win **win_ptr) -{ - int mpi_errno = MPI_SUCCESS; - MPIDI_STATE_DECL(MPID_STATE_MPIDI_SHM_WIN_FREE); - - MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_SHM_WIN_FREE); - - /* Free memory allocated by the default shared memory window - implementation. Note that this implementation works only for - MPI_COMM_SELF and does not map a shared segment. */ - - MPIU_Free((*win_ptr)->base); - MPIU_Free((*win_ptr)->shm_base_addrs); - - mpi_errno = MPIDI_Win_free(win_ptr); - if (mpi_errno) { MPIU_ERR_POP(mpi_errno); } - - fn_exit: - MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_SHM_WIN_FREE); - return mpi_errno; - /* --BEGIN ERROR HANDLING-- */ - fn_fail: - goto fn_exit; - /* --END ERROR HANDLING-- */ -} - - -#undef FUNCNAME #define FUNCNAME MPIDI_Win_shared_query #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) http://git.mpich.org/mpich.git/commitdiff/20ff85b8c45d03c0b3f42dda13ed718bf… commit 20ff85b8c45d03c0b3f42dda13ed718bf64ab3fb Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Tue Jul 30 23:21:11 2013 -0500 delete CH3 default MPIDI_CH3U_Win_allocate_shared. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 2c1849e..ffc03ff 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -1122,8 +1122,6 @@ int MPIDI_CH3U_Win_create(void *, MPI_Aint, int, MPID_Info *, MPID_Comm *, MPID_Win **); int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, MPID_Comm *comm, void *baseptr, MPID_Win **win); -int MPIDI_CH3U_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info *info_ptr, - MPID_Comm *comm_ptr, void **baseptr, MPID_Win **win_ptr); int MPIDI_CH3U_Win_allocate_no_shm(MPI_Aint size, int disp_unit, MPID_Info *info, MPID_Comm *comm_ptr, void *baseptr, MPID_Win **win_ptr); int MPIDI_CH3U_Win_create_dynamic(MPID_Info *info, MPID_Comm *comm, MPID_Win **win); diff --git a/src/mpid/ch3/src/ch3u_win_fns.c b/src/mpid/ch3/src/ch3u_win_fns.c index 9b643d2..baf3108 100644 --- a/src/mpid/ch3/src/ch3u_win_fns.c +++ b/src/mpid/ch3/src/ch3u_win_fns.c @@ -214,67 +214,6 @@ int MPIDI_Win_detach(MPID_Win *win, const void *base) #undef FUNCNAME -#define FUNCNAME MPIDI_CH3U_Win_allocate_shared -#undef FCNAME -#define FCNAME MPIDI_QUOTE(FUNCNAME) -int MPIDI_CH3U_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info *info, MPID_Comm *comm_ptr, - void **base_ptr, MPID_Win **win_ptr) -{ - int mpi_errno = MPI_SUCCESS; - MPID_Comm *comm_self_ptr = NULL; - MPID_Group *group_comm, *group_self; - int result; - MPIU_CHKPMEM_DECL(1); - MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE_SHARED); - - MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE_SHARED); - -#ifdef HAVE_ERROR_CHECKING - /* The baseline CH3 implementation only works with MPI_COMM_SELF */ - MPID_Comm_get_ptr( MPI_COMM_SELF, comm_self_ptr ); - - mpi_errno = MPIR_Comm_group_impl(comm_ptr, &group_comm); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - mpi_errno = MPIR_Comm_group_impl(comm_self_ptr, &group_self); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - mpi_errno = MPIR_Group_compare_impl(group_comm, group_self, &result); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - mpi_errno = MPIR_Group_free_impl(group_comm); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - mpi_errno = MPIR_Group_free_impl(group_self); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - - if (result != MPI_IDENT) { - MPIU_ERR_SETANDJUMP(mpi_errno, MPI_ERR_RMA_SHARED, "**ch3|win_shared_comm"); - } -#endif - - mpi_errno = MPIDI_CH3U_Win_allocate(size, disp_unit, info, comm_ptr, - base_ptr, win_ptr); - if (mpi_errno) MPIU_ERR_POP(mpi_errno); - - MPIU_CHKPMEM_MALLOC((*win_ptr)->shm_base_addrs, void **, - 1 /* comm_size */ * sizeof(void *), - mpi_errno, "(*win_ptr)->shm_base_addrs"); - - (*win_ptr)->shm_base_addrs[0] = *base_ptr; - - /* Register the shared memory window free function, which will free the - memory allocated here. */ - (*win_ptr)->RMAFns.Win_free = MPIDI_SHM_Win_free; - -fn_exit: - MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE_SHARED); - return mpi_errno; - /* --BEGIN ERROR HANDLING-- */ -fn_fail: - MPIU_CHKPMEM_REAP(); - goto fn_exit; - /* --END ERROR HANDLING-- */ -} - - -#undef FUNCNAME #define FUNCNAME MPIDI_CH3U_Win_allocate_no_shm #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) http://git.mpich.org/mpich.git/commitdiff/3e23947322ee6257e66eb7d316de01ffb… commit 3e23947322ee6257e66eb7d316de01ffbda3ec3c Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Tue Jul 30 23:17:45 2013 -0500 In CH3 layer, change function name from MPIDI_CH3U_Win_allocate to MPIDI_CH3U_Win_allocate_no_shm. Also add prototype in header file. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index eb21fff..2c1849e 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -1124,6 +1124,8 @@ int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, MPID_Comm *comm, void *baseptr, MPID_Win **win); int MPIDI_CH3U_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info *info_ptr, MPID_Comm *comm_ptr, void **baseptr, MPID_Win **win_ptr); +int MPIDI_CH3U_Win_allocate_no_shm(MPI_Aint size, int disp_unit, MPID_Info *info, + MPID_Comm *comm_ptr, void *baseptr, MPID_Win **win_ptr); int MPIDI_CH3U_Win_create_dynamic(MPID_Info *info, MPID_Comm *comm, MPID_Win **win); diff --git a/src/mpid/ch3/src/ch3u_win_fns.c b/src/mpid/ch3/src/ch3u_win_fns.c index 988ae95..9b643d2 100644 --- a/src/mpid/ch3/src/ch3u_win_fns.c +++ b/src/mpid/ch3/src/ch3u_win_fns.c @@ -275,18 +275,18 @@ fn_fail: #undef FUNCNAME -#define FUNCNAME MPIDI_CH3U_Win_allocate +#define FUNCNAME MPIDI_CH3U_Win_allocate_no_shm #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) -int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, - MPID_Comm *comm_ptr, void *baseptr, MPID_Win **win_ptr ) +int MPIDI_CH3U_Win_allocate_no_shm(MPI_Aint size, int disp_unit, MPID_Info *info, + MPID_Comm *comm_ptr, void *baseptr, MPID_Win **win_ptr ) { void **base_pp = (void **) baseptr; int mpi_errno = MPI_SUCCESS; MPIU_CHKPMEM_DECL(1); - MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE); - MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE); + MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE_NO_SHM); + MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE_NO_SHM); if (size > 0) { MPIU_CHKPMEM_MALLOC(*base_pp, void *, size, mpi_errno, "(*win_ptr)->base"); @@ -302,7 +302,7 @@ int MPIDI_CH3U_Win_allocate(MPI_Aint size, int disp_unit, MPID_Info *info, if (mpi_errno != MPI_SUCCESS) { MPIU_ERR_POP(mpi_errno); } fn_exit: - MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE); + MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_CH3U_WIN_ALLOCATE_NO_SHM); return mpi_errno; /* --BEGIN ERROR HANDLING-- */ fn_fail: http://git.mpich.org/mpich.git/commitdiff/0a338e5dbe6a3589a9da8ba467d4bc18d… commit 0a338e5dbe6a3589a9da8ba467d4bc18d3f94270 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Thu Aug 1 14:44:22 2013 -0500 In nemesis layer, change type of argument 'base_ptr' from (void**) to (void*). In the code, some places use (void**)base_ptr and some places use (void*)base_ptr which are confusing. We make every win_allocate related function use (void*)base_ptr as the argument and do conversion inside the function, in order to keep the code clear. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c index eecf8fe..9d9c5ab 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c @@ -19,7 +19,7 @@ MPIU_INSTR_DURATION_EXTERN_DECL(wincreate_allgather); #endif static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPID_Info *info, MPID_Comm *comm_ptr, - void **base_ptr, MPID_Win **win_ptr); + void *base_ptr, MPID_Win **win_ptr); #undef FUNCNAME #define FUNCNAME MPIDI_CH3_Win_fns_init @@ -45,9 +45,10 @@ int MPIDI_CH3_Win_fns_init(MPIDI_CH3U_Win_fns_t *win_fns) #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPID_Info *info, - MPID_Comm *comm_ptr, void **base_ptr, MPID_Win **win_ptr) + MPID_Comm *comm_ptr, void *base_ptr, MPID_Win **win_ptr) { int mpi_errno = MPI_SUCCESS; + void **base_pp = (void **) base_ptr; int i, k, comm_size, rank; int node_size, node_rank; MPID_Comm *node_comm_ptr; @@ -342,7 +343,7 @@ static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPID_Info * for (i = 0; i < comm_size; ++i) (*win_ptr)->base_addrs[i] = MPIU_AintToPtr(tmp_buf[i]); - *base_ptr = (*win_ptr)->base; + *base_pp = (*win_ptr)->base; /* Provide operation overrides for this window flavor */ (*win_ptr)->RMAFns.Win_shared_query = MPIDI_CH3_SHM_Win_shared_query; http://git.mpich.org/mpich.git/commitdiff/48aaa82295c800f976c49a7aaba434417… commit 48aaa82295c800f976c49a7aaba4344175d643b5 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Tue Jul 30 22:25:25 2013 -0500 In nemesis layer, change function name from MPIDI_CH3I_Win_allocate_shared to MPIDI_CH3I_Win_allocate_shm. MPIDI_CH3I_Win_allocate_shm is assigned to (*allocate_shm). Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c index 57bbb3f..eecf8fe 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c @@ -18,8 +18,8 @@ MPIU_INSTR_DURATION_EXTERN_DECL(wincreate_allgather); #endif -static int MPIDI_CH3I_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info *info, MPID_Comm *comm_ptr, - void **base_ptr, MPID_Win **win_ptr); +static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPID_Info *info, MPID_Comm *comm_ptr, + void **base_ptr, MPID_Win **win_ptr); #undef FUNCNAME #define FUNCNAME MPIDI_CH3_Win_fns_init @@ -41,11 +41,11 @@ int MPIDI_CH3_Win_fns_init(MPIDI_CH3U_Win_fns_t *win_fns) #undef FUNCNAME -#define FUNCNAME MPIDI_CH3I_Win_allocate_shared +#define FUNCNAME MPIDI_CH3I_Win_allocate_shm #undef FCNAME #define FCNAME MPIDI_QUOTE(FUNCNAME) -static int MPIDI_CH3I_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Info *info, - MPID_Comm *comm_ptr, void **base_ptr, MPID_Win **win_ptr) +static int MPIDI_CH3I_Win_allocate_shm(MPI_Aint size, int disp_unit, MPID_Info *info, + MPID_Comm *comm_ptr, void **base_ptr, MPID_Win **win_ptr) { int mpi_errno = MPI_SUCCESS; int i, k, comm_size, rank; @@ -58,9 +58,9 @@ static int MPIDI_CH3I_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Inf int noncontig = FALSE; MPIU_CHKPMEM_DECL(6); MPIU_CHKLMEM_DECL(3); - MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_WIN_ALLOCATE_SHARED); + MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_WIN_ALLOCATE_SHM); - MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_WIN_ALLOCATE_SHARED); + MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_WIN_ALLOCATE_SHM); /* If create flavor is MPI_WIN_FLAVOR_ALLOCATE, alloc_shared_noncontig is set to 1 by default. */ if ((*win_ptr)->create_flavor == MPI_WIN_FLAVOR_ALLOCATE) @@ -350,7 +350,7 @@ static int MPIDI_CH3I_Win_allocate_shared(MPI_Aint size, int disp_unit, MPID_Inf fn_exit: MPIU_CHKLMEM_FREEALL(); - MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_CH3I_WIN_ALLOCATE_SHARED); + MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_CH3I_WIN_ALLOCATE_SHM); return mpi_errno; /* --BEGIN ERROR HANDLING-- */ fn_fail: http://git.mpich.org/mpich.git/commitdiff/723e5d5e86d33e5c668dfc3b528618a88… commit 723e5d5e86d33e5c668dfc3b528618a88587b928 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Wed Jul 31 16:04:33 2013 -0500 add function pointer 'allocate_shm' to win_fns. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c index 3a4c591..57bbb3f 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c @@ -32,6 +32,8 @@ int MPIDI_CH3_Win_fns_init(MPIDI_CH3U_Win_fns_t *win_fns) MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3_WIN_FNS_INIT); + win_fns->allocate_shm = MPIDI_CH3I_Win_allocate_shm; + MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_CH3_WIN_FNS_INIT); return mpi_errno; diff --git a/src/mpid/ch3/include/mpidimpl.h b/src/mpid/ch3/include/mpidimpl.h index 1350e64..eb21fff 100644 --- a/src/mpid/ch3/include/mpidimpl.h +++ b/src/mpid/ch3/include/mpidimpl.h @@ -1107,6 +1107,7 @@ typedef struct { int (*create)(void *, MPI_Aint, int, MPID_Info *, MPID_Comm *, MPID_Win **); int (*allocate)(MPI_Aint, int, MPID_Info *, MPID_Comm *, void *, MPID_Win **); int (*allocate_shared)(MPI_Aint, int, MPID_Info *, MPID_Comm *, void **, MPID_Win **); + int (*allocate_shm)(MPI_Aint, int, MPID_Info *, MPID_Comm *, void *, MPID_Win **); int (*create_dynamic)(MPID_Info *, MPID_Comm *, MPID_Win **); } MPIDI_CH3U_Win_fns_t; http://git.mpich.org/mpich.git/commitdiff/8bf8f815a5105af42fb368f5da4b71854… commit 8bf8f815a5105af42fb368f5da4b71854620d90f Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Wed Jul 31 16:02:55 2013 -0500 delete assignment of (*allocate_shared) in CH3 and nemesis. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c index c867138..3a4c591 100644 --- a/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c +++ b/src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c @@ -32,8 +32,6 @@ int MPIDI_CH3_Win_fns_init(MPIDI_CH3U_Win_fns_t *win_fns) MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3_WIN_FNS_INIT); - win_fns->allocate_shared = MPIDI_CH3I_Win_allocate_shared; - MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_CH3_WIN_FNS_INIT); return mpi_errno; diff --git a/src/mpid/ch3/src/ch3u_win_fns.c b/src/mpid/ch3/src/ch3u_win_fns.c index ef7d84c..988ae95 100644 --- a/src/mpid/ch3/src/ch3u_win_fns.c +++ b/src/mpid/ch3/src/ch3u_win_fns.c @@ -25,7 +25,6 @@ int MPIDI_Win_fns_init(MPIDI_CH3U_Win_fns_t *win_fns) win_fns->create = MPIDI_CH3U_Win_create; win_fns->allocate = MPIDI_CH3U_Win_allocate; - win_fns->allocate_shared = MPIDI_CH3U_Win_allocate_shared; win_fns->create_dynamic = MPIDI_CH3U_Win_create_dynamic; MPIDI_RMA_FUNC_EXIT(MPID_STATE_MPIDI_WIN_FNS_INIT); http://git.mpich.org/mpich.git/commitdiff/c7bc4694fbb0b10f6a09141794c6e0664… commit c7bc4694fbb0b10f6a09141794c6e0664a76197a Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Wed Jul 31 15:48:16 2013 -0500 When judging if origin and target process are on the same node, using vc->node_id flag instead of vc->ch.is_local flag. Flag 'is_local' is not correct because it is defined in nemesis, not in CH3. Flag 'node_id' is defined in CH3. Note that for ch3:sock, even if origin and target are on the same node, they are not within the same SHM region. Currently ch3:sock is filtered out by checking shm_allocated flag first. In future we need to figure out a way to check if origin and target are within the same "SHM comm". Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index b0d0df1..e469edc 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -325,16 +325,22 @@ static inline int MPIDI_CH3I_Shm_put_op(const void *origin_addr, int origin_coun MPID_Win *win_ptr) { int mpi_errno = MPI_SUCCESS; - MPIDI_VC_t *vc = NULL; void *base = NULL; int disp_unit; + MPIDI_VC_t *orig_vc, *target_vc; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_PUT_OP); MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_SHM_PUT_OP); - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - - if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { + /* FIXME: Here we decide whether to perform SHM operations by checking if origin and target are on + the same node. However, in ch3:sock, even if origin and target are on the same node, they do + not within the same SHM region. Here we filter out ch3:sock by checking shm_allocated flag first, + which is only set to TRUE when SHM region is allocated in nemesis. + In future we need to figure out a way to check if origin and target are in the same "SHM comm". + */ + MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; } @@ -372,7 +378,7 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun int origin_predefined, target_predefined; MPI_User_function *uop = NULL; MPID_Datatype *dtp; - MPIDI_VC_t *vc = NULL; + MPIDI_VC_t *orig_vc, *target_vc; int mpi_errno = MPI_SUCCESS; MPIU_CHKLMEM_DECL(2); MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_ACC_OP); @@ -382,9 +388,10 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun MPIDI_CH3I_DATATYPE_IS_PREDEFINED(origin_datatype, origin_predefined); MPIDI_CH3I_DATATYPE_IS_PREDEFINED(target_datatype, target_predefined); - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - - if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { + /* FIXME: refer to FIXME in MPIDI_CH3I_Shm_put_op */ + MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { shm_op = 1; base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; @@ -527,7 +534,7 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ MPI_User_function *uop = NULL; MPID_Datatype *dtp; int origin_predefined, result_predefined, target_predefined; - MPIDI_VC_t *vc = NULL; + MPIDI_VC_t *orig_vc, *target_vc; int mpi_errno = MPI_SUCCESS; MPIU_CHKLMEM_DECL(2); MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_GET_ACC_OP); @@ -541,9 +548,10 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ MPIDI_CH3I_DATATYPE_IS_PREDEFINED(result_datatype, result_predefined); MPIDI_CH3I_DATATYPE_IS_PREDEFINED(target_datatype, target_predefined); - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - - if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { + /* FIXME: refer to FIXME in MPIDI_CH3I_Shm_put_op */ + MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; MPIDI_CH3I_SHM_MUTEX_LOCK(win_ptr); @@ -699,15 +707,16 @@ static inline int MPIDI_CH3I_Shm_get_op(void *origin_addr, int origin_count, MPI { void *base = NULL; int disp_unit; - MPIDI_VC_t *vc = NULL; + MPIDI_VC_t *orig_vc, *target_vc; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_GET_OP); MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_SHM_GET_OP); - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - - if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { + /* FIXME: refer to FIXME in MPIDI_CH3I_Shm_put_op */ + MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; } @@ -742,15 +751,16 @@ static inline int MPIDI_CH3I_Shm_cas_op(const void *origin_addr, const void *com void *base = NULL, *dest_addr = NULL; int disp_unit; int len, shm_locked = 0; - MPIDI_VC_t *vc = NULL; int mpi_errno = MPI_SUCCESS; + MPIDI_VC_t *orig_vc, *target_vc; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_CAS_OP); MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_SHM_CAS_OP); - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - - if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { + /* FIXME: refer to FIXME in MPIDI_CH3I_Shm_put_op */ + MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; @@ -801,15 +811,16 @@ static inline int MPIDI_CH3I_Shm_fop_op(const void *origin_addr, void *result_ad MPI_User_function *uop = NULL; int disp_unit; int len, one, shm_locked = 0; - MPIDI_VC_t *vc = NULL; + MPIDI_VC_t *orig_vc, *target_vc; int mpi_errno = MPI_SUCCESS; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_SHM_FOP_OP); MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_SHM_FOP_OP); - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - - if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { + /* FIXME: refer to FIXME in MPIDI_CH3I_Shm_put_op */ + MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; diff --git a/src/mpid/ch3/src/ch3u_rma_acc_ops.c b/src/mpid/ch3/src/ch3u_rma_acc_ops.c index 0253095..e8e3dea 100644 --- a/src/mpid/ch3/src/ch3u_rma_acc_ops.c +++ b/src/mpid/ch3/src/ch3u_rma_acc_ops.c @@ -71,7 +71,7 @@ int MPIDI_Get_accumulate(const void *origin_addr, int origin_count, else { MPIDI_RMA_Ops_list_t *ops_list = MPIDI_CH3I_RMA_Get_ops_list(win_ptr, target_rank); MPIDI_RMA_Op_t *new_ptr = NULL; - MPIDI_VC_t *vc = NULL; + MPIDI_VC_t *orig_vc, *target_vc; /* Append the operation to the window's RMA ops queue */ MPIU_INSTR_DURATION_START(rmaqueue_alloc); @@ -103,8 +103,10 @@ int MPIDI_Get_accumulate(const void *origin_addr, int origin_count, because this operation will be directly done on shared memory region, instead of sending and receiving through the progress engine, therefore datatype will not be referenced by the progress engine */ - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - if (!(win_ptr->shm_allocated == TRUE && vc->ch.is_local)) { + + MPIDI_Comm_get_vc(win_ptr->comm_ptr, rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + if (!(win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id)) { /* if source or target datatypes are derived, increment their reference counts */ if (!origin_predefined) { diff --git a/src/mpid/ch3/src/ch3u_rma_ops.c b/src/mpid/ch3/src/ch3u_rma_ops.c index b7d6d49..ddd6681 100644 --- a/src/mpid/ch3/src/ch3u_rma_ops.c +++ b/src/mpid/ch3/src/ch3u_rma_ops.c @@ -190,7 +190,7 @@ int MPIDI_Put(const void *origin_addr, int origin_count, MPI_Datatype { MPIDI_RMA_Ops_list_t *ops_list = MPIDI_CH3I_RMA_Get_ops_list(win_ptr, target_rank); MPIDI_RMA_Op_t *new_ptr = NULL; - MPIDI_VC_t *vc = NULL; + MPIDI_VC_t *orig_vc, *target_vc; /* queue it up */ MPIU_INSTR_DURATION_START(rmaqueue_alloc); @@ -218,8 +218,16 @@ int MPIDI_Put(const void *origin_addr, int origin_count, MPI_Datatype because this operation will be directly done on shared memory region, instead of sending and receiving through the progress engine, therefore datatype will not be referenced by the progress engine */ - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - if (!(win_ptr->shm_allocated == TRUE && vc->ch.is_local)) { + + /* FIXME: Here we decide whether to perform SHM operations by checking if origin and target are on + the same node. However, in ch3:sock, even if origin and target are on the same node, they do + not within the same SHM region. Here we filter out ch3:sock by checking shm_allocated flag first, + which is only set to TRUE when SHM region is allocated in nemesis. + In future we need to figure out a way to check if origin and target are in the same "SHM comm". + */ + MPIDI_Comm_get_vc(win_ptr->comm_ptr, rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + if (!(win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id)) { /* if source or target datatypes are derived, increment their reference counts */ MPIDI_CH3I_DATATYPE_IS_PREDEFINED(origin_datatype, predefined); @@ -297,7 +305,7 @@ int MPIDI_Get(void *origin_addr, int origin_count, MPI_Datatype { MPIDI_RMA_Ops_list_t *ops_list = MPIDI_CH3I_RMA_Get_ops_list(win_ptr, target_rank); MPIDI_RMA_Op_t *new_ptr = NULL; - MPIDI_VC_t *vc = NULL; + MPIDI_VC_t *orig_vc, *target_vc; /* queue it up */ MPIU_INSTR_DURATION_START(rmaqueue_alloc); @@ -322,8 +330,10 @@ int MPIDI_Get(void *origin_addr, int origin_count, MPI_Datatype because this operation will be directly done on shared memory region, instead of sending and receiving through the progress engine, therefore datatype will not be referenced by the progress engine */ - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - if (!(win_ptr->shm_allocated == TRUE && vc->ch.is_local)) { + + MPIDI_Comm_get_vc(win_ptr->comm_ptr, rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + if (!(win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id)) { /* if source or target datatypes are derived, increment their reference counts */ MPIDI_CH3I_DATATYPE_IS_PREDEFINED(origin_datatype, predefined); @@ -407,7 +417,7 @@ int MPIDI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype { MPIDI_RMA_Ops_list_t *ops_list = MPIDI_CH3I_RMA_Get_ops_list(win_ptr, target_rank); MPIDI_RMA_Op_t *new_ptr = NULL; - MPIDI_VC_t *vc = NULL; + MPIDI_VC_t *orig_vc, *target_vc; /* queue it up */ MPIU_INSTR_DURATION_START(rmaqueue_alloc); @@ -453,8 +463,10 @@ int MPIDI_Accumulate(const void *origin_addr, int origin_count, MPI_Datatype because this operation will be directly done on shared memory region, instead of sending and receiving through the progress engine, therefore datatype will not be referenced by the progress engine */ - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - if (!(win_ptr->shm_allocated == TRUE && vc->ch.is_local)) { + + MPIDI_Comm_get_vc(win_ptr->comm_ptr, rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + if (!(win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id)) { /* if source or target datatypes are derived, increment their reference counts */ if (!origin_predefined) diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index df097d0..c16484a 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -329,6 +329,7 @@ int MPIDI_Win_fence(int assert, MPID_Win *win_ptr) { int nRequest = 0; int nRequestNew = 0; + MPIDI_VC_t *orig_vc, *target_vc; MPIU_INSTR_DURATION_START(winfence_rs); /* This is the second or later fence. Do all the preceding RMA ops. */ comm_ptr = win_ptr->comm_ptr; @@ -356,11 +357,11 @@ int MPIDI_Win_fence(int assert, MPID_Win *win_ptr) ops from this process */ total_op_count = 0; curr_ptr = MPIDI_CH3I_RMA_Ops_head(ops_list); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); while (curr_ptr != NULL) { - MPIDI_VC_t *vc = NULL; - MPIDI_Comm_get_vc(win_ptr->comm_ptr, curr_ptr->target_rank, &vc); - if (!(win_ptr->shm_allocated == TRUE && vc->ch.is_local)) { + MPIDI_Comm_get_vc(win_ptr->comm_ptr, curr_ptr->target_rank, &target_vc); + if (!(win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id)) { total_op_count++; rma_target_proc[curr_ptr->target_rank] = 1; nops_to_proc[curr_ptr->target_rank]++; @@ -400,9 +401,8 @@ int MPIDI_Win_fence(int assert, MPID_Win *win_ptr) curr_ptr = MPIDI_CH3I_RMA_Ops_head(ops_list); while (curr_ptr != NULL) { - MPIDI_VC_t *vc = NULL; - MPIDI_Comm_get_vc(win_ptr->comm_ptr, curr_ptr->target_rank, &vc); - if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { + MPIDI_Comm_get_vc(win_ptr->comm_ptr, curr_ptr->target_rank, &target_vc); + if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { MPIDI_CH3I_DO_SHM_OP(curr_ptr, win_ptr, mpi_errno); MPIDI_CH3I_RMA_Ops_free_and_next(ops_list, &curr_ptr); } @@ -1576,6 +1576,7 @@ int MPIDI_Win_complete(MPID_Win *win_ptr) int start_grp_size, *ranks_in_start_grp, *ranks_in_win_grp, rank; int nRequest = 0; int nRequestNew = 0; + MPIDI_VC_t *orig_vc, *target_vc; MPIU_CHKLMEM_DECL(9); MPIDI_STATE_DECL(MPID_STATE_MPIDI_WIN_COMPLETE); @@ -1688,11 +1689,11 @@ int MPIDI_Win_complete(MPID_Win *win_ptr) total_op_count = 0; curr_ptr = MPIDI_CH3I_RMA_Ops_head(ops_list); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); while (curr_ptr != NULL) { - MPIDI_VC_t *vc = NULL; - MPIDI_Comm_get_vc(win_ptr->comm_ptr, curr_ptr->target_rank, &vc); - if (!(win_ptr->shm_allocated == TRUE && vc->ch.is_local)) { + MPIDI_Comm_get_vc(win_ptr->comm_ptr, curr_ptr->target_rank, &target_vc); + if (!(win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id)) { nops_to_proc[curr_ptr->target_rank]++; total_op_count++; } @@ -1714,9 +1715,8 @@ int MPIDI_Win_complete(MPID_Win *win_ptr) curr_ptr = MPIDI_CH3I_RMA_Ops_head(ops_list); while (curr_ptr != NULL) { - MPIDI_VC_t *vc = NULL; - MPIDI_Comm_get_vc(win_ptr->comm_ptr, curr_ptr->target_rank, &vc); - if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { + MPIDI_Comm_get_vc(win_ptr->comm_ptr, curr_ptr->target_rank, &target_vc); + if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { MPIDI_CH3I_DO_SHM_OP(curr_ptr, win_ptr, mpi_errno); MPIDI_CH3I_RMA_Ops_free_and_next(ops_list, &curr_ptr); } @@ -2584,7 +2584,7 @@ static int MPIDI_CH3I_Do_passive_target_rma(MPID_Win *win_ptr, int target_rank, MPIDI_RMA_Op_t *curr_ptr; MPI_Win source_win_handle = MPI_WIN_NULL, target_win_handle = MPI_WIN_NULL; int nRequest=0, nRequestNew=0; - MPIDI_VC_t *vc = NULL; + MPIDI_VC_t *orig_vc, *target_vc; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_DO_PASSIVE_TARGET_RMA); MPIDI_RMA_FUNC_ENTER(MPID_STATE_MPIDI_CH3I_DO_PASSIVE_TARGET_RMA); @@ -2594,12 +2594,13 @@ static int MPIDI_CH3I_Do_passive_target_rma(MPID_Win *win_ptr, int target_rank, (win_ptr->targets[target_rank].remote_lock_state == MPIDI_CH3_WIN_LOCK_CALLED && win_ptr->targets[target_rank].remote_lock_assert & MPI_MODE_NOCHECK)); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, win_ptr->comm_ptr->rank, &orig_vc); + MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &target_vc); + /* if alloc_shm is enabled and target process is on the same node, directly perform RMA operations at the origin side and remove them from passive RMA operation list */ - - MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { + if (win_ptr->shm_allocated == TRUE && orig_vc->node_id == target_vc->node_id) { curr_ptr = MPIDI_CH3I_RMA_Ops_head(&win_ptr->targets[target_rank].rma_ops_list); while (curr_ptr != NULL) { MPIU_Assert(curr_ptr->target_rank == target_rank); http://git.mpich.org/mpich.git/commitdiff/a64a1d2ce36c1b0bbf4779734a67aa664… commit a64a1d2ce36c1b0bbf4779734a67aa6643192f30 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Wed Jul 31 15:44:48 2013 -0500 In SHM RMA operations, delete using MPI_WIN_FLAVOR_SHARED to judge if using shm_base_addrs. Because if MPI_WIN_FLAVOR_SHARED is used in ch3:sock, it will allocate normal memory instead of shared memory, therefore shm_base_addrs will not be used. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/include/mpidrma.h b/src/mpid/ch3/include/mpidrma.h index 3221c6a..b0d0df1 100644 --- a/src/mpid/ch3/include/mpidrma.h +++ b/src/mpid/ch3/include/mpidrma.h @@ -334,8 +334,7 @@ static inline int MPIDI_CH3I_Shm_put_op(const void *origin_addr, int origin_coun MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - if ((win_ptr->create_flavor == MPI_WIN_FLAVOR_SHARED) || - (win_ptr->shm_allocated == TRUE && vc->ch.is_local)) { + if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; } @@ -385,8 +384,7 @@ static inline int MPIDI_CH3I_Shm_acc_op(const void *origin_addr, int origin_coun MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - if ((win_ptr->create_flavor == MPI_WIN_FLAVOR_SHARED) || - (win_ptr->shm_allocated == TRUE && vc->ch.is_local)) { + if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { shm_op = 1; base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; @@ -545,8 +543,7 @@ static inline int MPIDI_CH3I_Shm_get_acc_op(const void *origin_addr, int origin_ MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - if ((win_ptr->create_flavor == MPI_WIN_FLAVOR_SHARED) || - (win_ptr->shm_allocated == TRUE && vc->ch.is_local)) { + if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; MPIDI_CH3I_SHM_MUTEX_LOCK(win_ptr); @@ -710,8 +707,7 @@ static inline int MPIDI_CH3I_Shm_get_op(void *origin_addr, int origin_count, MPI MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - if ((win_ptr->create_flavor == MPI_WIN_FLAVOR_SHARED) || - (win_ptr->shm_allocated == TRUE && vc->ch.is_local)) { + if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; } @@ -754,8 +750,7 @@ static inline int MPIDI_CH3I_Shm_cas_op(const void *origin_addr, const void *com MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - if ((win_ptr->create_flavor == MPI_WIN_FLAVOR_SHARED) || - (win_ptr->shm_allocated == TRUE && vc->ch.is_local)) { + if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; @@ -814,8 +809,7 @@ static inline int MPIDI_CH3I_Shm_fop_op(const void *origin_addr, void *result_ad MPIDI_Comm_get_vc(win_ptr->comm_ptr, target_rank, &vc); - if ((win_ptr->create_flavor == MPI_WIN_FLAVOR_SHARED) || - (win_ptr->shm_allocated == TRUE && vc->ch.is_local)) { + if (win_ptr->shm_allocated == TRUE && vc->ch.is_local) { base = win_ptr->shm_base_addrs[target_rank]; disp_unit = win_ptr->disp_units[target_rank]; http://git.mpich.org/mpich.git/commitdiff/66221968523896310b3920cbfd44f4c1f… commit 66221968523896310b3920cbfd44f4c1fd9bc205 Author: Xin Zhao <xinzhao3(a)illinois.edu> Date: Tue Jul 30 21:12:31 2013 -0500 Move shm_allocated flag from nemesis layer to CH3 layer. Because CH3 layer needs to know if shared memory region is allocated in lower layer. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/channels/nemesis/include/mpid_nem_pre.h b/src/mpid/ch3/channels/nemesis/include/mpid_nem_pre.h index 42cb894..b954b44 100644 --- a/src/mpid/ch3/channels/nemesis/include/mpid_nem_pre.h +++ b/src/mpid/ch3/channels/nemesis/include/mpid_nem_pre.h @@ -18,8 +18,6 @@ typedef pthread_mutex_t MPIDI_CH3I_SHM_MUTEX; #define MPIDI_CH3_WIN_DECL \ - int shm_allocated; /* flag: TRUE iff this window has a shared memory \ - region associated with it */ \ void *shm_base_addr; /* base address of shared memory region */ \ MPI_Aint shm_segment_len; /* size of shared memory region */ \ MPIU_SHMW_Hnd_t shm_segment_handle; /* handle to shared memory region */ \ diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 8210c97..3e0935d 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -303,6 +303,8 @@ struct MPIDI_Win_target_state { all processes remains consistent. */ \ MPID_Group *start_group_ptr; /* group passed in MPI_Win_start */ \ int start_assert; /* assert passed to MPI_Win_start */ \ + int shm_allocated; /* flag: TRUE iff this window has a shared memory \ + region associated with it */ \ #ifdef MPIDI_CH3_WIN_DECL #define MPID_DEV_WIN_DECL \ diff --git a/src/mpid/ch3/src/mpid_rma.c b/src/mpid/ch3/src/mpid_rma.c index d330933..46930d0 100644 --- a/src/mpid/ch3/src/mpid_rma.c +++ b/src/mpid/ch3/src/mpid_rma.c @@ -294,6 +294,7 @@ static int win_init(MPI_Aint size, int disp_unit, int create_flavor, int model, (*win_ptr)->epoch_state = MPIDI_EPOCH_NONE; (*win_ptr)->epoch_count = 0; (*win_ptr)->at_rma_ops_list = NULL; + (*win_ptr)->shm_allocated = FALSE; /* Initialize the passive target lock state */ MPIU_CHKPMEM_MALLOC((*win_ptr)->targets, struct MPIDI_Win_target_state *, ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/include/mpid_nem_pre.h | 2 - src/mpid/ch3/channels/nemesis/src/ch3_win_fns.c | 21 +++--- src/mpid/ch3/include/mpidimpl.h | 8 +- src/mpid/ch3/include/mpidpre.h | 2 + src/mpid/ch3/include/mpidrma.h | 68 +++++++++-------- src/mpid/ch3/src/ch3u_rma_acc_ops.c | 8 +- src/mpid/ch3/src/ch3u_rma_ops.c | 71 +++++++----------- src/mpid/ch3/src/ch3u_rma_sync.c | 33 ++++---- src/mpid/ch3/src/ch3u_win_fns.c | 78 ++++++-------------- src/mpid/ch3/src/mpid_rma.c | 23 ++++-- 10 files changed, 140 insertions(+), 174 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-412-g08273c8
by noreply＠mpich.org 01 Aug '13

01 Aug '13

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 08273c868fc7ddd7d81473e153eb3a0f7d38fabf (commit) from 27f6340573fe2e7bc0f2a387ab791fa95ec1479d (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/08273c868fc7ddd7d81473e153eb3a0f7… commit 08273c868fc7ddd7d81473e153eb3a0f7d38fabf Author: Antonio J. Pena <apenya(a)mcs.anl.gov> Date: Tue Jul 16 17:51:08 2013 -0500 Add weak symbol support for clang 3.2. Fixes #1815 In general, added weak symbol support for compilers supporting __attribute__((weak,alias)) instead of #pragma weak. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> Signed-off-by: William Gropp <wgropp(a)illinois.edu> diff --git a/confdb/aclocal_cc.m4 b/confdb/aclocal_cc.m4 index 3c4f052..1e5e87d 100644 --- a/confdb/aclocal_cc.m4 +++ b/confdb/aclocal_cc.m4 @@ -338,9 +338,7 @@ if test -n "$pragma_extra_message" ; then fi dnl ]) -if test "$pac_cv_prog_c_weak_symbols" = "no" ; then - ifelse([$2],,:,[$2]) -else +if test "$pac_cv_prog_c_weak_symbols" != "no" ; then case "$pac_cv_prog_c_weak_symbols" in "pragma weak") AC_DEFINE(HAVE_PRAGMA_WEAK,1,[Supports weak pragma]) ;; @@ -349,7 +347,6 @@ else "pragma _CRI") AC_DEFINE(HAVE_PRAGMA_CRI_DUP,1,[Cray style weak pragma]) ;; esac - ifelse([$1],,:,[$1]) fi AC_CACHE_CHECK([whether __attribute__ ((weak)) allowed], pac_cv_attr_weak,[ @@ -366,6 +363,14 @@ AC_CACHE_CHECK([whether __attribute__((weak,alias(...))) allowed], pac_cv_attr_weak_alias,[ AC_TRY_COMPILE([int foo(int) __attribute__((weak,alias("__foo")));],[int a;], pac_cv_attr_weak_alias=yes,pac_cv_attr_weak_alias=no)]) +if test "$pac_cv_attr_weak_alias" = "yes" ; then + AC_DEFINE(HAVE_WEAK_ATTRIBUTE,1,[Attribute style weak pragma]) +fi +if test "$pac_cv_prog_c_weak_symbols" = "no" -a "$pac_cv_attr_weak_alias" = "no" ; then + ifelse([$2],,:,[$2]) +else + ifelse([$1],,:,[$1]) +fi ]) # diff --git a/configure.ac b/configure.ac index b5ee69f..2a82962 100644 --- a/configure.ac +++ b/configure.ac @@ -1814,7 +1814,12 @@ if test $enable_weak_symbols = "yes" ; then # Check for the ability to support multiple weak symbols if test "$pac_cv_prog_c_weak_symbols" = "pragma weak" ; then PAC_PROG_C_MULTIPLE_WEAK_SYMBOLS(AC_DEFINE(HAVE_MULTIPLE_PRAGMA_WEAK,1,[Define if multiple weak symbols may be defined])) + else + if test "$pac_cv_prog_c_weak_symbols" = "no" -a "$pac_cv_attr_weak_alias" = "yes"; then + MPICH_ATTR_WEAK_ALIAS_DEFINITION="__attribute__((weak,alias(fname)))" + fi fi + AC_SUBST(MPICH_ATTR_WEAK_ALIAS_DEFINITION) fi export NEEDSPLIB diff --git a/src/binding/f77/buildiface b/src/binding/f77/buildiface index dd617e2..fe25571 100755 --- a/src/binding/f77/buildiface +++ b/src/binding/f77/buildiface @@ -1269,6 +1269,33 @@ sub print_profiling_block { #else\ #pragma _CRI duplicate ${lcprefix}${lcname}_ as p${lcprefix}${lcname}_\ #endif\ +\ +#elif defined(HAVE_WEAK_ATTRIBUTE) +#if defined(F77_NAME_UPPER)\n"; + &print_weak_decl( $OUTFD, "${ucprefix}$ucname", $args, $lcname, "P${ucprefix}${ucname}" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}__", $args, $lcname, "P${ucprefix}${ucname}" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}_", $args, $lcname, "P${ucprefix}${ucname}" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}", $args, $lcname, "P${ucprefix}${ucname}" ); + print $OUTFD " +#elif defined(F77_NAME_LOWER_2USCORE)\n"; + &print_weak_decl( $OUTFD, "${ucprefix}$ucname", $args, $lcname, "p${lcprefix}${lcname}__" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}__", $args, $lcname, "p${lcprefix}${lcname}__" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}_", $args, $lcname, "p${lcprefix}${lcname}__" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}", $args, $lcname, "p${lcprefix}${lcname}__" ); + print $OUTFD " +#elif defined(F77_NAME_LOWER_USCORE)\n"; + &print_weak_decl( $OUTFD, "${ucprefix}$ucname", $args, $lcname, "p${lcprefix}${lcname}_" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}__", $args, $lcname, "p${lcprefix}${lcname}_" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}_", $args, $lcname, "p${lcprefix}${lcname}_" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}", $args, $lcname, "p${lcprefix}${lcname}_" ); + print $OUTFD " +#else\n"; + &print_weak_decl( $OUTFD, "${ucprefix}$ucname", $args, $lcname, "p${lcprefix}${lcname}" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}__", $args, $lcname, "p${lcprefix}${lcname}" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}_", $args, $lcname, "p${lcprefix}${lcname}" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}", $args, $lcname, "p${lcprefix}${lcname}" ); + print $OUTFD " +#endif #endif /* HAVE_PRAGMA_WEAK */\ #endif /* USE_WEAK_SYMBOLS */\ /* End MPI profiling block */\n\n"; @@ -1300,7 +1327,8 @@ sub print_name_map_block { print $OUTFD " /* Map the name to the correct form */ #ifndef MPICH_MPI_FROM_PMPI -#if defined(USE_WEAK_SYMBOLS) && defined(HAVE_MULTIPLE_PRAGMA_WEAK) +#if defined(USE_WEAK_SYMBOLS) +#if defined(HAVE_MULTIPLE_PRAGMA_WEAK) /* Define the weak versions of the PMPI routine*/ #ifndef F77_NAME_UPPER\n"; &print_weak_decl( $OUTFD, "P${ucprefix}$ucname", $args, $lcname ); @@ -1330,7 +1358,31 @@ sub print_name_map_block { #pragma weak p${lcprefix}${lcname}__ = p${lcprefix}${lcname} #pragma weak p${lcprefix}${lcname}_ = p${lcprefix}${lcname} #endif /* Test on name mapping */ -#endif /* Use multiple pragma weak */ + +#elif defined(HAVE_WEAK_ATTRIBUTE) +#if defined(F77_NAME_UPPER)\n"; + &print_weak_decl( $OUTFD, "p${lcprefix}${lcname}__", $args, $lcname, "P${ucprefix}${ucname}" ); + &print_weak_decl( $OUTFD, "p${lcprefix}${lcname}_", $args, $lcname, "P${ucprefix}${ucname}" ); + &print_weak_decl( $OUTFD, "p${lcprefix}${lcname}", $args, $lcname, "P${ucprefix}${ucname}" ); + print $OUTFD " +#elif defined(F77_NAME_LOWER_2USCORE)\n"; + &print_weak_decl( $OUTFD, "P${ucprefix}$ucname", $args, $lcname, "p${lcprefix}${lcname}__" ); + &print_weak_decl( $OUTFD, "p${lcprefix}${lcname}_", $args, $lcname, "p${lcprefix}${lcname}__" ); + &print_weak_decl( $OUTFD, "p${lcprefix}${lcname}", $args, $lcname, "p${lcprefix}${lcname}__" ); + print $OUTFD " +#elif defined(F77_NAME_LOWER_USCORE)\n"; + &print_weak_decl( $OUTFD, "P${ucprefix}$ucname", $args, $lcname, "p${lcprefix}${lcname}_" ); + &print_weak_decl( $OUTFD, "p${lcprefix}${lcname}__", $args, $lcname, "p${lcprefix}${lcname}_" ); + &print_weak_decl( $OUTFD, "p${lcprefix}${lcname}", $args, $lcname, "p${lcprefix}${lcname}_" ); + print $OUTFD " +#else\n"; + &print_weak_decl( $OUTFD, "P${ucprefix}$ucname", $args, $lcname, "p${lcprefix}${lcname}" ); + &print_weak_decl( $OUTFD, "p${lcprefix}${lcname}__", $args, $lcname, "p${lcprefix}${lcname}" ); + &print_weak_decl( $OUTFD, "p${lcprefix}${lcname}_", $args, $lcname, "p${lcprefix}${lcname}" ); + print $OUTFD " +#endif /* Test on name mapping */ +#endif /* HAVE_MULTIPLE_PRAGMA_WEAK */ +#endif /* USE_WEAK_SYMBOLS */ #ifdef F77_NAME_UPPER #define ${lcprefix}${lcname}_ P${ucprefix}${ucname} @@ -1696,17 +1748,21 @@ sub print_weak_decl { my $name = $_[1]; my $args = $_[2]; my $lcname = $_[3]; + my $weak_alias = $_[4]; my $basename = lc($name); $basename =~ s/_*$//; if (defined($altweak{$basename})) { - print $OUTFD "extern FORT_DLL_SPEC $altweakrtype{$basename} FORT_CALL $name($altweak{$basename});\n"; + print $OUTFD "extern FORT_DLL_SPEC $altweakrtype{$basename} FORT_CALL $name($altweak{$basename})"; } else { print $OUTFD "extern FORT_DLL_SPEC $returnType FORT_CALL $name"; &print_args( $OUTFD, $args, 1, $lcname ); - print $OUTFD ";\n"; + } + if (defined($weak_alias)) { + print $OUTFD " __attribute__((weak,alias(\"$weak_alias\")))"; } + print $OUTFD ";\n"; } # # -------------------------------------------------------------------------- @@ -5354,11 +5410,23 @@ sub HelperForRegister_datarep { for use as the conversion function for MPI_Register_datarep. Like the attribute null functions, we provide multiple weak versions of this if possible */ -#if defined(USE_WEAK_SYMBOLS) && defined(HAVE_MULTIPLE_PRAGMA_WEAK) +#if defined(USE_WEAK_SYMBOLS) && (defined(HAVE_MULTIPLE_PRAGMA_WEAK) || defined(HAVE_WEAK_ATTRIBUTE)) extern FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null_ ( void*v1, MPI_Fint*v2, MPI_Fint*v3, void*v4, MPI_Offset*v5, MPI_Fint *v6, MPI_Fint*v7, MPI_Fint *ierr ); -extern FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null__ ( void*v1, MPI_Fint*v2, MPI_Fint*v3, void*v4, MPI_Offset*v5, MPI_Fint *v6, MPI_Fint*v7, MPI_Fint *ierr ); -extern FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null ( void*v1, MPI_Fint*v2, MPI_Fint*v3, void*v4, MPI_Offset*v5, MPI_Fint *v6, MPI_Fint*v7, MPI_Fint *ierr ); -extern FORT_DLL_SPEC int FORT_CALL MPI_CONVERSION_FN_NULL ( void*v1, MPI_Fint*v2, MPI_Fint*v3, void*v4, MPI_Offset*v5, MPI_Fint *v6, MPI_Fint*v7, MPI_Fint *ierr ); +extern FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null__ ( void*v1, MPI_Fint*v2, MPI_Fint*v3, void*v4, MPI_Offset*v5, MPI_Fint *v6, MPI_Fint*v7, MPI_Fint *ierr ) +#ifndef MPICH_MPI_FROM_PMPI +MPICH_ATTR_WEAK_ALIAS(\"mpi_conversion_fn_null_\") +#endif +; +extern FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null ( void*v1, MPI_Fint*v2, MPI_Fint*v3, void*v4, MPI_Offset*v5, MPI_Fint *v6, MPI_Fint*v7, MPI_Fint *ierr ) +#ifndef MPICH_MPI_FROM_PMPI +MPICH_ATTR_WEAK_ALIAS(\"mpi_conversion_fn_null_\") +#endif +; +extern FORT_DLL_SPEC int FORT_CALL MPI_CONVERSION_FN_NULL ( void*v1, MPI_Fint*v2, MPI_Fint*v3, void*v4, MPI_Offset*v5, MPI_Fint *v6, MPI_Fint*v7, MPI_Fint *ierr ) +#ifndef MPICH_MPI_FROM_PMPI +MPICH_ATTR_WEAK_ALIAS(\"mpi_conversion_fn_null_\") +#endif +; /* */ #ifndef MPICH_MPI_FROM_PMPI #pragma weak mpi_conversion_fn_null__ = mpi_conversion_fn_null_ @@ -5622,8 +5690,8 @@ sub AddFwrapWeakName { print $OUTFD " /* These definitions are used only for generating the Fortran wrappers */ -#if defined(USE_WEAK_SYMBOLS) && defined(HAVE_MULTIPLE_PRAGMA_WEAK) && \\ - defined(USE_ONLY_MPI_NAMES)\n"; +#if defined(USE_WEAK_SYMBOLS) && defined(USE_ONLY_MPI_NAMES) +#if defined(HAVE_MULTIPLE_PRAGMA_WEAK)\n"; &print_weak_decl( $OUTFD, "${ucprefix}$ucname", $args, $lcname ); &print_weak_decl( $OUTFD, "${lcprefix}${lcname}__", $args, $lcname ); &print_weak_decl( $OUTFD, "${lcprefix}${lcname}", $args, $lcname ); @@ -5646,6 +5714,33 @@ sub AddFwrapWeakName { #pragma weak ${lcprefix}${lcname}__ = ${lcprefix}${lcname} #pragma weak ${lcprefix}${lcname}_ = ${lcprefix}${lcname} #endif +#elif defined(HAVE_WEAK_ATTRIBUTE) +#if defined(F77_NAME_UPPER)\n"; + &print_weak_decl( $OUTFD, "${ucprefix}$ucname", $args, $lcname ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}__", $args, $lcname, "${ucprefix}${ucname}" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}_", $args, $lcname, "${ucprefix}${ucname}" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}", $args, $lcname, "${ucprefix}${ucname}" ); + print $OUTFD " +#elif defined(F77_NAME_LOWER_2USCORE)\n"; + &print_weak_decl( $OUTFD, "${ucprefix}$ucname", $args, $lcname, "${lcprefix}${lcname}__" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}__", $args, $lcname ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}_", $args, $lcname, "${lcprefix}${lcname}__" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}", $args, $lcname, "${lcprefix}${lcname}__" ); + print $OUTFD " +#elif defined(F77_NAME_LOWER_USCORE)\n"; + &print_weak_decl( $OUTFD, "${ucprefix}$ucname", $args, $lcname, "${lcprefix}${lcname}_" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}__", $args, $lcname, "${lcprefix}${lcname}_" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}_", $args, $lcname ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}", $args, $lcname, "${lcprefix}${lcname}_" ); + print $OUTFD " +#else\n"; + &print_weak_decl( $OUTFD, "${ucprefix}$ucname", $args, $lcname, "${lcprefix}${lcname}" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}__", $args, $lcname, "${lcprefix}${lcname}" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}_", $args, $lcname, "${lcprefix}${lcname}" ); + &print_weak_decl( $OUTFD, "${lcprefix}${lcname}", $args, $lcname ); + print $OUTFD " +#endif +#endif #endif "; diff --git a/src/include/mpi.h.in b/src/include/mpi.h.in index 4a848ad..ed0981d 100644 --- a/src/include/mpi.h.in +++ b/src/include/mpi.h.in @@ -14,6 +14,8 @@ extern "C" { #endif +#define MPICH_ATTR_WEAK_ALIAS(fname) @MPICH_ATTR_WEAK_ALIAS_DEFINITION@ + #undef MPICH_DEFINE_ATTR_TYPE_TYPES #if defined(__has_attribute) # if __has_attribute(pointer_with_type_tag) && \ @@ -840,633 +842,633 @@ typedef int (MPI_Datarep_extent_function)(MPI_Datatype datatype, MPI_Aint *, /* We require that the C compiler support prototypes */ /* Begin Prototypes */ int MPI_Send(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Send"); int MPI_Recv(void *buf, int count, MPI_Datatype datatype, int source, int tag, - MPI_Comm comm, MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); -int MPI_Get_count(const MPI_Status *status, MPI_Datatype datatype, int *count); + MPI_Comm comm, MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Recv"); +int MPI_Get_count(const MPI_Status *status, MPI_Datatype datatype, int *count) MPICH_ATTR_WEAK_ALIAS("PMPI_Get_count"); int MPI_Bsend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Bsend"); int MPI_Ssend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Ssend"); int MPI_Rsend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); -int MPI_Buffer_attach(void *buffer, int size); -int MPI_Buffer_detach(void *buffer_addr, int *size); + MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Rsend"); +int MPI_Buffer_attach(void *buffer, int size) MPICH_ATTR_WEAK_ALIAS("PMPI_Buffer_attach"); +int MPI_Buffer_detach(void *buffer_addr, int *size) MPICH_ATTR_WEAK_ALIAS("PMPI_Buffer_detach"); int MPI_Isend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Isend"); int MPI_Ibsend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Ibsend"); int MPI_Issend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Issend"); int MPI_Irsend(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Irsend"); int MPI_Irecv(void *buf, int count, MPI_Datatype datatype, int source, int tag, - MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); -int MPI_Wait(MPI_Request *request, MPI_Status *status); -int MPI_Test(MPI_Request *request, int *flag, MPI_Status *status); -int MPI_Request_free(MPI_Request *request); -int MPI_Waitany(int count, MPI_Request array_of_requests[], int *indx, MPI_Status *status); + MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Irecv"); +int MPI_Wait(MPI_Request *request, MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_Wait"); +int MPI_Test(MPI_Request *request, int *flag, MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_Test"); +int MPI_Request_free(MPI_Request *request) MPICH_ATTR_WEAK_ALIAS("PMPI_Request_free"); +int MPI_Waitany(int count, MPI_Request array_of_requests[], int *indx, MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_Waitany"); int MPI_Testany(int count, MPI_Request array_of_requests[], int *indx, int *flag, - MPI_Status *status); -int MPI_Waitall(int count, MPI_Request array_of_requests[], MPI_Status array_of_statuses[]); + MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_Testany"); +int MPI_Waitall(int count, MPI_Request array_of_requests[], MPI_Status array_of_statuses[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Waitall"); int MPI_Testall(int count, MPI_Request array_of_requests[], int *flag, - MPI_Status array_of_statuses[]); + MPI_Status array_of_statuses[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Testall"); int MPI_Waitsome(int incount, MPI_Request array_of_requests[], int *outcount, - int array_of_indices[], MPI_Status array_of_statuses[]); + int array_of_indices[], MPI_Status array_of_statuses[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Waitsome"); int MPI_Testsome(int incount, MPI_Request array_of_requests[], int *outcount, - int array_of_indices[], MPI_Status array_of_statuses[]); -int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag, MPI_Status *status); -int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status); -int MPI_Cancel(MPI_Request *request); -int MPI_Test_cancelled(const MPI_Status *status, int *flag); + int array_of_indices[], MPI_Status array_of_statuses[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Testsome"); +int MPI_Iprobe(int source, int tag, MPI_Comm comm, int *flag, MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_Iprobe"); +int MPI_Probe(int source, int tag, MPI_Comm comm, MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_Probe"); +int MPI_Cancel(MPI_Request *request) MPICH_ATTR_WEAK_ALIAS("PMPI_Cancel"); +int MPI_Test_cancelled(const MPI_Status *status, int *flag) MPICH_ATTR_WEAK_ALIAS("PMPI_Test_cancelled"); int MPI_Send_init(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Send_init"); int MPI_Bsend_init(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Bsend_init"); int MPI_Ssend_init(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Ssend_init"); int MPI_Rsend_init(const void *buf, int count, MPI_Datatype datatype, int dest, int tag, - MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Rsend_init"); int MPI_Recv_init(void *buf, int count, MPI_Datatype datatype, int source, int tag, - MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); -int MPI_Start(MPI_Request *request); -int MPI_Startall(int count, MPI_Request array_of_requests[]); + MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Recv_init"); +int MPI_Start(MPI_Request *request) MPICH_ATTR_WEAK_ALIAS("PMPI_Start"); +int MPI_Startall(int count, MPI_Request array_of_requests[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Startall"); int MPI_Sendrecv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, int dest, int sendtag, void *recvbuf, int recvcount, MPI_Datatype recvtype, int source, int recvtag, MPI_Comm comm, MPI_Status *status) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(6,8); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(6,8) MPICH_ATTR_WEAK_ALIAS("PMPI_Sendrecv"); int MPI_Sendrecv_replace(void *buf, int count, MPI_Datatype datatype, int dest, int sendtag, int source, int recvtag, MPI_Comm comm, - MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); -int MPI_Type_contiguous(int count, MPI_Datatype oldtype, MPI_Datatype *newtype); + MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Sendrecv_replace"); +int MPI_Type_contiguous(int count, MPI_Datatype oldtype, MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_contiguous"); int MPI_Type_vector(int count, int blocklength, int stride, MPI_Datatype oldtype, - MPI_Datatype *newtype); + MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_vector"); int MPI_Type_hvector(int count, int blocklength, MPI_Aint stride, MPI_Datatype oldtype, - MPI_Datatype *newtype); + MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_hvector"); int MPI_Type_indexed(int count, const int *array_of_blocklengths, const int *array_of_displacements, MPI_Datatype oldtype, - MPI_Datatype *newtype); + MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_indexed"); int MPI_Type_hindexed(int count, const int *array_of_blocklengths, const MPI_Aint *array_of_displacements, MPI_Datatype oldtype, - MPI_Datatype *newtype); + MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_hindexed"); int MPI_Type_struct(int count, const int *array_of_blocklengths, const MPI_Aint *array_of_displacements, - const MPI_Datatype *array_of_types, MPI_Datatype *newtype); -int MPI_Address(const void *location, MPI_Aint *address); -int MPI_Type_extent(MPI_Datatype datatype, MPI_Aint *extent); -int MPI_Type_size(MPI_Datatype datatype, int *size); -int MPI_Type_lb(MPI_Datatype datatype, MPI_Aint *displacement); -int MPI_Type_ub(MPI_Datatype datatype, MPI_Aint *displacement); -int MPI_Type_commit(MPI_Datatype *datatype); -int MPI_Type_free(MPI_Datatype *datatype); -int MPI_Get_elements(const MPI_Status *status, MPI_Datatype datatype, int *count); + const MPI_Datatype *array_of_types, MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_struct"); +int MPI_Address(const void *location, MPI_Aint *address) MPICH_ATTR_WEAK_ALIAS("PMPI_Address"); +int MPI_Type_extent(MPI_Datatype datatype, MPI_Aint *extent) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_extent"); +int MPI_Type_size(MPI_Datatype datatype, int *size) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_size"); +int MPI_Type_lb(MPI_Datatype datatype, MPI_Aint *displacement) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_lb"); +int MPI_Type_ub(MPI_Datatype datatype, MPI_Aint *displacement) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_ub"); +int MPI_Type_commit(MPI_Datatype *datatype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_commit"); +int MPI_Type_free(MPI_Datatype *datatype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_free"); +int MPI_Get_elements(const MPI_Status *status, MPI_Datatype datatype, int *count) MPICH_ATTR_WEAK_ALIAS("PMPI_Get_elements"); int MPI_Pack(const void *inbuf, int incount, MPI_Datatype datatype, void *outbuf, - int outsize, int *position, MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + int outsize, int *position, MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Pack"); int MPI_Unpack(const void *inbuf, int insize, int *position, void *outbuf, int outcount, - MPI_Datatype datatype, MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); -int MPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm, int *size); -int MPI_Barrier(MPI_Comm comm); + MPI_Datatype datatype, MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Unpack"); +int MPI_Pack_size(int incount, MPI_Datatype datatype, MPI_Comm comm, int *size) MPICH_ATTR_WEAK_ALIAS("PMPI_Pack_size"); +int MPI_Barrier(MPI_Comm comm) MPICH_ATTR_WEAK_ALIAS("PMPI_Barrier"); int MPI_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Bcast"); int MPI_Gather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Gather"); int MPI_Gatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, int root, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,7); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,7) MPICH_ATTR_WEAK_ALIAS("PMPI_Gatherv"); int MPI_Scatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Scatter"); int MPI_Scatterv(const void *sendbuf, const int *sendcounts, const int *displs, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,7); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,7) MPICH_ATTR_WEAK_ALIAS("PMPI_Scatterv"); int MPI_Allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Allgather"); int MPI_Allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int *recvcounts, const int *displs, MPI_Datatype recvtype, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,7); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,7) MPICH_ATTR_WEAK_ALIAS("PMPI_Allgatherv"); int MPI_Alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Alltoall"); int 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, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,8); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,8) MPICH_ATTR_WEAK_ALIAS("PMPI_Alltoallv"); int 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[], MPI_Comm comm); + const int rdispls[], const MPI_Datatype recvtypes[], MPI_Comm comm) MPICH_ATTR_WEAK_ALIAS("PMPI_Alltoallw"); int MPI_Exscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Exscan"); int MPI_Reduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); -int MPI_Op_create(MPI_User_function *user_fn, int commute, MPI_Op *op); -int MPI_Op_free(MPI_Op *op); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Reduce"); +int MPI_Op_create(MPI_User_function *user_fn, int commute, MPI_Op *op) MPICH_ATTR_WEAK_ALIAS("PMPI_Op_create"); +int MPI_Op_free(MPI_Op *op) MPICH_ATTR_WEAK_ALIAS("PMPI_Op_free"); int MPI_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Allreduce"); int MPI_Reduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[], MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Reduce_scatter"); int MPI_Scan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); -int MPI_Group_size(MPI_Group group, int *size); -int MPI_Group_rank(MPI_Group group, int *rank); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Scan"); +int MPI_Group_size(MPI_Group group, int *size) MPICH_ATTR_WEAK_ALIAS("PMPI_Group_size"); +int MPI_Group_rank(MPI_Group group, int *rank) MPICH_ATTR_WEAK_ALIAS("PMPI_Group_rank"); int MPI_Group_translate_ranks(MPI_Group group1, int n, const int ranks1[], MPI_Group group2, - int ranks2[]); -int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result); -int MPI_Comm_group(MPI_Comm comm, MPI_Group *group); -int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup); -int MPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup); -int MPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup); -int MPI_Group_incl(MPI_Group group, int n, const int ranks[], MPI_Group *newgroup); -int MPI_Group_excl(MPI_Group group, int n, const int ranks[], MPI_Group *newgroup); -int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPI_Group *newgroup); -int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group *newgroup); -int MPI_Group_free(MPI_Group *group); -int MPI_Comm_size(MPI_Comm comm, int *size); -int MPI_Comm_rank(MPI_Comm comm, int *rank); -int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result); -int MPI_Comm_dup(MPI_Comm comm, MPI_Comm *newcomm); -int MPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm *newcomm); -int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm); -int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *newcomm); -int MPI_Comm_free(MPI_Comm *comm); -int MPI_Comm_test_inter(MPI_Comm comm, int *flag); -int MPI_Comm_remote_size(MPI_Comm comm, int *size); -int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group); + int ranks2[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Group_translate_ranks"); +int MPI_Group_compare(MPI_Group group1, MPI_Group group2, int *result) MPICH_ATTR_WEAK_ALIAS("PMPI_Group_compare"); +int MPI_Comm_group(MPI_Comm comm, MPI_Group *group) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_group"); +int MPI_Group_union(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup) MPICH_ATTR_WEAK_ALIAS("PMPI_Group_union"); +int MPI_Group_intersection(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup) MPICH_ATTR_WEAK_ALIAS("PMPI_Group_intersection"); +int MPI_Group_difference(MPI_Group group1, MPI_Group group2, MPI_Group *newgroup) MPICH_ATTR_WEAK_ALIAS("PMPI_Group_difference"); +int MPI_Group_incl(MPI_Group group, int n, const int ranks[], MPI_Group *newgroup) MPICH_ATTR_WEAK_ALIAS("PMPI_Group_incl"); +int MPI_Group_excl(MPI_Group group, int n, const int ranks[], MPI_Group *newgroup) MPICH_ATTR_WEAK_ALIAS("PMPI_Group_excl"); +int MPI_Group_range_incl(MPI_Group group, int n, int ranges[][3], MPI_Group *newgroup) MPICH_ATTR_WEAK_ALIAS("PMPI_Group_range_incl"); +int MPI_Group_range_excl(MPI_Group group, int n, int ranges[][3], MPI_Group *newgroup) MPICH_ATTR_WEAK_ALIAS("PMPI_Group_range_excl"); +int MPI_Group_free(MPI_Group *group) MPICH_ATTR_WEAK_ALIAS("PMPI_Group_free"); +int MPI_Comm_size(MPI_Comm comm, int *size) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_size"); +int MPI_Comm_rank(MPI_Comm comm, int *rank) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_rank"); +int MPI_Comm_compare(MPI_Comm comm1, MPI_Comm comm2, int *result) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_compare"); +int MPI_Comm_dup(MPI_Comm comm, MPI_Comm *newcomm) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_dup"); +int MPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm *newcomm) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_dup_with_info"); +int MPI_Comm_create(MPI_Comm comm, MPI_Group group, MPI_Comm *newcomm) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_create"); +int MPI_Comm_split(MPI_Comm comm, int color, int key, MPI_Comm *newcomm) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_split"); +int MPI_Comm_free(MPI_Comm *comm) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_free"); +int MPI_Comm_test_inter(MPI_Comm comm, int *flag) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_test_inter"); +int MPI_Comm_remote_size(MPI_Comm comm, int *size) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_remote_size"); +int MPI_Comm_remote_group(MPI_Comm comm, MPI_Group *group) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_remote_group"); int MPI_Intercomm_create(MPI_Comm local_comm, int local_leader, MPI_Comm peer_comm, - int remote_leader, int tag, MPI_Comm *newintercomm); -int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm); + int remote_leader, int tag, MPI_Comm *newintercomm) MPICH_ATTR_WEAK_ALIAS("PMPI_Intercomm_create"); +int MPI_Intercomm_merge(MPI_Comm intercomm, int high, MPI_Comm *newintracomm) MPICH_ATTR_WEAK_ALIAS("PMPI_Intercomm_merge"); int MPI_Keyval_create(MPI_Copy_function *copy_fn, MPI_Delete_function *delete_fn, - int *keyval, void *extra_state); -int MPI_Keyval_free(int *keyval); -int MPI_Attr_put(MPI_Comm comm, int keyval, void *attribute_val); -int MPI_Attr_get(MPI_Comm comm, int keyval, void *attribute_val, int *flag); -int MPI_Attr_delete(MPI_Comm comm, int keyval); -int MPI_Topo_test(MPI_Comm comm, int *status); + int *keyval, void *extra_state) MPICH_ATTR_WEAK_ALIAS("PMPI_Keyval_create"); +int MPI_Keyval_free(int *keyval) MPICH_ATTR_WEAK_ALIAS("PMPI_Keyval_free"); +int MPI_Attr_put(MPI_Comm comm, int keyval, void *attribute_val) MPICH_ATTR_WEAK_ALIAS("PMPI_Attr_put"); +int MPI_Attr_get(MPI_Comm comm, int keyval, void *attribute_val, int *flag) MPICH_ATTR_WEAK_ALIAS("PMPI_Attr_get"); +int MPI_Attr_delete(MPI_Comm comm, int keyval) MPICH_ATTR_WEAK_ALIAS("PMPI_Attr_delete"); +int MPI_Topo_test(MPI_Comm comm, int *status) MPICH_ATTR_WEAK_ALIAS("PMPI_Topo_test"); int MPI_Cart_create(MPI_Comm comm_old, int ndims, const int dims[], const int periods[], - int reorder, MPI_Comm *comm_cart); -int MPI_Dims_create(int nnodes, int ndims, int dims[]); + int reorder, MPI_Comm *comm_cart) MPICH_ATTR_WEAK_ALIAS("PMPI_Cart_create"); +int MPI_Dims_create(int nnodes, int ndims, int dims[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Dims_create"); int MPI_Graph_create(MPI_Comm comm_old, int nnodes, const int indx[], const int edges[], - int reorder, MPI_Comm *comm_graph); -int MPI_Graphdims_get(MPI_Comm comm, int *nnodes, int *nedges); -int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges, int indx[], int edges[]); -int MPI_Cartdim_get(MPI_Comm comm, int *ndims); -int MPI_Cart_get(MPI_Comm comm, int maxdims, int dims[], int periods[], int coords[]); -int MPI_Cart_rank(MPI_Comm comm, const int coords[], int *rank); -int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int coords[]); -int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors); -int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors, int neighbors[]); -int MPI_Cart_shift(MPI_Comm comm, int direction, int disp, int *rank_source, int *rank_dest); -int MPI_Cart_sub(MPI_Comm comm, const int remain_dims[], MPI_Comm *newcomm); -int MPI_Cart_map(MPI_Comm comm, int ndims, const int dims[], const int periods[], int *newrank); -int MPI_Graph_map(MPI_Comm comm, int nnodes, const int indx[], const int edges[], int *newrank); -int MPI_Get_processor_name(char *name, int *resultlen); -int MPI_Get_version(int *version, int *subversion); -int MPI_Get_library_version(char *version, int *resultlen); -int MPI_Errhandler_create(MPI_Handler_function *function, MPI_Errhandler *errhandler); -int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler); -int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler); -int MPI_Errhandler_free(MPI_Errhandler *errhandler); -int MPI_Error_string(int errorcode, char *string, int *resultlen); -int MPI_Error_class(int errorcode, int *errorclass); -double MPI_Wtime(void); -double MPI_Wtick(void); -int MPI_Init(int *argc, char ***argv); -int MPI_Finalize(void); -int MPI_Initialized(int *flag); -int MPI_Abort(MPI_Comm comm, int errorcode); + int reorder, MPI_Comm *comm_graph) MPICH_ATTR_WEAK_ALIAS("PMPI_Graph_create"); +int MPI_Graphdims_get(MPI_Comm comm, int *nnodes, int *nedges) MPICH_ATTR_WEAK_ALIAS("PMPI_Graphdims_get"); +int MPI_Graph_get(MPI_Comm comm, int maxindex, int maxedges, int indx[], int edges[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Graph_get"); +int MPI_Cartdim_get(MPI_Comm comm, int *ndims) MPICH_ATTR_WEAK_ALIAS("PMPI_Cartdim_get"); +int MPI_Cart_get(MPI_Comm comm, int maxdims, int dims[], int periods[], int coords[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Cart_get"); +int MPI_Cart_rank(MPI_Comm comm, const int coords[], int *rank) MPICH_ATTR_WEAK_ALIAS("PMPI_Cart_rank"); +int MPI_Cart_coords(MPI_Comm comm, int rank, int maxdims, int coords[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Cart_coords"); +int MPI_Graph_neighbors_count(MPI_Comm comm, int rank, int *nneighbors) MPICH_ATTR_WEAK_ALIAS("PMPI_Graph_neighbors_count"); +int MPI_Graph_neighbors(MPI_Comm comm, int rank, int maxneighbors, int neighbors[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Graph_neighbors"); +int MPI_Cart_shift(MPI_Comm comm, int direction, int disp, int *rank_source, int *rank_dest) MPICH_ATTR_WEAK_ALIAS("PMPI_Cart_shift"); +int MPI_Cart_sub(MPI_Comm comm, const int remain_dims[], MPI_Comm *newcomm) MPICH_ATTR_WEAK_ALIAS("PMPI_Cart_sub"); +int MPI_Cart_map(MPI_Comm comm, int ndims, const int dims[], const int periods[], int *newrank) MPICH_ATTR_WEAK_ALIAS("PMPI_Cart_map"); +int MPI_Graph_map(MPI_Comm comm, int nnodes, const int indx[], const int edges[], int *newrank) MPICH_ATTR_WEAK_ALIAS("PMPI_Graph_map"); +int MPI_Get_processor_name(char *name, int *resultlen) MPICH_ATTR_WEAK_ALIAS("PMPI_Get_processor_name"); +int MPI_Get_version(int *version, int *subversion) MPICH_ATTR_WEAK_ALIAS("PMPI_Get_version"); +int MPI_Get_library_version(char *version, int *resultlen) MPICH_ATTR_WEAK_ALIAS("PMPI_Get_library_version"); +int MPI_Errhandler_create(MPI_Handler_function *function, MPI_Errhandler *errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_Errhandler_create"); +int MPI_Errhandler_set(MPI_Comm comm, MPI_Errhandler errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_Errhandler_set"); +int MPI_Errhandler_get(MPI_Comm comm, MPI_Errhandler *errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_Errhandler_get"); +int MPI_Errhandler_free(MPI_Errhandler *errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_Errhandler_free"); +int MPI_Error_string(int errorcode, char *string, int *resultlen) MPICH_ATTR_WEAK_ALIAS("PMPI_Error_string"); +int MPI_Error_class(int errorcode, int *errorclass) MPICH_ATTR_WEAK_ALIAS("PMPI_Error_class"); +double MPI_Wtime(void) MPICH_ATTR_WEAK_ALIAS("PMPI_Wtime"); +double MPI_Wtick(void) MPICH_ATTR_WEAK_ALIAS("PMPI_Wtick"); +int MPI_Init(int *argc, char ***argv) MPICH_ATTR_WEAK_ALIAS("PMPI_Init"); +int MPI_Finalize(void) MPICH_ATTR_WEAK_ALIAS("PMPI_Finalize"); +int MPI_Initialized(int *flag) MPICH_ATTR_WEAK_ALIAS("PMPI_Initialized"); +int MPI_Abort(MPI_Comm comm, int errorcode) MPICH_ATTR_WEAK_ALIAS("PMPI_Abort"); /* Note that we may need to define a @PCONTROL_LIST@ depending on whether stdargs are supported */ -int MPI_Pcontrol(const int level, ...); +int MPI_Pcontrol(const int level, ...) MPICH_ATTR_WEAK_ALIAS("PMPI_Pcontrol"); int MPI_DUP_FN(MPI_Comm oldcomm, int keyval, void *extra_state, void *attribute_val_in, void *attribute_val_out, int *flag); /* Process Creation and Management */ -int MPI_Close_port(const char *port_name); +int MPI_Close_port(const char *port_name) MPICH_ATTR_WEAK_ALIAS("PMPI_Close_port"); int MPI_Comm_accept(const char *port_name, MPI_Info info, int root, MPI_Comm comm, - MPI_Comm *newcomm); + MPI_Comm *newcomm) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_accept"); int MPI_Comm_connect(const char *port_name, MPI_Info info, int root, MPI_Comm comm, - MPI_Comm *newcomm); -int MPI_Comm_disconnect(MPI_Comm *comm); -int MPI_Comm_get_parent(MPI_Comm *parent); -int MPI_Comm_join(int fd, MPI_Comm *intercomm); + MPI_Comm *newcomm) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_connect"); +int MPI_Comm_disconnect(MPI_Comm *comm) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_disconnect"); +int MPI_Comm_get_parent(MPI_Comm *parent) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_get_parent"); +int MPI_Comm_join(int fd, MPI_Comm *intercomm) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_join"); int MPI_Comm_spawn(const char *command, char *argv[], int maxprocs, MPI_Info info, int root, - MPI_Comm comm, MPI_Comm *intercomm, int array_of_errcodes[]); + MPI_Comm comm, MPI_Comm *intercomm, int array_of_errcodes[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_spawn"); int MPI_Comm_spawn_multiple(int count, char *array_of_commands[], char **array_of_argv[], const int array_of_maxprocs[], const MPI_Info array_of_info[], - int root, MPI_Comm comm, MPI_Comm *intercomm, int array_of_errcodes[]); -int MPI_Lookup_name(const char *service_name, MPI_Info info, char *port_name); -int MPI_Open_port(MPI_Info info, char *port_name); -int MPI_Publish_name(const char *service_name, MPI_Info info, const char *port_name); -int MPI_Unpublish_name(const char *service_name, MPI_Info info, const char *port_name); -int MPI_Comm_set_info(MPI_Comm comm, MPI_Info info); -int MPI_Comm_get_info(MPI_Comm comm, MPI_Info *info); + int root, MPI_Comm comm, MPI_Comm *intercomm, int array_of_errcodes[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_spawn_multiple"); +int MPI_Lookup_name(const char *service_name, MPI_Info info, char *port_name) MPICH_ATTR_WEAK_ALIAS("PMPI_Lookup_name"); +int MPI_Open_port(MPI_Info info, char *port_name) MPICH_ATTR_WEAK_ALIAS("PMPI_Open_port"); +int MPI_Publish_name(const char *service_name, MPI_Info info, const char *port_name) MPICH_ATTR_WEAK_ALIAS("PMPI_Publish_name"); +int MPI_Unpublish_name(const char *service_name, MPI_Info info, const char *port_name) MPICH_ATTR_WEAK_ALIAS("PMPI_Unpublish_name"); +int MPI_Comm_set_info(MPI_Comm comm, MPI_Info info) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_set_info"); +int MPI_Comm_get_info(MPI_Comm comm, MPI_Info *info) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_get_info"); /* One-Sided Communications */ int 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, MPI_Win win) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Accumulate"); int 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, MPI_Win win) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Datatype target_datatype, MPI_Win win) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Get"); int 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, MPI_Win win) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); -int MPI_Win_complete(MPI_Win win); + MPI_Datatype target_datatype, MPI_Win win) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Put"); +int MPI_Win_complete(MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_complete"); int MPI_Win_create(void *base, MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, - MPI_Win *win); -int MPI_Win_fence(int assert, MPI_Win win); -int MPI_Win_free(MPI_Win *win); -int MPI_Win_get_group(MPI_Win win, MPI_Group *group); -int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win); -int MPI_Win_post(MPI_Group group, int assert, MPI_Win win); -int MPI_Win_start(MPI_Group group, int assert, MPI_Win win); -int MPI_Win_test(MPI_Win win, int *flag); -int MPI_Win_unlock(int rank, MPI_Win win); -int MPI_Win_wait(MPI_Win win); + MPI_Win *win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_create"); +int MPI_Win_fence(int assert, MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_fence"); +int MPI_Win_free(MPI_Win *win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_free"); +int MPI_Win_get_group(MPI_Win win, MPI_Group *group) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_get_group"); +int MPI_Win_lock(int lock_type, int rank, int assert, MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_lock"); +int MPI_Win_post(MPI_Group group, int assert, MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_post"); +int MPI_Win_start(MPI_Group group, int assert, MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_start"); +int MPI_Win_test(MPI_Win win, int *flag) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_test"); +int MPI_Win_unlock(int rank, MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_unlock"); +int MPI_Win_wait(MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_wait"); /* MPI-3 One-Sided Communication Routines */ int MPI_Win_allocate(MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, void *baseptr, - MPI_Win *win); + MPI_Win *win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_allocate"); int MPI_Win_allocate_shared(MPI_Aint size, int disp_unit, MPI_Info info, MPI_Comm comm, - void *baseptr, MPI_Win *win); -int MPI_Win_shared_query(MPI_Win win, int rank, MPI_Aint *size, int *disp_unit, void *baseptr); -int MPI_Win_create_dynamic(MPI_Info info, MPI_Comm comm, MPI_Win *win); -int MPI_Win_attach(MPI_Win win, void *base, MPI_Aint size); -int MPI_Win_detach(MPI_Win win, const void *base); -int MPI_Win_get_info(MPI_Win win, MPI_Info *info_used); -int MPI_Win_set_info(MPI_Win win, MPI_Info info); + void *baseptr, MPI_Win *win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_allocate_shared"); +int MPI_Win_shared_query(MPI_Win win, int rank, MPI_Aint *size, int *disp_unit, void *baseptr) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_shared_query"); +int MPI_Win_create_dynamic(MPI_Info info, MPI_Comm comm, MPI_Win *win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_create_dynamic"); +int MPI_Win_attach(MPI_Win win, void *base, MPI_Aint size) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_attach"); +int MPI_Win_detach(MPI_Win win, const void *base) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_detach"); +int MPI_Win_get_info(MPI_Win win, MPI_Info *info_used) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_get_info"); +int MPI_Win_set_info(MPI_Win win, MPI_Info info) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_set_info"); int 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, MPI_Win win) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Get_accumulate"); int MPI_Fetch_and_op(const void *origin_addr, void *result_addr, MPI_Datatype datatype, int target_rank, MPI_Aint target_disp, MPI_Op op, MPI_Win win) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Fetch_and_op"); int 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, MPI_Win win) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Compare_and_swap"); int 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, MPI_Win win, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Rput"); int 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, MPI_Win win, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Rget"); int 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, MPI_Win win, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Raccumulate"); int 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, MPI_Win win, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); -int MPI_Win_lock_all(int assert, MPI_Win win); -int MPI_Win_unlock_all(MPI_Win win); -int MPI_Win_flush(int rank, MPI_Win win); -int MPI_Win_flush_all(MPI_Win win); -int MPI_Win_flush_local(int rank, MPI_Win win); -int MPI_Win_flush_local_all(MPI_Win win); -int MPI_Win_sync(MPI_Win win); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Rget_accumulate"); +int MPI_Win_lock_all(int assert, MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_lock_all"); +int MPI_Win_unlock_all(MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_unlock_all"); +int MPI_Win_flush(int rank, MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_flush"); +int MPI_Win_flush_all(MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_flush_all"); +int MPI_Win_flush_local(int rank, MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_flush_local"); +int MPI_Win_flush_local_all(MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_flush_local_all"); +int MPI_Win_sync(MPI_Win win) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_sync"); /* External Interfaces */ -int MPI_Add_error_class(int *errorclass); -int MPI_Add_error_code(int errorclass, int *errorcode); -int MPI_Add_error_string(int errorcode, const char *string); -int MPI_Comm_call_errhandler(MPI_Comm comm, int errorcode); +int MPI_Add_error_class(int *errorclass) MPICH_ATTR_WEAK_ALIAS("PMPI_Add_error_class"); +int MPI_Add_error_code(int errorclass, int *errorcode) MPICH_ATTR_WEAK_ALIAS("PMPI_Add_error_code"); +int MPI_Add_error_string(int errorcode, const char *string) MPICH_ATTR_WEAK_ALIAS("PMPI_Add_error_string"); +int MPI_Comm_call_errhandler(MPI_Comm comm, int errorcode) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_call_errhandler"); int MPI_Comm_create_keyval(MPI_Comm_copy_attr_function *comm_copy_attr_fn, MPI_Comm_delete_attr_function *comm_delete_attr_fn, int *comm_keyval, - void *extra_state); -int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval); -int MPI_Comm_free_keyval(int *comm_keyval); -int MPI_Comm_get_attr(MPI_Comm comm, int comm_keyval, void *attribute_val, int *flag); -int MPI_Comm_get_name(MPI_Comm comm, char *comm_name, int *resultlen); -int MPI_Comm_set_attr(MPI_Comm comm, int comm_keyval, void *attribute_val); -int MPI_Comm_set_name(MPI_Comm comm, const char *comm_name); -int MPI_File_call_errhandler(MPI_File fh, int errorcode); -int MPI_Grequest_complete(MPI_Request request); + void *extra_state) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_create_keyval"); +int MPI_Comm_delete_attr(MPI_Comm comm, int comm_keyval) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_delete_attr"); +int MPI_Comm_free_keyval(int *comm_keyval) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_free_keyval"); +int MPI_Comm_get_attr(MPI_Comm comm, int comm_keyval, void *attribute_val, int *flag) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_get_attr"); +int MPI_Comm_get_name(MPI_Comm comm, char *comm_name, int *resultlen) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_get_name"); +int MPI_Comm_set_attr(MPI_Comm comm, int comm_keyval, void *attribute_val) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_set_attr"); +int MPI_Comm_set_name(MPI_Comm comm, const char *comm_name) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_set_name"); +int MPI_File_call_errhandler(MPI_File fh, int errorcode) MPICH_ATTR_WEAK_ALIAS("PMPI_File_call_errhandler"); +int MPI_Grequest_complete(MPI_Request request) MPICH_ATTR_WEAK_ALIAS("PMPI_Grequest_complete"); int MPI_Grequest_start(MPI_Grequest_query_function *query_fn, MPI_Grequest_free_function *free_fn, MPI_Grequest_cancel_function *cancel_fn, void *extra_state, - MPI_Request *request); -int MPI_Init_thread(int *argc, char ***argv, int required, int *provided); -int MPI_Is_thread_main(int *flag); -int MPI_Query_thread(int *provided); -int MPI_Status_set_cancelled(MPI_Status *status, int flag); -int MPI_Status_set_elements(MPI_Status *status, MPI_Datatype datatype, int count); + MPI_Request *request) MPICH_ATTR_WEAK_ALIAS("PMPI_Grequest_start"); +int MPI_Init_thread(int *argc, char ***argv, int required, int *provided) MPICH_ATTR_WEAK_ALIAS("PMPI_Init_thread"); +int MPI_Is_thread_main(int *flag) MPICH_ATTR_WEAK_ALIAS("PMPI_Is_thread_main"); +int MPI_Query_thread(int *provided) MPICH_ATTR_WEAK_ALIAS("PMPI_Query_thread"); +int MPI_Status_set_cancelled(MPI_Status *status, int flag) MPICH_ATTR_WEAK_ALIAS("PMPI_Status_set_cancelled"); +int MPI_Status_set_elements(MPI_Status *status, MPI_Datatype datatype, int count) MPICH_ATTR_WEAK_ALIAS("PMPI_Status_set_elements"); int MPI_Type_create_keyval(MPI_Type_copy_attr_function *type_copy_attr_fn, MPI_Type_delete_attr_function *type_delete_attr_fn, - int *type_keyval, void *extra_state); -int MPI_Type_delete_attr(MPI_Datatype datatype, int type_keyval); -int MPI_Type_dup(MPI_Datatype oldtype, MPI_Datatype *newtype); -int MPI_Type_free_keyval(int *type_keyval); -int MPI_Type_get_attr(MPI_Datatype datatype, int type_keyval, void *attribute_val, int *flag); + int *type_keyval, void *extra_state) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_create_keyval"); +int MPI_Type_delete_attr(MPI_Datatype datatype, int type_keyval) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_delete_attr"); +int MPI_Type_dup(MPI_Datatype oldtype, MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_dup"); +int MPI_Type_free_keyval(int *type_keyval) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_free_keyval"); +int MPI_Type_get_attr(MPI_Datatype datatype, int type_keyval, void *attribute_val, int *flag) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_get_attr"); int MPI_Type_get_contents(MPI_Datatype datatype, int max_integers, int max_addresses, int max_datatypes, int array_of_integers[], - MPI_Aint array_of_addresses[], MPI_Datatype array_of_datatypes[]); + MPI_Aint array_of_addresses[], MPI_Datatype array_of_datatypes[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_get_contents"); int MPI_Type_get_envelope(MPI_Datatype datatype, int *num_integers, int *num_addresses, - int *num_datatypes, int *combiner); -int MPI_Type_get_name(MPI_Datatype datatype, char *type_name, int *resultlen); -int MPI_Type_set_attr(MPI_Datatype datatype, int type_keyval, void *attribute_val); -int MPI_Type_set_name(MPI_Datatype datatype, const char *type_name); -int MPI_Type_match_size(int typeclass, int size, MPI_Datatype *datatype); -int MPI_Win_call_errhandler(MPI_Win win, int errorcode); + int *num_datatypes, int *combiner) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_get_envelope"); +int MPI_Type_get_name(MPI_Datatype datatype, char *type_name, int *resultlen) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_get_name"); +int MPI_Type_set_attr(MPI_Datatype datatype, int type_keyval, void *attribute_val) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_set_attr"); +int MPI_Type_set_name(MPI_Datatype datatype, const char *type_name) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_set_name"); +int MPI_Type_match_size(int typeclass, int size, MPI_Datatype *datatype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_match_size"); +int MPI_Win_call_errhandler(MPI_Win win, int errorcode) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_call_errhandler"); int MPI_Win_create_keyval(MPI_Win_copy_attr_function *win_copy_attr_fn, MPI_Win_delete_attr_function *win_delete_attr_fn, int *win_keyval, - void *extra_state); -int MPI_Win_delete_attr(MPI_Win win, int win_keyval); -int MPI_Win_free_keyval(int *win_keyval); -int MPI_Win_get_attr(MPI_Win win, int win_keyval, void *attribute_val, int *flag); -int MPI_Win_get_name(MPI_Win win, char *win_name, int *resultlen); -int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val); -int MPI_Win_set_name(MPI_Win win, const char *win_name); - -int MPI_Alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr); + void *extra_state) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_create_keyval"); +int MPI_Win_delete_attr(MPI_Win win, int win_keyval) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_delete_attr"); +int MPI_Win_free_keyval(int *win_keyval) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_free_keyval"); +int MPI_Win_get_attr(MPI_Win win, int win_keyval, void *attribute_val, int *flag) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_get_attr"); +int MPI_Win_get_name(MPI_Win win, char *win_name, int *resultlen) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_get_name"); +int MPI_Win_set_attr(MPI_Win win, int win_keyval, void *attribute_val) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_set_attr"); +int MPI_Win_set_name(MPI_Win win, const char *win_name) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_set_name"); + +int MPI_Alloc_mem(MPI_Aint size, MPI_Info info, void *baseptr) MPICH_ATTR_WEAK_ALIAS("PMPI_Alloc_mem"); int MPI_Comm_create_errhandler(MPI_Comm_errhandler_function *comm_errhandler_fn, - MPI_Errhandler *errhandler); -int MPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler *errhandler); -int MPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler); + MPI_Errhandler *errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_create_errhandler"); +int MPI_Comm_get_errhandler(MPI_Comm comm, MPI_Errhandler *errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_get_errhandler"); +int MPI_Comm_set_errhandler(MPI_Comm comm, MPI_Errhandler errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_set_errhandler"); int MPI_File_create_errhandler(MPI_File_errhandler_function *file_errhandler_fn, - MPI_Errhandler *errhandler); -int MPI_File_get_errhandler(MPI_File file, MPI_Errhandler *errhandler); -int MPI_File_set_errhandler(MPI_File file, MPI_Errhandler errhandler); -int MPI_Finalized(int *flag); -int MPI_Free_mem(void *base); -int MPI_Get_address(const void *location, MPI_Aint *address); -int MPI_Info_create(MPI_Info *info); -int MPI_Info_delete(MPI_Info info, const char *key); -int MPI_Info_dup(MPI_Info info, MPI_Info *newinfo); -int MPI_Info_free(MPI_Info *info); -int MPI_Info_get(MPI_Info info, const char *key, int valuelen, char *value, int *flag); -int MPI_Info_get_nkeys(MPI_Info info, int *nkeys); -int MPI_Info_get_nthkey(MPI_Info info, int n, char *key); -int MPI_Info_get_valuelen(MPI_Info info, const char *key, int *valuelen, int *flag); -int MPI_Info_set(MPI_Info info, const char *key, const char *value); + MPI_Errhandler *errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_File_create_errhandler"); +int MPI_File_get_errhandler(MPI_File file, MPI_Errhandler *errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_File_get_errhandler"); +int MPI_File_set_errhandler(MPI_File file, MPI_Errhandler errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_File_set_errhandler"); +int MPI_Finalized(int *flag) MPICH_ATTR_WEAK_ALIAS("PMPI_Finalized"); +int MPI_Free_mem(void *base) MPICH_ATTR_WEAK_ALIAS("PMPI_Free_mem"); +int MPI_Get_address(const void *location, MPI_Aint *address) MPICH_ATTR_WEAK_ALIAS("PMPI_Get_address"); +int MPI_Info_create(MPI_Info *info) MPICH_ATTR_WEAK_ALIAS("PMPI_Info_create"); +int MPI_Info_delete(MPI_Info info, const char *key) MPICH_ATTR_WEAK_ALIAS("PMPI_Info_delete"); +int MPI_Info_dup(MPI_Info info, MPI_Info *newinfo) MPICH_ATTR_WEAK_ALIAS("PMPI_Info_dup"); +int MPI_Info_free(MPI_Info *info) MPICH_ATTR_WEAK_ALIAS("PMPI_Info_free"); +int MPI_Info_get(MPI_Info info, const char *key, int valuelen, char *value, int *flag) MPICH_ATTR_WEAK_ALIAS("PMPI_Info_get"); +int MPI_Info_get_nkeys(MPI_Info info, int *nkeys) MPICH_ATTR_WEAK_ALIAS("PMPI_Info_get_nkeys"); +int MPI_Info_get_nthkey(MPI_Info info, int n, char *key) MPICH_ATTR_WEAK_ALIAS("PMPI_Info_get_nthkey"); +int MPI_Info_get_valuelen(MPI_Info info, const char *key, int *valuelen, int *flag) MPICH_ATTR_WEAK_ALIAS("PMPI_Info_get_valuelen"); +int MPI_Info_set(MPI_Info info, const char *key, const char *value) MPICH_ATTR_WEAK_ALIAS("PMPI_Info_set"); int MPI_Pack_external(const char datarep[], const void *inbuf, int incount, MPI_Datatype datatype, void *outbuf, MPI_Aint outsize, MPI_Aint *position) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Pack_external"); int MPI_Pack_external_size(const char datarep[], int incount, MPI_Datatype datatype, - MPI_Aint *size); -int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status); -int MPI_Status_c2f(const MPI_Status *c_status, MPI_Fint *f_status); -int MPI_Status_f2c(const MPI_Fint *f_status, MPI_Status *c_status); + MPI_Aint *size) MPICH_ATTR_WEAK_ALIAS("PMPI_Pack_external_size"); +int MPI_Request_get_status(MPI_Request request, int *flag, MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_Request_get_status"); +int MPI_Status_c2f(const MPI_Status *c_status, MPI_Fint *f_status) MPICH_ATTR_WEAK_ALIAS("PMPI_Status_c2f"); +int MPI_Status_f2c(const MPI_Fint *f_status, MPI_Status *c_status) MPICH_ATTR_WEAK_ALIAS("PMPI_Status_f2c"); int MPI_Type_create_darray(int size, int rank, int ndims, const int array_of_gsizes[], const int array_of_distribs[], const int array_of_dargs[], const int array_of_psizes[], int order, MPI_Datatype oldtype, - MPI_Datatype *newtype); + MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_create_darray"); int MPI_Type_create_hindexed(int count, const int array_of_blocklengths[], const MPI_Aint array_of_displacements[], MPI_Datatype oldtype, - MPI_Datatype *newtype); + MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_create_hindexed"); int MPI_Type_create_hvector(int count, int blocklength, MPI_Aint stride, MPI_Datatype oldtype, - MPI_Datatype *newtype); + MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_create_hvector"); int MPI_Type_create_indexed_block(int count, int blocklength, const int array_of_displacements[], - MPI_Datatype oldtype, MPI_Datatype *newtype); + MPI_Datatype oldtype, MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_create_indexed_block"); int MPI_Type_create_hindexed_block(int count, int blocklength, const MPI_Aint array_of_displacements[], - MPI_Datatype oldtype, MPI_Datatype *newtype); + MPI_Datatype oldtype, MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_create_hindexed_block"); int MPI_Type_create_resized(MPI_Datatype oldtype, MPI_Aint lb, MPI_Aint extent, - MPI_Datatype *newtype); + MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_create_resized"); int MPI_Type_create_struct(int count, const int array_of_blocklengths[], const MPI_Aint array_of_displacements[], - const MPI_Datatype array_of_types[], MPI_Datatype *newtype); + const MPI_Datatype array_of_types[], MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_create_struct"); int MPI_Type_create_subarray(int ndims, const int array_of_sizes[], const int array_of_subsizes[], const int array_of_starts[], - int order, MPI_Datatype oldtype, MPI_Datatype *newtype); -int MPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint *lb, MPI_Aint *extent); -int MPI_Type_get_true_extent(MPI_Datatype datatype, MPI_Aint *true_lb, MPI_Aint *true_extent); + int order, MPI_Datatype oldtype, MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_create_subarray"); +int MPI_Type_get_extent(MPI_Datatype datatype, MPI_Aint *lb, MPI_Aint *extent) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_get_extent"); +int MPI_Type_get_true_extent(MPI_Datatype datatype, MPI_Aint *true_lb, MPI_Aint *true_extent) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_get_true_extent"); int MPI_Unpack_external(const char datarep[], const void *inbuf, MPI_Aint insize, MPI_Aint *position, void *outbuf, int outcount, MPI_Datatype datatype) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,7); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,7) MPICH_ATTR_WEAK_ALIAS("PMPI_Unpack_external"); int MPI_Win_create_errhandler(MPI_Win_errhandler_function *win_errhandler_fn, - MPI_Errhandler *errhandler); -int MPI_Win_get_errhandler(MPI_Win win, MPI_Errhandler *errhandler); -int MPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler); + MPI_Errhandler *errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_create_errhandler"); +int MPI_Win_get_errhandler(MPI_Win win, MPI_Errhandler *errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_get_errhandler"); +int MPI_Win_set_errhandler(MPI_Win win, MPI_Errhandler errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_Win_set_errhandler"); /* Fortran 90-related functions. These routines are available only if Fortran 90 support is enabled */ -int MPI_Type_create_f90_integer(int range, MPI_Datatype *newtype); -int MPI_Type_create_f90_real(int precision, int range, MPI_Datatype *newtype); -int MPI_Type_create_f90_complex(int precision, int range, MPI_Datatype *newtype); +int MPI_Type_create_f90_integer(int range, MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_create_f90_integer"); +int MPI_Type_create_f90_real(int precision, int range, MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_create_f90_real"); +int MPI_Type_create_f90_complex(int precision, int range, MPI_Datatype *newtype) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_create_f90_complex"); int MPI_Reduce_local(const void *inbuf, void *inoutbuf, int count, MPI_Datatype datatype, MPI_Op op) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); -int MPI_Op_commutative(MPI_Op op, int *commute); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Reduce_local"); +int MPI_Op_commutative(MPI_Op op, int *commute) MPICH_ATTR_WEAK_ALIAS("PMPI_Op_commutative"); int MPI_Reduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Reduce_scatter_block"); int MPI_Dist_graph_create_adjacent(MPI_Comm comm_old, int indegree, const int sources[], const int sourceweights[], int outdegree, const int destinations[], const int destweights[], - MPI_Info info, int reorder, MPI_Comm *comm_dist_graph); + MPI_Info info, int reorder, MPI_Comm *comm_dist_graph) MPICH_ATTR_WEAK_ALIAS("PMPI_Dist_graph_create_adjacent"); int MPI_Dist_graph_create(MPI_Comm comm_old, int n, const int sources[], const int degrees[], const int destinations[], const int weights[], MPI_Info info, - int reorder, MPI_Comm *comm_dist_graph); -int MPI_Dist_graph_neighbors_count(MPI_Comm comm, int *indegree, int *outdegree, int *weighted); + int reorder, MPI_Comm *comm_dist_graph) MPICH_ATTR_WEAK_ALIAS("PMPI_Dist_graph_create"); +int MPI_Dist_graph_neighbors_count(MPI_Comm comm, int *indegree, int *outdegree, int *weighted) MPICH_ATTR_WEAK_ALIAS("PMPI_Dist_graph_neighbors_count"); int MPI_Dist_graph_neighbors(MPI_Comm comm, int maxindegree, int sources[], int sourceweights[], - int maxoutdegree, int destinations[], int destweights[]); + int maxoutdegree, int destinations[], int destweights[]) MPICH_ATTR_WEAK_ALIAS("PMPI_Dist_graph_neighbors"); /* Matched probe functionality */ int MPI_Improbe(int source, int tag, MPI_Comm comm, int *flag, MPI_Message *message, - MPI_Status *status); + MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_Improbe"); int MPI_Imrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message, - MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); -int MPI_Mprobe(int source, int tag, MPI_Comm comm, MPI_Message *message, MPI_Status *status); + MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Imrecv"); +int MPI_Mprobe(int source, int tag, MPI_Comm comm, MPI_Message *message, MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_Mprobe"); int MPI_Mrecv(void *buf, int count, MPI_Datatype datatype, MPI_Message *message, - MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Mrecv"); /* Nonblocking collectives */ -int MPI_Comm_idup(MPI_Comm comm, MPI_Comm *newcomm, MPI_Request *request); -int MPI_Ibarrier(MPI_Comm comm, MPI_Request *request); +int MPI_Comm_idup(MPI_Comm comm, MPI_Comm *newcomm, MPI_Request *request) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_idup"); +int MPI_Ibarrier(MPI_Comm comm, MPI_Request *request) MPICH_ATTR_WEAK_ALIAS("PMPI_Ibarrier"); int MPI_Ibcast(void *buffer, int count, MPI_Datatype datatype, int root, MPI_Comm comm, - MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3); + MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_WEAK_ALIAS("PMPI_Ibcast"); int MPI_Igather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Igather"); int MPI_Igatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,7); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,7) MPICH_ATTR_WEAK_ALIAS("PMPI_Igatherv"); int MPI_Iscatter(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Iscatter"); int MPI_Iscatterv(const void *sendbuf, const int sendcounts[], const int displs[], MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, int root, MPI_Comm comm, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,7); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,7) MPICH_ATTR_WEAK_ALIAS("PMPI_Iscatterv"); int MPI_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Iallgather"); int MPI_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,7); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,7) MPICH_ATTR_WEAK_ALIAS("PMPI_Iallgatherv"); int MPI_Ialltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Ialltoall"); int 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, MPI_Comm comm, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,8); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,8) MPICH_ATTR_WEAK_ALIAS("PMPI_Ialltoallv"); int 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[], MPI_Comm comm, - MPI_Request *request); + MPI_Request *request) MPICH_ATTR_WEAK_ALIAS("PMPI_Ialltoallw"); int MPI_Ireduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, int root, MPI_Comm comm, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Ireduce"); int MPI_Iallreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Iallreduce"); int MPI_Ireduce_scatter(const void *sendbuf, void *recvbuf, const int recvcounts[], MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Ireduce_scatter"); int MPI_Ireduce_scatter_block(const void *sendbuf, void *recvbuf, int recvcount, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Ireduce_scatter_block"); int MPI_Iscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Iscan"); int MPI_Iexscan(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, MPI_Op op, MPI_Comm comm, MPI_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_Iexscan"); /* Neighborhood collectives */ int MPI_Ineighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Ineighbor_allgather"); int MPI_Ineighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,7); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,7) MPICH_ATTR_WEAK_ALIAS("PMPI_Ineighbor_allgatherv"); int MPI_Ineighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Ineighbor_alltoall"); int 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, MPI_Comm comm, MPI_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,8); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,8) MPICH_ATTR_WEAK_ALIAS("PMPI_Ineighbor_alltoallv"); int 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[], MPI_Comm comm, MPI_Request *request); + const MPI_Datatype recvtypes[], MPI_Comm comm, MPI_Request *request) MPICH_ATTR_WEAK_ALIAS("PMPI_Ineighbor_alltoallw"); int MPI_Neighbor_allgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Neighbor_allgather"); int MPI_Neighbor_allgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, const int recvcounts[], const int displs[], MPI_Datatype recvtype, MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,7); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,7) MPICH_ATTR_WEAK_ALIAS("PMPI_Neighbor_allgatherv"); int MPI_Neighbor_alltoall(const void *sendbuf, int sendcount, MPI_Datatype sendtype, void *recvbuf, int recvcount, MPI_Datatype recvtype, MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,3) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(4,6) MPICH_ATTR_WEAK_ALIAS("PMPI_Neighbor_alltoall"); int 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, MPI_Comm comm) MPICH_ATTR_POINTER_WITH_TYPE_TAG(1,4) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,8); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(5,8) MPICH_ATTR_WEAK_ALIAS("PMPI_Neighbor_alltoallv"); int 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[], MPI_Comm comm); + const MPI_Aint rdispls[], const MPI_Datatype recvtypes[], MPI_Comm comm) MPICH_ATTR_WEAK_ALIAS("PMPI_Neighbor_alltoallw"); /* Shared memory */ -int MPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, MPI_Comm *newcomm); +int MPI_Comm_split_type(MPI_Comm comm, int split_type, int key, MPI_Info info, MPI_Comm *newcomm) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_split_type"); /* MPI-3 "large count" routines */ -int MPI_Get_elements_x(const MPI_Status *status, MPI_Datatype datatype, MPI_Count *count); -int MPI_Status_set_elements_x(MPI_Status *status, MPI_Datatype datatype, MPI_Count count); -int MPI_Type_get_extent_x(MPI_Datatype datatype, MPI_Count *lb, MPI_Count *extent); -int MPI_Type_get_true_extent_x(MPI_Datatype datatype, MPI_Count *lb, MPI_Count *extent); -int MPI_Type_size_x(MPI_Datatype datatype, MPI_Count *size); +int MPI_Get_elements_x(const MPI_Status *status, MPI_Datatype datatype, MPI_Count *count) MPICH_ATTR_WEAK_ALIAS("PMPI_Get_elements_x"); +int MPI_Status_set_elements_x(MPI_Status *status, MPI_Datatype datatype, MPI_Count count) MPICH_ATTR_WEAK_ALIAS("PMPI_Status_set_elements_x"); +int MPI_Type_get_extent_x(MPI_Datatype datatype, MPI_Count *lb, MPI_Count *extent) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_get_extent_x"); +int MPI_Type_get_true_extent_x(MPI_Datatype datatype, MPI_Count *lb, MPI_Count *extent) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_get_true_extent_x"); +int MPI_Type_size_x(MPI_Datatype datatype, MPI_Count *size) MPICH_ATTR_WEAK_ALIAS("PMPI_Type_size_x"); /* Noncollective communicator creation */ -int MPI_Comm_create_group(MPI_Comm comm, MPI_Group group, int tag, MPI_Comm *newcomm); +int MPI_Comm_create_group(MPI_Comm comm, MPI_Group group, int tag, MPI_Comm *newcomm) MPICH_ATTR_WEAK_ALIAS("PMPI_Comm_create_group"); /* Non-standard but public extensions to MPI */ /* Fault Tolerance Extensions */ -int MPIX_Comm_group_failed(MPI_Comm comm, MPI_Group *failed_group); -int MPIX_Comm_remote_group_failed(MPI_Comm comm, MPI_Group *failed_group); -int MPIX_Comm_reenable_anysource(MPI_Comm comm, MPI_Group *failed_group); +int MPIX_Comm_group_failed(MPI_Comm comm, MPI_Group *failed_group) MPICH_ATTR_WEAK_ALIAS("PMPIX_Comm_group_failed"); +int MPIX_Comm_remote_group_failed(MPI_Comm comm, MPI_Group *failed_group) MPICH_ATTR_WEAK_ALIAS("PMPIX_Comm_remote_group_failed"); +int MPIX_Comm_reenable_anysource(MPI_Comm comm, MPI_Group *failed_group) MPICH_ATTR_WEAK_ALIAS("PMPIX_Comm_reenable_anysource"); /* MPI_T interface */ /* The MPI_T routines are available only in C bindings - tell tools that they can skip these prototypes */ /* Begin Skip Prototypes */ -int MPI_T_init_thread(int required, int *provided); -int MPI_T_finalize(void); -int MPI_T_enum_get_info(MPI_T_enum enumtype, int *num, char *name, int *name_len); -int MPI_T_enum_get_item(MPI_T_enum enumtype, int indx, int *value, char *name, int *name_len); -int MPI_T_cvar_get_num(int *num_cvar); +int MPI_T_init_thread(int required, int *provided) MPICH_ATTR_WEAK_ALIAS("PMPI_T_init_thread"); +int MPI_T_finalize(void) MPICH_ATTR_WEAK_ALIAS("PMPI_T_finalize"); +int MPI_T_enum_get_info(MPI_T_enum enumtype, int *num, char *name, int *name_len) MPICH_ATTR_WEAK_ALIAS("PMPI_T_enum_get_info"); +int MPI_T_enum_get_item(MPI_T_enum enumtype, int indx, int *value, char *name, int *name_len) MPICH_ATTR_WEAK_ALIAS("PMPI_T_enum_get_item"); +int MPI_T_cvar_get_num(int *num_cvar) MPICH_ATTR_WEAK_ALIAS("PMPI_T_cvar_get_num"); int MPI_T_cvar_get_info(int cvar_index, char *name, int *name_len, int *verbosity, MPI_Datatype *datatype, MPI_T_enum *enumtype, char *desc, int *desc_len, - int *binding, int *scope); + int *binding, int *scope) MPICH_ATTR_WEAK_ALIAS("PMPI_T_cvar_get_info"); int MPI_T_cvar_handle_alloc(int cvar_index, void *obj_handle, MPI_T_cvar_handle *handle, - int *count); -int MPI_T_cvar_handle_free(MPI_T_cvar_handle *handle); -int MPI_T_cvar_read(MPI_T_cvar_handle handle, void *buf); -int MPI_T_cvar_write(MPI_T_cvar_handle handle, void *buf); -int MPI_T_pvar_get_num(int *num_pvar); + int *count) MPICH_ATTR_WEAK_ALIAS("PMPI_T_cvar_handle_alloc"); +int MPI_T_cvar_handle_free(MPI_T_cvar_handle *handle) MPICH_ATTR_WEAK_ALIAS("PMPI_T_cvar_handle_free"); +int MPI_T_cvar_read(MPI_T_cvar_handle handle, void *buf) MPICH_ATTR_WEAK_ALIAS("PMPI_T_cvar_read"); +int MPI_T_cvar_write(MPI_T_cvar_handle handle, void *buf) MPICH_ATTR_WEAK_ALIAS("PMPI_T_cvar_write"); +int MPI_T_pvar_get_num(int *num_pvar) MPICH_ATTR_WEAK_ALIAS("PMPI_T_pvar_get_num"); int MPI_T_pvar_get_info(int pvar_index, char *name, int *name_len, int *verbosity, int *var_class, MPI_Datatype *datatype, MPI_T_enum *enumtype, char *desc, int *desc_len, - int *binding, int *readonly, int *continuous, int *atomic); -int MPI_T_pvar_session_create(MPI_T_pvar_session *session); -int MPI_T_pvar_session_free(MPI_T_pvar_session *session); + int *binding, int *readonly, int *continuous, int *atomic) MPICH_ATTR_WEAK_ALIAS("PMPI_T_pvar_get_info"); +int MPI_T_pvar_session_create(MPI_T_pvar_session *session) MPICH_ATTR_WEAK_ALIAS("PMPI_T_pvar_session_create"); +int MPI_T_pvar_session_free(MPI_T_pvar_session *session) MPICH_ATTR_WEAK_ALIAS("PMPI_T_pvar_session_free"); int MPI_T_pvar_handle_alloc(MPI_T_pvar_session session, int pvar_index, void *obj_handle, - MPI_T_pvar_handle *handle, int *count); -int MPI_T_pvar_handle_free(MPI_T_pvar_session session, MPI_T_pvar_handle *handle); -int MPI_T_pvar_start(MPI_T_pvar_session session, MPI_T_pvar_handle handle); -int MPI_T_pvar_stop(MPI_T_pvar_session session, MPI_T_pvar_handle handle); -int MPI_T_pvar_read(MPI_T_pvar_session session, MPI_T_pvar_handle handle, void *buf); -int MPI_T_pvar_write(MPI_T_pvar_session session, MPI_T_pvar_handle handle, void *buf); -int MPI_T_pvar_reset(MPI_T_pvar_session session, MPI_T_pvar_handle handle); -int MPI_T_pvar_readreset(MPI_T_pvar_session session, MPI_T_pvar_handle handle, void *buf); -int MPI_T_category_get_num(int *num_cat); + MPI_T_pvar_handle *handle, int *count) MPICH_ATTR_WEAK_ALIAS("PMPI_T_pvar_handle_alloc"); +int MPI_T_pvar_handle_free(MPI_T_pvar_session session, MPI_T_pvar_handle *handle) MPICH_ATTR_WEAK_ALIAS("PMPI_T_pvar_handle_free"); +int MPI_T_pvar_start(MPI_T_pvar_session session, MPI_T_pvar_handle handle) MPICH_ATTR_WEAK_ALIAS("PMPI_T_pvar_start"); +int MPI_T_pvar_stop(MPI_T_pvar_session session, MPI_T_pvar_handle handle) MPICH_ATTR_WEAK_ALIAS("PMPI_T_pvar_stop"); +int MPI_T_pvar_read(MPI_T_pvar_session session, MPI_T_pvar_handle handle, void *buf) MPICH_ATTR_WEAK_ALIAS("PMPI_T_pvar_read"); +int MPI_T_pvar_write(MPI_T_pvar_session session, MPI_T_pvar_handle handle, void *buf) MPICH_ATTR_WEAK_ALIAS("PMPI_T_pvar_write"); +int MPI_T_pvar_reset(MPI_T_pvar_session session, MPI_T_pvar_handle handle) MPICH_ATTR_WEAK_ALIAS("PMPI_T_pvar_reset"); +int MPI_T_pvar_readreset(MPI_T_pvar_session session, MPI_T_pvar_handle handle, void *buf) MPICH_ATTR_WEAK_ALIAS("PMPI_T_pvar_readreset"); +int MPI_T_category_get_num(int *num_cat) MPICH_ATTR_WEAK_ALIAS("PMPI_T_category_get_num"); int MPI_T_category_get_info(int cat_index, char *name, int *name_len, char *desc, int *desc_len, - int *num_cvars, int *num_pvars, int *num_categories); -int MPI_T_category_get_cvars(int cat_index, int len, int indices[]); -int MPI_T_category_get_pvars(int cat_index, int len, int indices[]); -int MPI_T_category_get_categories(int cat_index, int len, int indices[]); -int MPI_T_category_changed(int *stamp); + int *num_cvars, int *num_pvars, int *num_categories) MPICH_ATTR_WEAK_ALIAS("PMPI_T_category_get_info"); +int MPI_T_category_get_cvars(int cat_index, int len, int indices[]) MPICH_ATTR_WEAK_ALIAS("PMPI_T_category_get_cvars"); +int MPI_T_category_get_pvars(int cat_index, int len, int indices[]) MPICH_ATTR_WEAK_ALIAS("PMPI_T_category_get_pvars"); +int MPI_T_category_get_categories(int cat_index, int len, int indices[]) MPICH_ATTR_WEAK_ALIAS("PMPI_T_category_get_categories"); +int MPI_T_category_changed(int *stamp) MPICH_ATTR_WEAK_ALIAS("PMPI_T_category_changed"); /* End Skip Prototypes */ /* End Prototypes */ #endif /* MPICH_SUPPRESS_PROTOTYPES */ diff --git a/src/mpi/romio/include/mpio.h.in b/src/mpi/romio/include/mpio.h.in index 75d8ea8..a860cbe 100644 --- a/src/mpi/romio/include/mpio.h.in +++ b/src/mpi/romio/include/mpio.h.in @@ -116,122 +116,122 @@ typedef int MPI_Fint; /* Section 9.2 */ /* Begin Prototypes */ -int MPI_File_open(MPI_Comm comm, const char *filename, int amode, MPI_Info info, MPI_File *fh); -int MPI_File_close(MPI_File *fh); -int MPI_File_delete(const char *filename, MPI_Info info); -int MPI_File_set_size(MPI_File fh, MPI_Offset size); -int MPI_File_preallocate(MPI_File fh, MPI_Offset size); -int MPI_File_get_size(MPI_File fh, MPI_Offset *size); -int MPI_File_get_group(MPI_File fh, MPI_Group *group); -int MPI_File_get_amode(MPI_File fh, int *amode); -int MPI_File_set_info(MPI_File fh, MPI_Info info); -int MPI_File_get_info(MPI_File fh, MPI_Info *info_used); +int MPI_File_open(MPI_Comm comm, const char *filename, int amode, MPI_Info info, MPI_File *fh) MPICH_ATTR_WEAK_ALIAS("PMPI_File_open"); +int MPI_File_close(MPI_File *fh) MPICH_ATTR_WEAK_ALIAS("PMPI_File_close"); +int MPI_File_delete(const char *filename, MPI_Info info) MPICH_ATTR_WEAK_ALIAS("PMPI_File_delete"); +int MPI_File_set_size(MPI_File fh, MPI_Offset size) MPICH_ATTR_WEAK_ALIAS("PMPI_File_set_size"); +int MPI_File_preallocate(MPI_File fh, MPI_Offset size) MPICH_ATTR_WEAK_ALIAS("PMPI_File_preallocate"); +int MPI_File_get_size(MPI_File fh, MPI_Offset *size) MPICH_ATTR_WEAK_ALIAS("PMPI_File_get_size"); +int MPI_File_get_group(MPI_File fh, MPI_Group *group) MPICH_ATTR_WEAK_ALIAS("PMPI_File_get_group"); +int MPI_File_get_amode(MPI_File fh, int *amode) MPICH_ATTR_WEAK_ALIAS("PMPI_File_get_amode"); +int MPI_File_set_info(MPI_File fh, MPI_Info info) MPICH_ATTR_WEAK_ALIAS("PMPI_File_set_info"); +int MPI_File_get_info(MPI_File fh, MPI_Info *info_used) MPICH_ATTR_WEAK_ALIAS("PMPI_File_get_info"); /* Section 9.3 */ int MPI_File_set_view(MPI_File fh, MPI_Offset disp, MPI_Datatype etype, MPI_Datatype filetype, - const char *datarep, MPI_Info info); + const char *datarep, MPI_Info info) MPICH_ATTR_WEAK_ALIAS("PMPI_File_set_view"); int MPI_File_get_view(MPI_File fh, MPI_Offset *disp, MPI_Datatype *etype, MPI_Datatype *filetype, - char *datarep); + char *datarep) MPICH_ATTR_WEAK_ALIAS("PMPI_File_get_view"); /* Section 9.4.2 */ int MPI_File_read_at(MPI_File fh, MPI_Offset offset, void *buf, int count, MPI_Datatype datatype, - MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5); + MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5) MPICH_ATTR_WEAK_ALIAS("PMPI_File_read_at"); int MPI_File_read_at_all(MPI_File fh, MPI_Offset offset, void * buf, int count, MPI_Datatype datatype, MPI_Status *status) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5) MPICH_ATTR_WEAK_ALIAS("PMPI_File_read_at_all"); int MPI_File_write_at(MPI_File fh, MPI_Offset offset, const void * buf, int count, MPI_Datatype datatype, MPI_Status *status) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5) MPICH_ATTR_WEAK_ALIAS("PMPI_File_write_at"); int MPI_File_write_at_all(MPI_File fh, MPI_Offset offset, const void *buf, int count, MPI_Datatype datatype, MPI_Status *status) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5) MPICH_ATTR_WEAK_ALIAS("PMPI_File_write_at_all"); /* nonblocking calls currently use MPIO_Request, because generalized requests not yet implemented. For the same reason, MPIO_Test and MPIO_Wait are used to test and wait on nonblocking I/O requests */ int MPI_File_iread_at(MPI_File fh, MPI_Offset offset, void *buf, int count, MPI_Datatype datatype, - MPIO_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5); + MPIO_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5) MPICH_ATTR_WEAK_ALIAS("PMPI_File_iread_at"); int MPI_File_iwrite_at(MPI_File fh, MPI_Offset offset, const void *buf, int count, MPI_Datatype datatype, MPIO_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5) MPICH_ATTR_WEAK_ALIAS("PMPI_File_iwrite_at"); /* Section 9.4.3 */ int MPI_File_read(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Status *status) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_read"); int MPI_File_read_all(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPI_Status *status) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_read_all"); int MPI_File_write(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, - MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_write"); int MPI_File_write_all(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, - MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_write_all"); /* nonblocking calls currently use MPIO_Request, because generalized requests not yet implemented. For the same reason, MPIO_Test and MPIO_Wait are used to test and wait on nonblocking I/O requests */ int MPI_File_iread(MPI_File fh, void *buf, int count, MPI_Datatype datatype, MPIO_Request *request) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_iread"); int MPI_File_iwrite(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, - MPIO_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPIO_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_iwrite"); -int MPI_File_seek(MPI_File fh, MPI_Offset offset, int whence); -int MPI_File_get_position(MPI_File fh, MPI_Offset *offset); -int MPI_File_get_byte_offset(MPI_File fh, MPI_Offset offset, MPI_Offset *disp); +int MPI_File_seek(MPI_File fh, MPI_Offset offset, int whence) MPICH_ATTR_WEAK_ALIAS("PMPI_File_seek"); +int MPI_File_get_position(MPI_File fh, MPI_Offset *offset) MPICH_ATTR_WEAK_ALIAS("PMPI_File_get_position"); +int MPI_File_get_byte_offset(MPI_File fh, MPI_Offset offset, MPI_Offset *disp) MPICH_ATTR_WEAK_ALIAS("PMPI_File_get_byte_offset"); /* Section 9.4.4 */ int MPI_File_read_shared(MPI_File fh, void *buf, int count, MPI_Datatype datatype, - MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_read_shared"); int MPI_File_write_shared(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, - MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_write_shared"); int MPI_File_iread_shared(MPI_File fh, void *buf, int count, MPI_Datatype datatype, - MPIO_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPIO_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_iread_shared"); int MPI_File_iwrite_shared(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, - MPIO_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPIO_Request *request) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_iwrite_shared"); int MPI_File_read_ordered(MPI_File fh, void *buf, int count, MPI_Datatype datatype, - MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); + MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_read_ordered"); int MPI_File_write_ordered(MPI_File fh, const void *buf, int count, MPI_Datatype datatype, - MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); -int MPI_File_seek_shared(MPI_File fh, MPI_Offset offset, int whence); -int MPI_File_get_position_shared(MPI_File fh, MPI_Offset *offset); + MPI_Status *status) MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_write_ordered"); +int MPI_File_seek_shared(MPI_File fh, MPI_Offset offset, int whence) MPICH_ATTR_WEAK_ALIAS("PMPI_File_seek_shared"); +int MPI_File_get_position_shared(MPI_File fh, MPI_Offset *offset) MPICH_ATTR_WEAK_ALIAS("PMPI_File_get_position_shared"); /* Section 9.4.5 */ int MPI_File_read_at_all_begin(MPI_File fh, MPI_Offset offset, void *buf, int count, - MPI_Datatype datatype) MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5); -int MPI_File_read_at_all_end(MPI_File fh, void *buf, MPI_Status *status); + MPI_Datatype datatype) MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5) MPICH_ATTR_WEAK_ALIAS("PMPI_File_read_at_all_begin"); +int MPI_File_read_at_all_end(MPI_File fh, void *buf, MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_File_read_at_all_end"); int MPI_File_write_at_all_begin(MPI_File fh, MPI_Offset offset, const void *buf, int count, - MPI_Datatype datatype) MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5); -int MPI_File_write_at_all_end(MPI_File fh, const void *buf, MPI_Status *status); + MPI_Datatype datatype) MPICH_ATTR_POINTER_WITH_TYPE_TAG(3,5) MPICH_ATTR_WEAK_ALIAS("PMPI_File_write_at_all_begin"); +int MPI_File_write_at_all_end(MPI_File fh, const void *buf, MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_File_write_at_all_end"); int MPI_File_read_all_begin(MPI_File fh, void *buf, int count, MPI_Datatype datatype) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); -int MPI_File_read_all_end(MPI_File fh, void *buf, MPI_Status *status); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_read_all_begin"); +int MPI_File_read_all_end(MPI_File fh, void *buf, MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_File_read_all_end"); int MPI_File_write_all_begin(MPI_File fh, const void *buf, int count, MPI_Datatype datatype) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); -int MPI_File_write_all_end(MPI_File fh, const void *buf, MPI_Status *status); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_write_all_begin"); +int MPI_File_write_all_end(MPI_File fh, const void *buf, MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_File_write_all_end"); int MPI_File_read_ordered_begin(MPI_File fh, void *buf, int count, MPI_Datatype datatype) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); -int MPI_File_read_ordered_end(MPI_File fh, void *buf, MPI_Status *status); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_read_ordered_begin"); +int MPI_File_read_ordered_end(MPI_File fh, void *buf, MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_File_read_ordered_end"); int MPI_File_write_ordered_begin(MPI_File fh, const void *buf, int count, MPI_Datatype datatype) - MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4); -int MPI_File_write_ordered_end(MPI_File fh, const void *buf, MPI_Status *status); + MPICH_ATTR_POINTER_WITH_TYPE_TAG(2,4) MPICH_ATTR_WEAK_ALIAS("PMPI_File_write_ordered_begin"); +int MPI_File_write_ordered_end(MPI_File fh, const void *buf, MPI_Status *status) MPICH_ATTR_WEAK_ALIAS("PMPI_File_write_ordered_end"); /* Section 9.5.1 */ -int MPI_File_get_type_extent(MPI_File fh, MPI_Datatype datatype, MPI_Aint *extent); +int MPI_File_get_type_extent(MPI_File fh, MPI_Datatype datatype, MPI_Aint *extent) MPICH_ATTR_WEAK_ALIAS("PMPI_File_get_type_extent"); /* Section 9.5.3 */ int MPI_Register_datarep(const char *datarep, MPI_Datarep_conversion_function *read_conversion_fn, MPI_Datarep_conversion_function *write_conversion_fn, - MPI_Datarep_extent_function *dtype_file_extent_fn, void *extra_state); + MPI_Datarep_extent_function *dtype_file_extent_fn, void *extra_state) MPICH_ATTR_WEAK_ALIAS("PMPI_Register_datarep"); /* Section 9.6.1 */ -int MPI_File_set_atomicity(MPI_File fh, int flag); -int MPI_File_get_atomicity(MPI_File fh, int *flag); -int MPI_File_sync(MPI_File fh); +int MPI_File_set_atomicity(MPI_File fh, int flag) MPICH_ATTR_WEAK_ALIAS("PMPI_File_set_atomicity"); +int MPI_File_get_atomicity(MPI_File fh, int *flag) MPICH_ATTR_WEAK_ALIAS("PMPI_File_get_atomicity"); +int MPI_File_sync(MPI_File fh) MPICH_ATTR_WEAK_ALIAS("PMPI_File_sync"); /* Section 4.13.3 */ #ifndef MPICH /* MPICH provides these definitions */ -int MPI_File_set_errhandler(MPI_File file, MPI_Errhandler errhandler); -int MPI_File_get_errhandler(MPI_File file, MPI_Errhandler *errhandler); +int MPI_File_set_errhandler(MPI_File file, MPI_Errhandler errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_File_set_errhandler"); +int MPI_File_get_errhandler(MPI_File file, MPI_Errhandler *errhandler) MPICH_ATTR_WEAK_ALIAS("PMPI_File_get_errhandler"); #endif /* End Prototypes */ @@ -261,8 +261,8 @@ int MPI_Type_create_darray(int size, int rank, int ndims, const int array_of_gsi #endif #endif /* above needed for some versions of mpi.h in MPICH!! */ -MPI_File MPI_File_f2c(MPI_Fint file); -MPI_Fint MPI_File_c2f(MPI_File file); +MPI_File MPI_File_f2c(MPI_Fint file) MPICH_ATTR_WEAK_ALIAS("PMPI_File_f2c"); +MPI_Fint MPI_File_c2f(MPI_File file) MPICH_ATTR_WEAK_ALIAS("PMPI_File_c2f"); #ifndef HAVE_MPI_GREQUEST ----------------------------------------------------------------------- Summary of changes: confdb/aclocal_cc.m4 | 13 +- configure.ac | 5 + src/binding/f77/buildiface | 115 ++++++- src/include/mpi.h.in | 682 ++++++++++++++++++++------------------- src/mpi/romio/include/mpio.h.in | 112 ++++---- 5 files changed, 517 insertions(+), 410 deletions(-) hooks/post-receive -- MPICH primary repository

1 0