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 1bcb945c1f1636d838ba40d5b2f6980218d80802 (commit) via 16b696194e26ea1517a0a4cd4ff1ce73ab1c9ee3 (commit) via 79a2a5aa19355ab17253d28376564a07a238b191 (commit) from b6e85ed8e711f352d15b9b98b7ea2e7f84c912f0 (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/1bcb945c1f1636d838ba40d5b2f6980218... commit 1bcb945c1f1636d838ba40d5b2f6980218d80802 Author: Ken Raffenetti <[email protected]> Date: Fri May 20 09:25:06 2016 -0500 test/mpi/.gitignore: add missing f08 test artifacts No reviewer. diff --git a/test/mpi/.gitignore b/test/mpi/.gitignore index 4466ece..2a9d871 100644 --- a/test/mpi/.gitignore +++ b/test/mpi/.gitignore @@ -464,6 +464,105 @@ /f08/io/iwriteatallf90 /f08/io/i_fcoll_test /f08/io/testlist +/f08/attr/attrlangf08 +/f08/attr/attrmpi1f08 +/f08/attr/baseattr2f08 +/f08/attr/baseattr3f08 +/f08/attr/baseattrf08 +/f08/attr/commattr2f08 +/f08/attr/commattr3f08 +/f08/attr/commattrf08 +/f08/attr/fandcattrf08 +/f08/attr/typeattr2f08 +/f08/attr/typeattr3f08 +/f08/attr/typeattrf08 +/f08/comm/commerrf08 +/f08/comm/commnamef08 +/f08/ext/c2f2cf90 +/f08/ext/c2f902c.c +/f08/ext/c2f90mult +/f08/ext/ctypesfromc.c +/f08/ext/ctypesinf90 +/f08/info/infotest2f90 +/f08/info/infotestf90 +/f08/init/baseenvf90 +/f08/io/atomicityf90 +/f08/io/c2f2ciof90 +/f08/io/c2f90multio +/f08/io/fileerrf90 +/f08/io/fileinfof90 +/f08/io/iwriteatf90 +/f08/io/iwriteatf90.f90 +/f08/io/iwritef90 +/f08/io/iwritef90.f90 +/f08/io/iwriteshf90 +/f08/io/iwriteshf90.f90 +/f08/io/miscfilef90 +/f08/io/setviewcurf90 +/f08/io/shpositionf90 +/f08/io/writeallbef90 +/f08/io/writeallbef90.f90 +/f08/io/writeallf90 +/f08/io/writeallf90.f90 +/f08/io/writeatallbef90 +/f08/io/writeatallbef90.f90 +/f08/io/writeatallf90 +/f08/io/writeatallf90.f90 +/f08/io/writeatf90 +/f08/io/writeatf90.f90 +/f08/io/writef90 +/f08/io/writef90.f90 +/f08/io/writeordbef90 +/f08/io/writeordbef90.f90 +/f08/io/writeordf90 +/f08/io/writeordf90.f90 +/f08/io/writeshf90 +/f08/io/writeshf90.f90 +/f08/misc/hello +/f08/misc/ring +/f08/misc/sizeof2 +/f08/profile/profile1f90 +/f08/rma/aintf08 +/f08/rma/baseattrwinf08 +/f08/rma/c2f2cwinf08 +/f08/rma/winaccf08 +/f08/rma/winattr2f08 +/f08/rma/winattrf08 +/f08/rma/winerrf08 +/f08/rma/winfencef08 +/f08/rma/wingetf08 +/f08/rma/wingroupf08 +/f08/rma/winnamef08 +/f08/rma/winscale1f08 +/f08/rma/winscale2f08 +/f08/spawn/connaccf90 +/f08/spawn/namepubf90 +/f08/spawn/spawnargvf03 +/f08/spawn/spawnargvf90 +/f08/spawn/spawnf90 +/f08/spawn/spawnmult2f90 +/f08/spawn/spawnmultf03 +/f08/spawn/spawnmultf90 +/f08/subarray/test1 +/f08/subarray/test10 +/f08/subarray/test11 +/f08/subarray/test12 +/f08/subarray/test13 +/f08/subarray/test14 +/f08/subarray/test15 +/f08/subarray/test2 +/f08/subarray/test3 +/f08/subarray/test4 +/f08/subarray/test5 +/f08/subarray/test6 +/f08/subarray/test7 +/f08/subarray/test8 +/f08/subarray/test9 +/f08/timer/wtimef90 +/f08/topo/cart_subf90 +/f08/topo/cartcrf90 +/f08/topo/dgraph_unwgtf90 +/f08/topo/dgraph_wgtf90 /group/errstring /group/grouptest /group/groupcreate http://git.mpich.org/mpich.git/commitdiff/16b696194e26ea1517a0a4cd4ff1ce73ab... commit 16b696194e26ea1517a0a4cd4ff1ce73ab1c9ee3 Author: Artem Yalozo <[email protected]> Date: Thu May 19 16:34:22 2016 -0500 test/mpi/f08: add test for MPI_CART_SUB Add a simple regression test to ensure MPI_CART_SUB returns a valid communicator when using the F08 bindings. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/test/mpi/f08/topo/Makefile.am b/test/mpi/f08/topo/Makefile.am index 78dce0a..7872054 100644 --- a/test/mpi/f08/topo/Makefile.am +++ b/test/mpi/f08/topo/Makefile.am @@ -11,4 +11,4 @@ EXTRA_DIST = testlist AM_DEFAULT_SOURCE_EXT = .f90 -noinst_PROGRAMS = cartcrf90 dgraph_wgtf90 dgraph_unwgtf90 +noinst_PROGRAMS = cartcrf90 dgraph_wgtf90 dgraph_unwgtf90 cart_subf90 diff --git a/test/mpi/f08/topo/cart_subf90.f90 b/test/mpi/f08/topo/cart_subf90.f90 new file mode 100644 index 0000000..3bd4344 --- /dev/null +++ b/test/mpi/f08/topo/cart_subf90.f90 @@ -0,0 +1,42 @@ +! -*- Mode: Fortran; -*- +! +! (C) 2016 by Argonne National Laboratory. +! See COPYRIGHT in top-level directory. +! +! Portions of this code were written by Intel Corporation. +! Copyright (C) 2011-2016 Intel Corporation. Intel provides this material +! to Argonne National Laboratory subject to Software Grant and Corporate +! Contributor License Agreement dated February 8, 2012. + +program main +use mpi_f08 +implicit none +integer rank, size + +type(MPI_Comm) :: comm_cart, comm_new +integer dims(2), coords(2) +logical periods(2), reorder, remain_dims(2) +integer errs + +dims(1:2) = 0 +periods(1) = .TRUE. +periods(2) = .FALSE. +reorder = .TRUE. +remain_dims(1) = .TRUE. +remain_dims(2) = .FALSE. +errs = 0 + +call MTEST_Init() +call MPI_Comm_rank(MPI_COMM_WORLD, rank) +call MPI_Comm_size(MPI_COMM_WORLD, size) +call MPI_Dims_create(size, 2, dims) +call MPI_Cart_create(MPI_COMM_WORLD, 2, dims, periods, reorder, comm_cart) +call MPI_Comm_rank(comm_cart, rank) +call MPI_Cart_coords(comm_cart, rank, 2, coords) + +call MPI_Cart_sub(comm_cart, remain_dims, comm_new) +call MPI_Comm_size(comm_new, size) + +call MTEST_Finalize(errs) + +end program diff --git a/test/mpi/f08/topo/testlist b/test/mpi/f08/topo/testlist index 9836414..9b9685e 100644 --- a/test/mpi/f08/topo/testlist +++ b/test/mpi/f08/topo/testlist @@ -1,3 +1,4 @@ cartcrf90 4 dgraph_wgtf90 4 dgraph_unwgtf90 4 +cart_subf90 4 http://git.mpich.org/mpich.git/commitdiff/79a2a5aa19355ab17253d28376564a07a2... commit 79a2a5aa19355ab17253d28376564a07a238b191 Author: Artem Yalozo <[email protected]> Date: Wed May 18 16:45:43 2016 +0300 binding/f08: fix bug in MPI_CART_SUB wrapper Fixes inverted logic in Fortran wrapper for MPI_CART_SUB. Change-Id: I73605eefe65364b6d10f7f35d43388aa1fbf1214 Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/src/binding/fortran/use_mpi_f08/wrappers_f/cart_sub_f08ts.f90 b/src/binding/fortran/use_mpi_f08/wrappers_f/cart_sub_f08ts.f90 index aaea10d..3487de2 100644 --- a/src/binding/fortran/use_mpi_f08/wrappers_f/cart_sub_f08ts.f90 +++ b/src/binding/fortran/use_mpi_f08/wrappers_f/cart_sub_f08ts.f90 @@ -25,7 +25,7 @@ subroutine MPI_Cart_sub_f08(comm, remain_dims, newcomm, ierror) comm_c = comm%MPI_VAL ierror_c = MPIR_Cartdim_get_c(comm_c, ndims) - if (ierror_c /= MPI_SUCCESS) then + if (ierror_c == MPI_SUCCESS) then remain_dims_c = merge(1, 0, remain_dims(1:ndims)) ierror_c = MPIR_Cart_sub_c(comm_c, remain_dims_c, newcomm_c) newcomm%MPI_VAL = newcomm_c ----------------------------------------------------------------------- Summary of changes: .../use_mpi_f08/wrappers_f/cart_sub_f08ts.f90 | 2 +- test/mpi/.gitignore | 99 ++++++++++++++++++++ test/mpi/f08/topo/Makefile.am | 2 +- test/mpi/f08/topo/cart_subf90.f90 | 42 ++++++++ test/mpi/f08/topo/testlist | 1 + 5 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 test/mpi/f08/topo/cart_subf90.f90 hooks/post-receive -- MPICH primary repository