Skip to content

OSHMEM: added missing API for get/put operations #6168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 26, 2018
Merged

OSHMEM: added missing API for get/put operations #6168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
220 changes: 190 additions & 30 deletions oshmem/include/pshmem.h
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions oshmem/include/pshmemx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,6 @@ OSHMEM_DECLSPEC void pshmemx_int64_prod_to_all(int64_t *target, const int64_t *s
/*
* Backward compatibility section
*/
#define pshmem_int16_p pshmemx_int16_p
#define pshmem_int32_p pshmemx_int32_p
#define pshmem_int64_p pshmemx_int64_p

#define pshmem_int16_g pshmemx_int16_g
#define pshmem_int32_g pshmemx_int32_g
#define pshmem_int64_g pshmemx_int64_g

#define pshmem_int32_swap pshmemx_int32_swap
#define pshmem_int64_swap pshmemx_int64_swap

Expand Down
220 changes: 190 additions & 30 deletions oshmem/include/shmem.h.in
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions oshmem/include/shmemx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,14 +171,6 @@ OSHMEM_DECLSPEC void shmemx_int64_prod_to_all(int64_t *target, const int64_t *so
/*
* Backward compatibility section
*/
#define shmem_int16_p shmemx_int16_p
#define shmem_int32_p shmemx_int32_p
#define shmem_int64_p shmemx_int64_p

#define shmem_int16_g shmemx_int16_g
#define shmem_int32_g shmemx_int32_g
#define shmem_int64_g shmemx_int64_g

#define shmem_int32_swap shmemx_int32_swap
#define shmem_int64_swap shmemx_int64_swap

Expand Down
161 changes: 160 additions & 1 deletion oshmem/shmem/c/profile/defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@
/*
* Elemental put routines
*/

#define shmem_ctx_char_p pshmem_ctx_char_p
#define shmem_ctx_short_p pshmem_ctx_short_p
#define shmem_ctx_int_p pshmem_ctx_int_p
Expand All @@ -87,6 +86,16 @@
#define shmem_ctx_ulong_p pshmem_ctx_ulong_p
#define shmem_ctx_ulonglong_p pshmem_ctx_ulonglong_p
#define shmem_ctx_longdouble_p pshmem_ctx_longdouble_p
#define shmem_ctx_int8_p pshmem_ctx_int8_p
#define shmem_ctx_int16_p pshmem_ctx_int16_p
#define shmem_ctx_int32_p pshmem_ctx_int32_p
#define shmem_ctx_int64_p pshmem_ctx_int64_p
#define shmem_ctx_uint8_p pshmem_ctx_uint8_p
#define shmem_ctx_uint16_p pshmem_ctx_uint16_p
#define shmem_ctx_uint32_p pshmem_ctx_uint32_p
#define shmem_ctx_uint64_p pshmem_ctx_uint64_p
#define shmem_ctx_size_p pshmem_ctx_size_p
#define shmem_ctx_ptrdiff_p pshmem_ctx_ptrdiff_p

#define shmem_char_p pshmem_char_p
#define shmem_short_p pshmem_short_p
Expand All @@ -102,6 +111,16 @@
#define shmem_ulong_p pshmem_ulong_p
#define shmem_ulonglong_p pshmem_ulonglong_p
#define shmem_longdouble_p pshmem_longdouble_p
#define shmem_int8_p pshmem_int8_p
#define shmem_int16_p pshmem_int16_p
#define shmem_int32_p pshmem_int32_p
#define shmem_int64_p pshmem_int64_p
#define shmem_uint8_p pshmem_uint8_p
#define shmem_uint16_p pshmem_uint16_p
#define shmem_uint32_p pshmem_uint32_p
#define shmem_uint64_p pshmem_uint64_p
#define shmem_size_p pshmem_size_p
#define shmem_ptrdiff_p pshmem_ptrdiff_p

#define shmemx_int16_p pshmemx_int16_p
#define shmemx_int32_p pshmemx_int32_p
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hoopoepg Do you still need this ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually not, but backward compatibility...

Expand All @@ -124,6 +143,16 @@
#define shmem_ctx_ulong_put pshmem_ctx_ulong_put
#define shmem_ctx_ulonglong_put pshmem_ctx_ulonglong_put
#define shmem_ctx_longdouble_put pshmem_ctx_longdouble_put
#define shmem_ctx_int8_put pshmem_ctx_int8_put
#define shmem_ctx_int16_put pshmem_ctx_int16_put
#define shmem_ctx_int32_put pshmem_ctx_int32_put
#define shmem_ctx_int64_put pshmem_ctx_int64_put
#define shmem_ctx_uint8_put pshmem_ctx_uint8_put
#define shmem_ctx_uint16_put pshmem_ctx_uint16_put
#define shmem_ctx_uint32_put pshmem_ctx_uint32_put
#define shmem_ctx_uint64_put pshmem_ctx_uint64_put
#define shmem_ctx_size_put pshmem_ctx_size_put
#define shmem_ctx_ptrdiff_put pshmem_ctx_ptrdiff_put

#define shmem_char_put pshmem_char_put /* shmem-compat.h */
#define shmem_short_put pshmem_short_put
Expand All @@ -139,6 +168,16 @@
#define shmem_ulong_put pshmem_ulong_put
#define shmem_ulonglong_put pshmem_ulonglong_put
#define shmem_longdouble_put pshmem_longdouble_put
#define shmem_int8_put pshmem_int8_put
#define shmem_int16_put pshmem_int16_put
#define shmem_int32_put pshmem_int32_put
#define shmem_int64_put pshmem_int64_put
#define shmem_uint8_put pshmem_uint8_put
#define shmem_uint16_put pshmem_uint16_put
#define shmem_uint32_put pshmem_uint32_put
#define shmem_uint64_put pshmem_uint64_put
#define shmem_size_put pshmem_size_put
#define shmem_ptrdiff_put pshmem_ptrdiff_put

#define shmem_ctx_put8 pshmem_ctx_put8
#define shmem_ctx_put16 pshmem_ctx_put16
Expand Down Expand Up @@ -171,6 +210,16 @@
#define shmem_ctx_ulong_iput pshmem_ctx_ulong_iput
#define shmem_ctx_ulonglong_iput pshmem_ctx_ulonglong_iput
#define shmem_ctx_longdouble_iput pshmem_ctx_longdouble_iput
#define shmem_ctx_int8_iput pshmem_ctx_int8_iput
#define shmem_ctx_int16_iput pshmem_ctx_int16_iput
#define shmem_ctx_int32_iput pshmem_ctx_int32_iput
#define shmem_ctx_int64_iput pshmem_ctx_int64_iput
#define shmem_ctx_uint8_iput pshmem_ctx_uint8_iput
#define shmem_ctx_uint16_iput pshmem_ctx_uint16_iput
#define shmem_ctx_uint32_iput pshmem_ctx_uint32_iput
#define shmem_ctx_uint64_iput pshmem_ctx_uint64_iput
#define shmem_ctx_size_iput pshmem_ctx_size_iput
#define shmem_ctx_ptrdiff_iput pshmem_ctx_ptrdiff_iput

#define shmem_char_iput pshmem_char_iput
#define shmem_short_iput pshmem_short_iput
Expand All @@ -186,6 +235,16 @@
#define shmem_ulong_iput pshmem_ulong_iput
#define shmem_ulonglong_iput pshmem_ulonglong_iput
#define shmem_longdouble_iput pshmem_longdouble_iput
#define shmem_int8_iput pshmem_int8_iput
#define shmem_int16_iput pshmem_int16_iput
#define shmem_int32_iput pshmem_int32_iput
#define shmem_int64_iput pshmem_int64_iput
#define shmem_uint8_iput pshmem_uint8_iput
#define shmem_uint16_iput pshmem_uint16_iput
#define shmem_uint32_iput pshmem_uint32_iput
#define shmem_uint64_iput pshmem_uint64_iput
#define shmem_size_iput pshmem_size_iput
#define shmem_ptrdiff_iput pshmem_ptrdiff_iput

#define shmem_ctx_iput8 pshmem_ctx_iput8
#define shmem_ctx_iput16 pshmem_ctx_iput16
Expand Down Expand Up @@ -216,6 +275,16 @@
#define shmem_ctx_ulong_put_nbi pshmem_ctx_ulong_put_nbi
#define shmem_ctx_ulonglong_put_nbi pshmem_ctx_ulonglong_put_nbi
#define shmem_ctx_longdouble_put_nbi pshmem_ctx_longdouble_put_nbi
#define shmem_ctx_int8_put_nbi pshmem_ctx_int8_put_nbi
#define shmem_ctx_int16_put_nbi pshmem_ctx_int16_put_nbi
#define shmem_ctx_int32_put_nbi pshmem_ctx_int32_put_nbi
#define shmem_ctx_int64_put_nbi pshmem_ctx_int64_put_nbi
#define shmem_ctx_uint8_put_nbi pshmem_ctx_uint8_put_nbi
#define shmem_ctx_uint16_put_nbi pshmem_ctx_uint16_put_nbi
#define shmem_ctx_uint32_put_nbi pshmem_ctx_uint32_put_nbi
#define shmem_ctx_uint64_put_nbi pshmem_ctx_uint64_put_nbi
#define shmem_ctx_size_put_nbi pshmem_ctx_size_put_nbi
#define shmem_ctx_ptrdiff_put_nbi pshmem_ctx_ptrdiff_put_nbi

#define shmem_char_put_nbi pshmem_char_put_nbi
#define shmem_short_put_nbi pshmem_short_put_nbi
Expand All @@ -231,6 +300,16 @@
#define shmem_ulong_put_nbi pshmem_ulong_put_nbi
#define shmem_ulonglong_put_nbi pshmem_ulonglong_put_nbi
#define shmem_longdouble_put_nbi pshmem_longdouble_put_nbi
#define shmem_int8_put_nbi pshmem_int8_put_nbi
#define shmem_int16_put_nbi pshmem_int16_put_nbi
#define shmem_int32_put_nbi pshmem_int32_put_nbi
#define shmem_int64_put_nbi pshmem_int64_put_nbi
#define shmem_uint8_put_nbi pshmem_uint8_put_nbi
#define shmem_uint16_put_nbi pshmem_uint16_put_nbi
#define shmem_uint32_put_nbi pshmem_uint32_put_nbi
#define shmem_uint64_put_nbi pshmem_uint64_put_nbi
#define shmem_size_put_nbi pshmem_size_put_nbi
#define shmem_ptrdiff_put_nbi pshmem_ptrdiff_put_nbi

#define shmem_ctx_put8_nbi pshmem_ctx_put8_nbi
#define shmem_ctx_put16_nbi pshmem_ctx_put16_nbi
Expand Down Expand Up @@ -263,6 +342,16 @@
#define shmem_ctx_ulong_g pshmem_ctx_ulong_g
#define shmem_ctx_ulonglong_g pshmem_ctx_ulonglong_g
#define shmem_ctx_longdouble_g pshmem_ctx_longdouble_g
#define shmem_ctx_int8_g pshmem_ctx_int8_g
#define shmem_ctx_int16_g pshmem_ctx_int16_g
#define shmem_ctx_int32_g pshmem_ctx_int32_g
#define shmem_ctx_int64_g pshmem_ctx_int64_g
#define shmem_ctx_uint8_g pshmem_ctx_uint8_g
#define shmem_ctx_uint16_g pshmem_ctx_uint16_g
#define shmem_ctx_uint32_g pshmem_ctx_uint32_g
#define shmem_ctx_uint64_g pshmem_ctx_uint64_g
#define shmem_ctx_size_g pshmem_ctx_size_g
#define shmem_ctx_ptrdiff_g pshmem_ctx_ptrdiff_g

#define shmem_char_g pshmem_char_g
#define shmem_short_g pshmem_short_g
Expand All @@ -278,6 +367,16 @@
#define shmem_ulong_g pshmem_ulong_g
#define shmem_ulonglong_g pshmem_ulonglong_g
#define shmem_longdouble_g pshmem_longdouble_g
#define shmem_int8_g pshmem_int8_g
#define shmem_int16_g pshmem_int16_g
#define shmem_int32_g pshmem_int32_g
#define shmem_int64_g pshmem_int64_g
#define shmem_uint8_g pshmem_uint8_g
#define shmem_uint16_g pshmem_uint16_g
#define shmem_uint32_g pshmem_uint32_g
#define shmem_uint64_g pshmem_uint64_g
#define shmem_size_g pshmem_size_g
#define shmem_ptrdiff_g pshmem_ptrdiff_g

#define shmemx_int16_g pshmemx_int16_g
#define shmemx_int32_g pshmemx_int32_g
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hoopoepg same here ..

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn't removed this to not break existing software where this API is used

Expand All @@ -300,6 +399,16 @@
#define shmem_ctx_ulong_get pshmem_ctx_ulong_get
#define shmem_ctx_ulonglong_get pshmem_ctx_ulonglong_get
#define shmem_ctx_longdouble_get pshmem_ctx_longdouble_get
#define shmem_ctx_int8_get pshmem_ctx_int8_get
#define shmem_ctx_int16_get pshmem_ctx_int16_get
#define shmem_ctx_int32_get pshmem_ctx_int32_get
#define shmem_ctx_int64_get pshmem_ctx_int64_get
#define shmem_ctx_uint8_get pshmem_ctx_uint8_get
#define shmem_ctx_uint16_get pshmem_ctx_uint16_get
#define shmem_ctx_uint32_get pshmem_ctx_uint32_get
#define shmem_ctx_uint64_get pshmem_ctx_uint64_get
#define shmem_ctx_size_get pshmem_ctx_size_get
#define shmem_ctx_ptrdiff_get pshmem_ctx_ptrdiff_get

#define shmem_char_get pshmem_char_get /* shmem-compat.h */
#define shmem_short_get pshmem_short_get
Expand All @@ -315,6 +424,16 @@
#define shmem_ulong_get pshmem_ulong_get
#define shmem_ulonglong_get pshmem_ulonglong_get
#define shmem_longdouble_get pshmem_longdouble_get
#define shmem_int8_get pshmem_int8_get
#define shmem_int16_get pshmem_int16_get
#define shmem_int32_get pshmem_int32_get
#define shmem_int64_get pshmem_int64_get
#define shmem_uint8_get pshmem_uint8_get
#define shmem_uint16_get pshmem_uint16_get
#define shmem_uint32_get pshmem_uint32_get
#define shmem_uint64_get pshmem_uint64_get
#define shmem_size_get pshmem_size_get
#define shmem_ptrdiff_get pshmem_ptrdiff_get

#define shmem_ctx_get8 pshmem_ctx_get8
#define shmem_ctx_get16 pshmem_ctx_get16
Expand Down Expand Up @@ -347,6 +466,16 @@
#define shmem_ctx_ulong_iget pshmem_ctx_ulong_iget
#define shmem_ctx_ulonglong_iget pshmem_ctx_ulonglong_iget
#define shmem_ctx_longdouble_iget pshmem_ctx_longdouble_iget
#define shmem_ctx_int8_iget pshmem_ctx_int8_iget
#define shmem_ctx_int16_iget pshmem_ctx_int16_iget
#define shmem_ctx_int32_iget pshmem_ctx_int32_iget
#define shmem_ctx_int64_iget pshmem_ctx_int64_iget
#define shmem_ctx_uint8_iget pshmem_ctx_uint8_iget
#define shmem_ctx_uint16_iget pshmem_ctx_uint16_iget
#define shmem_ctx_uint32_iget pshmem_ctx_uint32_iget
#define shmem_ctx_uint64_iget pshmem_ctx_uint64_iget
#define shmem_ctx_size_iget pshmem_ctx_size_iget
#define shmem_ctx_ptrdiff_iget pshmem_ctx_ptrdiff_iget

#define shmem_char_iget pshmem_char_iget
#define shmem_short_iget pshmem_short_iget
Expand All @@ -362,6 +491,16 @@
#define shmem_ulong_iget pshmem_ulong_iget
#define shmem_ulonglong_iget pshmem_ulonglong_iget
#define shmem_longdouble_iget pshmem_longdouble_iget
#define shmem_int8_iget pshmem_int8_iget
#define shmem_int16_iget pshmem_int16_iget
#define shmem_int32_iget pshmem_int32_iget
#define shmem_int64_iget pshmem_int64_iget
#define shmem_uint8_iget pshmem_uint8_iget
#define shmem_uint16_iget pshmem_uint16_iget
#define shmem_uint32_iget pshmem_uint32_iget
#define shmem_uint64_iget pshmem_uint64_iget
#define shmem_size_iget pshmem_size_iget
#define shmem_ptrdiff_iget pshmem_ptrdiff_iget

#define shmem_ctx_iget8 pshmem_ctx_iget8
#define shmem_ctx_iget16 pshmem_ctx_iget16
Expand Down Expand Up @@ -392,6 +531,16 @@
#define shmem_ctx_ulong_get_nbi pshmem_ctx_ulong_get_nbi
#define shmem_ctx_ulonglong_get_nbi pshmem_ctx_ulonglong_get_nbi
#define shmem_ctx_longdouble_get_nbi pshmem_ctx_longdouble_get_nbi
#define shmem_ctx_int8_get_nbi pshmem_ctx_int8_get_nbi
#define shmem_ctx_int16_get_nbi pshmem_ctx_int16_get_nbi
#define shmem_ctx_int32_get_nbi pshmem_ctx_int32_get_nbi
#define shmem_ctx_int64_get_nbi pshmem_ctx_int64_get_nbi
#define shmem_ctx_uint8_get_nbi pshmem_ctx_uint8_get_nbi
#define shmem_ctx_uint16_get_nbi pshmem_ctx_uint16_get_nbi
#define shmem_ctx_uint32_get_nbi pshmem_ctx_uint32_get_nbi
#define shmem_ctx_uint64_get_nbi pshmem_ctx_uint64_get_nbi
#define shmem_ctx_size_get_nbi pshmem_ctx_size_get_nbi
#define shmem_ctx_ptrdiff_get_nbi pshmem_ctx_ptrdiff_get_nbi

#define shmem_char_get_nbi pshmem_char_get_nbi
#define shmem_short_get_nbi pshmem_short_get_nbi
Expand All @@ -407,6 +556,16 @@
#define shmem_ulong_get_nbi pshmem_ulong_get_nbi
#define shmem_ulonglong_get_nbi pshmem_ulonglong_get_nbi
#define shmem_longdouble_get_nbi pshmem_longdouble_get_nbi
#define shmem_int8_get_nbi pshmem_int8_get_nbi
#define shmem_int16_get_nbi pshmem_int16_get_nbi
#define shmem_int32_get_nbi pshmem_int32_get_nbi
#define shmem_int64_get_nbi pshmem_int64_get_nbi
#define shmem_uint8_get_nbi pshmem_uint8_get_nbi
#define shmem_uint16_get_nbi pshmem_uint16_get_nbi
#define shmem_uint32_get_nbi pshmem_uint32_get_nbi
#define shmem_uint64_get_nbi pshmem_uint64_get_nbi
#define shmem_size_get_nbi pshmem_size_get_nbi
#define shmem_ptrdiff_get_nbi pshmem_ptrdiff_get_nbi

#define shmem_ctx_get8_nbi pshmem_ctx_get8_nbi
#define shmem_ctx_get16_nbi pshmem_ctx_get16_nbi
Expand Down
Loading