OSHMEM/MCA/SPML/UCX: removed config leak, fixed start calculation, removed (start < size) requirement

Signed-off-by: Roie Danino <[email protected]>

Author: roiedanino

oshmem/mca/spml/ucx/spml_ucx.c

@@ -1789,14 +1789,14 @@ int mca_spml_ucx_team_get_config(shmem_team_t team, long config_mask,
 }
 
 static inline int mca_spml_ucx_is_pe_in_strided_team(int src_pe, int start,
-        int stride, int size)
+                                                     int stride, int size)
 {
     return (src_pe >= start) && (src_pe < start + size * stride)
            && ((src_pe - start) % stride == 0);
 }
 
 int mca_spml_ucx_team_translate_pe(shmem_team_t src_team, int src_pe,
-        shmem_team_t dest_team)
+                                   shmem_team_t dest_team)
 {
     mca_spml_ucx_team_t *ucx_src_team  = (mca_spml_ucx_team_t*) src_team;
     mca_spml_ucx_team_t *ucx_dest_team = (mca_spml_ucx_team_t*) dest_team;
@@ -1831,7 +1831,8 @@ int mca_spml_ucx_team_split_strided(shmem_team_t parent_team, int start, int
     int parent_stride;
     int my_pe;
 
-    SPML_UCX_ASSERT(((start + size * stride) <= oshmem_num_procs()) && (start < size) && (stride > 0) && (size > 0));
+    SPML_UCX_ASSERT(((start + size * stride) <= oshmem_num_procs()) &&
+                    (stride > 0) && (size > 0));
 
     if (parent_team == SHMEM_TEAM_WORLD) {
         parent_pe = shmem_my_pe();
@@ -1855,7 +1856,7 @@ int mca_spml_ucx_team_split_strided(shmem_team_t parent_team, int start, int
     /* In order to simplify pe translations start and stride are calculated with respect to
      * world_team */
     ucx_new_team = (mca_spml_ucx_team_t *)malloc(sizeof(mca_spml_ucx_team_t));
-    ucx_new_team->start = parent_start + start;
+    ucx_new_team->start = parent_start + (start * parent_stride);
     ucx_new_team->stride = parent_stride * stride;
 
     ucx_new_team->n_pes = size;
@@ -1867,7 +1868,6 @@ int mca_spml_ucx_team_split_strided(shmem_team_t parent_team, int start, int
         memcpy(&ucx_new_team->config->super, config, sizeof(shmem_team_config_t));
     }
 
-    ucx_new_team->config = (mca_spml_ucx_team_config_t*)config;
     ucx_new_team->parent_team = (mca_spml_ucx_team_t*)parent_team;
 
     *new_team = (shmem_team_t)ucx_new_team;