Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare osc framework for bigcount #12379

Merged
merged 1 commit into from
Mar 12, 2024
Merged

Prepare osc framework for bigcount #12379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ompi/mca/osc/base/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ void ompi_osc_base_set_memory_alignment(struct opal_info_t *info,
int ompi_osc_base_select(ompi_win_t *win,
void **base,
size_t size,
int disp_unit,
ptrdiff_t disp_unit,
ompi_communicator_t *comm,
int flavor,
int *model);
Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/osc/base/osc_base_init.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ int
ompi_osc_base_select(ompi_win_t *win,
void **base,
size_t size,
int disp_unit,
ptrdiff_t disp_unit,
ompi_communicator_t *comm,
int flavor,
int *model)
Expand Down
20 changes: 10 additions & 10 deletions ompi/mca/osc/monitoring/osc_monitoring_accumulate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
} \
\
static int ompi_osc_monitoring_## template ##_get_accumulate (const void *origin_addr, \
int origin_count, \
size_t origin_count, \
ompi_datatype_t*origin_datatype, \
void *result_addr, \
int result_count, \
size_t result_count, \
ompi_datatype_t*result_datatype, \
int target_rank, \
MPI_Aint target_disp, \
int target_count, \
size_t target_count, \
ompi_datatype_t*target_datatype, \
ompi_op_t *op, ompi_win_t*win) \
{ \
Expand All @@ -72,14 +72,14 @@
} \
\
static int ompi_osc_monitoring_## template ##_rget_accumulate (const void *origin_addr, \
int origin_count, \
size_t origin_count, \
ompi_datatype_t *origin_datatype, \
void *result_addr, \
int result_count, \
size_t result_count, \
ompi_datatype_t *result_datatype, \
int target_rank, \
MPI_Aint target_disp, \
int target_count, \
size_t target_count, \
ompi_datatype_t*target_datatype, \
ompi_op_t *op, \
ompi_win_t *win, \
Expand All @@ -104,11 +104,11 @@
} \
\
static int ompi_osc_monitoring_## template ##_raccumulate (const void *origin_addr, \
int origin_count, \
size_t origin_count, \
ompi_datatype_t *origin_datatype, \
int target_rank, \
ptrdiff_t target_disp, \
int target_count, \
size_t target_count, \
ompi_datatype_t *target_datatype, \
ompi_op_t *op, ompi_win_t *win, \
ompi_request_t **request) \
Expand All @@ -129,11 +129,11 @@
} \
\
static int ompi_osc_monitoring_## template ##_accumulate (const void *origin_addr, \
int origin_count, \
size_t origin_count, \
ompi_datatype_t *origin_datatype, \
int target_rank, \
ptrdiff_t target_disp, \
int target_count, \
size_t target_count, \
ompi_datatype_t *target_datatype, \
ompi_op_t *op, ompi_win_t *win) \
{ \
Expand Down
16 changes: 8 additions & 8 deletions ompi/mca/osc/monitoring/osc_monitoring_comm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
#define OSC_MONITORING_GENERATE_TEMPLATE_COMM(template) \
\
static int ompi_osc_monitoring_## template ##_put (const void *origin_addr, \
int origin_count, \
size_t origin_count, \
ompi_datatype_t *origin_datatype, \
int target_rank, \
ptrdiff_t target_disp, \
int target_count, \
size_t target_count, \
ompi_datatype_t *target_datatype, \
ompi_win_t *win) \
{ \
Expand All @@ -43,11 +43,11 @@
} \
\
static int ompi_osc_monitoring_## template ##_rput (const void *origin_addr, \
int origin_count, \
size_t origin_count, \
ompi_datatype_t *origin_datatype, \
int target_rank, \
ptrdiff_t target_disp, \
int target_count, \
size_t target_count, \
ompi_datatype_t *target_datatype, \
ompi_win_t *win, \
ompi_request_t **request) \
Expand All @@ -67,11 +67,11 @@
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); \
} \
\
static int ompi_osc_monitoring_## template ##_get (void *origin_addr, int origin_count, \
static int ompi_osc_monitoring_## template ##_get (void *origin_addr, size_t origin_count, \
ompi_datatype_t *origin_datatype, \
int source_rank, \
ptrdiff_t source_disp, \
int source_count, \
size_t source_count, \
ompi_datatype_t *source_datatype, \
ompi_win_t *win) \
{ \
Expand All @@ -91,11 +91,11 @@
return OMPI_OSC_MONITORING_MODULE_VARIABLE(template).osc_get(origin_addr, origin_count, origin_datatype, source_rank, source_disp, source_count, source_datatype, win); \
} \
\
static int ompi_osc_monitoring_## template ##_rget (void *origin_addr, int origin_count, \
static int ompi_osc_monitoring_## template ##_rget (void *origin_addr, size_t origin_count, \
ompi_datatype_t *origin_datatype, \
int source_rank, \
ptrdiff_t source_disp, \
int source_count, \
size_t source_count, \
ompi_datatype_t *source_datatype, \
ompi_win_t *win, \
ompi_request_t **request) \
Expand Down
6 changes: 3 additions & 3 deletions ompi/mca/osc/monitoring/osc_monitoring_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ static int mca_osc_monitoring_component_register(void)
return OMPI_SUCCESS;
}

static int mca_osc_monitoring_component_query(struct ompi_win_t *win, void **base, size_t size, int disp_unit,
static int mca_osc_monitoring_component_query(struct ompi_win_t *win, void **base, size_t size, ptrdiff_t disp_unit,
struct ompi_communicator_t *comm, struct opal_info_t *info,
int flavor)
{
Expand All @@ -69,7 +69,7 @@ ompi_mca_osc_monitoring_set_template(ompi_osc_base_component_t *best_component,
return OMPI_ERR_NOT_SUPPORTED;
}

static int mca_osc_monitoring_component_select(struct ompi_win_t *win, void **base, size_t size, int disp_unit,
static int mca_osc_monitoring_component_select(struct ompi_win_t *win, void **base, size_t size, ptrdiff_t disp_unit,
struct ompi_communicator_t *comm, struct opal_info_t *info,
int flavor, int *model)
{
Expand Down Expand Up @@ -119,7 +119,7 @@ ompi_osc_monitoring_component_t mca_osc_monitoring_component = {
/* First, the mca_base_component_t struct containing meta
information about the component itself */
.osc_version = {
OMPI_OSC_BASE_VERSION_3_0_0,
OMPI_OSC_BASE_VERSION_4_0_0,

.mca_component_name = "monitoring", /* MCA component name */
MCA_MONITORING_MAKE_VERSION,
Expand Down
Loading
Loading