@@ -149,7 +149,7 @@ void mca_spml_ucx_peer_mkey_cache_init(mca_spml_ucx_ctx_t *ucx_ctx, int pe)
149
149
int mca_spml_ucx_peer_mkey_cache_add (ucp_peer_t * ucp_peer , int index )
150
150
{
151
151
/* Allocate an array to hold the pointers to the ucx_cached_mkey */
152
- if (index >= ucp_peer -> mkeys_cnt ){
152
+ if (index >= ( int ) ucp_peer -> mkeys_cnt ){
153
153
int old_size = ucp_peer -> mkeys_cnt ;
154
154
if (MCA_MEMHEAP_MAX_SEGMENTS <= (index + 1 )) {
155
155
SPML_UCX_ERROR ("Failed to get new mkey for segment: max number (%d) of segment descriptor is exhausted" ,
@@ -184,7 +184,7 @@ int mca_spml_ucx_peer_mkey_cache_add(ucp_peer_t *ucp_peer, int index)
184
184
/* Release individual mkeys */
185
185
int mca_spml_ucx_peer_mkey_cache_del (ucp_peer_t * ucp_peer , int segno )
186
186
{
187
- if ((ucp_peer -> mkeys_cnt <= segno ) || (segno < 0 )) {
187
+ if ((( int ) ucp_peer -> mkeys_cnt <= segno ) || (segno < 0 )) {
188
188
return OSHMEM_ERR_NOT_AVAILABLE ;
189
189
}
190
190
if (NULL != ucp_peer -> mkeys [segno ]) {
@@ -197,7 +197,7 @@ int mca_spml_ucx_peer_mkey_cache_del(ucp_peer_t *ucp_peer, int segno)
197
197
/* Release the memkey map from a ucp_peer if it has any element in memkey */
198
198
void mca_spml_ucx_peer_mkey_cache_release (ucp_peer_t * ucp_peer )
199
199
{
200
- int i ;
200
+ size_t i ;
201
201
if (ucp_peer -> mkeys_cnt ) {
202
202
for (i = 0 ; i < ucp_peer -> mkeys_cnt ; i ++ ) {
203
203
assert (NULL == ucp_peer -> mkeys [i ]);
@@ -270,7 +270,6 @@ int mca_spml_ucx_ctx_mkey_add(mca_spml_ucx_ctx_t *ucx_ctx, int pe, uint32_t segn
270
270
int mca_spml_ucx_ctx_mkey_del (mca_spml_ucx_ctx_t * ucx_ctx , int pe , uint32_t segno , spml_ucx_mkey_t * ucx_mkey )
271
271
{
272
272
ucp_peer_t * ucp_peer ;
273
- spml_ucx_cached_mkey_t * ucx_cached_mkey ;
274
273
int rc ;
275
274
ucp_peer = & (ucx_ctx -> ucp_peers [pe ]);
276
275
ucp_rkey_destroy (ucx_mkey -> rkey );
@@ -429,8 +428,6 @@ static int oshmem_shmem_xchng(
429
428
}
430
429
431
430
432
- static char spml_ucx_transport_ids [1 ] = { 0 };
433
-
434
431
int mca_spml_ucx_init_put_op_mask (mca_spml_ucx_ctx_t * ctx , size_t nprocs )
435
432
{
436
433
int res ;
@@ -473,7 +470,7 @@ int mca_spml_ucx_add_procs(oshmem_group_t* group, size_t nprocs)
473
470
unsigned int * wk_roffs = NULL ;
474
471
unsigned int * wk_rsizes = NULL ;
475
472
char * wk_raddrs = NULL ;
476
- size_t i , j , w , n ;
473
+ size_t i , w , n ;
477
474
ucs_status_t err ;
478
475
ucp_address_t * * wk_local_addr ;
479
476
unsigned int * wk_addr_len ;
@@ -1011,7 +1008,7 @@ void mca_spml_ucx_ctx_destroy(shmem_ctx_t ctx)
1011
1008
1012
1009
int mca_spml_ucx_get (shmem_ctx_t ctx , void * src_addr , size_t size , void * dst_addr , int src )
1013
1010
{
1014
- void * rva ;
1011
+ void * rva = NULL ;
1015
1012
spml_ucx_mkey_t * ucx_mkey = mca_spml_ucx_ctx_mkey_by_va (ctx , src , src_addr , & rva , & mca_spml_ucx );
1016
1013
assert (NULL != ucx_mkey );
1017
1014
mca_spml_ucx_ctx_t * ucx_ctx = (mca_spml_ucx_ctx_t * )ctx ;
@@ -1038,7 +1035,7 @@ int mca_spml_ucx_get(shmem_ctx_t ctx, void *src_addr, size_t size, void *dst_add
1038
1035
1039
1036
int mca_spml_ucx_get_nb (shmem_ctx_t ctx , void * src_addr , size_t size , void * dst_addr , int src , void * * handle )
1040
1037
{
1041
- void * rva ;
1038
+ void * rva = NULL ;
1042
1039
ucs_status_t status ;
1043
1040
spml_ucx_mkey_t * ucx_mkey = mca_spml_ucx_ctx_mkey_by_va (ctx , src , src_addr , & rva , & mca_spml_ucx );
1044
1041
assert (NULL != ucx_mkey );
@@ -1066,7 +1063,7 @@ int mca_spml_ucx_get_nb(shmem_ctx_t ctx, void *src_addr, size_t size, void *dst_
1066
1063
int mca_spml_ucx_get_nb_wprogress (shmem_ctx_t ctx , void * src_addr , size_t size , void * dst_addr , int src , void * * handle )
1067
1064
{
1068
1065
unsigned int i ;
1069
- void * rva ;
1066
+ void * rva = NULL ;
1070
1067
ucs_status_t status ;
1071
1068
spml_ucx_mkey_t * ucx_mkey = mca_spml_ucx_ctx_mkey_by_va (ctx , src , src_addr , & rva , & mca_spml_ucx );
1072
1069
assert (NULL != ucx_mkey );
@@ -1104,7 +1101,7 @@ int mca_spml_ucx_get_nb_wprogress(shmem_ctx_t ctx, void *src_addr, size_t size,
1104
1101
1105
1102
int mca_spml_ucx_put (shmem_ctx_t ctx , void * dst_addr , size_t size , void * src_addr , int dst )
1106
1103
{
1107
- void * rva ;
1104
+ void * rva = NULL ;
1108
1105
spml_ucx_mkey_t * ucx_mkey = mca_spml_ucx_ctx_mkey_by_va (ctx , dst , dst_addr , & rva , & mca_spml_ucx );
1109
1106
assert (NULL != ucx_mkey );
1110
1107
mca_spml_ucx_ctx_t * ucx_ctx = (mca_spml_ucx_ctx_t * )ctx ;
@@ -1138,7 +1135,7 @@ int mca_spml_ucx_put(shmem_ctx_t ctx, void* dst_addr, size_t size, void* src_add
1138
1135
1139
1136
int mca_spml_ucx_put_nb (shmem_ctx_t ctx , void * dst_addr , size_t size , void * src_addr , int dst , void * * handle )
1140
1137
{
1141
- void * rva ;
1138
+ void * rva = NULL ;
1142
1139
spml_ucx_mkey_t * ucx_mkey = mca_spml_ucx_ctx_mkey_by_va (ctx , dst , dst_addr , & rva , & mca_spml_ucx );
1143
1140
assert (NULL != ucx_mkey );
1144
1141
mca_spml_ucx_ctx_t * ucx_ctx = (mca_spml_ucx_ctx_t * )ctx ;
@@ -1171,7 +1168,7 @@ int mca_spml_ucx_put_nb(shmem_ctx_t ctx, void* dst_addr, size_t size, void* src_
1171
1168
int mca_spml_ucx_put_nb_wprogress (shmem_ctx_t ctx , void * dst_addr , size_t size , void * src_addr , int dst , void * * handle )
1172
1169
{
1173
1170
unsigned int i ;
1174
- void * rva ;
1171
+ void * rva = NULL ;
1175
1172
ucs_status_t status ;
1176
1173
spml_ucx_mkey_t * ucx_mkey = mca_spml_ucx_ctx_mkey_by_va (ctx , dst , dst_addr , & rva , & mca_spml_ucx );
1177
1174
assert (NULL != ucx_mkey );
0 commit comments