Merge pull request #6693 from hoopoepg/topic/fixed-compilation-warnings

SPML/UCX: fixed few compilation warnings

Author: yosefe

oshmem/mca/spml/ucx/spml_ucx.c

@@ -551,7 +551,8 @@ static int mca_spml_ucx_ctx_create_common(long options, mca_spml_ucx_ctx_t **ucx
 {
     ucp_worker_params_t params;
     ucp_ep_params_t ep_params;
-    size_t i, j, nprocs = oshmem_num_procs();
+    size_t i, nprocs = oshmem_num_procs();
+    int j;
     ucs_status_t err;
     spml_ucx_mkey_t *ucx_mkey;
     sshmem_mkey_t *mkey;

oshmem/mca/spml/ucx/spml_ucx.h

@@ -184,7 +184,8 @@ static inline void mca_spml_ucx_aux_unlock(void)
     }
 }
 
-static void mca_spml_ucx_cache_mkey(mca_spml_ucx_ctx_t *ucx_ctx, sshmem_mkey_t *mkey, uint32_t segno, int dst_pe)
+static inline void mca_spml_ucx_cache_mkey(mca_spml_ucx_ctx_t *ucx_ctx,
+                                           sshmem_mkey_t *mkey, uint32_t segno, int dst_pe)
 {
     ucp_peer_t *peer;
 

oshmem/mca/sshmem/ucx/configure.m4

@@ -50,7 +50,10 @@ AC_DEFUN([MCA_oshmem_sshmem_ucx_CONFIG],[
            sshmem_ucx_LIBS+=" $alloc_dm_LIBS"
            sshmem_ucx_LDFLAGS+=" $alloc_dm_LDFLAGS"
           ],
-          [AC_MSG_NOTICE([UCX device memory allocation is not supported])])
+          [
+           AC_MSG_NOTICE([UCX device memory allocation is not supported])
+           AC_DEFINE([HAVE_UCX_DEVICE_MEM], [0], [Support for device memory allocation])
+          ])
     AC_LANG_POP([C])
 
     CPPFLAGS="$save_CPPFLAGS"

oshmem/mca/sshmem/ucx/sshmem_ucx_module.c

@@ -225,7 +225,6 @@ segment_create(map_segment_t *ds_buf,
 {
     mca_spml_ucx_t *spml = (mca_spml_ucx_t*)mca_spml.self;
     unsigned flags;
-    int ret;
 
 #if HAVE_UCX_DEVICE_MEM
     if (hint & SHMEM_HINT_DEVICE_NIC_MEM) {
@@ -337,7 +336,7 @@ static unsigned sshmem_ucx_memheap_ptr2index(map_segment_t *s, void *ptr)
     return ((char*)ptr - (char*)s->super.va_base) / ALLOC_ELEM_SIZE;
 }
 
-void sshmem_ucx_memheap_wordcopy(void *dst, void *src, size_t size)
+static void sshmem_ucx_memheap_wordcopy(void *dst, void *src, size_t size)
 {
     const size_t count = (size + sizeof(uint64_t) - 1) / sizeof(uint64_t);
     uint64_t *dst64 = (uint64_t*)dst;