Skip to content

Commit a8eb53e

Browse files
awlauriaawlauria
authored
Merge pull request #10209 from vspetrov/v5.0.x_coll_ucc_build_fix
v5.0.x: coll/ucc: build and warn fixes
2 parents 8add392 + feb33f7 commit a8eb53e

File tree

3 files changed

+42
-35
lines changed

3 files changed

+42
-35
lines changed

‎ompi/mca/coll/ucc/coll_ucc_component.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ mca_coll_ucc_component_t mca_coll_ucc_component = {
4545
.collm_init_query = mca_coll_ucc_init_query,
4646
.collm_comm_query = mca_coll_ucc_comm_query,
4747
},
48-
10, /* ucc_priority */
48+
10, /* ucc_priority */
4949
0, /* ucc_verbose */
5050
0, /* ucc_enable */
5151
2, /* ucc_np */

‎ompi/mca/coll/ucc/coll_ucc_dtypes.h

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,38 +13,43 @@
1313
#include "ompi/mca/op/op.h"
1414
#include <ucc/api/ucc.h>
1515

16-
#define COLL_UCC_DT_UNSUPPORTED -1
17-
#define COLL_UCC_OP_UNSUPPORTED -1
16+
#define COLL_UCC_DT_UNSUPPORTED ((ucc_datatype_t)-1)
17+
#define COLL_UCC_OP_UNSUPPORTED ((ucc_reduction_op_t)-1)
1818

1919
static ucc_datatype_t ompi_datatype_2_ucc_dt[OPAL_DATATYPE_MAX_PREDEFINED] = {
20-
COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_LOOP 0 */
21-
COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_END_LOOP 1 */
22-
COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_LB 2 */
23-
COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_UB 3 */
24-
UCC_DT_INT8, /*OPAL_DATATYPE_INT1 4 */
25-
UCC_DT_INT16, /*OPAL_DATATYPE_INT2 5 */
26-
UCC_DT_INT32, /*OPAL_DATATYPE_INT4 6 */
27-
UCC_DT_INT64, /*OPAL_DATATYPE_INT8 7 */
28-
UCC_DT_INT128, /*OPAL_DATATYPE_INT16 8 */
29-
UCC_DT_UINT8, /*OPAL_DATATYPE_UINT1 9 */
30-
UCC_DT_UINT16, /*OPAL_DATATYPE_UINT2 10 */
31-
UCC_DT_UINT32, /*OPAL_DATATYPE_UINT4 11 */
32-
UCC_DT_UINT64, /*OPAL_DATATYPE_UINT8 12 */
33-
UCC_DT_UINT128, /*OPAL_DATATYPE_UINT16 13 */
34-
UCC_DT_FLOAT16, /*OPAL_DATATYPE_FLOAT2 14 */
35-
UCC_DT_FLOAT32, /*OPAL_DATATYPE_FLOAT4 15 */
36-
UCC_DT_FLOAT64, /*OPAL_DATATYPE_FLOAT8 16 */
37-
COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_FLOAT12 17 */
38-
COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_FLOAT16 18 */
39-
COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_SHORT_FLOAT_COMPLEX 19 */
40-
COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_FLOAT_COMPLEX 20 */
41-
COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_DOUBLE_COMPLEX 21 */
42-
COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_LONG_DOUBLE_COMPLEX 22 */
43-
COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_BOOL 23 */
44-
COLL_UCC_DT_UNSUPPORTED, /*OPAL_DATATYPE_WCHAR 24 */
45-
UCC_DT_INT64, /*OPAL_DATATYPE_LONG 25 */
46-
UCC_DT_UINT64, /*OPAL_DATATYPE_UNSIGNED_LONG 26 */
47-
COLL_UCC_DT_UNSUPPORTED /*OPAL_DATATYPE_UNAVAILABLE 27 */
20+
[OPAL_DATATYPE_LOOP] = COLL_UCC_DT_UNSUPPORTED,
21+
[OPAL_DATATYPE_END_LOOP] = COLL_UCC_DT_UNSUPPORTED,
22+
[OPAL_DATATYPE_LB] = COLL_UCC_DT_UNSUPPORTED,
23+
[OPAL_DATATYPE_UB] = COLL_UCC_DT_UNSUPPORTED,
24+
[OPAL_DATATYPE_INT1] = UCC_DT_INT8,
25+
[OPAL_DATATYPE_INT2] = UCC_DT_INT16,
26+
[OPAL_DATATYPE_INT4] = UCC_DT_INT32,
27+
[OPAL_DATATYPE_INT8] = UCC_DT_INT64,
28+
[OPAL_DATATYPE_INT16] = UCC_DT_INT128,
29+
[OPAL_DATATYPE_UINT1] = UCC_DT_UINT8,
30+
[OPAL_DATATYPE_UINT2] = UCC_DT_UINT16,
31+
[OPAL_DATATYPE_UINT4] = UCC_DT_UINT32,
32+
[OPAL_DATATYPE_UINT8] = UCC_DT_UINT64,
33+
[OPAL_DATATYPE_UINT16] = UCC_DT_UINT128,
34+
[OPAL_DATATYPE_FLOAT2] = UCC_DT_FLOAT16,
35+
[OPAL_DATATYPE_FLOAT4] = UCC_DT_FLOAT32,
36+
[OPAL_DATATYPE_FLOAT8] = UCC_DT_FLOAT64,
37+
[OPAL_DATATYPE_FLOAT12] = COLL_UCC_DT_UNSUPPORTED,
38+
[OPAL_DATATYPE_FLOAT16] = COLL_UCC_DT_UNSUPPORTED,
39+
[OPAL_DATATYPE_SHORT_FLOAT_COMPLEX] = COLL_UCC_DT_UNSUPPORTED,
40+
[OPAL_DATATYPE_FLOAT_COMPLEX] = COLL_UCC_DT_UNSUPPORTED,
41+
[OPAL_DATATYPE_DOUBLE_COMPLEX] = COLL_UCC_DT_UNSUPPORTED,
42+
[OPAL_DATATYPE_LONG_DOUBLE_COMPLEX] = COLL_UCC_DT_UNSUPPORTED,
43+
[OPAL_DATATYPE_BOOL] = COLL_UCC_DT_UNSUPPORTED,
44+
[OPAL_DATATYPE_WCHAR] = COLL_UCC_DT_UNSUPPORTED,
45+
#if SIZEOF_LONG == 4
46+
[OPAL_DATATYPE_LONG] = UCC_DT_INT32,
47+
[OPAL_DATATYPE_UNSIGNED_LONG] = UCC_DT_UINT32,
48+
#elif SIZEOF_LONG == 8
49+
[OPAL_DATATYPE_LONG] = UCC_DT_INT64,
50+
[OPAL_DATATYPE_UNSIGNED_LONG] = UCC_DT_UINT64,
51+
#endif
52+
[OPAL_DATATYPE_UNAVAILABLE] = COLL_UCC_DT_UNSUPPORTED
4853
};
4954

