Skip to content

Commit 8031336

Browse files
authored
Merge pull request #6168 from hoopoepg/topic/get-put-int-uint-8-16-32
OSHMEM: added missing API for get/put operations
2 parents 26a2054 + cfa9150 commit 8031336

13 files changed

+1091
-298
lines changed

oshmem/include/pshmem.h

Lines changed: 190 additions & 30 deletions
Large diffs are not rendered by default.

oshmem/include/pshmemx.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,6 @@ OSHMEM_DECLSPEC void pshmemx_int64_prod_to_all(int64_t *target, const int64_t *s
184184
/*
185185
* Backward compatibility section
186186
*/
187-
#define pshmem_int16_p pshmemx_int16_p
188-
#define pshmem_int32_p pshmemx_int32_p
189-
#define pshmem_int64_p pshmemx_int64_p
190-
191-
#define pshmem_int16_g pshmemx_int16_g
192-
#define pshmem_int32_g pshmemx_int32_g
193-
#define pshmem_int64_g pshmemx_int64_g
194-
195187
#define pshmem_int32_swap pshmemx_int32_swap
196188
#define pshmem_int64_swap pshmemx_int64_swap
197189

oshmem/include/shmem.h.in

Lines changed: 190 additions & 30 deletions
Large diffs are not rendered by default.

oshmem/include/shmemx.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -171,14 +171,6 @@ OSHMEM_DECLSPEC void shmemx_int64_prod_to_all(int64_t *target, const int64_t *so
171171
/*
172172
* Backward compatibility section
173173
*/
174-
#define shmem_int16_p shmemx_int16_p
175-
#define shmem_int32_p shmemx_int32_p
176-
#define shmem_int64_p shmemx_int64_p
177-
178-
#define shmem_int16_g shmemx_int16_g
179-
#define shmem_int32_g shmemx_int32_g
180-
#define shmem_int64_g shmemx_int64_g
181-
182174
#define shmem_int32_swap shmemx_int32_swap
183175
#define shmem_int64_swap shmemx_int64_swap
184176

oshmem/shmem/c/profile/defines.h

Lines changed: 160 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
/*
7373
* Elemental put routines
7474
*/
75-
7675
#define shmem_ctx_char_p pshmem_ctx_char_p
7776
#define shmem_ctx_short_p pshmem_ctx_short_p
7877
#define shmem_ctx_int_p pshmem_ctx_int_p
@@ -87,6 +86,16 @@
8786
#define shmem_ctx_ulong_p pshmem_ctx_ulong_p
8887
#define shmem_ctx_ulonglong_p pshmem_ctx_ulonglong_p
8988
#define shmem_ctx_longdouble_p pshmem_ctx_longdouble_p
89+
#define shmem_ctx_int8_p pshmem_ctx_int8_p
90+
#define shmem_ctx_int16_p pshmem_ctx_int16_p
91+
#define shmem_ctx_int32_p pshmem_ctx_int32_p
92+
#define shmem_ctx_int64_p pshmem_ctx_int64_p
93+
#define shmem_ctx_uint8_p pshmem_ctx_uint8_p
94+
#define shmem_ctx_uint16_p pshmem_ctx_uint16_p
95+
#define shmem_ctx_uint32_p pshmem_ctx_uint32_p
96+
#define shmem_ctx_uint64_p pshmem_ctx_uint64_p
97+
#define shmem_ctx_size_p pshmem_ctx_size_p
98+
#define shmem_ctx_ptrdiff_p pshmem_ctx_ptrdiff_p
9099

91100
#define shmem_char_p pshmem_char_p
92101
#define shmem_short_p pshmem_short_p
@@ -102,6 +111,16 @@
102111
#define shmem_ulong_p pshmem_ulong_p
103112
#define shmem_ulonglong_p pshmem_ulonglong_p
104113
#define shmem_longdouble_p pshmem_longdouble_p
114+
#define shmem_int8_p pshmem_int8_p
115+
#define shmem_int16_p pshmem_int16_p
116+
#define shmem_int32_p pshmem_int32_p
117+
#define shmem_int64_p pshmem_int64_p
118+
#define shmem_uint8_p pshmem_uint8_p
119+
#define shmem_uint16_p pshmem_uint16_p
120+
#define shmem_uint32_p pshmem_uint32_p
121+
#define shmem_uint64_p pshmem_uint64_p
122+
#define shmem_size_p pshmem_size_p
123+
#define shmem_ptrdiff_p pshmem_ptrdiff_p
105124

106125
#define shmemx_int16_p pshmemx_int16_p
107126
#define shmemx_int32_p pshmemx_int32_p
@@ -124,6 +143,16 @@
124143
#define shmem_ctx_ulong_put pshmem_ctx_ulong_put
125144
#define shmem_ctx_ulonglong_put pshmem_ctx_ulonglong_put
126145
#define shmem_ctx_longdouble_put pshmem_ctx_longdouble_put
146+
#define shmem_ctx_int8_put pshmem_ctx_int8_put
147+
#define shmem_ctx_int16_put pshmem_ctx_int16_put
148+
#define shmem_ctx_int32_put pshmem_ctx_int32_put
149+
#define shmem_ctx_int64_put pshmem_ctx_int64_put
150+
#define shmem_ctx_uint8_put pshmem_ctx_uint8_put
151+
#define shmem_ctx_uint16_put pshmem_ctx_uint16_put
152+
#define shmem_ctx_uint32_put pshmem_ctx_uint32_put
153+
#define shmem_ctx_uint64_put pshmem_ctx_uint64_put
154+
#define shmem_ctx_size_put pshmem_ctx_size_put
155+
#define shmem_ctx_ptrdiff_put pshmem_ctx_ptrdiff_put
127156

128157
#define shmem_char_put pshmem_char_put /* shmem-compat.h */
129158
#define shmem_short_put pshmem_short_put
@@ -139,6 +168,16 @@
139168
#define shmem_ulong_put pshmem_ulong_put
140169
#define shmem_ulonglong_put pshmem_ulonglong_put
141170
#define shmem_longdouble_put pshmem_longdouble_put
171+
#define shmem_int8_put pshmem_int8_put
172+
#define shmem_int16_put pshmem_int16_put
173+
#define shmem_int32_put pshmem_int32_put
174+
#define shmem_int64_put pshmem_int64_put
175+
#define shmem_uint8_put pshmem_uint8_put
176+
#define shmem_uint16_put pshmem_uint16_put
177+
#define shmem_uint32_put pshmem_uint32_put
178+
#define shmem_uint64_put pshmem_uint64_put
179+
#define shmem_size_put pshmem_size_put
180+
#define shmem_ptrdiff_put pshmem_ptrdiff_put
142181

143182
#define shmem_ctx_put8 pshmem_ctx_put8
144183
#define shmem_ctx_put16 pshmem_ctx_put16
@@ -171,6 +210,16 @@
171210
#define shmem_ctx_ulong_iput pshmem_ctx_ulong_iput
172211
#define shmem_ctx_ulonglong_iput pshmem_ctx_ulonglong_iput
173212
#define shmem_ctx_longdouble_iput pshmem_ctx_longdouble_iput
213+
#define shmem_ctx_int8_iput pshmem_ctx_int8_iput
214+
#define shmem_ctx_int16_iput pshmem_ctx_int16_iput
215+
#define shmem_ctx_int32_iput pshmem_ctx_int32_iput
216+
#define shmem_ctx_int64_iput pshmem_ctx_int64_iput
217+
#define shmem_ctx_uint8_iput pshmem_ctx_uint8_iput
218+
#define shmem_ctx_uint16_iput pshmem_ctx_uint16_iput
219+
#define shmem_ctx_uint32_iput pshmem_ctx_uint32_iput
220+
#define shmem_ctx_uint64_iput pshmem_ctx_uint64_iput
221+
#define shmem_ctx_size_iput pshmem_ctx_size_iput
222+
#define shmem_ctx_ptrdiff_iput pshmem_ctx_ptrdiff_iput
174223

175224
#define shmem_char_iput pshmem_char_iput
176225
#define shmem_short_iput pshmem_short_iput
@@ -186,6 +235,16 @@
186235
#define shmem_ulong_iput pshmem_ulong_iput
187236
#define shmem_ulonglong_iput pshmem_ulonglong_iput
188237
#define shmem_longdouble_iput pshmem_longdouble_iput
238+
#define shmem_int8_iput pshmem_int8_iput
239+
#define shmem_int16_iput pshmem_int16_iput
240+
#define shmem_int32_iput pshmem_int32_iput
241+
#define shmem_int64_iput pshmem_int64_iput
242+
#define shmem_uint8_iput pshmem_uint8_iput
243+
#define shmem_uint16_iput pshmem_uint16_iput
244+
#define shmem_uint32_iput pshmem_uint32_iput
245+
#define shmem_uint64_iput pshmem_uint64_iput
246+
#define shmem_size_iput pshmem_size_iput
247+
#define shmem_ptrdiff_iput pshmem_ptrdiff_iput
189248

190249
#define shmem_ctx_iput8 pshmem_ctx_iput8
191250
#define shmem_ctx_iput16 pshmem_ctx_iput16
@@ -216,6 +275,16 @@
216275
#define shmem_ctx_ulong_put_nbi pshmem_ctx_ulong_put_nbi
217276
#define shmem_ctx_ulonglong_put_nbi pshmem_ctx_ulonglong_put_nbi
218277
#define shmem_ctx_longdouble_put_nbi pshmem_ctx_longdouble_put_nbi
278+
#define shmem_ctx_int8_put_nbi pshmem_ctx_int8_put_nbi
279+
#define shmem_ctx_int16_put_nbi pshmem_ctx_int16_put_nbi
280+
#define shmem_ctx_int32_put_nbi pshmem_ctx_int32_put_nbi
281+
#define shmem_ctx_int64_put_nbi pshmem_ctx_int64_put_nbi
282+
#define shmem_ctx_uint8_put_nbi pshmem_ctx_uint8_put_nbi
283+
#define shmem_ctx_uint16_put_nbi pshmem_ctx_uint16_put_nbi
284+
#define shmem_ctx_uint32_put_nbi pshmem_ctx_uint32_put_nbi
285+
#define shmem_ctx_uint64_put_nbi pshmem_ctx_uint64_put_nbi
286+
#define shmem_ctx_size_put_nbi pshmem_ctx_size_put_nbi
287+
#define shmem_ctx_ptrdiff_put_nbi pshmem_ctx_ptrdiff_put_nbi
219288

220289
#define shmem_char_put_nbi pshmem_char_put_nbi
221290
#define shmem_short_put_nbi pshmem_short_put_nbi
@@ -231,6 +300,16 @@
231300
#define shmem_ulong_put_nbi pshmem_ulong_put_nbi
232301
#define shmem_ulonglong_put_nbi pshmem_ulonglong_put_nbi
233302
#define shmem_longdouble_put_nbi pshmem_longdouble_put_nbi
303+
#define shmem_int8_put_nbi pshmem_int8_put_nbi
304+
#define shmem_int16_put_nbi pshmem_int16_put_nbi
305+
#define shmem_int32_put_nbi pshmem_int32_put_nbi
306+
#define shmem_int64_put_nbi pshmem_int64_put_nbi
307+
#define shmem_uint8_put_nbi pshmem_uint8_put_nbi
308+
#define shmem_uint16_put_nbi pshmem_uint16_put_nbi
309+
#define shmem_uint32_put_nbi pshmem_uint32_put_nbi
310+
#define shmem_uint64_put_nbi pshmem_uint64_put_nbi
311+
#define shmem_size_put_nbi pshmem_size_put_nbi
312+
#define shmem_ptrdiff_put_nbi pshmem_ptrdiff_put_nbi
234313

235314
#define shmem_ctx_put8_nbi pshmem_ctx_put8_nbi
236315
#define shmem_ctx_put16_nbi pshmem_ctx_put16_nbi
@@ -263,6 +342,16 @@
263342
#define shmem_ctx_ulong_g pshmem_ctx_ulong_g
264343
#define shmem_ctx_ulonglong_g pshmem_ctx_ulonglong_g
265344
#define shmem_ctx_longdouble_g pshmem_ctx_longdouble_g
345+
#define shmem_ctx_int8_g pshmem_ctx_int8_g
346+
#define shmem_ctx_int16_g pshmem_ctx_int16_g
347+
#define shmem_ctx_int32_g pshmem_ctx_int32_g
348+
#define shmem_ctx_int64_g pshmem_ctx_int64_g
349+
#define shmem_ctx_uint8_g pshmem_ctx_uint8_g
350+
#define shmem_ctx_uint16_g pshmem_ctx_uint16_g
351+
#define shmem_ctx_uint32_g pshmem_ctx_uint32_g
352+
#define shmem_ctx_uint64_g pshmem_ctx_uint64_g
353+
#define shmem_ctx_size_g pshmem_ctx_size_g
354+
#define shmem_ctx_ptrdiff_g pshmem_ctx_ptrdiff_g
266355

267356
#define shmem_char_g pshmem_char_g
268357
#define shmem_short_g pshmem_short_g
@@ -278,6 +367,16 @@
278367
#define shmem_ulong_g pshmem_ulong_g
279368
#define shmem_ulonglong_g pshmem_ulonglong_g
280369
#define shmem_longdouble_g pshmem_longdouble_g
370+
#define shmem_int8_g pshmem_int8_g
371+
#define shmem_int16_g pshmem_int16_g
372+
#define shmem_int32_g pshmem_int32_g
373+
#define shmem_int64_g pshmem_int64_g
374+
#define shmem_uint8_g pshmem_uint8_g
375+
#define shmem_uint16_g pshmem_uint16_g
376+
#define shmem_uint32_g pshmem_uint32_g
377+
#define shmem_uint64_g pshmem_uint64_g
378+
#define shmem_size_g pshmem_size_g
379+
#define shmem_ptrdiff_g pshmem_ptrdiff_g
281380

282381
#define shmemx_int16_g pshmemx_int16_g
283382
#define shmemx_int32_g pshmemx_int32_g
@@ -300,6 +399,16 @@
300399
#define shmem_ctx_ulong_get pshmem_ctx_ulong_get
301400
#define shmem_ctx_ulonglong_get pshmem_ctx_ulonglong_get
302401
#define shmem_ctx_longdouble_get pshmem_ctx_longdouble_get
402+
#define shmem_ctx_int8_get pshmem_ctx_int8_get
403+
#define shmem_ctx_int16_get pshmem_ctx_int16_get
404+
#define shmem_ctx_int32_get pshmem_ctx_int32_get
405+
#define shmem_ctx_int64_get pshmem_ctx_int64_get
406+
#define shmem_ctx_uint8_get pshmem_ctx_uint8_get
407+
#define shmem_ctx_uint16_get pshmem_ctx_uint16_get
408+
#define shmem_ctx_uint32_get pshmem_ctx_uint32_get
409+
#define shmem_ctx_uint64_get pshmem_ctx_uint64_get
410+
#define shmem_ctx_size_get pshmem_ctx_size_get
411+
#define shmem_ctx_ptrdiff_get pshmem_ctx_ptrdiff_get
303412

304413
#define shmem_char_get pshmem_char_get /* shmem-compat.h */
305414
#define shmem_short_get pshmem_short_get
@@ -315,6 +424,16 @@
315424
#define shmem_ulong_get pshmem_ulong_get
316425
#define shmem_ulonglong_get pshmem_ulonglong_get
317426
#define shmem_longdouble_get pshmem_longdouble_get
427+
#define shmem_int8_get pshmem_int8_get
428+
#define shmem_int16_get pshmem_int16_get
429+
#define shmem_int32_get pshmem_int32_get
430+
#define shmem_int64_get pshmem_int64_get
431+
#define shmem_uint8_get pshmem_uint8_get
432+
#define shmem_uint16_get pshmem_uint16_get
433+
#define shmem_uint32_get pshmem_uint32_get
434+
#define shmem_uint64_get pshmem_uint64_get
435+
#define shmem_size_get pshmem_size_get
436+
#define shmem_ptrdiff_get pshmem_ptrdiff_get
318437

319438
#define shmem_ctx_get8 pshmem_ctx_get8
320439
#define shmem_ctx_get16 pshmem_ctx_get16
@@ -347,6 +466,16 @@
347466
#define shmem_ctx_ulong_iget pshmem_ctx_ulong_iget
348467
#define shmem_ctx_ulonglong_iget pshmem_ctx_ulonglong_iget
349468
#define shmem_ctx_longdouble_iget pshmem_ctx_longdouble_iget
469+
#define shmem_ctx_int8_iget pshmem_ctx_int8_iget
470+
#define shmem_ctx_int16_iget pshmem_ctx_int16_iget
471+
#define shmem_ctx_int32_iget pshmem_ctx_int32_iget
472+
#define shmem_ctx_int64_iget pshmem_ctx_int64_iget
473+
#define shmem_ctx_uint8_iget pshmem_ctx_uint8_iget
474+
#define shmem_ctx_uint16_iget pshmem_ctx_uint16_iget
475+
#define shmem_ctx_uint32_iget pshmem_ctx_uint32_iget
476+
#define shmem_ctx_uint64_iget pshmem_ctx_uint64_iget
477+
#define shmem_ctx_size_iget pshmem_ctx_size_iget
478+
#define shmem_ctx_ptrdiff_iget pshmem_ctx_ptrdiff_iget
350479

351480
#define shmem_char_iget pshmem_char_iget
352481
#define shmem_short_iget pshmem_short_iget
@@ -362,6 +491,16 @@
362491
#define shmem_ulong_iget pshmem_ulong_iget
363492
#define shmem_ulonglong_iget pshmem_ulonglong_iget
364493
#define shmem_longdouble_iget pshmem_longdouble_iget
494+
#define shmem_int8_iget pshmem_int8_iget
495+
#define shmem_int16_iget pshmem_int16_iget
496+
#define shmem_int32_iget pshmem_int32_iget
497+
#define shmem_int64_iget pshmem_int64_iget
498+
#define shmem_uint8_iget pshmem_uint8_iget
499+
#define shmem_uint16_iget pshmem_uint16_iget
500+
#define shmem_uint32_iget pshmem_uint32_iget
501+
#define shmem_uint64_iget pshmem_uint64_iget
502+
#define shmem_size_iget pshmem_size_iget
503+
#define shmem_ptrdiff_iget pshmem_ptrdiff_iget
365504

366505
#define shmem_ctx_iget8 pshmem_ctx_iget8
367506
#define shmem_ctx_iget16 pshmem_ctx_iget16
@@ -392,6 +531,16 @@
392531
#define shmem_ctx_ulong_get_nbi pshmem_ctx_ulong_get_nbi
393532
#define shmem_ctx_ulonglong_get_nbi pshmem_ctx_ulonglong_get_nbi
394533
#define shmem_ctx_longdouble_get_nbi pshmem_ctx_longdouble_get_nbi
534+
#define shmem_ctx_int8_get_nbi pshmem_ctx_int8_get_nbi
535+
#define shmem_ctx_int16_get_nbi pshmem_ctx_int16_get_nbi
536+
#define shmem_ctx_int32_get_nbi pshmem_ctx_int32_get_nbi
537+
#define shmem_ctx_int64_get_nbi pshmem_ctx_int64_get_nbi
538+
#define shmem_ctx_uint8_get_nbi pshmem_ctx_uint8_get_nbi
539+
#define shmem_ctx_uint16_get_nbi pshmem_ctx_uint16_get_nbi
540+
#define shmem_ctx_uint32_get_nbi pshmem_ctx_uint32_get_nbi
541+
#define shmem_ctx_uint64_get_nbi pshmem_ctx_uint64_get_nbi
542+
#define shmem_ctx_size_get_nbi pshmem_ctx_size_get_nbi
543+
#define shmem_ctx_ptrdiff_get_nbi pshmem_ctx_ptrdiff_get_nbi
395544

396545
#define shmem_char_get_nbi pshmem_char_get_nbi
397546
#define shmem_short_get_nbi pshmem_short_get_nbi
@@ -407,6 +556,16 @@
407556
#define shmem_ulong_get_nbi pshmem_ulong_get_nbi
408557
#define shmem_ulonglong_get_nbi pshmem_ulonglong_get_nbi
409558
#define shmem_longdouble_get_nbi pshmem_longdouble_get_nbi
559+
#define shmem_int8_get_nbi pshmem_int8_get_nbi
560+
#define shmem_int16_get_nbi pshmem_int16_get_nbi
561+
#define shmem_int32_get_nbi pshmem_int32_get_nbi
562+
#define shmem_int64_get_nbi pshmem_int64_get_nbi
563+
#define shmem_uint8_get_nbi pshmem_uint8_get_nbi
564+
#define shmem_uint16_get_nbi pshmem_uint16_get_nbi
565+
#define shmem_uint32_get_nbi pshmem_uint32_get_nbi
566+
#define shmem_uint64_get_nbi pshmem_uint64_get_nbi
567+
#define shmem_size_get_nbi pshmem_size_get_nbi
568+
#define shmem_ptrdiff_get_nbi pshmem_ptrdiff_get_nbi
410569

411570
#define shmem_ctx_get8_nbi pshmem_ctx_get8_nbi
412571
#define shmem_ctx_get16_nbi pshmem_ctx_get16_nbi

0 commit comments

Comments
 (0)