Skip to content

Commit d366812

Browse files
author
Valentin Petrov
committed
coll/hcoll: compile warning fix
Signed-off-by: Valentin Petrov <valentinp@mellanox.com>
1 parent 1d54071 commit d366812

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

ompi/mca/coll/hcoll/coll_hcoll.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -316,11 +316,11 @@ int mca_coll_hcoll_ialltoall(const void *sbuf, int scount,
316316
mca_coll_base_module_t *module);
317317

318318
#if HCOLL_API >= HCOLL_VERSION(3,7)
319-
int mca_coll_hcoll_ialltoallv(const void *sbuf, int *scounts,
320-
int *sdisps,
319+
int mca_coll_hcoll_ialltoallv(const void *sbuf, const int *scounts,
320+
const int *sdisps,
321321
struct ompi_datatype_t *sdtype,
322-
void *rbuf, int *rcounts,
323-
int *rdisps,
322+
void *rbuf, const int *rcounts,
323+
const int *rdisps,
324324
struct ompi_datatype_t *rdtype,
325325
struct ompi_communicator_t *comm,
326326
ompi_request_t **req,

ompi/mca/coll/hcoll/coll_hcoll_ops.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ int mca_coll_hcoll_allgatherv(const void *sbuf, int scount,
136136
hcoll_module->previous_allgatherv_module);
137137
return rc;
138138
}
139-
rc = hcoll_collectives.coll_allgatherv((void *)sbuf,scount,stype,rbuf,rcount,displs,rtype,hcoll_module->hcoll_context);
139+
rc = hcoll_collectives.coll_allgatherv((void *)sbuf,scount,stype,rbuf,(int*)rcount,
140+
(int*)displs,rtype,hcoll_module->hcoll_context);
140141
if (HCOLL_SUCCESS != rc){
141142
HCOL_VERBOSE(20,"RUNNING FALLBACK ALLGATHERV");
142143
rc = hcoll_module->previous_allgatherv(sbuf,scount,sdtype,
@@ -558,7 +559,7 @@ int mca_coll_hcoll_iallgatherv(const void *sbuf, int scount,
558559
hcoll_module->previous_iallgatherv_module);
559560
return rc;
560561
}
561-
rc = hcoll_collectives.coll_iallgatherv((void *)sbuf,scount,stype,rbuf,rcount,displs,rtype,
562+
rc = hcoll_collectives.coll_iallgatherv((void *)sbuf,scount,stype,rbuf,(int*)rcount,(int*)displs,rtype,
562563
hcoll_module->hcoll_context, rt_handle);
563564
if (HCOLL_SUCCESS != rc){
564565
HCOL_VERBOSE(20,"RUNNING FALLBACK NON-BLOCKING ALLGATHER");
@@ -724,9 +725,9 @@ int mca_coll_hcoll_igatherv(const void* sbuf, int scount,
724725

725726

726727
#if HCOLL_API >= HCOLL_VERSION(3,7)
727-
int mca_coll_hcoll_ialltoallv(const void *sbuf, int *scounts, int *sdisps,
728+
int mca_coll_hcoll_ialltoallv(const void *sbuf, const int *scounts, const int *sdisps,
728729
struct ompi_datatype_t *sdtype,
729-
void *rbuf, int *rcounts, int *rdisps,
730+
void *rbuf, const int *rcounts, const int *rdisps,
730731
struct ompi_datatype_t *rdtype,
731732
struct ompi_communicator_t *comm,
732733
ompi_request_t ** request,

0 commit comments

Comments
 (0)