From d366812030d9916b49789c3b67335d7d063535ba Mon Sep 17 00:00:00 2001 From: Valentin Petrov Date: Thu, 25 Jun 2020 09:09:35 +0300 Subject: [PATCH] coll/hcoll: compile warning fix Signed-off-by: Valentin Petrov --- ompi/mca/coll/hcoll/coll_hcoll.h | 8 ++++---- ompi/mca/coll/hcoll/coll_hcoll_ops.c | 9 +++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ompi/mca/coll/hcoll/coll_hcoll.h b/ompi/mca/coll/hcoll/coll_hcoll.h index aadc0735fd..4b7e783583 100644 --- a/ompi/mca/coll/hcoll/coll_hcoll.h +++ b/ompi/mca/coll/hcoll/coll_hcoll.h @@ -316,11 +316,11 @@ int mca_coll_hcoll_ialltoall(const void *sbuf, int scount, mca_coll_base_module_t *module); #if HCOLL_API >= HCOLL_VERSION(3,7) -int mca_coll_hcoll_ialltoallv(const void *sbuf, int *scounts, - int *sdisps, +int mca_coll_hcoll_ialltoallv(const void *sbuf, const int *scounts, + const int *sdisps, struct ompi_datatype_t *sdtype, - void *rbuf, int *rcounts, - int *rdisps, + void *rbuf, const int *rcounts, + const int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, ompi_request_t **req, diff --git a/ompi/mca/coll/hcoll/coll_hcoll_ops.c b/ompi/mca/coll/hcoll/coll_hcoll_ops.c index d864ae0d55..a4e83f9943 100644 --- a/ompi/mca/coll/hcoll/coll_hcoll_ops.c +++ b/ompi/mca/coll/hcoll/coll_hcoll_ops.c @@ -136,7 +136,8 @@ int mca_coll_hcoll_allgatherv(const void *sbuf, int scount, hcoll_module->previous_allgatherv_module); return rc; } - rc = hcoll_collectives.coll_allgatherv((void *)sbuf,scount,stype,rbuf,rcount,displs,rtype,hcoll_module->hcoll_context); + rc = hcoll_collectives.coll_allgatherv((void *)sbuf,scount,stype,rbuf,(int*)rcount, + (int*)displs,rtype,hcoll_module->hcoll_context); if (HCOLL_SUCCESS != rc){ HCOL_VERBOSE(20,"RUNNING FALLBACK ALLGATHERV"); rc = hcoll_module->previous_allgatherv(sbuf,scount,sdtype, @@ -558,7 +559,7 @@ int mca_coll_hcoll_iallgatherv(const void *sbuf, int scount, hcoll_module->previous_iallgatherv_module); return rc; } - rc = hcoll_collectives.coll_iallgatherv((void *)sbuf,scount,stype,rbuf,rcount,displs,rtype, + rc = hcoll_collectives.coll_iallgatherv((void *)sbuf,scount,stype,rbuf,(int*)rcount,(int*)displs,rtype, hcoll_module->hcoll_context, rt_handle); if (HCOLL_SUCCESS != rc){ HCOL_VERBOSE(20,"RUNNING FALLBACK NON-BLOCKING ALLGATHER"); @@ -724,9 +725,9 @@ int mca_coll_hcoll_igatherv(const void* sbuf, int scount, #if HCOLL_API >= HCOLL_VERSION(3,7) -int mca_coll_hcoll_ialltoallv(const void *sbuf, int *scounts, int *sdisps, +int mca_coll_hcoll_ialltoallv(const void *sbuf, const int *scounts, const int *sdisps, struct ompi_datatype_t *sdtype, - void *rbuf, int *rcounts, int *rdisps, + void *rbuf, const int *rcounts, const int *rdisps, struct ompi_datatype_t *rdtype, struct ompi_communicator_t *comm, ompi_request_t ** request,