Commit 83253a41 authored by Rob Latham's avatar Rob Latham
Browse files

some type promotions in RMA path


Signed-off-by: default avatarXin Zhao <xinzhao3@illinois.edu>
parent 9c4b9b17
...@@ -10,8 +10,8 @@ ...@@ -10,8 +10,8 @@
#include "mpl_utlist.h" #include "mpl_utlist.h"
#include "mpid_rma_types.h" #include "mpid_rma_types.h"
static inline int do_accumulate_op(void *source_buf, int source_count, MPI_Datatype source_dtp, static inline int do_accumulate_op(void *source_buf, MPI_Aint source_count, MPI_Datatype source_dtp,
void *target_buf, int target_count, MPI_Datatype target_dtp, void *target_buf, MPI_Aint target_count, MPI_Datatype target_dtp,
MPI_Aint stream_offset, MPI_Op acc_op); MPI_Aint stream_offset, MPI_Op acc_op);
#define ASSIGN_COPY(src, dest, count, type) \ #define ASSIGN_COPY(src, dest, count, type) \
......
...@@ -26,10 +26,10 @@ enum MPIDI_RMA_Datatype { ...@@ -26,10 +26,10 @@ enum MPIDI_RMA_Datatype {
/* to send derived datatype across in RMA ops */ /* to send derived datatype across in RMA ops */
typedef struct MPIDI_RMA_dtype_info { /* for derived datatypes */ typedef struct MPIDI_RMA_dtype_info { /* for derived datatypes */
int is_contig; int is_contig;
int max_contig_blocks; MPI_Aint max_contig_blocks;
MPI_Aint size; MPI_Aint size;
MPI_Aint extent; MPI_Aint extent;
int dataloop_size; /* not needed because this info is sent in MPI_Aint dataloop_size; /* not needed because this info is sent in
* packet header. remove it after lock/unlock * packet header. remove it after lock/unlock
* is implemented in the device */ * is implemented in the device */
void *dataloop; /* pointer needed to update pointers void *dataloop; /* pointer needed to update pointers
...@@ -61,7 +61,7 @@ typedef struct MPIDI_RMA_Op { ...@@ -61,7 +61,7 @@ typedef struct MPIDI_RMA_Op {
MPI_Datatype result_datatype; MPI_Datatype result_datatype;
struct MPID_Request **reqs; struct MPID_Request **reqs;
int reqs_size; MPI_Aint reqs_size;
MPIDI_RMA_dtype_info dtype_info; MPIDI_RMA_dtype_info dtype_info;
void *dataloop; void *dataloop;
......
...@@ -806,8 +806,8 @@ static inline int MPIDI_CH3I_RMA_Handle_flush_ack(MPID_Win * win_ptr, int target ...@@ -806,8 +806,8 @@ static inline int MPIDI_CH3I_RMA_Handle_flush_ack(MPID_Win * win_ptr, int target
#define FUNCNAME do_accumulate_op #define FUNCNAME do_accumulate_op
#undef FCNAME #undef FCNAME
#define FCNAME MPIDI_QUOTE(FUNCNAME) #define FCNAME MPIDI_QUOTE(FUNCNAME)
static inline int do_accumulate_op(void *source_buf, int source_count, MPI_Datatype source_dtp, static inline int do_accumulate_op(void *source_buf, MPI_Aint source_count, MPI_Datatype source_dtp,
void *target_buf, int target_count, MPI_Datatype target_dtp, void *target_buf, MPI_Aint target_count, MPI_Datatype target_dtp,
MPI_Aint stream_offset, MPI_Op acc_op) MPI_Aint stream_offset, MPI_Op acc_op)
{ {
int mpi_errno = MPI_SUCCESS; int mpi_errno = MPI_SUCCESS;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment