Skip to content

Commit 3e1e131

Browse files
igor-ivanovigor-ivanov
committed
oshmem: Align OSHMEM API with spec v1.3 (Add alltoall Fortran)
1 parent bd6eaac commit 3e1e131

File tree

6 files changed

+217
-0
lines changed

6 files changed

+217
-0
lines changed

‎oshmem/shmem/fortran/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ liboshmem_fortran_la_SOURCES += \
120120
shmem_prod_to_all_f.c \
121121
shmem_collect_f.c \
122122
shmem_broadcast_f.c \
123+
shmem_alltoall_f.c \
123124
shmem_lock_f.c \
124125
shmem_cache_f.c \
125126
shmem_int4_inc_f.c \

‎oshmem/shmem/fortran/profile/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ nodist_liboshmem_fortran_pshmem_la_SOURCES = \
112112
pshmem_prod_to_all_f.c \
113113
pshmem_collect_f.c \
114114
pshmem_broadcast_f.c \
115+
pshmem_alltoall_f.c \
115116
pshmem_lock_f.c \
116117
pshmem_cache_f.c \
117118
pshmem_int4_inc_f.c \

‎oshmem/shmem/fortran/profile/defines.h‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,22 @@
8686
#define shmem_broadcast64_ pshmem_broadcast64_
8787
#define shmem_broadcast64__ pshmem_broadcast64__
8888

89+
#define SHMEM_ALLTOALL32 PSHMEM_ALLTOALL32
90+
#define shmem_alltoall32_ pshmem_alltoall32_
91+
#define shmem_alltoall32__ pshmem_alltoall32__
92+
93+
#define SHMEM_ALLTOALL64 PSHMEM_ALLTOALL64
94+
#define shmem_alltoall64_ pshmem_alltoall64_
95+
#define shmem_alltoall64__ pshmem_alltoall64__
96+
97+
#define SHMEM_ALLTOALLS32 PSHMEM_ALLTOALLS32
98+
#define shmem_alltoalls32_ pshmem_alltoalls32_
99+
#define shmem_alltoalls32__ pshmem_alltoalls32__
100+
101+
#define SHMEM_ALLTOALLS64 PSHMEM_ALLTOALLS64
102+
#define shmem_alltoalls64_ pshmem_alltoalls64_
103+
#define shmem_alltoalls64__ pshmem_alltoalls64__
104+
89105
#define SHMEM_SET_CACHE_INV PSHMEM_SET_CACHE_INV
90106
#define shmem_set_cache_inv_ pshmem_set_cache_inv_
91107
#define shmem_set_cache_inv__ pshmem_set_cache_inv__

