From 1743b727962953373aa383b3564d517335234944 Mon Sep 17 00:00:00 2001 From: Boris Karasev Date: Tue, 26 Sep 2017 09:12:09 +0300 Subject: [PATCH 1/2] oshmem: introduced the definition `SHMEM_ALLTOALLS_SYNC_SIZE` In accordance with the OSHMEM spec, this definition must be included in the code. Signed-off-by: Boris Karasev (cherry picked from commit 584ff76dea12889090404e4d87e2b58074fc02e7) --- oshmem/include/shmem.h.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/oshmem/include/shmem.h.in b/oshmem/include/shmem.h.in index 7b51eaddd6c..73c624b832c 100644 --- a/oshmem/include/shmem.h.in +++ b/oshmem/include/shmem.h.in @@ -118,6 +118,7 @@ enum shmem_wait_ops { #define _SHMEM_COLLECT_SYNC_SIZE (1 + _SHMEM_BCAST_SYNC_SIZE) #define _SHMEM_REDUCE_SYNC_SIZE (1 + _SHMEM_BCAST_SYNC_SIZE) #define _SHMEM_ALLTOALL_SYNC_SIZE (1) +#define _SHMEM_ALLTOALLS_SYNC_SIZE (1) #define _SHMEM_REDUCE_MIN_WRKDATA_SIZE (1) #define _SHMEM_SYNC_VALUE (-1) @@ -126,6 +127,7 @@ enum shmem_wait_ops { #define SHMEM_COLLECT_SYNC_SIZE _SHMEM_COLLECT_SYNC_SIZE #define SHMEM_REDUCE_SYNC_SIZE _SHMEM_REDUCE_SYNC_SIZE #define SHMEM_ALLTOALL_SYNC_SIZE _SHMEM_ALLTOALL_SYNC_SIZE +#define SHMEM_ALLTOALLS_SYNC_SIZE _SHMEM_ALLTOALLS_SYNC_SIZE #define SHMEM_REDUCE_MIN_WRKDATA_SIZE _SHMEM_REDUCE_MIN_WRKDATA_SIZE #define SHMEM_SYNC_VALUE _SHMEM_SYNC_VALUE From 4ac812d7db465ad1bc5b16aa264dc7dae5dfc05f Mon Sep 17 00:00:00 2001 From: Boris Karasev Date: Tue, 26 Sep 2017 11:37:20 +0300 Subject: [PATCH 2/2] oshmem: refactoring the definition of `SHMEM_ALLTOALLS_SYNC_SIZE` Signed-off-by: Boris Karasev (cherry picked from commit 7479328937f69f9ba6c99027e9fbd8477ce0c946) --- oshmem/include/shmem.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/oshmem/include/shmem.h.in b/oshmem/include/shmem.h.in index 73c624b832c..a81e890cdc6 100644 --- a/oshmem/include/shmem.h.in +++ b/oshmem/include/shmem.h.in @@ -117,8 +117,8 @@ enum shmem_wait_ops { #define _SHMEM_BCAST_SYNC_SIZE (1 + _SHMEM_BARRIER_SYNC_SIZE) #define _SHMEM_COLLECT_SYNC_SIZE (1 + _SHMEM_BCAST_SYNC_SIZE) #define _SHMEM_REDUCE_SYNC_SIZE (1 + _SHMEM_BCAST_SYNC_SIZE) -#define _SHMEM_ALLTOALL_SYNC_SIZE (1) -#define _SHMEM_ALLTOALLS_SYNC_SIZE (1) +#define _SHMEM_ALLTOALL_SYNC_SIZE (_SHMEM_BARRIER_SYNC_SIZE) +#define _SHMEM_ALLTOALLS_SYNC_SIZE (_SHMEM_BARRIER_SYNC_SIZE) #define _SHMEM_REDUCE_MIN_WRKDATA_SIZE (1) #define _SHMEM_SYNC_VALUE (-1)