Fix count types for multiple C function templates

Signed-off-by: Jake Tronge <jtronge@lanl.gov>

Author: jtronge

ompi/include/mpi.h.in

@@ -2190,7 +2190,7 @@ OMPI_DECLSPEC  int MPI_Rput(const void *origin_addr, int origin_count, MPI_Datat
                             int target_rank, MPI_Aint target_disp, int target_cout,
                             MPI_Datatype target_datatype, MPI_Win win, MPI_Request *request);
 OMPI_DECLSPEC  int MPI_Rput_c(const void *origin_addr, MPI_Count origin_count, MPI_Datatype origin_datatype,
-                              int target_rank, MPI_Aint target_disp, int target_cout,
+                              int target_rank, MPI_Aint target_disp, MPI_Count target_cout,
                               MPI_Datatype target_datatype, MPI_Win win, MPI_Request *request);
 OMPI_DECLSPEC  int MPI_Rsend(const void *ibuf, int count, MPI_Datatype datatype, int dest,
                              int tag, MPI_Comm comm);
@@ -3305,7 +3305,7 @@ OMPI_DECLSPEC  int PMPI_Rput(const void *origin_addr, int origin_count, MPI_Data
                              int target_rank, MPI_Aint target_disp, int target_cout,
                              MPI_Datatype target_datatype, MPI_Win win, MPI_Request *request);
 OMPI_DECLSPEC  int PMPI_Rput_c(const void *origin_addr, MPI_Count origin_count, MPI_Datatype origin_datatype,
-                               int target_rank, MPI_Aint target_disp, int target_cout,
+                               int target_rank, MPI_Aint target_disp, MPI_Count target_cout,
                                MPI_Datatype target_datatype, MPI_Win win, MPI_Request *request);
 OMPI_DECLSPEC  int PMPI_Rsend(const void *ibuf, int count, MPI_Datatype datatype, int dest,
                               int tag, MPI_Comm comm);

ompi/mpi/bindings/ompi_bindings/c_type.py

@@ -177,6 +177,16 @@ def type_text(self, enable_count=False):
         return 'MPI_Aint *'
 
 
+@Type.add_type('AINT_ARRAY')
+class TypeAintArray(Type):
+
+    def type_text(self, enable_count=False):
+        return 'const MPI_Aint *'
+
+    def parameter(self, enable_count=False, **kwargs):
+        return f'const MPI_Aint {self.name}[]'
+
+
 @Type.add_type('INT_OUT')
 class TypeIntOut(Type):
 

ompi/mpi/c/Makefile.am

@@ -460,11 +460,11 @@ prototype_sources = \
 	win_test.c.in \
 	win_unlock.c.in \
 	win_unlock_all.c.in \
+	ineighbor_alltoallw.c.in \
+	neighbor_alltoallw.c.in \
+	neighbor_alltoallw_init.c.in \
 	win_wait.c.in
 
-# neighbor_alltoallw.c.in \
-# ineighbor_alltoallw.c.in \
-# neighbor_alltoallw_init.c.in \
 # pcontrol.c.in \
 # type_create_hindexed.c.in \
 # type_create_hindexed_block.c.in \
@@ -742,7 +742,7 @@ interface_profile_sources = \
         generated_ineighbor_alltoallv.c \
         generated_neighbor_alltoallv_init.c \
         neighbor_alltoallw.c \
-        ineighbor_alltoallw.c \
+        generated_ineighbor_alltoallw.c \
         neighbor_alltoallw_init.c \
         generated_keyval_create.c \
         generated_keyval_free.c \

ompi/mpi/c/add_error_class.c.in

@@ -28,8 +28,7 @@
 #include "ompi/communicator/communicator.h"
 #include "ompi/attribute/attribute.h"
 
-
-PROTOTYPE ERROR_CLASS Add_error_class(INT_OUT errorclass)
+PROTOTYPE ERROR_CLASS add_error_class(INT_OUT errorclass)
 {
     int err_class;
     int rc;

ompi/mpi/c/add_error_code.c.in

@@ -28,7 +28,7 @@
 #include "ompi/errhandler/errcode.h"
 #include "ompi/attribute/attribute.h"
 
-PROTOTYPE ERROR_CLASS Add_error_code(INT errorclass, INT_OUT errorcode)
+PROTOTYPE ERROR_CLASS add_error_code(INT errorclass, INT_OUT errorcode)
 {
     int code;
     int rc;

ompi/mpi/c/add_error_string.c.in

@@ -28,8 +28,7 @@
 #include "ompi/errhandler/errhandler.h"
 #include "ompi/errhandler/errcode.h"
 
-
-PROTOTYPE ERROR_CLASS Add_error_string(INT errorcode, STRING string)
+PROTOTYPE ERROR_CLASS add_error_string(INT errorcode, STRING string)
 {
     int rc;
 

ompi/mpi/c/allgather.c.in

@@ -35,9 +35,9 @@
 #include "ompi/memchecker.h"
 #include "ompi/runtime/ompi_spc.h"
 
-PROTOTYPE ERROR_CLASS Allgather(BUFFER sendbuf, INT sendcount, DATATYPE sendtype,
-                  BUFFER_OUT recvbuf, INT recvcount, DATATYPE recvtype,
-                  COMM comm)
+PROTOTYPE ERROR_CLASS allgather(BUFFER sendbuf, COUNT sendcount, DATATYPE sendtype,
+                                BUFFER_OUT recvbuf, COUNT recvcount, DATATYPE recvtype,
+                                COMM comm)
 {
     int err;
 

ompi/mpi/c/allgather_init.c.in

@@ -35,7 +35,7 @@
 #include "ompi/memchecker.h"
 #include "ompi/runtime/ompi_spc.h"
 
-PROTOTYPE ERROR_CLASS Allgather_init(BUFFER sendbuf, INT sendcount, DATATYPE sendtype,
+PROTOTYPE ERROR_CLASS allgather_init(BUFFER sendbuf, INT sendcount, DATATYPE sendtype,
                        BUFFER_OUT recvbuf, INT recvcount, DATATYPE recvtype,
                        COMM comm, INFO info, REQUEST_INOUT request)
 {

ompi/mpi/c/allgatherv.c.in

@@ -36,7 +36,7 @@
 #include "ompi/runtime/ompi_spc.h"
 
 
-PROTOTYPE ERROR_CLASS Allgatherv(BUFFER sendbuf, COUNT sendcount, DATATYPE sendtype,
+PROTOTYPE ERROR_CLASS allgatherv(BUFFER sendbuf, COUNT sendcount, DATATYPE sendtype,
                    BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts,
                    DISP_ARRAY displs, DATATYPE recvtype, COMM comm)
 {

ompi/mpi/c/allgatherv_init.c.in

@@ -35,11 +35,10 @@
 #include "ompi/memchecker.h"
 #include "ompi/runtime/ompi_spc.h"
 
-
-PROTOTYPE ERROR_CLASS Allgatherv_init(BUFFER sendbuf, COUNT sendcount, DATATYPE sendtype,
-                        BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts, DISP_ARRAY displs,
-                        DATATYPE recvtype, COMM comm,
-                        INFO info, REQUEST_INOUT request)
+PROTOTYPE ERROR_CLASS allgatherv_init(BUFFER sendbuf, COUNT sendcount, DATATYPE sendtype,
+                                      BUFFER_OUT recvbuf, COUNT_ARRAY recvcounts, DISP_ARRAY displs,
+                                      DATATYPE recvtype, COMM comm,
+                                      INFO info, REQUEST_INOUT request)
 {
     int i, size, err;
     ompi_count_array_t recvcounts_desc;