.

Author: MaayanGadishNvidia

src/components/tl/ucp/tl_ucp_context.c

@@ -219,7 +219,7 @@ UCC_CLASS_INIT_FUNC(ucc_tl_ucp_context_t,
     }
 
 #ifdef HAVE_UCX_NODE_LOCAL_ID
-    if (params->node_local_id != UCC_ULUNITS_AUTO) { 
+    if (params->node_local_id != UCC_ULUNITS_AUTO) {
         ucp_params.field_mask |= UCP_PARAM_FIELD_NODE_LOCAL_ID;
         ucp_params.node_local_id = params->node_local_id;
     }

src/core/ucc_context.c

@@ -860,8 +860,7 @@ ucc_status_t ucc_context_create_proc_info(ucc_lib_h                   lib,
         ucc_error("failed to init progress queue for context %p", ctx);
         goto error_ctx_create;
     }
-    ctx->id.pi      = *proc_info;
-    ctx->id.seq_num = ucc_atomic_fadd32(&ucc_context_seq_num, 1);
+
     if (params->mask & UCC_CONTEXT_PARAM_FIELD_OOB &&
         params->oob.n_oob_eps > 1) {
         do {
@@ -877,7 +876,7 @@ ucc_status_t ucc_context_create_proc_info(ucc_lib_h                   lib,
             }
         } while (status == UCC_INPROGRESS);
 
-        if (topo_required) {
+        if (topo_required && !ctx->topo) {
             /* At least one available CL context reported it needs topo info */
             status = ucc_context_topo_init(&ctx->addr_storage, &ctx->topo);
             if (UCC_OK != status) {
@@ -950,6 +949,7 @@ ucc_status_t ucc_context_create_proc_info(ucc_lib_h                   lib,
             goto error_ctx_create;
         }
     }
+
     n_tl_ctx = ctx->n_tl_ctx;
     for (i = 0; i < n_tl_ctx; i++) {
         tl_ctx = ctx->tl_ctx[i];