Skip to content

Commit 4962bda

Browse files
committed
c interfaces: remove some bigcount arg checks
for pack external functions Signed-off-by: Howard Pritchard <[email protected]>
1 parent 12ea7aa commit 4962bda

File tree

3 files changed

+3
-21
lines changed

3 files changed

+3
-21
lines changed

ompi/mpi/c/pack_external.c.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,6 @@ PROTOTYPE ERROR_CLASS pack_external(STRING datarep, BUFFER inbuf, COUNT incount,
5858
OMPI_ERRHANDLER_NOHANDLE_CHECK(rc, rc, FUNC_NAME);
5959
OMPI_CHECK_USER_BUFFER(rc, inbuf, datatype, incount);
6060
OMPI_ERRHANDLER_NOHANDLE_CHECK(rc, rc, FUNC_NAME);
61-
#if OMPI_BIGCOUNT_SRC
62-
OMPI_CHECK_MPI_COUNT_INT_CONVERSION_OVERFLOW(rc, incount);
63-
if (MPI_SUCCESS != rc) {
64-
return OMPI_ERRHANDLER_NOHANDLE_INVOKE(rc, FUNC_NAME);
65-
}
66-
#endif
6761
}
6862

6963
rc = ompi_datatype_pack_external(datarep, inbuf, incount,

ompi/mpi/c/pack_external_size.c.in

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,9 @@ PROTOTYPE ERROR_CLASS pack_external_size(STRING datarep, COUNT incount,
5151
} else if (MPI_DATATYPE_NULL == datatype || NULL == datatype) {
5252
return OMPI_ERRHANDLER_NOHANDLE_INVOKE(MPI_ERR_TYPE, FUNC_NAME);
5353
}
54-
#if OMPI_BIGCOUNT_SRC
55-
OMPI_CHECK_MPI_COUNT_INT_CONVERSION_OVERFLOW(rc, incount);
56-
if (MPI_SUCCESS != rc) {
57-
return OMPI_ERRHANDLER_NOHANDLE_INVOKE(rc, FUNC_NAME);
58-
}
59-
#endif
6054
}
6155

62-
rc = ompi_datatype_pack_external_size(datarep, (int) incount,
56+
rc = ompi_datatype_pack_external_size(datarep, incount,
6357
datatype, &tmp_size);
6458
*size = tmp_size;
6559

ompi/mpi/c/unpack_external.c.in

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,10 @@ PROTOTYPE ERROR_CLASS unpack_external (STRING datarep, BUFFER inbuf, AINT_COUNT
5555
OMPI_ERRHANDLER_NOHANDLE_CHECK(rc, rc, FUNC_NAME);
5656
OMPI_CHECK_USER_BUFFER(rc, outbuf, datatype, outcount);
5757
OMPI_ERRHANDLER_NOHANDLE_CHECK(rc, rc, FUNC_NAME);
58-
#if OMPI_BIGCOUNT_SRC
59-
OMPI_CHECK_MPI_COUNT_INT_CONVERSION_OVERFLOW(rc, insize);
60-
if (MPI_SUCCESS != rc) {
61-
return OMPI_ERRHANDLER_NOHANDLE_INVOKE(rc, FUNC_NAME);
62-
}
63-
#endif
6458
}
6559

66-
rc = ompi_datatype_unpack_external(datarep, inbuf, (MPI_Aint) insize,
67-
(MPI_Aint *)position, outbuf, (int) outcount,
60+
rc = ompi_datatype_unpack_external(datarep, inbuf, insize,
61+
(MPI_Aint *)position, outbuf, outcount,
6862
datatype);
6963
OMPI_ERRHANDLER_NOHANDLE_RETURN(rc, rc, FUNC_NAME);
7064
}

0 commit comments

Comments
 (0)