diff --git a/config/ompi_config_files.m4 b/config/ompi_config_files.m4 index 15e6859924..1a2003961d 100644 --- a/config/ompi_config_files.m4 +++ b/config/ompi_config_files.m4 @@ -1,8 +1,8 @@ # -*- shell-script -*- # # Copyright (c) 2009-2020 Cisco Systems, Inc. All rights reserved -# Copyright (c) 2017-2018 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# Copyright (c) 2017-2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # Copyright (c) 2018 Los Alamos National Security, LLC. All rights # reserved. # Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. @@ -29,6 +29,8 @@ AC_DEFUN([OMPI_CONFIG_FILES],[ ompi/mpi/fortran/base/Makefile ompi/mpi/fortran/mpif-h/Makefile ompi/mpi/fortran/mpif-h/profile/Makefile + ompi/mpi/fortran/use-mpi/Makefile + ompi/mpi/fortran/use-mpi/mpi-types.F90 ompi/mpi/fortran/use-mpi-tkr/Makefile ompi/mpi/fortran/use-mpi-tkr/fortran_sizes.h ompi/mpi/fortran/use-mpi-tkr/fortran_kinds.sh diff --git a/config/ompi_fortran_check_bind_c.m4 b/config/ompi_fortran_check_bind_c.m4 index bcdf6e3187..d7e10e1fa5 100644 --- a/config/ompi_fortran_check_bind_c.m4 +++ b/config/ompi_fortran_check_bind_c.m4 @@ -11,6 +11,8 @@ dnl University of Stuttgart. All rights reserved. dnl Copyright (c) 2004-2005 The Regents of the University of California. dnl All rights reserved. dnl Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved. +dnl Copyright (c) 2020 Research Organization for Information Science +dnl and Technology (RIST). All rights reserved. dnl $COPYRIGHT$ dnl dnl Additional copyrights may follow @@ -83,6 +85,7 @@ AC_DEFUN([OMPI_FORTRAN_CHECK_BIND_C_TYPE],[ end module]])], [AS_VAR_SET(bind_c_type_var, yes)], [AS_VAR_SET(bind_c_type_var, no)]) + rm -rf *.mod 2>/dev/null AC_LANG_POP([Fortran]) ]) diff --git a/config/ompi_setup_mpi_fortran.m4 b/config/ompi_setup_mpi_fortran.m4 index bfabf40d10..fbfd9c5fcf 100644 --- a/config/ompi_setup_mpi_fortran.m4 +++ b/config/ompi_setup_mpi_fortran.m4 @@ -15,7 +15,7 @@ dnl Copyright (c) 2006-2008 Sun Microsystems, Inc. All rights reserved. dnl Copyright (c) 2006-2007 Los Alamos National Security, LLC. All rights dnl reserved. dnl Copyright (c) 2009 Oak Ridge National Labs. All rights reserved. -dnl Copyright (c) 2014-2019 Research Organization for Information Science +dnl Copyright (c) 2014-2020 Research Organization for Information Science dnl and Technology (RIST). All rights reserved. dnl Copyright (c) 2016 IBM Corporation. All rights reserved. dnl Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. @@ -276,6 +276,9 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[ OMPI_FORTRAN_STATUS_SIZE=$num_ints AC_MSG_RESULT([$OMPI_FORTRAN_STATUS_SIZE Fortran INTEGERs]) AC_SUBST(OMPI_FORTRAN_STATUS_SIZE) + AC_DEFINE_UNQUOTED([OMPI_FORTRAN_STATUS_SIZE], + [$OMPI_FORTRAN_STATUS_SIZE], + [The number or Fortran INTEGER in MPI Status]) # Setup for the compilers that don't support ignore TKR functionality OPAL_UNIQ(OMPI_FORTRAN_IKINDS) @@ -384,6 +387,18 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[ [OMPI_TRY_FORTRAN_BINDINGS=$OMPI_FORTRAN_MPIFH_BINDINGS AC_MSG_RESULT([no])]) + OMPI_FORTRAN_HAVE_BIND_C_TYPE=0 + OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS=0 + + AS_IF([test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPI_BINDINGS], + [OMPI_FORTRAN_CHECK_BIND_C_TYPE( + [OMPI_FORTRAN_HAVE_BIND_C_TYPE=1 + OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS=1])]) + + AC_SUBST(OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS) + AM_CONDITIONAL(OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS, + [test $OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS -eq 1]) + #--------------------------------- # Fortran use mpi_f08 MPI bindings #--------------------------------- @@ -419,14 +434,11 @@ AC_DEFUN([OMPI_SETUP_MPI_FORTRAN],[ [OMPI_FORTRAN_HAVE_BIND_C_SUB=0 OMPI_BUILD_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPI_BINDINGS])]) - OMPI_FORTRAN_HAVE_BIND_C_TYPE=0 AS_IF([test $OMPI_TRY_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS && \ test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPIF08_BINDINGS], [ # If we don't have TYPE, BIND(C), we won't build mpi_f08 at all - OMPI_FORTRAN_CHECK_BIND_C_TYPE( - [OMPI_FORTRAN_HAVE_BIND_C_TYPE=1], - [OMPI_FORTRAN_HAVE_BIND_C_TYPE=0 - OMPI_BUILD_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPI_BINDINGS])]) + AS_IF([test $OMPI_FORTRAN_HAVE_BIND_C_TYPE -ne 1], + [OMPI_BUILD_FORTRAN_BINDINGS=$OMPI_FORTRAN_USEMPI_BINDINGS])]) # Per discussion on the devel list starting here: # https://www.open-mpi.org/community/lists/devel/2014/01/13799.php @@ -698,6 +710,16 @@ end type test_mpi_handle], AM_CONDITIONAL(OMPI_BUILD_FORTRAN_USEMPI_IGNORE_TKR_BINDINGS, [test $OMPI_BUILD_FORTRAN_BINDINGS -ge $OMPI_FORTRAN_USEMPI_BINDINGS && \ test $OMPI_FORTRAN_HAVE_IGNORE_TKR -eq 1]) + # True if we support TYPE, BIND(C) + AC_DEFINE_UNQUOTED(OMPI_FORTRAN_HAVE_BIND_C_TYPE, + [$OMPI_FORTRAN_HAVE_BIND_C_TYPE], + [For ompi_info: Whether the compiler supports TYPE, BIND(C) or not]) + + # For mpif-status.h, configure-fortran-output.h, mpi-f08-types.F90 (and ompi_info) + AC_SUBST([OMPI_FORTRAN_HAVE_PRIVATE]) + AC_DEFINE_UNQUOTED([OMPI_FORTRAN_HAVE_PRIVATE], + [$OMPI_FORTRAN_HAVE_PRIVATE], + [For mpif-status.h, mpi-f08-types.f90 and ompi_info: whether the compiler supports the "private" keyword or not (used in TYPE(MPI_Status))]) # ------------------- # use mpi_f08 final setup @@ -746,9 +768,6 @@ end type test_mpi_handle], AC_DEFINE_UNQUOTED(OMPI_FORTRAN_HAVE_BIND_C_SUB, [$OMPI_FORTRAN_HAVE_BIND_C_SUB], [For ompi_info: Whether the compiler supports SUBROUTINE ... BIND(C) or not]) - AC_DEFINE_UNQUOTED(OMPI_FORTRAN_HAVE_BIND_C_TYPE, - [$OMPI_FORTRAN_HAVE_BIND_C_TYPE], - [For ompi_info: Whether the compiler supports TYPE, BIND(C) or not]) AC_DEFINE_UNQUOTED(OMPI_FORTRAN_HAVE_BIND_C_TYPE_NAME, [$OMPI_FORTRAN_HAVE_BIND_C_TYPE_NAME], [For ompi_info: Whether the compiler supports TYPE, BIND(C, NAME="name") or not]) @@ -756,12 +775,6 @@ end type test_mpi_handle], [$OMPI_FORTRAN_HAVE_OPTIONAL_ARGS], [For ompi_info: whether the Fortran compiler supports optional arguments or not]) - # For configure-fortran-output.h, mpi-f08-types.F90 (and ompi_info) - AC_SUBST([OMPI_FORTRAN_HAVE_PRIVATE]) - AC_DEFINE_UNQUOTED([OMPI_FORTRAN_HAVE_PRIVATE], - [$OMPI_FORTRAN_HAVE_PRIVATE], - [For mpi-f08-types.f90 and ompi_info: whether the compiler supports the "private" keyword or not (used in MPI_Status)]) - # For configure-fortran-output.h, mpi-f08-interfaces-callbacks.F90 # (and ompi_info) AC_SUBST([OMPI_FORTRAN_HAVE_ABSTRACT]) diff --git a/ompi/Makefile.am b/ompi/Makefile.am index b0791efa0a..b3952e375a 100644 --- a/ompi/Makefile.am +++ b/ompi/Makefile.am @@ -15,8 +15,8 @@ # Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights # reserved. # Copyright (c) 2015-2019 Intel, Inc. All rights reserved. -# Copyright (c) 2015-2018 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# Copyright (c) 2015-2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # Copyright (c) 2016 IBM Corporation. All rights reserved. # Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. # $COPYRIGHT$ @@ -88,6 +88,7 @@ SUBDIRS = \ . \ $(OMPI_MPIEXT_MPIFH_DIRS) \ mpi/fortran/mpif-h \ + mpi/fortran/use-mpi \ $(OMPI_MPIEXT_USEMPI_DIR) \ $(OMPI_FORTRAN_USEMPI_DIR) \ mpi/fortran/mpiext-use-mpi \ @@ -121,6 +122,7 @@ DIST_SUBDIRS = \ mpi/tool \ mpi/fortran/base \ mpi/fortran/mpif-h \ + mpi/fortran/use-mpi \ mpi/fortran/use-mpi-tkr \ mpi/fortran/use-mpi-ignore-tkr \ mpi/fortran/mpiext-use-mpi \ diff --git a/ompi/include/mpi.h.in b/ompi/include/mpi.h.in index e74372657d..7079f3335a 100644 --- a/ompi/include/mpi.h.in +++ b/ompi/include/mpi.h.in @@ -17,8 +17,8 @@ * reserved. * Copyright (c) 2011-2013 INRIA. All rights reserved. * Copyright (c) 2015 University of Houston. All rights reserved. - * Copyright (c) 2015-2018 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2015-2020 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * Copyright (c) 2017-2019 IBM Corporation. All rights reserved. * Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. * $COPYRIGHT$ @@ -98,6 +98,9 @@ /* Maximum length of processor names (default is 256) */ #undef OPAL_MAX_PROCESSOR_NAME +/* The number or Fortran INTEGER in MPI Status */ +#undef OMPI_FORTRAN_STATUS_SIZE + /* Whether we have FORTRAN LOGICAL*1 or not */ #undef OMPI_HAVE_FORTRAN_LOGICAL1 @@ -408,6 +411,7 @@ typedef struct ompi_op_t *MPI_Op; typedef struct ompi_request_t *MPI_Request; typedef struct ompi_message_t *MPI_Message; typedef struct ompi_status_public_t MPI_Status; +typedef struct ompi_f08_status_public_t MPI_F08_status; typedef struct ompi_win_t *MPI_Win; typedef struct mca_base_var_enum_t *MPI_T_enum; typedef struct ompi_mpit_cvar_handle_t *MPI_T_cvar_handle; @@ -432,6 +436,19 @@ struct ompi_status_public_t { }; typedef struct ompi_status_public_t ompi_status_public_t; +/* + * MPI_F08_status + */ +struct ompi_f08_status_public_t { + /* These fields are publicly defined in the MPI specification. + User applications may freely read from these fields. */ + MPI_Fint MPI_SOURCE; + MPI_Fint MPI_TAG; + MPI_Fint MPI_ERROR; + MPI_Fint internal[OMPI_FORTRAN_STATUS_SIZE - 3]; +}; +typedef struct ompi_f08_status_public_t ompi_f08_status_public_t; + /* * User typedefs */ @@ -1763,7 +1780,11 @@ OMPI_DECLSPEC int MPI_Ssend(const void *buf, int count, MPI_Datatype datatype, OMPI_DECLSPEC int MPI_Start(MPI_Request *request); OMPI_DECLSPEC int MPI_Startall(int count, MPI_Request array_of_requests[]); OMPI_DECLSPEC int MPI_Status_c2f(const MPI_Status *c_status, MPI_Fint *f_status); +OMPI_DECLSPEC int MPI_Status_c2f08(const MPI_Status *c_status, MPI_F08_status *f08_status); +OMPI_DECLSPEC int MPI_Status_f082c(const MPI_F08_status *f08_status, MPI_Status *c_status); +OMPI_DECLSPEC int MPI_Status_f082f(const MPI_F08_status *f08_status, MPI_Fint *f_status); OMPI_DECLSPEC int MPI_Status_f2c(const MPI_Fint *f_status, MPI_Status *c_status); +OMPI_DECLSPEC int MPI_Status_f2f08(const MPI_Fint *f_status, MPI_F08_status *f08_status); OMPI_DECLSPEC int MPI_Status_set_cancelled(MPI_Status *status, int flag); OMPI_DECLSPEC int MPI_Status_set_elements(MPI_Status *status, MPI_Datatype datatype, int count); @@ -2424,7 +2445,11 @@ OMPI_DECLSPEC int PMPI_Ssend(const void *buf, int count, MPI_Datatype datatype, OMPI_DECLSPEC int PMPI_Start(MPI_Request *request); OMPI_DECLSPEC int PMPI_Startall(int count, MPI_Request array_of_requests[]); OMPI_DECLSPEC int PMPI_Status_c2f(const MPI_Status *c_status, MPI_Fint *f_status); +OMPI_DECLSPEC int PMPI_Status_c2f08(const MPI_Status *c_status, MPI_F08_status *f08_status); +OMPI_DECLSPEC int PMPI_Status_f082f(const MPI_F08_status *f08_status, MPI_Fint *f_status); +OMPI_DECLSPEC int PMPI_Status_f082c(const MPI_F08_status *f08_status, MPI_Status *c_status); OMPI_DECLSPEC int PMPI_Status_f2c(const MPI_Fint *f_status, MPI_Status *c_status); +OMPI_DECLSPEC int PMPI_Status_f2f08(const MPI_Fint *f_status, MPI_F08_status *f08_status); OMPI_DECLSPEC int PMPI_Status_set_cancelled(MPI_Status *status, int flag); OMPI_DECLSPEC int PMPI_Status_set_elements(MPI_Status *status, MPI_Datatype datatype, int count); diff --git a/ompi/mpi/c/Makefile.am b/ompi/mpi/c/Makefile.am index d4c822beba..d58b564f22 100644 --- a/ompi/mpi/c/Makefile.am +++ b/ompi/mpi/c/Makefile.am @@ -15,8 +15,8 @@ # Copyright (c) 2012-2013 Inria. All rights reserved. # Copyright (c) 2013-2018 Los Alamos National Security, LLC. All rights # reserved. -# Copyright (c) 2015-2018 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# Copyright (c) 2015-2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -339,7 +339,11 @@ libmpi_c_mpi_la_SOURCES = \ start.c \ startall.c \ status_c2f.c \ + status_c2f08.c \ + status_f082c.c \ + status_f082f.c \ status_f2c.c \ + status_f2f08.c \ status_set_cancelled.c \ status_set_elements.c \ status_set_elements_x.c \ diff --git a/ompi/mpi/c/profile/Makefile.am b/ompi/mpi/c/profile/Makefile.am index 5330752db5..a15613a6dd 100644 --- a/ompi/mpi/c/profile/Makefile.am +++ b/ompi/mpi/c/profile/Makefile.am @@ -16,8 +16,8 @@ # Copyright (c) 2012-2013 Inria. All rights reserved. # Copyright (c) 2013 Los Alamos National Security, LLC. All rights # reserved. -# Copyright (c) 2015-2018 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# Copyright (c) 2015-2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -319,6 +319,10 @@ nodist_libmpi_c_pmpi_la_SOURCES = \ pstart.c \ pstartall.c \ pstatus_c2f.c \ + pstatus_c2f08.c \ + pstatus_f082c.c \ + pstatus_f082f.c \ + pstatus_f2f08.c \ pstatus_f2c.c \ pstatus_set_cancelled.c \ pstatus_set_elements.c \ diff --git a/ompi/mpi/c/status_c2f.c b/ompi/mpi/c/status_c2f.c index 2b19e72209..68fc4f33f8 100644 --- a/ompi/mpi/c/status_c2f.c +++ b/ompi/mpi/c/status_c2f.c @@ -95,8 +95,9 @@ int MPI_Status_c2f(const MPI_Status *c_status, MPI_Fint *f_status) get truncated). But if sizeof(int) == sizeof(INTEGER) or sizeof(int) < sizeof(INTEGER), everything should be kosher. */ c_ints = (const int*)c_status; - for( i = 0; i < (int)(sizeof(MPI_Status) / sizeof(int)); i++ ) + for( i = 0; i < (int)(sizeof(MPI_Status) / sizeof(int)); i++ ) { f_status[i] = OMPI_INT_2_FINT(c_ints[i]); + } return MPI_SUCCESS; } diff --git a/ompi/mpi/c/status_c2f08.c b/ompi/mpi/c/status_c2f08.c new file mode 100644 index 0000000000..9475d1beeb --- /dev/null +++ b/ompi/mpi/c/status_c2f08.c @@ -0,0 +1,87 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2005 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2008 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2013 Los Alamos National Security, LLC. All rights + * reserved. + * Copyright (c) 2015-2020 Research Organization for Information Science + * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +#include "ompi_config.h" +#include + +#include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" +#include "ompi/mpi/fortran/base/fint_2_int.h" +#include "ompi/mpi/fortran/base/constants.h" +#include "ompi/memchecker.h" + +#if OMPI_BUILD_MPI_PROFILING +#if OPAL_HAVE_WEAK_SYMBOLS +#pragma weak MPI_Status_c2f08 = PMPI_Status_c2f08 +#endif +#define MPI_Status_c2f08 PMPI_Status_c2f08 +#endif + +static const char FUNC_NAME[] = "MPI_Status_c2f08"; + + +int MPI_Status_c2f08(const MPI_Status *c_status, MPI_F08_status *f08_status) +{ + const int *c_ints; + MEMCHECKER( + if(c_status != MPI_STATUSES_IGNORE) { + /* + * Before checking the complete status, we need to reset the definedness + * of the MPI_ERROR-field (single-completion calls wait/test). + */ + opal_memchecker_base_mem_defined((void*)&c_status->MPI_ERROR, sizeof(int)); + memchecker_status(c_status); + } + ); + + OPAL_CR_NOOP_PROGRESS(); + + if (MPI_PARAM_CHECK) { + OMPI_ERR_INIT_FINALIZE(FUNC_NAME); + + /* MPI-4:18.2.5 implies that if you pass in + MPI_STATUS[ES]_IGNORE, it's erroneous */ + + if (NULL == c_status || MPI_STATUS_IGNORE == c_status || + MPI_STATUSES_IGNORE == c_status || NULL == f08_status) { + return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, + MPI_ERR_IN_STATUS, FUNC_NAME); + } + } + + /* ***NOTE*** See huge comment in status_c2f.c (yes, I know + there's a size_t member in the C MPI_Status -- go + read that comment for an explanation why copying + everything as a bunch of int's is ok). */ + f08_status->MPI_SOURCE = OMPI_INT_2_FINT(c_status->MPI_SOURCE); + f08_status->MPI_TAG = OMPI_INT_2_FINT(c_status->MPI_TAG); + f08_status->MPI_ERROR = OMPI_INT_2_FINT(c_status->MPI_ERROR); + c_ints = (const int *)c_status + 3; + for(int i = 0; i < (int)(sizeof(MPI_Status) / sizeof(int) - 3); i++ ) { + f08_status->internal[i] = OMPI_INT_2_FINT(c_ints[i]); + } + + return MPI_SUCCESS; +} diff --git a/ompi/mpi/c/status_f082c.c b/ompi/mpi/c/status_f082c.c new file mode 100644 index 0000000000..4c3deb2468 --- /dev/null +++ b/ompi/mpi/c/status_f082c.c @@ -0,0 +1,85 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2005 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2013 Los Alamos National Security, LLC. All rights + * reserved. + * Copyright (c) 2015-2020 Research Organization for Information Science + * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +#include "ompi_config.h" + +#include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" +#include "ompi/mpi/fortran/base/fint_2_int.h" +#include "ompi/mpi/fortran/base/constants.h" + +#if OMPI_BUILD_MPI_PROFILING +#if OPAL_HAVE_WEAK_SYMBOLS +#pragma weak MPI_Status_f082c = PMPI_Status_f082c +#endif +#define MPI_Status_f082c PMPI_Status_f082c +#endif + +static const char FUNC_NAME[] = "MPI_Status_f082c"; + + +int MPI_Status_f082c(const MPI_F08_status *f08_status, MPI_Status *c_status) +{ + int *c_ints; + OPAL_CR_NOOP_PROGRESS(); + + if (MPI_PARAM_CHECK) { + OMPI_ERR_INIT_FINALIZE(FUNC_NAME); + + /* MPI-4:18.2.5 implies that if you pass in + MPI_STATUS[ES]_IGNORE, it's erroneous */ + + if (NULL == f08_status || +#if OMPI_BUILD_FORTRAN_BINDINGS + /* This section is #if'ed out if we are not building the + fortran bindings because these macros check values + against constants that only exist if the fortran + bindings exist. */ + OMPI_IS_FORTRAN_STATUS_IGNORE(f08_status) || + OMPI_IS_FORTRAN_STATUSES_IGNORE(f08_status) || +#endif + NULL == c_status) { + return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, + MPI_ERR_IN_STATUS, FUNC_NAME); + } + } + + /* ***NOTE*** See huge comment in status_c2f.c (yes, I know + there's a size_t member in the C MPI_Status -- go + read that comment for an explanation why copying + everything as a bunch of int's is ok). + + We can't use OMPI_FINT_2_INT here because of some complications + with include files. :-( So just do the casting manually. */ + c_status->MPI_SOURCE = (int)f08_status->MPI_SOURCE; + c_status->MPI_TAG = (int)f08_status->MPI_TAG; + c_status->MPI_ERROR = (int)f08_status->MPI_ERROR; + c_ints = (int *)c_status + 3; + for(int i=0; i < (int)(sizeof(MPI_Status) / sizeof(int) - 3); i++) { + c_ints[i] = (int)f08_status->internal[i]; + } + + return MPI_SUCCESS; +} diff --git a/ompi/mpi/c/status_f082f.c b/ompi/mpi/c/status_f082f.c new file mode 100644 index 0000000000..9a57084238 --- /dev/null +++ b/ompi/mpi/c/status_f082f.c @@ -0,0 +1,71 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2005 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2013 Los Alamos National Security, LLC. All rights + * reserved. + * Copyright (c) 2015-2020 Research Organization for Information Science + * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +#include "ompi_config.h" + +#include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" +#include "ompi/mpi/fortran/base/fint_2_int.h" +#include "ompi/mpi/fortran/base/constants.h" + +#if OMPI_BUILD_MPI_PROFILING +#if OPAL_HAVE_WEAK_SYMBOLS +#pragma weak MPI_Status_f082f = PMPI_Status_f082f +#endif +#define MPI_Status_f082f PMPI_Status_f082f +#endif + +static const char FUNC_NAME[] = "MPI_Status_f082f"; + + +int MPI_Status_f082f(const MPI_F08_status *f08_status, MPI_Fint *f_status) +{ + OPAL_CR_NOOP_PROGRESS(); + + if (MPI_PARAM_CHECK) { + OMPI_ERR_INIT_FINALIZE(FUNC_NAME); + + /* MPI-2:4.12.5 says that if you pass in + MPI_STATUS[ES]_IGNORE, it's erroneous */ + + if (NULL == f08_status || +#if OMPI_BUILD_FORTRAN_BINDINGS + /* This section is #if'ed out if we are not building the + fortran bindings because these macros check values + against constants that only exist if the fortran + bindings exist. */ + OMPI_IS_FORTRAN_STATUS_IGNORE(f08_status) || + OMPI_IS_FORTRAN_STATUSES_IGNORE(f08_status) || +#endif + NULL == f_status) { + return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, + MPI_ERR_IN_STATUS, FUNC_NAME); + } + } + + memcpy(f_status, f08_status, OMPI_FORTRAN_STATUS_SIZE * sizeof(MPI_Fint)); + + return MPI_SUCCESS; +} diff --git a/ompi/mpi/c/status_f2c.c b/ompi/mpi/c/status_f2c.c index d00f4fcf22..338de7e4d4 100644 --- a/ompi/mpi/c/status_f2c.c +++ b/ompi/mpi/c/status_f2c.c @@ -75,8 +75,9 @@ int MPI_Status_f2c(const MPI_Fint *f_status, MPI_Status *c_status) We can't use OMPI_FINT_2_INT here because of some complications with include files. :-( So just do the casting manually. */ c_ints = (int*)c_status; - for( i = 0; i < (int)(sizeof(MPI_Status) / sizeof(int)); i++ ) + for( i = 0; i < (int)(sizeof(MPI_Status) / sizeof(int)); i++ ) { c_ints[i] = (int)f_status[i]; + } return MPI_SUCCESS; } diff --git a/ompi/mpi/c/status_f2f08.c b/ompi/mpi/c/status_f2f08.c new file mode 100644 index 0000000000..6f092a8204 --- /dev/null +++ b/ompi/mpi/c/status_f2f08.c @@ -0,0 +1,73 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ +/* + * Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana + * University Research and Technology + * Corporation. All rights reserved. + * Copyright (c) 2004-2005 The University of Tennessee and The University + * of Tennessee Research Foundation. All rights + * reserved. + * Copyright (c) 2004-2008 High Performance Computing Center Stuttgart, + * University of Stuttgart. All rights reserved. + * Copyright (c) 2004-2005 The Regents of the University of California. + * All rights reserved. + * Copyright (c) 2010-2012 Cisco Systems, Inc. All rights reserved. + * Copyright (c) 2013 Los Alamos National Security, LLC. All rights + * reserved. + * Copyright (c) 2015-2020 Research Organization for Information Science + * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ +#include "ompi_config.h" +#include + +#include "ompi/mpi/c/bindings.h" +#include "ompi/runtime/params.h" +#include "ompi/communicator/communicator.h" +#include "ompi/errhandler/errhandler.h" +#include "ompi/mpi/fortran/base/fint_2_int.h" +#include "ompi/mpi/fortran/base/constants.h" +#include "ompi/memchecker.h" + +#if OMPI_BUILD_MPI_PROFILING +#if OPAL_HAVE_WEAK_SYMBOLS +#pragma weak MPI_Status_f2f08 = PMPI_Status_f2f08 +#endif +#define MPI_Status_f2f08 PMPI_Status_f2f08 +#endif + +static const char FUNC_NAME[] = "MPI_Status_f2f08"; + + +int MPI_Status_f2f08(const MPI_Fint *f_status, MPI_F08_status *f08_status) +{ + OPAL_CR_NOOP_PROGRESS(); + + if (MPI_PARAM_CHECK) { + OMPI_ERR_INIT_FINALIZE(FUNC_NAME); + + /* MPI-2:4.12.5 says that if you pass in + MPI_STATUS[ES]_IGNORE, it's erroneous */ + + if (NULL == f_status || +#if OMPI_BUILD_FORTRAN_BINDINGS + /* This section is #if'ed out if we are not building the + fortran bindings because these macros check values + against constants that only exist if the fortran + bindings exist. */ + OMPI_IS_FORTRAN_STATUS_IGNORE(f_status) || + OMPI_IS_FORTRAN_STATUSES_IGNORE(f_status) || +#endif + NULL == f08_status) { + return OMPI_ERRHANDLER_INVOKE(MPI_COMM_WORLD, + MPI_ERR_IN_STATUS, FUNC_NAME); + } + } + + memcpy(f08_status, f_status, OMPI_FORTRAN_STATUS_SIZE*sizeof(MPI_Fint)); + + return MPI_SUCCESS; +} diff --git a/ompi/mpi/fortran/configure-fortran-output.h.in b/ompi/mpi/fortran/configure-fortran-output.h.in index c44e965a07..2c96d83a2b 100644 --- a/ompi/mpi/fortran/configure-fortran-output.h.in +++ b/ompi/mpi/fortran/configure-fortran-output.h.in @@ -3,7 +3,7 @@ ! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved. ! Copyright (c) 2009-2012 Los Alamos National Security, LLC. ! All rights reserved. -! Copyright (c) 2017-2019 Research Organization for Information Science +! Copyright (c) 2017-2020 Research Organization for Information Science ! and Technology (RIST). All rights reserved. ! ! $COPYRIGHT$ @@ -105,6 +105,8 @@ #define OMPI_ENABLE_MPI1_COMPAT @OMPI_ENABLE_MPI1_COMPAT@ +#define OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS @OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS@ + ! Include some post-processing, based on the values from above #include "ompi/mpi/fortran/configure-fortran-output-bottom.h" diff --git a/ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile.am b/ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile.am index 23186eedb4..5e5312f6e2 100644 --- a/ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile.am +++ b/ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile.am @@ -1,7 +1,7 @@ # # Copyright (c) 2012-2019 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# Copyright (c) 2017-2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. # $COPYRIGHT$ # @@ -28,6 +28,7 @@ if OMPI_BUILD_FORTRAN_USEMPI_OR_USEMPIF08_EXT AM_FCFLAGS = -I$(top_builddir)/ompi/include -I$(top_srcdir)/ompi/include \ $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/base \ + $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi \ $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-f08/mod \ $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-f08 \ -I$(top_srcdir) -I$(top_builddir) $(FCFLAGS_f90) diff --git a/ompi/mpi/fortran/mpiext-use-mpi/Makefile.am b/ompi/mpi/fortran/mpiext-use-mpi/Makefile.am index 71bfad26d9..825da31f1a 100644 --- a/ompi/mpi/fortran/mpiext-use-mpi/Makefile.am +++ b/ompi/mpi/fortran/mpiext-use-mpi/Makefile.am @@ -1,7 +1,7 @@ # # Copyright (c) 2012-2019 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# Copyright (c) 2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. # $COPYRIGHT$ # @@ -28,6 +28,7 @@ if OMPI_BUILD_FORTRAN_USEMPI_OR_USEMPIF08_EXT AM_FCFLAGS = -I$(top_builddir)/ompi/include -I$(top_srcdir)/ompi/include \ $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/base \ + $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi \ $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-ignore-tkr \ -I$(top_srcdir) -I$(top_builddir) $(FCFLAGS_f90) diff --git a/ompi/mpi/fortran/mpif-h/Makefile.am b/ompi/mpi/fortran/mpif-h/Makefile.am index 1b1f80d852..b8225bf889 100644 --- a/ompi/mpi/fortran/mpif-h/Makefile.am +++ b/ompi/mpi/fortran/mpif-h/Makefile.am @@ -14,8 +14,8 @@ # Copyright (c) 2011-2013 Universite Bordeaux 1 # Copyright (c) 2013-2018 Los Alamos National Security, LLC. All rights # reserved. -# Copyright (c) 2015-2017 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# Copyright (c) 2015-2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # Copyright (c) 2016 IBM Corporation. All rights reserved. # Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. # $COPYRIGHT$ @@ -385,6 +385,8 @@ lib@OMPI_LIBMPI_NAME@_mpifh_la_SOURCES += \ ssend_init_f.c \ startall_f.c \ start_f.c \ + status_f082f_f.c \ + status_f2f08_f.c \ status_set_cancelled_f.c \ status_set_elements_f.c \ status_set_elements_x_f.c \ diff --git a/ompi/mpi/fortran/mpif-h/profile/Makefile.am b/ompi/mpi/fortran/mpif-h/profile/Makefile.am index 35a9390f6f..9d183297df 100644 --- a/ompi/mpi/fortran/mpif-h/profile/Makefile.am +++ b/ompi/mpi/fortran/mpif-h/profile/Makefile.am @@ -15,8 +15,8 @@ # Copyright (c) 2011-2013 Universite Bordeaux 1 # Copyright (c) 2013-2014 Los Alamos National Security, LLC. All rights # reserved. -# Copyright (c) 2015-2018 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# Copyright (c) 2015-2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. # $COPYRIGHT$ # @@ -298,6 +298,8 @@ linked_files = \ pssend_init_f.c \ pstartall_f.c \ pstart_f.c \ + pstatus_f082f_f.c \ + pstatus_f2f08_f.c \ pstatus_set_cancelled_f.c \ pstatus_set_elements_f.c \ pstatus_set_elements_x_f.c \ diff --git a/ompi/mpi/fortran/mpif-h/prototypes_mpi.h b/ompi/mpi/fortran/mpif-h/prototypes_mpi.h index 6a664e9bd2..bd560a9dc2 100644 --- a/ompi/mpi/fortran/mpif-h/prototypes_mpi.h +++ b/ompi/mpi/fortran/mpif-h/prototypes_mpi.h @@ -14,8 +14,8 @@ * Copyright (c) 2011-2013 Universite Bordeaux 1 * Copyright (c) 2013-2015 Los Alamos National Security, LLC. All rights * reserved. - * Copyright (c) 2016-2017 Research Organization for Information Science - * and Technology (RIST). All rights reserved. + * Copyright (c) 2016-2020 Research Organization for Information Science + * and Technology (RIST). All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -354,6 +354,8 @@ PN2(void, MPI_Ssend_init, mpi_ssend_init, MPI_SSEND_INIT, (char *buf, MPI_Fint * PN2(void, MPI_Ssend, mpi_ssend, MPI_SSEND, (char *buf, MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *dest, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *ierr)); PN2(void, MPI_Start, mpi_start, MPI_START, (MPI_Fint *request, MPI_Fint *ierr)); PN2(void, MPI_Startall, mpi_startall, MPI_STARTALL, (MPI_Fint *count, MPI_Fint *array_of_requests, MPI_Fint *ierr)); +PN2(void, MPI_Status_f082f, mpi_status_f082f, MPI_STATUS_F082F, (const MPI_F08_status *f08_status, MPI_Fint *f_status, MPI_Fint *ierr)); +PN2(void, MPI_Status_f2f08, mpi_status_f2f08, MPI_STATUS_F2F08, (const MPI_Fint *f_status, MPI_F08_status *f08_status, MPI_Fint *ierr)); PN2(void, MPI_Status_set_cancelled, mpi_status_set_cancelled, MPI_STATUS_SET_CANCELLED, (MPI_Fint *status, ompi_fortran_logical_t *flag, MPI_Fint *ierr)); PN2(void, MPI_Status_set_elements, mpi_status_set_elements, MPI_STATUS_SET_ELEMENTS, (MPI_Fint *status, MPI_Fint *datatype, MPI_Fint *count, MPI_Fint *ierr)); PN2(void, MPI_Status_set_elements_x, mpi_status_set_elements_x, MPI_STATUS_SET_ELEMENTS_X, (MPI_Fint *status, MPI_Fint *datatype, MPI_Count *count, MPI_Fint *ierr)); diff --git a/ompi/mpi/fortran/mpif-h/status_f082f_f.c b/ompi/mpi/fortran/mpif-h/status_f082f_f.c new file mode 100644 index 0000000000..83ac4d5672 --- /dev/null +++ b/ompi/mpi/fortran/mpif-h/status_f082f_f.c @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2020 Research Organization for Information Science + * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +#include "ompi_config.h" + +#include "ompi/mpi/fortran/mpif-h/bindings.h" +#include "ompi/mpi/fortran/base/constants.h" + +#if OMPI_BUILD_MPI_PROFILING +#if OPAL_HAVE_WEAK_SYMBOLS +#pragma weak PMPI_STATUS_F082F = ompi_status_f082f_f +#pragma weak pmpi_status_f082f = ompi_status_f082f_f +#pragma weak pmpi_status_f082f_ = ompi_status_f082f_f +#pragma weak pmpi_status_f082f__ = ompi_status_f082f_f + +#pragma weak PMPI_Status_f082f_f = ompi_status_f082f_f +#pragma weak PMPI_Status_f082f_f08 = ompi_status_f082f_f +#else +OMPI_GENERATE_F77_BINDINGS(PMPI_STATUS_F082F, + pmpi_status_f082f, + pmpi_status_f082f_, + pmpi_status_f082f__, + pompi_status_f082f_f, + (const MPI_F08_status *f08_status, MPI_Fint *f_status, MPI_Fint *ierr), + (f08_status, f_status, ierr) ) +#endif +#endif + +#if OPAL_HAVE_WEAK_SYMBOLS +#pragma weak MPI_STATUS_F082F = ompi_status_f082f_f +#pragma weak mpi_status_f082f = ompi_status_f082f_f +#pragma weak mpi_status_f082f_ = ompi_status_f082f_f +#pragma weak mpi_status_f082f__ = ompi_status_f082f_f + +#pragma weak MPI_Status_f082f_f = ompi_status_f082f_f +#pragma weak MPI_Status_f082f_f08 = ompi_status_f082f_f +#else +#if ! OMPI_BUILD_MPI_PROFILING +OMPI_GENERATE_F77_BINDINGS(MPI_STATUS_F082F, + mpi_status_f082f, + mpi_status_f082f_, + mpi_status_f082f__, + ompi_status_f082f_f, + (const MPI_F08_status *f08_status, MPI_Fint *f_status, MPI_Fint *ierr), + (f08_status, f_status, ierr) ) +#else +#define ompi_status_f082f_f pompi_status_f082f_f +#endif +#endif + + +void ompi_status_f082f_f(const MPI_F08_status *f08_status, MPI_Fint *f_status, MPI_Fint *ierr) +{ + int c_ierr; + + c_ierr = PMPI_Status_f082f(f08_status, f_status); + if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); +} diff --git a/ompi/mpi/fortran/mpif-h/status_f2f08_f.c b/ompi/mpi/fortran/mpif-h/status_f2f08_f.c new file mode 100644 index 0000000000..02b6db7a34 --- /dev/null +++ b/ompi/mpi/fortran/mpif-h/status_f2f08_f.c @@ -0,0 +1,65 @@ +/* + * Copyright (c) 2020 Research Organization for Information Science + * and Technology (RIST). All rights reserved. + * $COPYRIGHT$ + * + * Additional copyrights may follow + * + * $HEADER$ + */ + +#include "ompi_config.h" + +#include "ompi/mpi/fortran/mpif-h/bindings.h" +#include "ompi/mpi/fortran/base/constants.h" + +#if OMPI_BUILD_MPI_PROFILING +#if OPAL_HAVE_WEAK_SYMBOLS +#pragma weak PMPI_STATUS_F2F08 = ompi_status_f2f08_f +#pragma weak pmpi_status_f2f08 = ompi_status_f2f08_f +#pragma weak pmpi_status_f2f08_ = ompi_status_f2f08_f +#pragma weak pmpi_status_f2f08__ = ompi_status_f2f08_f + +#pragma weak PMPI_Status_f2f08_f = ompi_status_f2f08_f +#pragma weak PMPI_Status_f2f08_f08 = ompi_status_f2f08_f +#else +OMPI_GENERATE_F77_BINDINGS(PMPI_STATUS_F2F08, + pmpi_status_f2f08, + pmpi_status_f2f08_, + pmpi_status_f2f08__, + pompi_status_f2f08_f, + (const MPI_Fint *f_status, MPI_F08_status *f08_status, MPI_Fint *ierr), + (f_status, f08_status, ierr) ) +#endif +#endif + +#if OPAL_HAVE_WEAK_SYMBOLS +#pragma weak MPI_STATUS_F2F08 = ompi_status_f2f08_f +#pragma weak mpi_status_f2f08 = ompi_status_f2f08_f +#pragma weak mpi_status_f2f08_ = ompi_status_f2f08_f +#pragma weak mpi_status_f2f08__ = ompi_status_f2f08_f + +#pragma weak MPI_Status_f2f08_f = ompi_status_f2f08_f +#pragma weak MPI_Status_f2f08_f08 = ompi_status_f2f08_f +#else +#if ! OMPI_BUILD_MPI_PROFILING +OMPI_GENERATE_F77_BINDINGS(MPI_STATUS_F2F08, + mpi_status_f2f08, + mpi_status_f2f08_, + mpi_status_f2f08__, + ompi_status_f2f08_f, + (const MPI_Fint *f_stttttatus, MPI_F08_status *f08_status *f08_status, MPI_Fint *ierr), + (f_status, f08_status, ierr) ) +#else +#define ompi_status_f2f08_f pompi_status_f2f08_f +#endif +#endif + + +void ompi_status_f2f08_f(const MPI_Fint *f_status, MPI_F08_status *f08_status, MPI_Fint *ierr) +{ + int c_ierr; + + c_ierr = PMPI_Status_f2f08(f_status, f08_status); + if (NULL != ierr) *ierr = OMPI_INT_2_FINT(c_ierr); +} diff --git a/ompi/mpi/fortran/use-mpi-f08/Makefile.am b/ompi/mpi/fortran/use-mpi-f08/Makefile.am index 2ed9a01997..3ab8c24f50 100644 --- a/ompi/mpi/fortran/use-mpi-f08/Makefile.am +++ b/ompi/mpi/fortran/use-mpi-f08/Makefile.am @@ -7,7 +7,7 @@ # Copyright (c) 2012-2013 Inria. All rights reserved. # Copyright (c) 2013-2018 Los Alamos National Security, LLC. All rights # reserved. -# Copyright (c) 2015-2019 Research Organization for Information Science +# Copyright (c) 2015-2020 Research Organization for Information Science # and Technology (RIST). All rights reserved. # Copyright (c) 2016 IBM Corporation. All rights reserved. # Copyright (c) 2017-2018 FUJITSU LIMITED. All rights reserved. @@ -36,6 +36,7 @@ if OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS AM_FCFLAGS = -I$(top_builddir)/ompi/include \ -I$(top_srcdir)/ompi/include \ + $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi \ $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/$(OMPI_FORTRAN_USEMPI_DIR) \ $(OMPI_FC_MODULE_FLAG)mod \ $(OMPI_FC_MODULE_FLAG)bindings \ @@ -363,6 +364,8 @@ mpi_api_files = \ ssend_init_f08.F90 \ startall_f08.F90 \ start_f08.F90 \ + status_f082f_f08.F90 \ + status_f2f08_f08.F90 \ status_set_cancelled_f08.F90 \ status_set_elements_f08.F90 \ status_set_elements_x_f08.F90 \ @@ -718,6 +721,8 @@ pmpi_api_files = \ profile/pssend_init_f08.F90 \ profile/pstartall_f08.F90 \ profile/pstart_f08.F90 \ + profile/pstatus_f082f_f08.F90 \ + profile/pstatus_f2f08_f08.F90 \ profile/pstatus_set_cancelled_f08.F90 \ profile/pstatus_set_elements_f08.F90 \ profile/pstatus_set_elements_x_f08.F90 \ diff --git a/ompi/mpi/fortran/use-mpi-f08/base/Makefile.am b/ompi/mpi/fortran/use-mpi-f08/base/Makefile.am index 7e1bc3bc29..7b62c571a4 100644 --- a/ompi/mpi/fortran/use-mpi-f08/base/Makefile.am +++ b/ompi/mpi/fortran/use-mpi-f08/base/Makefile.am @@ -1,6 +1,8 @@ # -*- makefile -*- # -# Copyright (c) 2019 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2019 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # # $COPYRIGHT$ # diff --git a/ompi/mpi/fortran/use-mpi-f08/bindings/Makefile.am b/ompi/mpi/fortran/use-mpi-f08/bindings/Makefile.am index b00d08757c..9e038f7e87 100644 --- a/ompi/mpi/fortran/use-mpi-f08/bindings/Makefile.am +++ b/ompi/mpi/fortran/use-mpi-f08/bindings/Makefile.am @@ -7,8 +7,8 @@ # Copyright (c) 2012-2013 Inria. All rights reserved. # Copyright (c) 2013 Los Alamos National Security, LLC. All rights # reserved. -# Copyright (c) 2015-2018 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# Copyright (c) 2015-2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # Copyright (c) 2016 IBM Corporation. All rights reserved. # # $COPYRIGHT$ @@ -33,6 +33,7 @@ if OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS AM_FCFLAGS = -I$(top_builddir)/ompi/include \ -I$(top_srcdir)/ompi/include \ + $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi \ $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/$(OMPI_FORTRAN_USEMPI_DIR) \ $(OMPI_FC_MODULE_FLAG). \ $(OMPI_FC_MODULE_FLAG)../mod \ diff --git a/ompi/mpi/fortran/use-mpi-f08/bindings/mpi-f-interfaces-bind.h b/ompi/mpi/fortran/use-mpi-f08/bindings/mpi-f-interfaces-bind.h index 3243711234..140ad0d01f 100644 --- a/ompi/mpi/fortran/use-mpi-f08/bindings/mpi-f-interfaces-bind.h +++ b/ompi/mpi/fortran/use-mpi-f08/bindings/mpi-f-interfaces-bind.h @@ -7,7 +7,7 @@ ! of Tennessee Research Foundation. All rights ! reserved. ! Copyright (c) 2012 Inria. All rights reserved. -! Copyright (c) 2015-2019 Research Organization for Information Science +! Copyright (c) 2015-2020 Research Organization for Information Science ! and Technology (RIST). All rights reserved. ! $COPYRIGHT$ ! @@ -2635,6 +2635,24 @@ subroutine ompi_query_thread_f(provided,ierror) & INTEGER, INTENT(OUT) :: ierror end subroutine ompi_query_thread_f +subroutine ompi_status_f082f_f(f08_status,f_status,ierror) & + BIND(C, name="ompi_status_f2f08_f") + use :: mpi_f08_types, only : MPI_Status, MPI_STATUS_SIZE + implicit none + TYPE(MPI_Status), INTENT(IN) :: f08_status + INTEGER, INTENT(OUT) :: f_status(MPI_STATUS_SIZE) + INTEGER, INTENT(OUT) :: ierror +end subroutine ompi_status_f082f_f + +subroutine ompi_status_f2f08_f(f_status,f08_status,ierror) & + BIND(C, name="ompi_status_f082f_f") + use :: mpi_f08_types, only : MPI_Status, MPI_STATUS_SIZE + implicit none + INTEGER, INTENT(IN) :: f_status(MPI_STATUS_SIZE) + TYPE(MPI_Status), INTENT(OUT) :: f08_status + INTEGER, INTENT(OUT) :: ierror +end subroutine ompi_status_f2f08_f + subroutine ompi_status_set_elements_f(status,datatype,count,ierror) & BIND(C, name="ompi_status_set_elements_f") use :: mpi_f08_types, only : MPI_Status diff --git a/ompi/mpi/fortran/use-mpi-f08/mod/Makefile.am b/ompi/mpi/fortran/use-mpi-f08/mod/Makefile.am index ae85a4a7ea..52639bf101 100644 --- a/ompi/mpi/fortran/use-mpi-f08/mod/Makefile.am +++ b/ompi/mpi/fortran/use-mpi-f08/mod/Makefile.am @@ -7,7 +7,7 @@ # Copyright (c) 2012-2013 Inria. All rights reserved. # Copyright (c) 2013 Los Alamos National Security, LLC. All rights # reserved. -# Copyright (c) 2015-2019 Research Organization for Information Science +# Copyright (c) 2015-2020 Research Organization for Information Science # and Technology (RIST). All rights reserved. # Copyright (c) 2016 IBM Corporation. All rights reserved. # @@ -33,6 +33,7 @@ if OMPI_BUILD_FORTRAN_USEMPIF08_BINDINGS AM_FCFLAGS = -I$(top_builddir)/ompi/include \ -I$(top_srcdir)/ompi/include \ + $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi \ $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/$(OMPI_FORTRAN_USEMPI_DIR) \ $(OMPI_FC_MODULE_FLAG). \ -I$(top_srcdir) -I$(top_builddir) $(FCFLAGS_f90) @@ -53,6 +54,9 @@ libusempif08_internal_modules_la_SOURCES = \ mpi-f08-callbacks.F90 \ mpi-f08-constants.h +libusempif08_internal_modules_la_LIBADD = \ + $(top_builddir)/ompi/mpi/fortran/use-mpi/libusempi_internal_modules.la + libforce_usempif08_internal_modules_to_be_built_la_SOURCES = \ mpi-f08-interfaces.F90 \ pmpi-f08-interfaces.F90 \ diff --git a/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.F90 b/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.F90 index 55ae341d80..46100f46d5 100644 --- a/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-interfaces.F90 @@ -7,8 +7,8 @@ ! of Tennessee Research Foundation. All rights ! reserved. ! Copyright (c) 2012 Inria. All rights reserved. -! Copyright (c) 2015-2017 Research Organization for Information Science -! and Technology (RIST). All rights reserved. +! Copyright (c) 2015-2020 Research Organization for Information Science +! and Technology (RIST). All rights reserved. ! Copyright (c) 2017-2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ ! @@ -3498,6 +3498,26 @@ subroutine MPI_Query_thread_f08(provided,ierror) end subroutine MPI_Query_thread_f08 end interface MPI_Query_thread +interface MPI_Status_f082f +subroutine MPI_Status_f082f_f08(f08_status,f_status,ierror) + use :: mpi_f08_types, only : MPI_Status, MPI_STATUS_SIZE + implicit none + TYPE(MPI_Status), INTENT(IN) :: f08_status + INTEGER, INTENT(OUT) :: f_status(MPI_STATUS_SIZE) + INTEGER, OPTIONAL, INTENT(OUT) :: ierror +end subroutine MPI_Status_f082f_f08 +end interface MPI_Status_f082f + +interface MPI_Status_f2f08 +subroutine MPI_Status_f2f08_f08(f_status,f08_status,ierror) + use :: mpi_f08_types, only : MPI_Status, MPI_STATUS_SIZE + implicit none + INTEGER, INTENT(IN) :: f_status(MPI_STATUS_SIZE) + TYPE(MPI_Status), INTENT(OUT) :: f08_status + INTEGER, OPTIONAL, INTENT(OUT) :: ierror +end subroutine MPI_Status_f2f08_f08 +end interface MPI_Status_f2f08 + interface MPI_Status_set_cancelled subroutine MPI_Status_set_cancelled_f08(status,flag,ierror) use :: mpi_f08_types, only : MPI_Status diff --git a/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90 b/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90 index a383f3bcf7..c1abace16b 100644 --- a/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90 @@ -3,7 +3,7 @@ ! Copyright (c) 2009-2015 Cisco Systems, Inc. All rights reserved. ! Copyright (c) 2009-2012 Los Alamos National Security, LLC. ! All rights reserved. -! Copyright (c) 2015-2019 Research Organization for Information Science +! Copyright (c) 2015-2020 Research Organization for Information Science ! and Technology (RIST). All rights reserved. ! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. ! Copyright (c) 2020 The University of Tennessee and The University @@ -21,6 +21,7 @@ module mpi_f08_types use, intrinsic :: ISO_C_BINDING + use mpi_types include "mpif-config.h" include "mpif-constants.h" @@ -70,24 +71,6 @@ module mpi_f08_types integer :: MPI_VAL end type MPI_Win - type, BIND(C) :: MPI_Status - integer :: MPI_SOURCE - integer :: MPI_TAG - integer :: MPI_ERROR - ! The mpif.h interface uses MPI_STATUS_SIZE to know how long of - ! an array of INTEGERs is necessary to hold a C MPI_Status. - ! Effectively do the same thing here: pad out this datatype with - ! as many INTEGERs as there are C int's can fit in - ! sizeof(MPI_Status) bytes -- see MPI_Status_ctof() for an - ! explanation why. - ! - ! This padding makes this F08 Type(MPI_Status) be the same size - ! as the mpif.h status (i.e., an array of MPI_STATUS_SIZE - ! INTEGERs), which is critical for MPI_Status_ctof() to not - ! overwrite memory. - integer OMPI_PRIVATE :: internal(MPI_STATUS_SIZE - 3) - end type MPI_Status - ! ! Pre-defined handles ! diff --git a/ompi/mpi/fortran/use-mpi-f08/mod/pmpi-f08-interfaces.F90 b/ompi/mpi/fortran/use-mpi-f08/mod/pmpi-f08-interfaces.F90 index 6e02e8aac2..95ebf8fe5b 100644 --- a/ompi/mpi/fortran/use-mpi-f08/mod/pmpi-f08-interfaces.F90 +++ b/ompi/mpi/fortran/use-mpi-f08/mod/pmpi-f08-interfaces.F90 @@ -7,8 +7,8 @@ ! of Tennessee Research Foundation. All rights ! reserved. ! Copyright (c) 2012 Inria. All rights reserved. -! Copyright (c) 2015-2017 Research Organization for Information Science -! and Technology (RIST). All rights reserved. +! Copyright (c) 2015-2020 Research Organization for Information Science +! and Technology (RIST). All rights reserved. ! Copyright (c) 2017-2018 FUJITSU LIMITED. All rights reserved. ! $COPYRIGHT$ ! @@ -3498,6 +3498,26 @@ subroutine PMPI_Query_thread_f08(provided,ierror) end subroutine PMPI_Query_thread_f08 end interface PMPI_Query_thread +interface PMPI_Status_f082f +subroutine PMPI_Status_f082f_f08(f08_status,f_status,ierror) + use :: mpi_f08_types, only : MPI_Status, MPI_STATUS_SIZE + implicit none + TYPE(MPI_Status), INTENT(IN) :: f08_status + INTEGER, INTENT(OUT) :: f_status(MPI_STATUS_SIZE) + INTEGER, OPTIONAL, INTENT(OUT) :: ierror +end subroutine PMPI_Status_f082f_f08 +end interface PMPI_Status_f082f + +interface PMPI_Status_f2f08 +subroutine PMPI_Status_f2f08_f08(f_status,f08_status,ierror) + use :: mpi_f08_types, only : MPI_Status, MPI_STATUS_SIZE + implicit none + INTEGER, INTENT(IN) :: f_status(MPI_STATUS_SIZE) + TYPE(MPI_Status), INTENT(OUT) :: f08_status + INTEGER, OPTIONAL, INTENT(OUT) :: ierror +end subroutine PMPI_Status_f2f08_f08 +end interface PMPI_Status_f2f08 + interface PMPI_Status_set_cancelled subroutine PMPI_Status_set_cancelled_f08(status,flag,ierror) use :: mpi_f08_types, only : MPI_Status diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_f082f_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_f082f_f08.F90 new file mode 100644 index 0000000000..8c31cc73b1 --- /dev/null +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_f082f_f08.F90 @@ -0,0 +1,19 @@ +! -*- f90 -*- +! +! Copyright (c) 2020 Research Organization for Information Science +! and Technology (RIST). All rights reserved. +! $COPYRIGHT$ + +subroutine PMPI_Status_f082f_f08(f08_status,f_status,ierror) + use :: mpi_f08_types, only : MPI_Status, MPI_STATUS_SIZE + use :: ompi_mpifh_bindings, only : ompi_status_f082f_f + implicit none + TYPE(MPI_Status), INTENT(IN) :: f08_status + INTEGER, INTENT(OUT) :: f_status(MPI_STATUS_SIZE) + INTEGER, OPTIONAL, INTENT(OUT) :: ierror + integer :: c_ierror + + call ompi_status_f082f_f(f08_status, f_status, c_ierror) + if (present(ierror)) ierror = c_ierror + +end subroutine PMPI_Status_f082f_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_f2f08_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_f2f08_f08.F90 new file mode 100644 index 0000000000..5052c999b3 --- /dev/null +++ b/ompi/mpi/fortran/use-mpi-f08/profile/pstatus_f2f08_f08.F90 @@ -0,0 +1,19 @@ +! -*- f90 -*- +! +! Copyright (c) 2020 Research Organization for Information Science +! and Technology (RIST). All rights reserved. +! $COPYRIGHT$ + +subroutine PMPI_Status_f2f08_f08(f_status,f08_status,ierror) + use :: mpi_f08_types, only : MPI_Status, MPI_STATUS_SIZE + use :: ompi_mpifh_bindings, only : ompi_status_f2f08_f + implicit none + INTEGER, INTENT(IN) :: f_status(MPI_STATUS_SIZE) + TYPE(MPI_Status), INTENT(OUT) :: f08_status + INTEGER, OPTIONAL, INTENT(OUT) :: ierror + integer :: c_ierror + + call ompi_status_f2f08_f(f_status, f08_status, c_ierror) + if (present(ierror)) ierror = c_ierror + +end subroutine PMPI_Status_f2f08_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/status_f082f_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/status_f082f_f08.F90 new file mode 100644 index 0000000000..e24519c321 --- /dev/null +++ b/ompi/mpi/fortran/use-mpi-f08/status_f082f_f08.F90 @@ -0,0 +1,19 @@ +! -*- f90 -*- +! +! Copyright (c) 2020 Research Organization for Information Science +! and Technology (RIST). All rights reserved. +! $COPYRIGHT$ + +subroutine MPI_Status_f082f_f08(f08_status,f_status,ierror) + use :: mpi_f08_types, only : MPI_Status, MPI_STATUS_SIZE + use :: ompi_mpifh_bindings, only : ompi_status_f082f_f + implicit none + TYPE(MPI_Status), INTENT(IN) :: f08_status + INTEGER, INTENT(OUT) :: f_status(MPI_STATUS_SIZE) + INTEGER, OPTIONAL, INTENT(OUT) :: ierror + integer :: c_ierror + + call ompi_status_f082f_f(f08_status, f_status, c_ierror) + if (present(ierror)) ierror = c_ierror + +end subroutine MPI_Status_f082f_f08 diff --git a/ompi/mpi/fortran/use-mpi-f08/status_f2f08_f08.F90 b/ompi/mpi/fortran/use-mpi-f08/status_f2f08_f08.F90 new file mode 100644 index 0000000000..1375d77204 --- /dev/null +++ b/ompi/mpi/fortran/use-mpi-f08/status_f2f08_f08.F90 @@ -0,0 +1,19 @@ +! -*- f90 -*- +! +! Copyright (c) 2020 Research Organization for Information Science +! and Technology (RIST). All rights reserved. +! $COPYRIGHT$ + +subroutine MPI_Status_f2f08_f08(f_status,f08_status,ierror) + use :: mpi_f08_types, only : MPI_Status, MPI_STATUS_SIZE + use :: ompi_mpifh_bindings, only : ompi_status_f2f08_f + implicit none + INTEGER, INTENT(IN) :: f_status(MPI_STATUS_SIZE) + TYPE(MPI_Status), INTENT(OUT) :: f08_status + INTEGER, OPTIONAL, INTENT(OUT) :: ierror + integer :: c_ierror + + call ompi_status_f2f08_f(f_status, f08_status, c_ierror) + if (present(ierror)) ierror = c_ierror + +end subroutine MPI_Status_f2f08_f08 diff --git a/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am b/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am index 481cf80047..2a5ac9270e 100644 --- a/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am +++ b/ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am @@ -1,8 +1,8 @@ # -*- makefile -*- # # Copyright (c) 2006-2019 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2015-2018 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# Copyright (c) 2015-2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # Copyright (c) 2016 IBM Corporation. All rights reserved. # # Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. @@ -27,6 +27,7 @@ AM_CPPFLAGS = if OMPI_BUILD_FORTRAN_USEMPI_IGNORE_TKR_BINDINGS AM_FCFLAGS = -I$(top_builddir)/ompi/include -I$(top_srcdir)/ompi/include \ + -I$(top_builddir)/ompi/mpi/fortran/use-mpi \ -I$(top_builddir) -I$(top_srcdir) $(FCFLAGS_f90) lib_LTLIBRARIES = lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr.la @@ -38,6 +39,7 @@ mpi-ignore-tkr-removed-interfaces.h: mpi-ignore-tkr-removed-interfaces.h.in mpi-ignore-tkr.lo: $(top_srcdir)/ompi/mpi/fortran/base/attr-fn-int-callback-interfaces.h mpi-ignore-tkr.lo: $(top_srcdir)/ompi/mpi/fortran/base/conversion-fn-null-int-interface.h mpi-ignore-tkr.lo: mpi-ignore-tkr-interfaces.h +mpi-ignore-tkr.lo: mpi-ignore-tkr-status.h mpi-ignore-tkr.lo: mpi-ignore-tkr-file-interfaces.h mpi-ignore-tkr.lo: mpi-ignore-tkr-removed-interfaces.h mpi-ignore-tkr.lo: mpi-ignore-tkr-sizeof.h @@ -45,7 +47,9 @@ mpi-ignore-tkr.lo: mpi-ignore-tkr-sizeof.f90 mpi-ignore-tkr.lo: mpi-ignore-tkr.F90 lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_SOURCES = \ - mpi-ignore-tkr.F90 + mpi-ignore-tkr.F90 \ + mpi-ignore-tkr-status.h + nodist_lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_SOURCES = \ mpi-ignore-tkr-interfaces.h \ mpi-ignore-tkr-file-interfaces.h \ @@ -58,11 +62,17 @@ nodist_lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_SOURCES += \ mpi-ignore-tkr-sizeof.f90 endif +libusempi_internal_modules = +if OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS +libusempi_internal_modules += $(top_builddir)/ompi/mpi/fortran/use-mpi/libusempi_internal_modules.la +endif + # Note that we invoke some OPAL functions directly in # libmpi_usempi_ignore_tkr.la, so we need to link in the OPAL library # directly (pulling it in indirectly via libmpi.la does not work on # all platforms). lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_LIBADD = \ + $(libusempi_internal_modules) \ $(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB_PREFIX@open-pal.la lib@OMPI_LIBMPI_NAME@_usempi_ignore_tkr_la_LDFLAGS = \ -version-info $(libmpi_usempi_ignore_tkr_so_version) \ diff --git a/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-status.h b/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-status.h new file mode 100644 index 0000000000..bd5635700f --- /dev/null +++ b/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-status.h @@ -0,0 +1,61 @@ +! -*- fortran -*- +! +! Copyright (c) 2020 Research Organization for Information Science +! and Technology (RIST). All rights reserved. +! $COPYRIGHT$ +! +! Additional copyrights may follow +! +! $HEADER$ + + +interface MPI_Status_f082f + +subroutine MPI_Status_f082f(f08_status, f_status, ierror) + use mpi_types + include 'mpif-config.h' + type(MPI_Status), intent(in) :: f08_status + integer, intent(out) :: f_status(MPI_STATUS_SIZE) + integer, intent(out) :: ierror +end subroutine MPI_Status_f082f + +end interface + + +interface MPI_Status_f2f08 + +subroutine MPI_Status_f2f08(f_status, f08_status, ierror) + use mpi_types + include 'mpif-config.h' + integer, intent(in) :: f_status(MPI_STATUS_SIZE) + type(MPI_Status), intent(out) :: f08_status + integer, intent(out) :: ierror +end subroutine MPI_Status_f2f08 + +end interface + + +interface PMPI_Status_f082f + +subroutine PMPI_Status_f082f(f08_status, f_status, ierror) + use mpi_types + include 'mpif-config.h' + type(MPI_Status), intent(in) :: f08_status + integer, intent(out) :: f_status(MPI_STATUS_SIZE) + integer, intent(out) :: ierror +end subroutine PMPI_Status_f082f + +end interface + + +interface PMPI_Status_f2f08 + +subroutine PMPI_Status_f2f08(f_status, f08_status, ierror) + use mpi_types + include 'mpif-config.h' + integer, intent(in) :: f_status(MPI_STATUS_SIZE) + type(MPI_Status), intent(out) :: f08_status + integer, intent(out) :: ierror +end subroutine PMPI_Status_f2f08 + +end interface diff --git a/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr.F90 b/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr.F90 index e19c4280a9..1f31468ce4 100644 --- a/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr.F90 +++ b/ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr.F90 @@ -11,8 +11,8 @@ ! Copyright (c) 2004-2005 The Regents of the University of California. ! All rights reserved. ! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved. -! Copyright (c) 2017 Research Organization for Information Science -! and Technology (RIST). All rights reserved. +! Copyright (c) 2017-2020 Research Organization for Information Science +! and Technology (RIST). All rights reserved. ! $COPYRIGHT$ ! ! Additional copyrights may follow @@ -24,6 +24,9 @@ module mpi +#if OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS + use mpi_types +#endif include "mpif-config.h" include "mpif-constants.h" include "mpif-handles.h" @@ -42,6 +45,9 @@ module mpi ! The ignore-TKR version of the MPI interfaces include "ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-interfaces.h" +#if OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS + include "ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-status.h" +#endif include "ompi/mpi/fortran/use-mpi-ignore-tkr/mpi-ignore-tkr-file-interfaces.h" #if !defined(OMPI_ENABLE_MPI1_COMPAT) diff --git a/ompi/mpi/fortran/use-mpi-tkr/Makefile.am b/ompi/mpi/fortran/use-mpi-tkr/Makefile.am index 8ffd719dbb..ce5c8a295d 100644 --- a/ompi/mpi/fortran/use-mpi-tkr/Makefile.am +++ b/ompi/mpi/fortran/use-mpi-tkr/Makefile.am @@ -13,8 +13,8 @@ # Copyright (c) 2006-2019 Cisco Systems, Inc. All rights reserved # Copyright (c) 2007 Los Alamos National Security, LLC. All rights # reserved. -# Copyright (c) 2014-2016 Research Organization for Information Science -# and Technology (RIST). All rights reserved. +# Copyright (c) 2014-2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # Copyright (c) 2016 IBM Corporation. All rights reserved. # Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. # $COPYRIGHT$ @@ -49,6 +49,7 @@ if OMPI_BUILD_FORTRAN_USEMPI_TKR_BINDINGS AM_FCFLAGS = -I$(top_builddir)/ompi/include -I$(top_srcdir)/ompi/include \ $(OMPI_FC_MODULE_FLAG). -I$(top_srcdir) -I$(top_builddir) -I. \ + -I$(top_builddir)/ompi/mpi/fortran/use-mpi \ -I$(top_builddir)/ompi/mpi/fortran/use-mpi-tkr $(FCFLAGS_f90) # Do different things if the top-level configure decided that we're @@ -66,11 +67,13 @@ lib_LTLIBRARIES += lib@OMPI_LIBMPI_NAME@_usempi.la mpi.lo: mpi.F90 mpi.lo: mpi-f90-interfaces.h +mpi.lo: mpi-f90-status.h mpi.lo: mpi-f90-file-interfaces.h mpi.lo: mpi-f90-removed-interfaces.h mpi.lo: $(top_builddir)/ompi/mpi/fortran/configure-fortran-output.h mpi.lo: mpi-f90-cptr-interfaces.h mpi.lo: pmpi-f90-interfaces.h +mpi.lo: pmpi-f90-status.h mpi.lo: pmpi-f90-file-interfaces.h mpi.lo: pmpi-f90-removed-interfaces.h mpi.lo: pmpi-f90-cptr-interfaces.h @@ -102,12 +105,18 @@ nodist_lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES += \ endif mpi.lo: $(nodist_lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES) +libusempi_internal_modules = +if OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS +libusempi_internal_modules += $(top_builddir)/ompi/mpi/fortran/use-mpi/libusempi_internal_modules.la +endif + # Note that we invoke some OPAL functions directly in # libmpi_usempi.la, so we need to link in the OPAL library directly # (pulling it in indirectly via libmpi.la does not work on all # platforms). lib@OMPI_LIBMPI_NAME@_usempi_la_LIBADD = \ $(top_builddir)/ompi/mpi/fortran/mpif-h/lib@OMPI_LIBMPI_NAME@_mpifh.la \ + $(libusempi_internal_modules) \ $(OMPI_TOP_BUILDDIR)/opal/lib@OPAL_LIB_PREFIX@open-pal.la # Set the library version lib@OMPI_LIBMPI_NAME@_usempi_la_LDFLAGS = \ @@ -181,10 +190,12 @@ endif EXTRA_DIST = \ mpi-f90-interfaces.h \ + mpi-f90-status.h \ mpi-f90-file-interfaces.h \ mpi-f90-removed-interfaces.h \ mpi-f90-cptr-interfaces.h \ pmpi-f90-interfaces.h \ + pmpi-f90-status.h \ pmpi-f90-file-interfaces.h \ pmpi-f90-removed-interfaces.h \ pmpi-f90-cptr-interfaces.h diff --git a/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-status.h b/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-status.h new file mode 100644 index 0000000000..1f75bb46d3 --- /dev/null +++ b/ompi/mpi/fortran/use-mpi-tkr/mpi-f90-status.h @@ -0,0 +1,35 @@ +! -*- fortran -*- +! +! Copyright (c) 2020 Research Organization for Information Science +! and Technology (RIST). All rights reserved. +! $COPYRIGHT$ +! +! Additional copyrights may follow +! +! $HEADER$ + + +interface MPI_Status_f082f + +subroutine MPI_Status_f082f(f08_status, f_status, ierror) + use mpi_types + include 'mpif-config.h' + type(MPI_Status), intent(in) :: f08_status + integer, intent(out) :: f_status(MPI_STATUS_SIZE) + integer, intent(out) :: ierror +end subroutine MPI_Status_f082f + +end interface + + +interface MPI_Status_f2f08 + +subroutine MPI_Status_f2f08(f_status, f08_status, ierror) + use mpi_types + include 'mpif-config.h' + integer, intent(in) :: f_status(MPI_STATUS_SIZE) + type(MPI_Status), intent(out) :: f08_status + integer, intent(out) :: ierror +end subroutine MPI_Status_f2f08 + +end interface diff --git a/ompi/mpi/fortran/use-mpi-tkr/mpi.F90 b/ompi/mpi/fortran/use-mpi-tkr/mpi.F90 index bb6a4ce651..69ee51262b 100644 --- a/ompi/mpi/fortran/use-mpi-tkr/mpi.F90 +++ b/ompi/mpi/fortran/use-mpi-tkr/mpi.F90 @@ -11,7 +11,7 @@ ! Copyright (c) 2004-2005 The Regents of the University of California. ! All rights reserved. ! Copyright (c) 2006-2014 Cisco Systems, Inc. All rights reserved. -! Copyright (c) 2016-2019 Research Organization for Information Science +! Copyright (c) 2016-2020 Research Organization for Information Science ! and Technology (RIST). All rights reserved. ! $COPYRIGHT$ ! @@ -24,6 +24,10 @@ module mpi +#if OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS + use mpi_types +#endif + include "mpif-config.h" include "mpif-constants.h" include "mpif-handles.h" @@ -46,6 +50,11 @@ module mpi #include "mpi-f90-cptr-interfaces.h" #include "pmpi-f90-cptr-interfaces.h" +#if OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS + include "mpi-f90-status.h" + include "pmpi-f90-status.h" +#endif + ! This file is generated, and is *huge*. Its size is directly related ! to the --with-f90-max-array-dim configure parameter. diff --git a/ompi/mpi/fortran/use-mpi-tkr/pmpi-f90-status.h b/ompi/mpi/fortran/use-mpi-tkr/pmpi-f90-status.h new file mode 100644 index 0000000000..d20bd24829 --- /dev/null +++ b/ompi/mpi/fortran/use-mpi-tkr/pmpi-f90-status.h @@ -0,0 +1,35 @@ +! -*- fortran -*- +! +! Copyright (c) 2020 Research Organization for Information Science +! and Technology (RIST). All rights reserved. +! $COPYRIGHT$ +! +! Additional copyrights may follow +! +! $HEADER$ + + +interface PMPI_Status_f082f + +subroutine PMPI_Status_f082f(f08_status, f_status, ierror) + use mpi_types + include 'mpif-config.h' + type(MPI_Status), intent(in) :: f08_status + integer, intent(out) :: f_status(MPI_STATUS_SIZE) + integer, intent(out) :: ierror +end subroutine PMPI_Status_f082f + +end interface + + +interface PMPI_Status_f2f08 + +subroutine PMPI_Status_f2f08(f_status, f08_status, ierror) + use mpi_types + include 'mpif-config.h' + integer, intent(in) :: f_status(MPI_STATUS_SIZE) + type(MPI_Status), intent(out) :: f08_status + integer, intent(out) :: ierror +end subroutine PMPI_Status_f2f08 + +end interface diff --git a/ompi/mpi/fortran/use-mpi/Makefile.am b/ompi/mpi/fortran/use-mpi/Makefile.am new file mode 100644 index 0000000000..3f1bc6b176 --- /dev/null +++ b/ompi/mpi/fortran/use-mpi/Makefile.am @@ -0,0 +1,67 @@ +# -*- makefile -*- +# +# Copyright (c) 2006-2019 Cisco Systems, Inc. All rights reserved. +# Copyright (c) 2012-2013 The University of Tennessee and The University +# of Tennessee Research Foundation. All rights +# reserved. +# Copyright (c) 2012-2013 Inria. All rights reserved. +# Copyright (c) 2013 Los Alamos National Security, LLC. All rights +# reserved. +# Copyright (c) 2015-2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. +# Copyright (c) 2016 IBM Corporation. All rights reserved. +# +# $COPYRIGHT$ +# +# Additional copyrights may follow +# +# $HEADER$ +# + +include $(top_srcdir)/Makefile.ompi-rules + +# Note that Automake's Fortran-buidling rules uses CPPFLAGS and +# AM_CPPFLAGS. This can cause weirdness (e.g., +# https://github.com/open-mpi/ompi/issues/7253). Let's just zero +# those out and rely on AM_FCFLAGS. +CPPFLAGS = +AM_CPPFLAGS = + +# This Makefile is only relevant if we support TYPE(MPI_Status) +# MPI bindings. +if OMPI_FORTRAN_HAVE_TYPE_MPI_STATUS + +AM_FCFLAGS = -I$(top_builddir)/ompi/include \ + -I$(top_srcdir)/ompi/include \ + -I$(top_srcdir) -I$(top_builddir) $(FCFLAGS_f90) + +MOSTLYCLEANFILES = *.mod + +CLEANFILES += *.i90 + +########################################################################### + + +noinst_LTLIBRARIES = libusempi_internal_modules.la + +# Don't distribute mpi-types.F90, it is generated. +nodist_libusempi_internal_modules_la_SOURCES = \ + mpi-types.F90 + +mpi-types.lo: mpi-types.F90 + +# Install the generated .mod files. Unfortunately, each F90 compiler +# may generate different filenames, so we have to use a glob. :-( + +install-exec-hook: + @ for file in `ls *.mod`; do \ + echo $(INSTALL) $$file $(DESTDIR)$(libdir); \ + $(INSTALL) $$file $(DESTDIR)$(libdir); \ + done + +uninstall-local: + @ for file in `ls *.mod`; do \ + echo rm -f $(DESTDIR)$(libdir)/$$file; \ + rm -f $(DESTDIR)$(libdir)/$$file; \ + done +endif diff --git a/ompi/mpi/fortran/use-mpi/mpi-types.F90.in b/ompi/mpi/fortran/use-mpi/mpi-types.F90.in new file mode 100644 index 0000000000..3b2ac85e2e --- /dev/null +++ b/ompi/mpi/fortran/use-mpi/mpi-types.F90.in @@ -0,0 +1,39 @@ +! -*- f90 -*- +! +! Copyright (c) 2020 Research Organization for Information Science +! and Technology (RIST). All rights reserved. +! $COPYRIGHT$ +! +! Additional copyrights may follow +! +! $HEADER$ +! + +! PRIVATE or not +#if @OMPI_FORTRAN_HAVE_PRIVATE@ +#define OMPI_PRIVATE , PRIVATE +#else +#define OMPI_PRIVATE +#endif + +module mpi_types + +type, BIND(C) :: MPI_Status + integer :: MPI_SOURCE + integer :: MPI_TAG + integer :: MPI_ERROR + ! The mpif.h interface uses MPI_STATUS_SIZE to know how long of + ! an array of INTEGERs is necessary to hold a C MPI_Status. + ! Effectively do the same thing here: pad out this datatype with + ! as many INTEGERs as there are C int's can fit in + ! sizeof(MPI_Status) bytes -- see MPI_Status_ctof() for an + ! explanation why. + ! + ! This padding makes this F08 Type(MPI_Status) be the same size + ! as the mpif.h status (i.e., an array of MPI_STATUS_SIZE + ! INTEGERs), which is critical for MPI_Status_ctof() to not + ! overwrite memory. + integer OMPI_PRIVATE :: internal(@OMPI_FORTRAN_STATUS_SIZE@ - 3) + end type MPI_Status + +end module diff --git a/ompi/mpi/man/man3/MPI_Status_c2f08.3in b/ompi/mpi/man/man3/MPI_Status_c2f08.3in new file mode 100644 index 0000000000..b3c411bb42 --- /dev/null +++ b/ompi/mpi/man/man3/MPI_Status_c2f08.3in @@ -0,0 +1 @@ +.so man3/MPI_Status_f082c.3 diff --git a/ompi/mpi/man/man3/MPI_Status_f082c.3.md b/ompi/mpi/man/man3/MPI_Status_f082c.3.md new file mode 100644 index 0000000000..c9004565f7 --- /dev/null +++ b/ompi/mpi/man/man3/MPI_Status_f082c.3.md @@ -0,0 +1,58 @@ +# NAME + +MPI_Status_f082c, MPI_Status_c2f08 - Translates a C status into a Fortran 2008 status, or vice versa. + +# SYNTAX + +## C Syntax + +```c +#include + +int MPI_Status_f082c(const MPI_F08_status *f08_status, MPI_Status *c_status) +int MPI_Status_c2f08(const MPI_Status *c_status, MPI_F08_status *f08_status) +``` + +# PARAMETERS + +* `f08_status`: `mpi_f08`-style MPI status object +* `c_status`: C-style MPI status object + +# DESCRIPTION + +These two procedures are provided in C to convert from a Fortran 2008 +status (which is a derived type made of integers) to a C status (which +is a structure), and vice versa. The conversion occurs on all the +information in `status`, including that which is hidden. That is, +no status information is lost in the conversion. + +When using `MPI_Status_f082c()`, if `f08_status` is a valid Fortran +status, but not the Fortran value of `MPI_F08_STATUS_IGNORE` or +`MPI_F08_STATUSES_IGNORE`, then `MPI_Status_f082c()` returns in +`c_status` a valid C status with the same content. If `f08_status` is +the Fortran value of `MPI_STATUS_IGNORE` or `MPI_STATUSES_IGNORE`, or +if `f08_status` is not a valid Fortran status, then the call is +erroneous. + +When using `MPI_Status_c2f08()`, the opposite conversion is applied. If +`c_status` is `MPI_STATUS_IGNORE` or `MPI_STATUSES_IGNORE`, or if +`c_status` is not a valid C status, then the call is erroneous. + +The input status has the same source, tag and error code values as the +output status, and returns the same answers when queried for count, +elements, and cancellation. The conversion function may be called with +an input status argument that has an undefined error field, in which +case the value of the error field in the output status argument is +undefined. + +# NOTES + +These functions are only available in C; they are not available in any +of the Fortran MPI interfaces. + +# SEE ALSO + +[`MPI_Status_c2f`(3)](MPI_Status_c2f.html), +[`MPI_Status_f2c`(3)](MPI_Status_f2c.html), +[`MPI_Status_f082f`(3)](MPI_Status_f082f.html), +[`MPI_Status_f2f08`(3)](MPI_Status_f2f08.html) diff --git a/ompi/mpi/man/man3/MPI_Status_f082f.3.md b/ompi/mpi/man/man3/MPI_Status_f082f.3.md new file mode 100644 index 0000000000..a53af76bef --- /dev/null +++ b/ompi/mpi/man/man3/MPI_Status_f082f.3.md @@ -0,0 +1,92 @@ +# NAME + +MPI_Status_f082f, MPI_Status_c2f08 - Translates a Fortran 2008 status into a Fortran INTEGER-style status, or vice versa. + +# SYNTAX + +## C Syntax + +```c +#include + +int MPI_Status_f082f(const MPI_F08_status *f08_status, MPI_Fint *f_status) +int MPI_Status_f2f08(const MPI_Fint *f_status, MPI_F08_status *f08_status) +``` + +## Fortran mpi Module Syntax + +```fortran +USE MPI + +MPI_STATUS_F082F(F08_STATUS, F_STATUS, IERROR) + TYPE(MPI_Status) :: F08_STATUS + INTEGER :: STATUS(MPI_STATUS_SIZE), IERROR + +MPI_STATUS_F2F08(F_STATUS, F08_STATUS, IERROR) + INTEGER :: F_STATUS(MPI_STATUS_SIZE), IERROR + TYPE(MPI_Status) :: F08_STATUS +``` + +## Fortran mpi_f08 Module Syntax + +```fortran +USE mpi_f08 + +MPI_Status_f082f(f08_status, f_status, ierror) + TYPE(MPI_Status), INTENT(IN) :: f08_status + INTEGER, INTENT(OUT) :: f_status(MPI_STATUS_SIZE) + INTEGER, OPTIONAL, INTENT(OUT) :: ierror + +MPI_Status_f2f08(f_status, f08_status, ierror) + INTEGER, INTENT(IN) :: f_status(MPI_STATUS_SIZE) + TYPE(MPI_Status), INTENT(OUT) :: f08_status + INTEGER, OPTIONAL, INTENT(OUT) :: ierror +``` + +# PARAMETERS + +* `f08_status`: `mpi_f08`-style MPI status object +* `f_status`: `mpi`-style `INTEGER` MPI status object + +# DESCRIPTION + +These two procedures are provided to convert from a Fortran 2008 +status (which is a derived datatype made of integers) to a Fortran +status (which is an array of integers), and vice versa. The conversion +occurs on all the information in `status`, including that which is +hidden. That is, no status information is lost in the conversion. + +When using `MPI_Status_f082f()`, if `f08_status` is a valid Fortran +status, but not the Fortran value of `MPI_F08_STATUS_IGNORE` (in C), +`MPI_STATUS_IGNORE` (in Fortran) or `MPI_F08_STATUSES_IGNORE` (in C) +or `MPI_STATUSES_IGNORE` (in Fortran), then `MPI_Status_f082f()` +returns in `f_status` a valid array with the same content. If +`f08_status` is the C value of `MPI_F08_STATUS_IGNORE` or +`MPI_F08_STATUSES_IGNORE` or the Fortran value of `MPI_STATUS_IGNORE` +or `MPI_STATUSES_IGNORE`, or if `f08_status` is not a valid Fortran +status, then the call is erroneous. + +When using `MPI_Status_f2f08()`, the opposite conversion is +applied. If `f_status` is `MPI_STATUS_IGNORE` or +`MPI_STATUSES_IGNORE`, or if `f_status` is not a valid Fortran status, +then the call is erroneous. + +The input status has the same source, tag and error code values as the +output status, and returns the same answers when queried for count, +elements, and cancellation. The conversion function may be called with +an input status argument that has an undefined error field, in which +case the value of the error field in the output status argument is +undefined. + +# NOTES + +The Fortran subroutines for these MPI routines are only available in +the `mpi` and `mpi_f08` modules (including the type specification for +`TYPE(MPI_Status); they are (intentionally) not available in `mpif.h`. + +# SEE ALSO + +[`MPI_Status_c2f`(3)](MPI_Status_c2f.html), +[`MPI_Status_f2c`(3)](MPI_Status_c2f.html), +[`MPI_Status_f082c`(3)](MPI_Status_f082c.html), +[`MPI_Status_c2f08`(3)](MPI_Status_c2f08.html) diff --git a/ompi/mpi/man/man3/MPI_Status_f2c.3.md b/ompi/mpi/man/man3/MPI_Status_f2c.3.md new file mode 100644 index 0000000000..4f24ffdc93 --- /dev/null +++ b/ompi/mpi/man/man3/MPI_Status_f2c.3.md @@ -0,0 +1,57 @@ +# NAME + +MPI_Status_f2c, MPI_Status_f2c - Translates a C status into a Fortran INTEGER-style status, or vice versa. + +# SYNTAX + +## C Syntax + +```c +#include + +int MPI_Status_f2c(const MPI_Fint *f_status, MPI_Status *c_status) +int MPI_Status_c2f(const MPI_Status *c_status, MPI_Fint *f_status) +``` + +# PARAMETERS + +* `f_status`: `mpi`-style `INTEGER` MPI status object +* `c_status`: C-style MPI status object + +# DESCRIPTION + +These two procedures are provided in C to convert from a Fortran +status (which is an array of integers) to a C status (which is a +structure), and vice versa. The conversion occurs on all the +information in `status`, including that which is hidden. That is, +no status information is lost in the conversion. + +When using `MPI_Status_f2c()`, if `f_status` is a valid Fortran +status, but not the Fortran value of `MPI_STATUS_IGNORE` or +`MPI_STATUSES_IGNORE`, then `MPI_Status_f2c()` returns in `c_status` a +valid C status with the same content. If `f_status` is the Fortran +value of `MPI_STATUS_IGNORE` or `MPI_STATUSES_IGNORE`, or if +`f_status` is not a valid Fortran status, then the call is erroneous. + +When using `MPI_Status_c2f()`, the opposite conversion is applied. If +`c_status` is `MPI_STATUS_IGNORE` or `MPI_STATUSES_IGNORE`, or if +`c_status` is not a valid C status, then the call is erroneous. + +The input status has the same source, tag and error code values as the +output status, and returns the same answers when queried for count, +elements, and cancellation. The conversion function may be called with +an input status argument that has an undefined error field, in which +case the value of the error field in the output status argument is +undefined. + +# NOTES + +These functions are only available in C; they are not available in any +of the Fortran MPI interfaces. + +# SEE ALSO + +[`MPI_Status_f082c`(3)](MPI_Status_f082c.html), +[`MPI_Status_c2f08`(3)](MPI_Status_c2f08.html), +[`MPI_Status_f082f`(3)](MPI_Status_f082f.html), +[`MPI_Status_f2f08`(3)](MPI_Status_f2f08.html) diff --git a/ompi/mpi/man/man3/MPI_Status_f2c.3in b/ompi/mpi/man/man3/MPI_Status_f2c.3in deleted file mode 100644 index c28748be54..0000000000 --- a/ompi/mpi/man/man3/MPI_Status_f2c.3in +++ /dev/null @@ -1,30 +0,0 @@ -.\" -*- nroff -*- -.\" Copyright 2013 Los Alamos National Security, LLC. All rights reserved. -.\" Copyright 2006-2008 Sun Microsystems, Inc. -.\" Copyright (c) 1996 Thinking Machines Corporation -.\" $COPYRIGHT$ -.TH MPI_Status_f2c 3 "#OMPI_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#" -.SH NAME -\fBMPI_Status_f2c, MPI_Status_c2f \fP \- Translates a C status into a Fortran status, or vice versa. - -.SH SYNTAX -.ft R -.SH C Syntax -.nf -#include -int MPI_Status_f2c(const MPI_Fint \fI*f_status\fP, MPI_Status \fI*c_status\fP) -int MPI_Status_c2f(const MPI_Status \fI*c_status\fP, MPI_Fint \fI*f_status\fP) - -.fi -.SH DESCRIPTION -.ft R -These two procedures are provided in C to convert from a Fortran status (which is an array of integers) to a C status (which is a structure), and vice versa. The conversion occurs on all the information in \fIstatus\fP, including that which is hidden. That is, no status information is lost in the conversion. -.sp -When using MPI_Status_f2c, if \fIf_status\fP is a valid Fortran status, but not the Fortran value of MPI_STATUS_IGNORE or MPI_STATUSES_IGNORE, then MPI_Status_f2c returns in \fIc_status\fP a valid C status with the same content. If \fIf_status\fP is the Fortran value of MPI_STATUS_IGNORE or MPI_STATUSES_IGNORE, or if \fIf_status\fP is not a valid Fortran status, then the call is erroneous. -.sp -When using MPI_Status_c2f, the opposite conversion is applied. If \fIc_status\fP is MPI_STATUS_IGNORE or MPI_STATUSES_IGNORE, or if \fIc_status\fP is not a valid C status, then the call is erroneous. -.sp -The C status has the same source, tag and error code values as the Fortran status, and returns the same answers when queried for count, elements, and cancellation. The conversion function may be called with a Fortran status argument that has an undefined error field, in which case the value of the error field in the C status argument is undefined. -.sp - - diff --git a/ompi/mpi/man/man3/MPI_Status_f2f08.3in b/ompi/mpi/man/man3/MPI_Status_f2f08.3in new file mode 100644 index 0000000000..67f77ae23b --- /dev/null +++ b/ompi/mpi/man/man3/MPI_Status_f2f08.3in @@ -0,0 +1 @@ +.so man3/MPI_Status_f082f.3 diff --git a/ompi/mpi/man/man3/Makefile.am b/ompi/mpi/man/man3/Makefile.am index 8e3e63390b..f44459f4fb 100644 --- a/ompi/mpi/man/man3/Makefile.am +++ b/ompi/mpi/man/man3/Makefile.am @@ -2,6 +2,8 @@ # Copyright (c) 2006-2020 Cisco Systems, Inc. All rights reserved. # Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. # Copyright (c) 2012-2013 Los Alamos National Security, LLC. All rights reserved. +# Copyright (c) 2020 Research Organization for Information Science +# and Technology (RIST). All rights reserved. # $COPYRIGHT$ # # Additional copyrights may follow @@ -22,7 +24,10 @@ include $(top_srcdir)/Makefile.ompi-rules # https://rmarkdown.rstudio.com/authoring_pandoc_markdown.html MD_FILES = \ - MPI_T_init_thread.3.md + MPI_T_init_thread.3.md \ + MPI_Status_f2c.3.md \ + MPI_Status_f082c.3.md \ + MPI_Status_f082f.3.md TEMPLATE_FILES = \ MPI_Abort.3in \ @@ -311,8 +316,9 @@ TEMPLATE_FILES = \ MPI_Ssend_init.3in \ MPI_Start.3in \ MPI_Startall.3in \ + MPI_Status_c2f08.3in \ MPI_Status_c2f.3in \ - MPI_Status_f2c.3in \ + MPI_Status_f2f08.3in \ MPI_Status_set_cancelled.3in \ MPI_Status_set_elements.3in \ MPI_Status_set_elements_x.3in \ diff --git a/ompi/mpiext/pcollreq/use-mpi-f08/Makefile.am b/ompi/mpiext/pcollreq/use-mpi-f08/Makefile.am index 8f3157f819..b03a78e610 100644 --- a/ompi/mpiext/pcollreq/use-mpi-f08/Makefile.am +++ b/ompi/mpiext/pcollreq/use-mpi-f08/Makefile.am @@ -1,6 +1,6 @@ # # Copyright (c) 2011-2012 Cisco Systems, Inc. All rights reserved. -# Copyright (c) 2017-2019 Research Organization for Information Science +# Copyright (c) 2017-2020 Research Organization for Information Science # and Technology (RIST). All rights reserved. # Copyright (c) 2018 FUJITSU LIMITED. All rights reserved. # $COPYRIGHT$ @@ -22,7 +22,8 @@ AM_CPPFLAGS = # We must set these #defines and include paths so that the inner OMPI # MPI prototype header files do the Right Thing. -AM_FCFLAGS = $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-f08/mod \ +AM_FCFLAGS = $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi \ + $(OMPI_FC_MODULE_FLAG)$(top_builddir)/ompi/mpi/fortran/use-mpi-f08/mod \ -I$(top_builddir) -I$(top_srcdir) $(FCFLAGS_f90) # Note that the mpi_f08-based bindings are optional -- they can only