Skip to content

Commit 245d6d4

Browse files
jtrongejtronge
committed
Fix count types for multiple C function templates
Signed-off-by: Jake Tronge <jtronge@lanl.gov>
1 parent d48c58b commit 245d6d4

File tree

375 files changed

+786
-922
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

375 files changed

+786
-922
lines changed

‎ompi/include/mpi.h.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2190,7 +2190,7 @@ OMPI_DECLSPEC int MPI_Rput(const void *origin_addr, int origin_count, MPI_Datat
21902190
int target_rank, MPI_Aint target_disp, int target_cout,
21912191
MPI_Datatype target_datatype, MPI_Win win, MPI_Request *request);
21922192
OMPI_DECLSPEC int MPI_Rput_c(const void *origin_addr, MPI_Count origin_count, MPI_Datatype origin_datatype,
2193-
int target_rank, MPI_Aint target_disp, int target_cout,
2193+
int target_rank, MPI_Aint target_disp, MPI_Count target_cout,
21942194
MPI_Datatype target_datatype, MPI_Win win, MPI_Request *request);
21952195
OMPI_DECLSPEC int MPI_Rsend(const void *ibuf, int count, MPI_Datatype datatype, int dest,
21962196
int tag, MPI_Comm comm);
@@ -3305,7 +3305,7 @@ OMPI_DECLSPEC int PMPI_Rput(const void *origin_addr, int origin_count, MPI_Data
33053305
int target_rank, MPI_Aint target_disp, int target_cout,
33063306
MPI_Datatype target_datatype, MPI_Win win, MPI_Request *request);
33073307
OMPI_DECLSPEC int PMPI_Rput_c(const void *origin_addr, MPI_Count origin_count, MPI_Datatype origin_datatype,
3308-
int target_rank, MPI_Aint target_disp, int target_cout,
3308+
int target_rank, MPI_Aint target_disp, MPI_Count target_cout,
33093309
MPI_Datatype target_datatype, MPI_Win win, MPI_Request *request);
33103310
OMPI_DECLSPEC int PMPI_Rsend(const void *ibuf, int count, MPI_Datatype datatype, int dest,
33113311
int tag, MPI_Comm comm);

‎ompi/mpi/bindings/ompi_bindings/c_type.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,16 @@ def type_text(self, enable_count=False):
177177
return 'MPI_Aint *'
178178

179179

180+
@Type.add_type('AINT_ARRAY')
181+
class TypeAintArray(Type):
182+
183+
def type_text(self, enable_count=False):
184+
return 'const MPI_Aint *'
185+
186+
def parameter(self, enable_count=False, **kwargs):
187+
return f'const MPI_Aint {self.name}[]'
188+
189+
180190
@Type.add_type('INT_OUT')
181191
class TypeIntOut(Type):
182192

‎ompi/mpi/c/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -460,11 +460,11 @@ prototype_sources = \
460460
win_test.c.in \
461461
win_unlock.c.in \
462462
win_unlock_all.c.in \
463+
ineighbor_alltoallw.c.in \
464+
neighbor_alltoallw.c.in \
465+
neighbor_alltoallw_init.c.in \
463466
win_wait.c.in
464467

465-
# neighbor_alltoallw.c.in \
466-
# ineighbor_alltoallw.c.in \
467-
# neighbor_alltoallw_init.c.in \
468468
# pcontrol.c.in \
469469
# type_create_hindexed.c.in \
470470
# type_create_hindexed_block.c.in \
@@ -742,7 +742,7 @@ interface_profile_sources = \
742742
generated_ineighbor_alltoallv.c \
743743
generated_neighbor_alltoallv_init.c \
744744
neighbor_alltoallw.c \
745-
ineighbor_alltoallw.c \
745+
generated_ineighbor_alltoallw.c \
746746
neighbor_alltoallw_init.c \
747747
generated_keyval_create.c \
748748
generated_keyval_free.c \

‎ompi/mpi/c/add_error_class.c.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
#include "ompi/communicator/communicator.h"
2929
#include "ompi/attribute/attribute.h"
3030

