Skip to content

Commit 3f11c8e

Browse files
authored
Merge pull request #7249 from janjust/oshmem_atomic_set_fix
Oshmem atomic set fix
2 parents 569d63c + 2d8f9b1 commit 3f11c8e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

oshmem/mca/sshmem/ucx/sshmem_ucx_module.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ segment_create(map_segment_t *ds_buf,
226226
unsigned flags;
227227

228228
#if HAVE_UCX_DEVICE_MEM
229+
int ret = OSHMEM_ERROR;
229230
if (hint & SHMEM_HINT_DEVICE_NIC_MEM) {
230231
if (size > UINT_MAX) {
231232
return OSHMEM_ERR_BAD_PARAM;

oshmem/shmem/c/shmem_set.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,18 @@
2727
int rc = OSHMEM_SUCCESS; \
2828
size_t size = 0; \
2929
type out_value; \
30-
\
30+
uint64_t value_tmp; \
3131
RUNTIME_CHECK_INIT(); \
3232
RUNTIME_CHECK_PE(pe); \
3333
RUNTIME_CHECK_ADDR(target); \
3434
\
3535
size = sizeof(out_value); \
36+
memcpy(&value_tmp, &value, size); \
3637
rc = MCA_ATOMIC_CALL(swap( \
3738
ctx, \
3839
(void*)target, \
3940
(void*)&out_value, \
40-
value, \
41+
value_tmp, \
4142
size, \
4243
pe)); \
4344
RUNTIME_CHECK_RC(rc); \

0 commit comments

Comments
 (0)