Merge pull request #13135 from devreal/osc-ucx-fix-no-locks-v5.0.x

janjust · web-flow · commit ac3455bcfc33 · 2025-03-11T10:33:46.000-05:00
osc/ucx: ignore lock table if "no_locks" info key is set
diff --git a/ompi/mca/osc/ucx/osc_ucx_comm.c b/ompi/mca/osc/ucx/osc_ucx_comm.c
@@ -598,6 +598,9 @@ int ompi_osc_ucx_get(void *origin_addr, int origin_count,
 static inline bool ompi_osc_need_acc_lock(ompi_osc_ucx_module_t *module, int target)
 {
     ompi_osc_ucx_lock_t *lock = NULL;
+    if (module->no_locks) {
+        return true; // if we have no locks we always need to acquire the accumulate lock
+    }
     opal_hash_table_get_value_uint32(&module->outstanding_locks,
                                      (uint32_t) target, (void **) &lock);
 

Original file line number	Diff line number	Diff line change
`@@ -598,6 +598,9 @@ int ompi_osc_ucx_get(void *origin_addr, int origin_count,`
`598`	`598`	`static inline bool ompi_osc_need_acc_lock(ompi_osc_ucx_module_t *module, int target)`
`599`	`599`	`{`
`600`	`600`	`ompi_osc_ucx_lock_t *lock = NULL;`
	`601`	`+ if (module->no_locks) {`
	`602`	`+ return true; // if we have no locks we always need to acquire the accumulate lock`
	`603`	`+ }`
`601`	`604`	`opal_hash_table_get_value_uint32(&module->outstanding_locks,`
`602`	`605`	`(uint32_t) target, (void **) &lock);`
`603`	`606`