Skip to content

Commit 44880f6

Browse files
hppritchahppritcha
authored
Merge pull request #12379 from jtronge/osc-framework-bigcount
Prepare osc framework for bigcount
2 parents f4f2dd2 + 8bcbe17 commit 44880f6

22 files changed

+353
-353
lines changed

‎ompi/mca/osc/base/base.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void ompi_osc_base_set_memory_alignment(struct opal_info_t *info,
4747
int ompi_osc_base_select(ompi_win_t *win,
4848
void **base,
4949
size_t size,
50-
int disp_unit,
50+
ptrdiff_t disp_unit,
5151
ompi_communicator_t *comm,
5252
int flavor,
5353
int *model);

‎ompi/mca/osc/base/osc_base_init.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ int
3434
ompi_osc_base_select(ompi_win_t *win,
3535
void **base,
3636
size_t size,
37-
int disp_unit,
37+
ptrdiff_t disp_unit,
3838
ompi_communicator_t *comm,
3939
int flavor,
4040
int *model)

‎ompi/mca/osc/monitoring/osc_monitoring_accumulate.h‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
} \
4343
\
4444
static int ompi_osc_monitoring_## template ##_get_accumulate (const void *origin_addr, \
45-
int origin_count, \
45+
size_t origin_count, \
4646
ompi_datatype_t*origin_datatype, \
4747
void *result_addr, \
48-
int result_count, \
48+
size_t result_count, \
4949
ompi_datatype_t*result_datatype, \
5050
int target_rank, \
5151
MPI_Aint target_disp, \
52-
int target_count, \
52+
size_t target_count, \
5353
ompi_datatype_t*target_datatype, \
5454
ompi_op_t *op, ompi_win_t*win) \
5555
{ \
@@ -72,14 +72,14 @@
7272
} \
7373
\
7474
static int ompi_osc_monitoring_## template ##_rget_accumulate (const void *origin_addr, \
75-
int origin_count, \
75+
size_t origin_count, \
7676
ompi_datatype_t *origin_datatype, \
7777
void *result_addr, \
78-
int result_count, \
78+
size_t result_count, \
7979
ompi_datatype_t *result_datatype, \
8080
int target_rank, \
8181
MPI_Aint target_disp, \
82-
int target_count, \
82+
size_t target_count, \
8383
ompi_datatype_t*target_datatype, \
8484
ompi_op_t *op, \
8585
ompi_win_t *win, \
@@ -104,11 +104,11 @@
104104
} \
105105
\
106106
static int ompi_osc_monitoring_## template ##_raccumulate (const void *origin_addr, \
107-
int origin_count, \
107+
size_t origin_count, \
108108
ompi_datatype_t *origin_datatype, \
109109
int target_rank, \
110110
ptrdiff_t target_disp, \
111-
int target_count, \
111+
size_t target_count, \
112112
ompi_datatype_t *target_datatype, \
113113
ompi_op_t *op, ompi_win_t *win, \
114114
ompi_request_t **request) \
@@ -129,11 +129,11 @@
129129
} \
130130
\
131131
static int ompi_osc_monitoring_## template ##_accumulate (const void *origin_addr, \
132-
int origin_count, \
132+
size_t origin_count, \
133133
ompi_datatype_t *origin_datatype, \
134134
int target_rank, \
135135
ptrdiff_t target_disp, \
136-
int target_count, \
136+
size_t target_count, \
137137
ompi_datatype_t *target_datatype, \
138138
ompi_op_t *op, ompi_win_t *win) \
139139
{ \

‎ompi/mca/osc/monitoring/osc_monitoring_comm.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
#define OSC_MONITORING_GENERATE_TEMPLATE_COMM(template) \
2020
\
2121
static int ompi_osc_monitoring_## template ##_put (const void *origin_addr, \
22-
int origin_count, \
22+
size_t origin_count, \
2323
ompi_datatype_t *origin_datatype, \
2424
int target_rank, \
2525
ptrdiff_t target_disp, \
26-
int target_count, \
26+
size_t target_count, \
2727
ompi_datatype_t *target_datatype, \
2828
ompi_win_t *win) \
2929
{ \
@@ -43,11 +43,11 @@
4343
} \
4444
\
4545
static int ompi_osc_monitoring_## template ##_rput (const void *origin_addr, \
46-
int origin_count, \
46+
size_t origin_count, \
4747
ompi_datatype_t *origin_datatype, \
4848
int target_rank, \
4949
ptrdiff_t target_disp, \
50-
int target_count, \
50+
size_t target_count, \
5151
ompi_datatype_t *target_datatype, \
5252
ompi_win_t *win, \
5353
ompi_request_t **request) \
@@ -67,11 +67,11 @@
6767
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_rput(origin_addr, origin_count, origin_datatype, target_rank, target_disp, target_count, target_datatype, win, request); \
6868
} \
6969
\
70-
static int ompi_osc_monitoring_## template ##_get (void *origin_addr, int origin_count, \
70+
static int ompi_osc_monitoring_## template ##_get (void *origin_addr, size_t origin_count, \
7171
ompi_datatype_t *origin_datatype, \
7272
int source_rank, \
7373
ptrdiff_t source_disp, \
74-
int source_count, \
74+
size_t source_count, \
7575
ompi_datatype_t *source_datatype, \
7676
ompi_win_t *win) \
7777
{ \
@@ -91,11 +91,11 @@
9191
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_get(origin_addr, origin_count, origin_datatype, source_rank, source_disp, source_count, source_datatype, win); \
9292
} \
9393
\
94-
static int ompi_osc_monitoring_## template ##_rget (void *origin_addr, int origin_count, \
94+
static int ompi_osc_monitoring_## template ##_rget (void *origin_addr, size_t origin_count, \
9595
ompi_datatype_t *origin_datatype, \
9696
int source_rank, \
9797
ptrdiff_t source_disp, \
98-
int source_count, \
98+
size_t source_count, \
9999
ompi_datatype_t *source_datatype, \
100100
ompi_win_t *win, \
101101
ompi_request_t **request) \

