Skip to content

v5.0.x: Add Missing MPI_F_XXX C constants #10530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 30, 2022
Merged

v5.0.x: Add Missing MPI_F_XXX C constants #10530

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1bb988
Add Missing MPI_F_XXX C constants
Jun 21, 2022
d44ec62
mpi.h.in: update several comments
jsquyres Jun 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 30 additions & 10 deletions ompi/include/mpi.h.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* University of Stuttgart. All rights reserved.
* Copyright (c) 2004-2005 The Regents of the University of California.
* All rights reserved.
* Copyright (c) 2007-2021 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2007-2022 Cisco Systems, Inc. All rights reserved
* Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2009-2012 Oak Rigde National Laboratory. All rights reserved.
* Copyright (c) 2011-2020 Sandia National Laboratories. All rights reserved.
Expand Down Expand Up @@ -532,6 +532,11 @@ typedef MPI_Win_errhandler_function MPI_Win_errhandler_fn

/*
* Miscellaneous constants
*
* NOTE: Many of the integer constants below *also* appear in
* ompi/include/mpif-values.pl. If you change any of these integer
* values below, make sure to also change the corresponding values in
* mpif-values.pl.
*/
#define MPI_ANY_SOURCE -1 /* match any source rank */
#define MPI_PROC_NULL -2 /* rank of null process */
Expand Down Expand Up @@ -570,6 +575,18 @@ typedef MPI_Win_errhandler_function MPI_Win_errhandler_fn
#define MPI_MAX_PSET_NAME_LEN OPAL_MAX_PSET_NAME_LEN /* max pset name len */
#define MPI_MAX_STRINGTAG_LEN OPAL_MAX_STRINGTAG_LEN /* max length of string arg to comm from group funcs*/

/*
* Constants for C code to access elements in Fortran MPI status array.
*
* NOTE: The MPI_F_SOURCE, MPI_F_TAG, MPI_F_ERROR are intentionally 1
* smaller than their Fortran equivalents in mpif-values.pl (because C
* is 0-indexed and Fortran is 1-indexed).
*/
#define MPI_F_STATUS_SIZE OMPI_FORTRAN_STATUS_SIZE /* Size of Fortran MPI status array */
#define MPI_F_SOURCE 0 /* Index for MPI_SOURCE */
#define MPI_F_TAG 1 /* Index for MPI_TAG */
#define MPI_F_ERROR 2 /* Index for MPI_ERROR */

/*
* Since these values are arbitrary to Open MPI, we might as well make
* them the same as ROMIO for ease of mapping. These values taken
Expand Down Expand Up @@ -618,7 +635,8 @@ typedef MPI_Win_errhandler_function MPI_Win_errhandler_fn
* Predefined attribute keyvals
*
* DO NOT CHANGE THE ORDER WITHOUT ALSO CHANGING THE ORDER IN
* src/attribute/attribute_predefined.c and mpif.h.in.
* ompi/attribute/attribute_predefined.c and mpif-constants.h (which
* is included by mpif.h.in).
*/
enum {
/* MPI-1 */
Expand Down Expand Up @@ -736,7 +754,8 @@ enum {
/*
* Comparison results. Don't change the order of these, the group
* comparison functions rely on it.
* Do not change the order of these without also modifying mpif.h.in.
* Do not change the order of these without also modifying
* mpif-values.pl.
*/
enum {
MPI_IDENT,
Expand All @@ -747,7 +766,8 @@ enum {

/*
* MPI_Init_thread constants
* Do not change the order of these without also modifying mpif.h.in.
* Do not change the order of these without also modifying
* mpif-values.pl.
*/
enum {
MPI_THREAD_SINGLE,
Expand All @@ -758,8 +778,8 @@ enum {

/*
* Datatype combiners.
* Do not change the order of these without also modifying mpif.h.in.
* (see also mpif-common.h.fin).
* Do not change the order of these without also modifying
* mpif-values.pl.
*/
enum {
MPI_COMBINER_NAMED,
Expand Down Expand Up @@ -810,8 +830,8 @@ enum {

/*
* Communicator split type constants.
* Do not change the order of these without also modifying mpif.h.in
* (see also mpif-common.h.fin).
* Do not change the order of these without also modifying
* mpif-values.pl.
*/
enum {
MPI_COMM_TYPE_SHARED,
Expand Down Expand Up @@ -1470,7 +1490,7 @@ OMPI_DECLSPEC int MPI_Comm_disconnect(MPI_Comm *comm);
OMPI_DECLSPEC int MPI_Comm_dup(MPI_Comm comm, MPI_Comm *newcomm);
OMPI_DECLSPEC int MPI_Comm_idup(MPI_Comm comm, MPI_Comm *newcomm, MPI_Request *request);
OMPI_DECLSPEC int MPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm *newcomm);
OMPI_DECLSPEC int MPI_Comm_idup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm *newcomm,
OMPI_DECLSPEC int MPI_Comm_idup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm *newcomm,
MPI_Request *request);
OMPI_DECLSPEC MPI_Comm MPI_Comm_f2c(MPI_Fint comm);
OMPI_DECLSPEC int MPI_Comm_free_keyval(int *comm_keyval);
Expand Down Expand Up @@ -2250,7 +2270,7 @@ OMPI_DECLSPEC int PMPI_Comm_disconnect(MPI_Comm *comm);
OMPI_DECLSPEC int PMPI_Comm_dup(MPI_Comm comm, MPI_Comm *newcomm);
OMPI_DECLSPEC int PMPI_Comm_idup(MPI_Comm comm, MPI_Comm *newcomm, MPI_Request *request);
OMPI_DECLSPEC int PMPI_Comm_dup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm *newcomm);
OMPI_DECLSPEC int PMPI_Comm_idup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm *newcomm,
OMPI_DECLSPEC int PMPI_Comm_idup_with_info(MPI_Comm comm, MPI_Info info, MPI_Comm *newcomm,
MPI_Request *request);
OMPI_DECLSPEC MPI_Comm PMPI_Comm_f2c(MPI_Fint comm);
OMPI_DECLSPEC int PMPI_Comm_free_keyval(int *comm_keyval);
Expand Down