Skip to content

Commit

Permalink
oshmem: Align OSHMEM API with spec v1.3 (Add alltoall Fortran)
Browse files Browse the repository at this point in the history
  • Loading branch information
igor-ivanov committed Mar 21, 2016
1 parent bd6eaac commit 3e1e131
Show file tree
Hide file tree
Showing 6 changed files with 217 additions and 0 deletions.
1 change: 1 addition & 0 deletions oshmem/shmem/fortran/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ liboshmem_fortran_la_SOURCES += \
shmem_prod_to_all_f.c \
shmem_collect_f.c \
shmem_broadcast_f.c \
shmem_alltoall_f.c \
shmem_lock_f.c \
shmem_cache_f.c \
shmem_int4_inc_f.c \
Expand Down
1 change: 1 addition & 0 deletions oshmem/shmem/fortran/profile/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ nodist_liboshmem_fortran_pshmem_la_SOURCES = \
pshmem_prod_to_all_f.c \
pshmem_collect_f.c \
pshmem_broadcast_f.c \
pshmem_alltoall_f.c \
pshmem_lock_f.c \
pshmem_cache_f.c \
pshmem_int4_inc_f.c \
Expand Down
16 changes: 16 additions & 0 deletions oshmem/shmem/fortran/profile/defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,22 @@
#define shmem_broadcast64_ pshmem_broadcast64_
#define shmem_broadcast64__ pshmem_broadcast64__

#define SHMEM_ALLTOALL32 PSHMEM_ALLTOALL32
#define shmem_alltoall32_ pshmem_alltoall32_
#define shmem_alltoall32__ pshmem_alltoall32__

#define SHMEM_ALLTOALL64 PSHMEM_ALLTOALL64
#define shmem_alltoall64_ pshmem_alltoall64_
#define shmem_alltoall64__ pshmem_alltoall64__

#define SHMEM_ALLTOALLS32 PSHMEM_ALLTOALLS32
#define shmem_alltoalls32_ pshmem_alltoalls32_
#define shmem_alltoalls32__ pshmem_alltoalls32__

#define SHMEM_ALLTOALLS64 PSHMEM_ALLTOALLS64
#define shmem_alltoalls64_ pshmem_alltoalls64_
#define shmem_alltoalls64__ pshmem_alltoalls64__

#define SHMEM_SET_CACHE_INV PSHMEM_SET_CACHE_INV
#define shmem_set_cache_inv_ pshmem_set_cache_inv_
#define shmem_set_cache_inv__ pshmem_set_cache_inv__
Expand Down
4 changes: 4 additions & 0 deletions oshmem/shmem/fortran/profile/prototypes_pshmem.h
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@ PN (void, pshmem_broadcast4, PSHMEM_BROADCAST4, (FORTRAN_POINTER_T target, FORTR
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));
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));
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));
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));
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));
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));
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));
PN (void, pshmem_set_lock, PSHMEM_SET_LOCK, (FORTRAN_POINTER_T lock));
PN (void, pshmem_clear_lock, PSHMEM_CLEAR_LOCK, (FORTRAN_POINTER_T lock));
PN (MPI_Fint, pshmem_test_lock, PSHMEM_TEST_LOCK, (FORTRAN_POINTER_T lock));
Expand Down
4 changes: 4 additions & 0 deletions oshmem/shmem/fortran/prototypes_shmem.h
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,10 @@ PN (void, shmem_broadcast4, SHMEM_BROADCAST4, (FORTRAN_POINTER_T target, FORTRAN
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));
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));
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));
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));
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));
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));
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));
PN (void, shmem_set_lock, SHMEM_SET_LOCK, (FORTRAN_POINTER_T lock));
PN (void, shmem_clear_lock, SHMEM_CLEAR_LOCK, (FORTRAN_POINTER_T lock));
PN (MPI_Fint, shmem_test_lock, SHMEM_TEST_LOCK, (FORTRAN_POINTER_T lock));
Expand Down
191 changes: 191 additions & 0 deletions oshmem/shmem/fortran/shmem_alltoall_f.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
/*
* Copyright (c) 2013-2016 Mellanox Technologies, Inc.
* All rights reserved.
* Copyright (c) 2013 Cisco Systems, Inc. All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
*
* $HEADER$
*/

#include "oshmem_config.h"
#include "oshmem/shmem/fortran/bindings.h"
#include "oshmem/include/shmem.h"
#include "oshmem/constants.h"
#include "oshmem/mca/scoll/scoll.h"
#include "oshmem/proc/proc.h"
#include "oshmem/proc/proc_group_cache.h"
#include "oshmem/op/op.h"

#if OSHMEM_PROFILING
#include "oshmem/shmem/fortran/profile/pbindings.h"
SHMEM_GENERATE_WEAK_BINDINGS(SHMEM_ALLTOALL32, shmem_alltoall32)
SHMEM_GENERATE_WEAK_BINDINGS(SHMEM_ALLTOALL64, shmem_alltoall64)
SHMEM_GENERATE_WEAK_BINDINGS(SHMEM_ALLTOALLS32, shmem_alltoalls32)
SHMEM_GENERATE_WEAK_BINDINGS(SHMEM_ALLTOALLS64, shmem_alltoalls64)
#include "oshmem/shmem/fortran/profile/defines.h"
#endif

SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
SHMEM_ALLTOALL32,
shmem_alltoall32_,
shmem_alltoall32__,
shmem_alltoall32_f,
(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),
(target, source, nlong, PE_start, logPE_stride, PE_size, pSync))

SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
SHMEM_ALLTOALL64,
shmem_alltoall64_,
shmem_alltoall64__,
shmem_alltoall64_f,
(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),
(target, source, nlong, PE_start, logPE_stride, PE_size, pSync))

SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
SHMEM_ALLTOALLS32,
shmem_alltoalls32_,
shmem_alltoalls32__,
shmem_alltoalls32_f,
(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),
(target, source, dst, sst, nlong, PE_start, logPE_stride, PE_size, pSync))

SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
SHMEM_ALLTOALLS64,
shmem_alltoalls64_,
shmem_alltoalls64__,
shmem_alltoalls64_f,
(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),
(target, source, dst, sst, nlong, PE_start, logPE_stride, PE_size, pSync))

#define SHMEM_ALLTOALL(F_NAME, T_NAME, OSHMEM_GROUP_CACHE_ENABLED) void F_NAME(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)\
{\
int rc = OSHMEM_SUCCESS;\
oshmem_group_t* group = NULL;\
{\
/* Create group basing PE_start, logPE_stride and PE_size */\
if (OSHMEM_GROUP_CACHE_ENABLED == 0)\
{\
group = oshmem_proc_group_create(OMPI_FINT_2_INT(*PE_start), \
(1 << OMPI_FINT_2_INT(*logPE_stride)), \
OMPI_FINT_2_INT(*PE_size));\
if (!group)\
rc = OSHMEM_ERROR;\
}\
else\
{\
group = find_group_in_cache(OMPI_FINT_2_INT(*PE_start),\
OMPI_FINT_2_INT(*logPE_stride),\
OMPI_FINT_2_INT(*PE_size));\
if (!group)\
{\
group = oshmem_proc_group_create(OMPI_FINT_2_INT(*PE_start), \
(1 << OMPI_FINT_2_INT(*logPE_stride)), \
OMPI_FINT_2_INT(*PE_size));\
if (!group)\
rc = OSHMEM_ERROR;\
cache_group(group,OMPI_FINT_2_INT(*PE_start),\
OMPI_FINT_2_INT(*logPE_stride),\
OMPI_FINT_2_INT(*PE_size));\
}\
} /* OSHMEM_GROUP_CACHE_ENABLED */\
/* Collective operation call */\
if ( rc == OSHMEM_SUCCESS )\
{\
oshmem_op_t* op = T_NAME;\
\
/* Call collective broadcast operation */\
rc = group->g_scoll.scoll_alltoall( group, \
FPTR_2_VOID_PTR(target), \
FPTR_2_VOID_PTR(source), \
1, \
1, \
OMPI_FINT_2_INT(*nlong), \
op->dt_size, \
FPTR_2_VOID_PTR(pSync), SCOLL_DEFAULT_ALG );\
}\
if (OSHMEM_GROUP_CACHE_ENABLED == 0) \
{\
if ( group )\
{\
oshmem_proc_group_destroy(group);\
}\
} /* OSHMEM_GROUP_CACHE_ENABLED */\
}\
}

#define SHMEM_ALLTOALLS(F_NAME, T_NAME, OSHMEM_GROUP_CACHE_ENABLED) void F_NAME(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)\
{\
int rc = OSHMEM_SUCCESS;\
oshmem_group_t* group = NULL;\
{\
/* Create group basing PE_start, logPE_stride and PE_size */\
if (OSHMEM_GROUP_CACHE_ENABLED == 0)\
{\
group = oshmem_proc_group_create(OMPI_FINT_2_INT(*PE_start), \
(1 << OMPI_FINT_2_INT(*logPE_stride)), \
OMPI_FINT_2_INT(*PE_size));\
if (!group)\
rc = OSHMEM_ERROR;\
}\
else\
{\
group = find_group_in_cache(OMPI_FINT_2_INT(*PE_start),\
OMPI_FINT_2_INT(*logPE_stride),\
OMPI_FINT_2_INT(*PE_size));\
if (!group)\
{\
group = oshmem_proc_group_create(OMPI_FINT_2_INT(*PE_start), \
(1 << OMPI_FINT_2_INT(*logPE_stride)), \
OMPI_FINT_2_INT(*PE_size));\
if (!group)\
rc = OSHMEM_ERROR;\
cache_group(group,OMPI_FINT_2_INT(*PE_start),\
OMPI_FINT_2_INT(*logPE_stride),\
OMPI_FINT_2_INT(*PE_size));\
}\
} /* OSHMEM_GROUP_CACHE_ENABLED */\
/* Collective operation call */\
if ( rc == OSHMEM_SUCCESS )\
{\
oshmem_op_t* op = T_NAME;\
\
/* Call collective broadcast operation */\
rc = group->g_scoll.scoll_alltoall( group, \
FPTR_2_VOID_PTR(target), \
FPTR_2_VOID_PTR(source), \
OMPI_FINT_2_INT(*dst), \
OMPI_FINT_2_INT(*sst), \
OMPI_FINT_2_INT(*nlong), \
op->dt_size, \
FPTR_2_VOID_PTR(pSync), SCOLL_DEFAULT_ALG );\
}\
if (OSHMEM_GROUP_CACHE_ENABLED == 0) \
{\
if ( group )\
{\
oshmem_proc_group_destroy(group);\
}\
} /* OSHMEM_GROUP_CACHE_ENABLED */\
}\
}

SHMEM_ALLTOALL(shmem_alltoall32_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_ALLTOALL(shmem_alltoall64_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_ALLTOALLS(shmem_alltoalls32_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_ALLTOALLS(shmem_alltoalls64_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED)

0 comments on commit 3e1e131

Please sign in to comment.