‎oshmem/shmem/fortran/profile/prototypes_pshmem.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ PN (void, pshmem_broadcast4, PSHMEM_BROADCAST4, (FORTRAN_POINTER_T target, FORTR
154154
PN (void, pshmem_broadcast8, PSHMEM_BROADCAST8, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_root, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
155155
PN (void, pshmem_broadcast32, PSHMEM_BROADCAST32, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_root, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
156156
PN (void, pshmem_broadcast64, PSHMEM_BROADCAST64, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_root, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
157+
PN (void, pshmem_alltoall32, PSHMEM_ALLTOALL32, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
158+
PN (void, pshmem_alltoall64, PSHMEM_ALLTOALL64, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
159+
PN (void, pshmem_alltoalls32, PSHMEM_ALLTOALLS32, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *dst, MPI_Fint *sst, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
160+
PN (void, pshmem_alltoalls64, PSHMEM_ALLTOALLS64, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *dst, MPI_Fint *sst, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
157161
PN (void, pshmem_set_lock, PSHMEM_SET_LOCK, (FORTRAN_POINTER_T lock));
158162
PN (void, pshmem_clear_lock, PSHMEM_CLEAR_LOCK, (FORTRAN_POINTER_T lock));
159163
PN (MPI_Fint, pshmem_test_lock, PSHMEM_TEST_LOCK, (FORTRAN_POINTER_T lock));

‎oshmem/shmem/fortran/prototypes_shmem.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,10 @@ PN (void, shmem_broadcast4, SHMEM_BROADCAST4, (FORTRAN_POINTER_T target, FORTRAN
157157
PN (void, shmem_broadcast8, SHMEM_BROADCAST8, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_root, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
158158
PN (void, shmem_broadcast32, SHMEM_BROADCAST32, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_root, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
159159
PN (void, shmem_broadcast64, SHMEM_BROADCAST64, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_root, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
160+
PN (void, shmem_alltoall32, SHMEM_ALLTOALL32, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
161+
PN (void, shmem_alltoall64, SHMEM_ALLTOALL64, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
162+
PN (void, shmem_alltoalls32, SHMEM_ALLTOALLS32, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *dst, MPI_Fint *sst, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
163+
PN (void, shmem_alltoalls64, SHMEM_ALLTOALLS64, (FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *dst, MPI_Fint *sst, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync));
160164
PN (void, shmem_set_lock, SHMEM_SET_LOCK, (FORTRAN_POINTER_T lock));
161165
PN (void, shmem_clear_lock, SHMEM_CLEAR_LOCK, (FORTRAN_POINTER_T lock));
162166
PN (MPI_Fint, shmem_test_lock, SHMEM_TEST_LOCK, (FORTRAN_POINTER_T lock));

‎oshmem/shmem/fortran/shmem_alltoall_f.c‎

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
/*
2+
* Copyright (c) 2013-2016 Mellanox Technologies, Inc.
3+
* All rights reserved.
4+
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
5+
* $COPYRIGHT$
6+
*
7+
* Additional copyrights may follow
8+
*
9+
* $HEADER$
10+
*/
11+
12+
#include "oshmem_config.h"
13+
#include "oshmem/shmem/fortran/bindings.h"
14+
#include "oshmem/include/shmem.h"
15+
#include "oshmem/constants.h"
16+
#include "oshmem/mca/scoll/scoll.h"
17+
#include "oshmem/proc/proc.h"
18+
#include "oshmem/proc/proc_group_cache.h"
19+
#include "oshmem/op/op.h"
20+
21+
#if OSHMEM_PROFILING
22+
#include "oshmem/shmem/fortran/profile/pbindings.h"
23+
SHMEM_GENERATE_WEAK_BINDINGS(SHMEM_ALLTOALL32, shmem_alltoall32)
24+
SHMEM_GENERATE_WEAK_BINDINGS(SHMEM_ALLTOALL64, shmem_alltoall64)
25+
SHMEM_GENERATE_WEAK_BINDINGS(SHMEM_ALLTOALLS32, shmem_alltoalls32)
26+
SHMEM_GENERATE_WEAK_BINDINGS(SHMEM_ALLTOALLS64, shmem_alltoalls64)
27+
#include "oshmem/shmem/fortran/profile/defines.h"
28+
#endif
29+
30+
SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
31+
SHMEM_ALLTOALL32,
32+
shmem_alltoall32_,
33+
shmem_alltoall32__,
34+
shmem_alltoall32_f,
35+
(FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync),
36+
(target, source, nlong, PE_start, logPE_stride, PE_size, pSync))
37+
38+
SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
39+
SHMEM_ALLTOALL64,
40+
shmem_alltoall64_,
41+
shmem_alltoall64__,
42+
shmem_alltoall64_f,
43+
(FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync),
44+
(target, source, nlong, PE_start, logPE_stride, PE_size, pSync))
45+
46+
SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
47+
SHMEM_ALLTOALLS32,
48+
shmem_alltoalls32_,
49+
shmem_alltoalls32__,
50+
shmem_alltoalls32_f,
51+
(FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *dst, MPI_Fint *sst, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync),
52+
(target, source, dst, sst, nlong, PE_start, logPE_stride, PE_size, pSync))
53+
54+
SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
55+
SHMEM_ALLTOALLS64,
56+
shmem_alltoalls64_,
57+
shmem_alltoalls64__,
58+
shmem_alltoalls64_f,
59+
(FORTRAN_POINTER_T target, FORTRAN_POINTER_T source, MPI_Fint *dst, MPI_Fint *sst, MPI_Fint *nlong, MPI_Fint *PE_start, MPI_Fint * logPE_stride, MPI_Fint *PE_size, FORTRAN_POINTER_T pSync),
60+
(target, source, dst, sst, nlong, PE_start, logPE_stride, PE_size, pSync))
61+
62+
#define SHMEM_ALLTOALL(F_NAME, T_NAME, OSHMEM_GROUP_CACHE_ENABLED) void F_NAME(FORTRAN_POINTER_T target, \
63+
FORTRAN_POINTER_T source, \
64+
MPI_Fint *nlong,\
65+
MPI_Fint *PE_start, \
66+
MPI_Fint *logPE_stride, \
67+
MPI_Fint *PE_size, \
68+
FORTRAN_POINTER_T pSync)\
69+
{\
70+
int rc = OSHMEM_SUCCESS;\
71+
oshmem_group_t* group = NULL;\
72+
{\
73+
/* Create group basing PE_start, logPE_stride and PE_size */\
74+
if (OSHMEM_GROUP_CACHE_ENABLED == 0)\
75+
{\
76+
group = oshmem_proc_group_create(OMPI_FINT_2_INT(*PE_start), \
77+
(1 << OMPI_FINT_2_INT(*logPE_stride)), \
78+
OMPI_FINT_2_INT(*PE_size));\
79+
if (!group)\
80+
rc = OSHMEM_ERROR;\
81+
}\
82+
else\
83+
{\
84+
group = find_group_in_cache(OMPI_FINT_2_INT(*PE_start),\
85+
OMPI_FINT_2_INT(*logPE_stride),\
86+
OMPI_FINT_2_INT(*PE_size));\
87+
if (!group)\
88+
{\
89+
group = oshmem_proc_group_create(OMPI_FINT_2_INT(*PE_start), \
90+
(1 << OMPI_FINT_2_INT(*logPE_stride)), \
91+
OMPI_FINT_2_INT(*PE_size));\
92+
if (!group)\
93+
rc = OSHMEM_ERROR;\
94+
cache_group(group,OMPI_FINT_2_INT(*PE_start),\
95+
OMPI_FINT_2_INT(*logPE_stride),\
96+
OMPI_FINT_2_INT(*PE_size));\
97+
}\
98+
} /* OSHMEM_GROUP_CACHE_ENABLED */\
99+
/* Collective operation call */\
100+
if ( rc == OSHMEM_SUCCESS )\
101+
{\
102+
oshmem_op_t* op = T_NAME;\
103+
\
104+
/* Call collective broadcast operation */\
105+
rc = group->g_scoll.scoll_alltoall( group, \
106+
FPTR_2_VOID_PTR(target), \
107+
FPTR_2_VOID_PTR(source), \
108+
1, \
109+
1, \
110+
OMPI_FINT_2_INT(*nlong), \
111+
op->dt_size, \
112+
FPTR_2_VOID_PTR(pSync), SCOLL_DEFAULT_ALG );\
113+
}\
114+
if (OSHMEM_GROUP_CACHE_ENABLED == 0) \
115+
{\
116+
if ( group )\
117+
{\
118+
oshmem_proc_group_destroy(group);\
119+
}\
120+
} /* OSHMEM_GROUP_CACHE_ENABLED */\
121+
}\
122+
}
123+
124+
#define SHMEM_ALLTOALLS(F_NAME, T_NAME, OSHMEM_GROUP_CACHE_ENABLED) void F_NAME(FORTRAN_POINTER_T target, \
125+
FORTRAN_POINTER_T source, \
126+
MPI_Fint *dst,\
127+
MPI_Fint *sst,\
128+
MPI_Fint *nlong,\
129+
MPI_Fint *PE_start, \
130+
MPI_Fint *logPE_stride, \
131+
MPI_Fint *PE_size, \
132+
FORTRAN_POINTER_T pSync)\
133+
{\
134+
int rc = OSHMEM_SUCCESS;\
135+
oshmem_group_t* group = NULL;\
136+
{\
137+
/* Create group basing PE_start, logPE_stride and PE_size */\
138+
if (OSHMEM_GROUP_CACHE_ENABLED == 0)\
139+
{\
140+
group = oshmem_proc_group_create(OMPI_FINT_2_INT(*PE_start), \
141+
(1 << OMPI_FINT_2_INT(*logPE_stride)), \
142+
OMPI_FINT_2_INT(*PE_size));\
143+
if (!group)\
144+
rc = OSHMEM_ERROR;\
145+
}\
146+
else\
147+
{\
148+
group = find_group_in_cache(OMPI_FINT_2_INT(*PE_start),\
149+
OMPI_FINT_2_INT(*logPE_stride),\
150+
OMPI_FINT_2_INT(*PE_size));\
151+
if (!group)\
152+
{\
153+
group = oshmem_proc_group_create(OMPI_FINT_2_INT(*PE_start), \
154+
(1 << OMPI_FINT_2_INT(*logPE_stride)), \
155+
OMPI_FINT_2_INT(*PE_size));\
156+
if (!group)\
157+
rc = OSHMEM_ERROR;\
158+
cache_group(group,OMPI_FINT_2_INT(*PE_start),\
159+
OMPI_FINT_2_INT(*logPE_stride),\
160+
OMPI_FINT_2_INT(*PE_size));\
161+
}\
162+
} /* OSHMEM_GROUP_CACHE_ENABLED */\
163+
/* Collective operation call */\
164+
if ( rc == OSHMEM_SUCCESS )\
165+
{\
166+
oshmem_op_t* op = T_NAME;\
167+
\
168+
/* Call collective broadcast operation */\
169+
rc = group->g_scoll.scoll_alltoall( group, \
170+
FPTR_2_VOID_PTR(target), \
171+
FPTR_2_VOID_PTR(source), \
172+
OMPI_FINT_2_INT(*dst), \
173+
OMPI_FINT_2_INT(*sst), \
174+
OMPI_FINT_2_INT(*nlong), \
175+
op->dt_size, \
176+
FPTR_2_VOID_PTR(pSync), SCOLL_DEFAULT_ALG );\
177+
}\
178+
if (OSHMEM_GROUP_CACHE_ENABLED == 0) \
179+
{\
180+
if ( group )\
181+
{\
182+
oshmem_proc_group_destroy(group);\
183+
}\
184+
} /* OSHMEM_GROUP_CACHE_ENABLED */\
185+
}\
186+
}
187+
188+
SHMEM_ALLTOALL(shmem_alltoall32_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED)
189+
SHMEM_ALLTOALL(shmem_alltoall64_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED)
190+
SHMEM_ALLTOALLS(shmem_alltoalls32_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED)
191+
SHMEM_ALLTOALLS(shmem_alltoalls64_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED)

0 commit comments

Comments
 (0)