Skip to content

Commit 7d7c95e

Browse files
author
Valentin Petrov
committed
coll/hcoll: fix compile warnings
Signed-off-by: Valentin Petrov <[email protected]>
1 parent fa43627 commit 7d7c95e

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

ompi/mca/coll/hcoll/coll_hcoll.h

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -316,15 +316,13 @@ 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,
321-
struct ompi_datatype_t *sdtype,
322-
void *rbuf, int *rcounts,
323-
int *rdisps,
324-
struct ompi_datatype_t *rdtype,
325-
struct ompi_communicator_t *comm,
326-
ompi_request_t **req,
327-
mca_coll_base_module_t *module);
319+
int mca_coll_hcoll_ialltoallv(const void *sbuf, const int *scounts,
320+
const int *sdisps, struct ompi_datatype_t *sdtype,
321+
void *rbuf, const int *rcounts, const int *rdisps,
322+
struct ompi_datatype_t *rdtype,
323+
struct ompi_communicator_t *comm,
324+
ompi_request_t **req,
325+
mca_coll_base_module_t *module);
328326
#endif
329327

330328
int mca_coll_hcoll_igatherv(const void* sbuf, int scount,

ompi/mca/coll/hcoll/coll_hcoll_ops.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,9 @@ 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,
140+
(int*)rcount, (int*)displs, rtype,
141+
hcoll_module->hcoll_context);
140142
if (HCOLL_SUCCESS != rc){
141143
HCOL_VERBOSE(20,"RUNNING FALLBACK ALLGATHERV");
142144
rc = hcoll_module->previous_allgatherv(sbuf,scount,sdtype,
@@ -558,8 +560,9 @@ int mca_coll_hcoll_iallgatherv(const void *sbuf, int scount,
558560
hcoll_module->previous_iallgatherv_module);
559561
return rc;
560562
}
561-
rc = hcoll_collectives.coll_iallgatherv((void *)sbuf,scount,stype,rbuf,rcount,displs,rtype,
562-
hcoll_module->hcoll_context, rt_handle);
563+
rc = hcoll_collectives.coll_iallgatherv((void *)sbuf, scount, stype,
564+
rbuf, (int*)rcount, (int*)displs, rtype,
565+
hcoll_module->hcoll_context, rt_handle);
563566
if (HCOLL_SUCCESS != rc){
564567
HCOL_VERBOSE(20,"RUNNING FALLBACK NON-BLOCKING ALLGATHER");
565568
rc = hcoll_module->previous_iallgatherv(sbuf,scount,sdtype,
@@ -724,9 +727,9 @@ int mca_coll_hcoll_igatherv(const void* sbuf, int scount,
724727

725728

726729
#if HCOLL_API >= HCOLL_VERSION(3,7)
727-
int mca_coll_hcoll_ialltoallv(const void *sbuf, int *scounts, int *sdisps,
730+
int mca_coll_hcoll_ialltoallv(const void *sbuf, const int *scounts, const int *sdisps,
728731
struct ompi_datatype_t *sdtype,
729-
void *rbuf, int *rcounts, int *rdisps,
732+
void *rbuf, const int *rcounts, const int *rdisps,
730733
struct ompi_datatype_t *rdtype,
731734
struct ompi_communicator_t *comm,
732735
ompi_request_t ** request,

0 commit comments

Comments
 (0)