31-
32-
PROTOTYPE ERROR_CLASS Add_error_class(INT_OUT errorclass)
31+
PROTOTYPE ERROR_CLASS add_error_class(INT_OUT errorclass)
3332
{
3433
int err_class;
3534
int rc;

‎ompi/mpi/c/add_error_code.c.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "ompi/errhandler/errcode.h"
2929
#include "ompi/attribute/attribute.h"
3030

31-
PROTOTYPE ERROR_CLASS Add_error_code(INT errorclass, INT_OUT errorcode)
31+
PROTOTYPE ERROR_CLASS add_error_code(INT errorclass, INT_OUT errorcode)
3232
{
3333
int code;
3434
int rc;

‎ompi/mpi/c/add_error_string.c.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828
#include "ompi/errhandler/errhandler.h"
2929
#include "ompi/errhandler/errcode.h"
3030

31-
32-
PROTOTYPE ERROR_CLASS Add_error_string(INT errorcode, STRING string)
31+
PROTOTYPE ERROR_CLASS add_error_string(INT errorcode, STRING string)
3332
{
3433
int rc;
3534

‎ompi/mpi/c/allgather.c.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
#include "ompi/memchecker.h"
3636
#include "ompi/runtime/ompi_spc.h"
3737

38-
PROTOTYPE ERROR_CLASS Allgather(BUFFER sendbuf, INT sendcount, DATATYPE sendtype,
39-
BUFFER_OUT recvbuf, INT recvcount, DATATYPE recvtype,
40-
COMM comm)
38+
PROTOTYPE ERROR_CLASS allgather(BUFFER sendbuf, COUNT sendcount, DATATYPE sendtype,
39+
BUFFER_OUT recvbuf, COUNT recvcount, DATATYPE recvtype,
40+
COMM comm)
4141
{
4242
int err;
4343

‎ompi/mpi/c/allgather_init.c.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "ompi/memchecker.h"
3636
#include "ompi/runtime/ompi_spc.h"
3737

38-
PROTOTYPE ERROR_CLASS Allgather_init(BUFFER sendbuf, INT sendcount, DATATYPE sendtype,
38+
PROTOTYPE ERROR_CLASS allgather_init(BUFFER sendbuf, INT sendcount, DATATYPE sendtype,
3939
BUFFER_OUT recvbuf, INT recvcount, DATATYPE recvtype,
4040
COMM comm, INFO info, REQUEST_INOUT request)
4141
{

‎ompi/mpi/c/allgatherv.c.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include "ompi/runtime/ompi_spc.h"
3737

3838

39-
PROTOTYPE ERROR_CLASS Allgatherv(BUFFER sendbuf, COUNT sendcount, DATATYPE sendtype,
39+
PROTOTYPE ERROR_CLASS allgatherv(BUFFER sendbuf, COUNT sendcount, DATATYPE sendtype,
4040
BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts,
4141
DISP_ARRAY displs, DATATYPE recvtype, COMM comm)
4242
{

‎ompi/mpi/c/allgatherv_init.c.in

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,10 @@
3535
#include "ompi/memchecker.h"
3636
#include "ompi/runtime/ompi_spc.h"
3737

38-
39-
PROTOTYPE ERROR_CLASS Allgatherv_init(BUFFER sendbuf, COUNT sendcount, DATATYPE sendtype,
40-
BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts, DISP_ARRAY displs,
41-
DATATYPE recvtype, COMM comm,
42-
INFO info, REQUEST_INOUT request)
38+
PROTOTYPE ERROR_CLASS allgatherv_init(BUFFER sendbuf, COUNT sendcount, DATATYPE sendtype,
39+
BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts, DISP_ARRAY displs,
40+
DATATYPE recvtype, COMM comm,
41+
INFO info, REQUEST_INOUT request)
4342
{
4443
int i, size, err;
4544
ompi_count_array_t recvcounts_desc;

0 commit comments

Comments
 (0)