Skip to content

Commit 04360cc

Browse files
jsquyresjsquyres
committed
coll/demo: Updates to support const, bigcount
Signed-off-by: Jeff Squyres <jeff@squyres.com>
1 parent 9f7dddf commit 04360cc

File tree

6 files changed

+22
-27
lines changed

6 files changed

+22
-27
lines changed

‎ompi/mca/coll/demo/coll_demo.h‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ BEGIN_C_DECLS
6464
struct ompi_datatype_t *rdtype,
6565
struct ompi_communicator_t *comm,
6666
mca_coll_base_module_t *module);
67-
int mca_coll_demo_allgatherv_inter(const void *sbuf, int scount,
67+
int mca_coll_demo_allgatherv_inter(const void *sbuf, size_t scount,
6868
struct ompi_datatype_t *sdtype,
6969
void * rbuf, ompi_count_array_t rcounts, ompi_disp_array_t disps,
7070
struct ompi_datatype_t *rdtype,
@@ -109,15 +109,15 @@ BEGIN_C_DECLS
109109
mca_coll_base_module_t *module);
110110

111111
int mca_coll_demo_alltoallw_intra(const void *sbuf, ompi_count_array_t scounts, ompi_disp_array_t sdisps,
112-
struct ompi_datatype_t **sdtypes,
112+
struct ompi_datatype_t *const *sdtypes,
113113
void *rbuf, ompi_count_array_t rcounts, ompi_disp_array_t rdisps,
114-
struct ompi_datatype_t **rdtypes,
114+
struct ompi_datatype_t *const *rdtypes,
115115
struct ompi_communicator_t *comm,
116116
mca_coll_base_module_t *module);
117-
int mca_coll_demo_alltoallw_inter(void *sbuf, ompi_count_array_t scounts, ompi_disp_array_t sdisps,
118-
struct ompi_datatype_t **sdtypes,
117+
int mca_coll_demo_alltoallw_inter(const void *sbuf, ompi_count_array_t scounts, ompi_disp_array_t sdisps,
118+
struct ompi_datatype_t *const *sdtypes,
119119
void *rbuf, ompi_count_array_t rcounts, ompi_disp_array_t rdisps,
120-
struct ompi_datatype_t **rdtypes,
120+
struct ompi_datatype_t *const *rdtypes,
121121
struct ompi_communicator_t *comm,
122122
mca_coll_base_module_t *module);
123123

@@ -159,15 +159,15 @@ BEGIN_C_DECLS
159159
int root, struct ompi_communicator_t *comm,
160160
mca_coll_base_module_t *module);
161161

162-
int mca_coll_demo_gatherv_intra(const void *sbuf, int scount,
162+
int mca_coll_demo_gatherv_intra(const void *sbuf, size_t scount,
163163
struct ompi_datatype_t *sdtype, void *rbuf,
164164
ompi_count_array_t rcounts, ompi_disp_array_t disps,
165165
struct ompi_datatype_t *rdtype, int root,
166166
struct ompi_communicator_t *comm,
167167
mca_coll_base_module_t *module);
168-
int mca_coll_demo_gatherv_inter(void *sbuf, int scount,
169-
struct ompi_datatype_t *sdtype, void *rbuf,
170-
ompi_count_array_t rcounts, ompi_disp_array_t disps,
168+
int mca_coll_demo_gatherv_inter(const void *sbuf, size_t scount,
169+
struct ompi_datatype_t *sdtype,
170+
void *rbuf, ompi_count_array_t rcounts, ompi_disp_array_t disps,
171171
struct ompi_datatype_t *rdtype, int root,
172172
struct ompi_communicator_t *comm,
173173
mca_coll_base_module_t *module);
@@ -199,15 +199,10 @@ BEGIN_C_DECLS
199199
mca_coll_base_module_t *module);
200200

201201
int mca_coll_demo_scan_intra(const void *sbuf, void *rbuf, size_t count,
202-
struct ompi_datatype_t *dtype,
203-
struct ompi_op_t *op,
204-
struct ompi_communicator_t *comm,
205-
mca_coll_base_module_t *module);
206-
int mca_coll_demo_scan_inter(const void *sbuf, void *rbuf, size_t count,
207-
struct ompi_datatype_t *dtype,
208-
struct ompi_op_t *op,
209-
struct ompi_communicator_t *comm,
210-
mca_coll_base_module_t *module);
202+
struct ompi_datatype_t *dtype,
203+
struct ompi_op_t *op,
204+
struct ompi_communicator_t *comm,
205+
mca_coll_base_module_t *module);
211206

212207
int mca_coll_demo_scatter_intra(const void *sbuf, size_t scount,
213208
struct ompi_datatype_t *sdtype, void *rbuf,

‎ompi/mca/coll/demo/coll_demo_allgatherv.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* Accepts: - same as MPI_Allgatherv()
3535
* Returns: - MPI_SUCCESS or error code
3636
*/
37-
int mca_coll_demo_allgatherv_intra(const void *sbuf, int scount,
37+
int mca_coll_demo_allgatherv_intra(const void *sbuf, size_t scount,
3838
struct ompi_datatype_t *sdtype,
3939
void * rbuf, ompi_count_array_t rcounts, ompi_disp_array_t disps,
4040
struct ompi_datatype_t *rdtype,
@@ -57,7 +57,7 @@ int mca_coll_demo_allgatherv_intra(const void *sbuf, int scount,
5757
* Accepts: - same as MPI_Allgatherv()
5858
* Returns: - MPI_SUCCESS or error code
5959
*/
60-
int mca_coll_demo_allgatherv_inter(const void *sbuf, int scount,
60+
int mca_coll_demo_allgatherv_inter(const void *sbuf, size_t scount,
6161
struct ompi_datatype_t *sdtype,
6262
void * rbuf, ompi_count_array_t rcounts, ompi_disp_array_t disps,
6363
struct ompi_datatype_t *rdtype,

‎ompi/mca/coll/demo/coll_demo_component.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const mca_coll_base_component_3_0_0_t mca_coll_demo_component = {
6262
about the component itself */
6363

6464
.collm_version = {
65-
MCA_COLL_BASE_VERSION_2_4_0,
65+
MCA_COLL_BASE_VERSION_3_0_0,
6666

6767
/* Component name and version */
6868
.mca_component_name = "demo",

‎ompi/mca/coll/demo/coll_demo_gatherv.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* Accepts: - same arguments as MPI_Gatherv()
3535
* Returns: - MPI_SUCCESS or error code
3636
*/
37-
int mca_coll_demo_gatherv_intra(const void *sbuf, int scount,
37+
int mca_coll_demo_gatherv_intra(const void *sbuf, size_t scount,
3838
struct ompi_datatype_t *sdtype,
3939
void *rbuf, ompi_count_array_t rcounts, ompi_disp_array_t disps,
4040
struct ompi_datatype_t *rdtype, int root,
@@ -57,7 +57,7 @@ int mca_coll_demo_gatherv_intra(const void *sbuf, int scount,
5757
* Accepts: - same arguments as MPI_Gatherv()
5858
* Returns: - MPI_SUCCESS or error code
5959
*/
60-
int mca_coll_demo_gatherv_inter(const void *sbuf, int scount,
60+
int mca_coll_demo_gatherv_inter(const void *sbuf, size_t scount,
6161
struct ompi_datatype_t *sdtype,
6262
void *rbuf, ompi_count_array_t rcounts, ompi_disp_array_t disps,
6363
struct ompi_datatype_t *rdtype, int root,

‎ompi/mca/coll/demo/coll_demo_scan.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* Accepts: - same arguments as MPI_Scan()
3535
* Returns: - MPI_SUCCESS or error code
3636
*/
37-
int mca_coll_demo_scan_intra(void *sbuf, void *rbuf, size_t count,
37+
int mca_coll_demo_scan_intra(const void *sbuf, void *rbuf, size_t count,
3838
struct ompi_datatype_t *dtype,
3939
struct ompi_op_t *op,
4040
struct ompi_communicator_t *comm,

‎ompi/mca/coll/demo/coll_demo_scatterv.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
*/
3737
int mca_coll_demo_scatterv_intra(const void *sbuf, ompi_count_array_t scounts,
3838
ompi_disp_array_t disps, struct ompi_datatype_t *sdtype,
39-
void *rbuf, int rcount,
39+
void *rbuf, size_t rcount,
4040
struct ompi_datatype_t *rdtype, int root,
4141
struct ompi_communicator_t *comm,
4242
mca_coll_base_module_t *module)
@@ -59,7 +59,7 @@ int mca_coll_demo_scatterv_intra(const void *sbuf, ompi_count_array_t scounts,
5959
*/
6060
int mca_coll_demo_scatterv_inter(const void *sbuf, ompi_count_array_t scounts,
6161
ompi_disp_array_t disps, struct ompi_datatype_t *sdtype,
62-
void *rbuf, int rcount,
62+
void *rbuf, size_t rcount,
6363
struct ompi_datatype_t *rdtype, int root,
6464
struct ompi_communicator_t *comm,
6565
mca_coll_base_module_t *module)

0 commit comments

Comments
 (0)