Skip to content

Commit 6a3e781

Browse files
abouteillerabouteiller
committed
Add ERR_PROC_ABORTED (compliance with mpi-next)
Signed-off-by: Aurélien Bouteiller <bouteill@icl.utk.edu>
1 parent 9b55419 commit 6a3e781

File tree

8 files changed

+21
-5
lines changed

8 files changed

+21
-5
lines changed

‎ompi/errhandler/errcode.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
44
* University Research and Technology
55
* Corporation. All rights reserved.
6-
* Copyright (c) 2004-2017 The University of Tennessee and The University
6+
* Copyright (c) 2004-2020 The University of Tennessee and The University
77
* of Tennessee Research Foundation. All rights
88
* reserved.
99
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@@ -85,6 +85,7 @@ static ompi_mpi_errcode_t ompi_err_not_same;
8585
static ompi_mpi_errcode_t ompi_err_no_space;
8686
static ompi_mpi_errcode_t ompi_err_no_such_file;
8787
static ompi_mpi_errcode_t ompi_err_port;
88+
static ompi_mpi_errcode_t ompi_err_proc_aborted;
8889
static ompi_mpi_errcode_t ompi_err_quota;
8990
static ompi_mpi_errcode_t ompi_err_read_only;
9091
static ompi_mpi_errcode_t ompi_err_rma_conflict;
@@ -186,6 +187,7 @@ int ompi_mpi_errcode_init (void)
186187
CONSTRUCT_ERRCODE( ompi_err_no_space, MPI_ERR_NO_SPACE, "MPI_ERR_NO_SPACE: no space left on device" );
187188
CONSTRUCT_ERRCODE( ompi_err_no_such_file, MPI_ERR_NO_SUCH_FILE, "MPI_ERR_NO_SUCH_FILE: no such file or directory" );
188189
CONSTRUCT_ERRCODE( ompi_err_port, MPI_ERR_PORT, "MPI_ERR_PORT: invalid port" );
190+
CONSTRUCT_ERRCODE( ompi_err_proc_aborted, MPI_ERR_PROC_ABORTED, "MPI_ERR_PROC_ABORTED: operation failed because a remote peer has aborted" );
189191
CONSTRUCT_ERRCODE( ompi_err_quota, MPI_ERR_QUOTA, "MPI_ERR_QUOTA: out of quota" );
190192
CONSTRUCT_ERRCODE( ompi_err_read_only, MPI_ERR_READ_ONLY, "MPI_ERR_READ_ONLY: file is read only" );
191193
CONSTRUCT_ERRCODE( ompi_err_rma_conflict, MPI_ERR_RMA_CONFLICT, "MPI_ERR_RMA_CONFLICT: rma conflict during operation" );
@@ -282,6 +284,7 @@ int ompi_mpi_errcode_finalize(void)
282284
OBJ_DESTRUCT(&ompi_err_no_space);
283285
OBJ_DESTRUCT(&ompi_err_no_such_file);
284286
OBJ_DESTRUCT(&ompi_err_port);
287+
OBJ_DESTRUCT(&ompi_err_proc_aborted);
285288
OBJ_DESTRUCT(&ompi_err_quota);
286289
OBJ_DESTRUCT(&ompi_err_read_only);
287290
OBJ_DESTRUCT(&ompi_err_rma_conflict);

