Merge pull request #10493 from MamziB/mamzi/atomic-acc-nocheck

devreal · web-flow · commit eba4e3377712 · 2022-06-23T09:35:15.000-04:00
OSC UCX: Enable software atomicity when lock is set to MPI_MODE_NOCHECK
diff --git a/ompi/mca/osc/ucx/osc_ucx_passive_target.c b/ompi/mca/osc/ucx/osc_ucx_passive_target.c
@@ -124,6 +124,11 @@ int ompi_osc_ucx_lock(int lock_type, int target, int mpi_assert, struct ompi_win
         }
     } else {
         lock->is_nocheck = true;
+        if (lock_type == MPI_LOCK_EXCLUSIVE) {
+            lock->type = LOCK_EXCLUSIVE;
+        } else {
+            lock->type = LOCK_SHARED;
+        }
     }
 
     if (ret == OMPI_SUCCESS) {

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,11 @@ int ompi_osc_ucx_lock(int lock_type, int target, int mpi_assert, struct ompi_win`
`124`	`124`	`}`
`125`	`125`	`} else {`
`126`	`126`	`lock->is_nocheck = true;`
	`127`	`+ if (lock_type == MPI_LOCK_EXCLUSIVE) {`
	`128`	`+ lock->type = LOCK_EXCLUSIVE;`
	`129`	`+ } else {`
	`130`	`+ lock->type = LOCK_SHARED;`
	`131`	`+ }`
`127`	`132`	`}`
`128`	`133`
`129`	`134`	`if (ret == OMPI_SUCCESS) {`