‎ompi/mca/osc/monitoring/osc_monitoring_component.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ static int mca_osc_monitoring_component_register(void)
4747
return OMPI_SUCCESS;
4848
}
4949

50-
static int mca_osc_monitoring_component_query(struct ompi_win_t *win, void **base, size_t size, int disp_unit,
50+
static int mca_osc_monitoring_component_query(struct ompi_win_t *win, void **base, size_t size, ptrdiff_t disp_unit,
5151
struct ompi_communicator_t *comm, struct opal_info_t *info,
5252
int flavor)
5353
{
@@ -69,7 +69,7 @@ ompi_mca_osc_monitoring_set_template(ompi_osc_base_component_t *best_component,
6969
return OMPI_ERR_NOT_SUPPORTED;
7070
}
7171

72-
static int mca_osc_monitoring_component_select(struct ompi_win_t *win, void **base, size_t size, int disp_unit,
72+
static int mca_osc_monitoring_component_select(struct ompi_win_t *win, void **base, size_t size, ptrdiff_t disp_unit,
7373
struct ompi_communicator_t *comm, struct opal_info_t *info,
7474
int flavor, int *model)
7575
{
@@ -119,7 +119,7 @@ ompi_osc_monitoring_component_t mca_osc_monitoring_component = {
119119
/* First, the mca_base_component_t struct containing meta
120120
information about the component itself */
121121
.osc_version = {
122-
OMPI_OSC_BASE_VERSION_3_0_0,
122+
OMPI_OSC_BASE_VERSION_4_0_0,
123123

124124
.mca_component_name = "monitoring", /* MCA component name */
125125
MCA_MONITORING_MAKE_VERSION,

0 commit comments

Comments
 (0)