5055
static inline ucc_datatype_t ompi_dtype_to_ucc_dtype(ompi_datatype_t *dtype)

‎ompi/mca/coll/ucc/coll_ucc_module.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,8 @@ uint64_t rank_map_cb(uint64_t ep, void *cb_ctx)
333333
static inline ucc_ep_map_t get_rank_map(struct ompi_communicator_t *comm)
334334
{
335335
ucc_ep_map_t map;
336-
int64_t r1, r2, stride, i;
336+
int64_t r1, r2, stride;
337+
uint64_t i;
337338
int is_strided;
338339

339340
map.ep_num = ompi_comm_size(comm);
@@ -392,10 +393,11 @@ static int mca_coll_ucc_module_enable(mca_coll_base_module_t *module,
392393
},
393394
.ep = ompi_comm_rank(comm),
394395
.ep_range = UCC_COLLECTIVE_EP_RANGE_CONTIG,
395-
.id = comm->c_contextid
396+
.id = ompi_comm_get_local_cid(comm)
396397
};
397-
UCC_VERBOSE(2,"creating ucc_team for comm %p, comm_id %d, comm_size %d",
398-
(void*)comm,comm->c_contextid,ompi_comm_size(comm));
398+
UCC_VERBOSE(2, "creating ucc_team for comm %p, comm_id %llu, comm_size %d",
399+
(void*)comm, (long long unsigned)team_params.id,
400+
ompi_comm_size(comm));
399401

400402
if (OMPI_SUCCESS != mca_coll_ucc_save_coll_handlers(ucc_module)){
401403
UCC_ERROR("mca_coll_ucc_save_coll_handlers failed");

0 commit comments

Comments
 (0)