‎ompi/include/mpi.h.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
33
* University Research and Technology
44
* Corporation. All rights reserved.
5-
* Copyright (c) 2004-2013 The University of Tennessee and The University
5+
* Copyright (c) 2004-2020 The University of Tennessee and The University
66
* of Tennessee Research Foundation. All rights
77
* reserved.
88
* Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
@@ -640,6 +640,7 @@ enum {
640640
#define MPI_ERR_RMA_SHARED 71
641641
#define MPI_T_ERR_INVALID 72
642642
#define MPI_T_ERR_INVALID_NAME 73
643+
#define MPI_ERR_PROC_ABORTED 74
643644

644645
/* Per MPI-3 p349 47, MPI_ERR_LASTCODE must be >= the last predefined
645646
MPI_ERR_<foo> code. Set the last code to allow some room for adding

‎ompi/include/mpif-values.pl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
# Copyright (c) 2016-2019 Research Organization for Information Science
55
# and Technology (RIST). All rights reserved.
66
# Copyright (c) 2016-2018 FUJITSU LIMITED. All rights reserved.
7+
# Copyright (c) 2020 The University of Tennessee and The University
8+
# of Tennessee Research Foundation. All rights
9+
# reserved.
710
# $COPYRIGHT$
811
#
912
# Additional copyrights may follow
@@ -312,6 +315,7 @@ sub write_file {
312315
$constants->{MPI_ERR_NO_SPACE} = 41;
313316
$constants->{MPI_ERR_NO_SUCH_FILE} = 42;
314317
$constants->{MPI_ERR_PORT} = 43;
318+
$constants->{MPI_ERR_PROC_ABORTED} = 74;
315319
$constants->{MPI_ERR_QUOTA} = 44;
316320
$constants->{MPI_ERR_READ_ONLY} = 45;
317321
$constants->{MPI_ERR_RMA_CONFLICT} = 46;

‎ompi/mpi/fortran/use-mpi-f08/mod/mpi-f08-types.F90

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
! Copyright (c) 2015-2019 Research Organization for Information Science
77
! and Technology (RIST). All rights reserved.
88
! Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
9+
! Copyright (c) 2020 The University of Tennessee and The University
10+
! of Tennessee Research Foundation. All rights
11+
! reserved.
912
! $COPYRIGHT$
1013
!
1114
! This file creates mappings between MPI C types (e.g., MPI_Comm) and

‎ompi/mpi/java/c/mpi_Constant.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
33
* University Research and Technology
44
* Corporation. All rights reserved.
5-
* Copyright (c) 2004-2005 The University of Tennessee and The University
5+
* Copyright (c) 2004-2020 The University of Tennessee and The University
66
* of Tennessee Research Foundation. All rights
77
* reserved.
88
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@@ -160,6 +160,7 @@ JNIEXPORT void JNICALL Java_mpi_Constant_setConstant(JNIEnv *env, jobject obj)
160160
ompi_java_setIntField(env, c, obj, "ERR_NO_SPACE", MPI_ERR_NO_SPACE);
161161
ompi_java_setIntField(env, c, obj, "ERR_NO_SUCH_FILE", MPI_ERR_NO_SUCH_FILE);
162162
ompi_java_setIntField(env, c, obj, "ERR_PORT", MPI_ERR_PORT);
163+
ompi_java_setIntField(env, c, obj, "ERR_PROC_ABORTED", MPI_ERR_PROC_ABORTED);
163164
ompi_java_setIntField(env, c, obj, "ERR_QUOTA", MPI_ERR_QUOTA);
164165
ompi_java_setIntField(env, c, obj, "ERR_READ_ONLY", MPI_ERR_READ_ONLY);
165166
ompi_java_setIntField(env, c, obj, "ERR_RMA_CONFLICT", MPI_ERR_RMA_CONFLICT);

‎ompi/mpi/java/java/Constant.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
33
* University Research and Technology
44
* Corporation. All rights reserved.
5-
* Copyright (c) 2004-2005 The University of Tennessee and The University
5+
* Copyright (c) 2004-2020 The University of Tennessee and The University
66
* of Tennessee Research Foundation. All rights
77
* reserved.
88
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@@ -98,6 +98,7 @@ class Constant
9898
protected int ERR_NO_SPACE;
9999
protected int ERR_NO_SUCH_FILE;
100100
protected int ERR_PORT;
101+
protected int ERR_PROC_ABORTED;
101102
protected int ERR_QUOTA;
102103
protected int ERR_READ_ONLY;
103104
protected int ERR_RMA_CONFLICT;

‎ompi/mpi/java/java/MPI.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
33
* University Research and Technology
44
* Corporation. All rights reserved.
5-
* Copyright (c) 2004-2005 The University of Tennessee and The University
5+
* Copyright (c) 2004-2020 The University of Tennessee and The University
66
* of Tennessee Research Foundation. All rights
77
* reserved.
88
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@@ -188,6 +188,7 @@ public final class MPI
188188
public static final int ERR_NO_SPACE;
189189
public static final int ERR_NO_SUCH_FILE;
190190
public static final int ERR_PORT;
191+
public static final int ERR_PROC_ABORTED;
191192
public static final int ERR_QUOTA;
192193
public static final int ERR_READ_ONLY;
193194
public static final int ERR_RMA_CONFLICT;
@@ -382,6 +383,7 @@ public final class MPI
382383
ERR_NO_SPACE = c.ERR_NO_SPACE;
383384
ERR_NO_SUCH_FILE = c.ERR_NO_SUCH_FILE;
384385
ERR_PORT = c.ERR_PORT;
386+
ERR_PROC_ABORTED = c.ERR_PROC_ABORTED;
385387
ERR_QUOTA = c.ERR_QUOTA;
386388
ERR_READ_ONLY = c.ERR_READ_ONLY;
387389
ERR_RMA_CONFLICT = c.ERR_RMA_CONFLICT;

‎ompi/mpi/man/man5/Open-MPI.5.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ Standard error return classes for Open MPI:
107107
| MPI_ERR_NO_SPACE | 41 | Not enough space. |
108108
| MPI_ERR_NO_SUCH_FILE | 42 | File (or directory) does not exist. |
109109
| MPI_ERR_PORT | 43 | Invalid port. |
110+
| MPI_ERR_PROC_ABORTED | 74 | Operation failed because a remote peer has aborted. |
110111
| MPI_ERR_QUOTA | 44 | Quota exceeded. |
111112
| MPI_ERR_READ_ONLY | 45 | Read-only file system. |
112113
| MPI_ERR_RMA_CONFLICT | 46 | Conflicting accesses to window. |

0 commit comments

Comments
 (0)