1
1

Apply Jeff`s patch from ticket: 3145

Refs: 3763

This commit was SVN r29751.
Этот коммит содержится в:
Mike Dubman 2013-11-25 11:02:42 +00:00
родитель ac9820c46f
Коммит bd358cb180
28 изменённых файлов: 172 добавлений и 176 удалений

Просмотреть файл

@ -99,7 +99,7 @@ libmpi_usempif08_so_version=0:0:0
libopen_rte_so_version=0:0:0
libopen_pal_so_version=0:0:0
libmpi_java_so_version=0:0:0
libshmem_so_version=0:0:0
liboshmem_so_version=0:0:0
# "Common" components install standalone libraries that are run-time
# linked by one or more components. So they need to be versioned as

Просмотреть файл

@ -105,6 +105,7 @@ AM_CONDITIONAL(OSHMEM_PROFILING, test "$oshmem_profiling_support" = 1)
#
# Fortran bindings
#
AC_MSG_CHECKING([if want to build OSHMEM fortran bindings])
AC_ARG_ENABLE(oshmem-fortran,
AC_HELP_STRING([--enable-oshmem-fortran],
[enable OSHMEM Fortran bindings (default: enabled if Fortran compiler found)]))
@ -127,14 +128,12 @@ fi],
[AC_MSG_RESULT([no])
OSHMEM_WANT_FORTRAN_BINDINGS=0])
AC_MSG_CHECKING([if want to build OSHMEM fortran bindings])
AM_CONDITIONAL(OSHMEM_WANT_FORTRAN_BINDINGS,
[test $OSHMEM_WANT_FORTRAN_BINDINGS -eq 1])
AS_IF([test $OSHMEM_WANT_FORTRAN_BINDINGS -eq 1],
[AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])])
])
############################################################################
AC_DEFUN([OSHMEM_SETUP_CFLAGS],[

Просмотреть файл

@ -150,7 +150,7 @@ m4_ifdef([project_ompi],
m4_ifdef([project_orte],
[AC_SUBST(libopen_rte_so_version)])
m4_ifdef([project_oshmem],
[AC_SUBST(libshmem_so_version)])
[AC_SUBST(liboshmem_so_version)])
AC_SUBST(libmca_opal_common_pmi_so_version)
AC_SUBST(libopen_pal_so_version)
@ -869,9 +869,9 @@ AC_DEFINE_UNQUOTED(OMPI_MPI_OFFSET_TYPE, $MPI_OFFSET_TYPE, [Type of MPI_Offset -
AC_DEFINE_UNQUOTED(OMPI_MPI_OFFSET_SIZE, $MPI_OFFSET_SIZE, [Size of the MPI_Offset])
AC_DEFINE_UNQUOTED(OMPI_OFFSET_DATATYPE, $MPI_OFFSET_DATATYPE, [MPI datatype corresponding to MPI_Offset])
AC_DEFINE_UNQUOTED(OSHMEM_SHMEM_OFFSET_TYPE, $MPI_OFFSET_TYPE, [Type of SHMEM_Offset -- has to be defined here and typedef'ed later because shmem.h does not get AC SUBST's])
AC_DEFINE_UNQUOTED(OSHMEM_SHMEM_OFFSET_SIZE, $MPI_OFFSET_SIZE, [Size of the SHMEM_Offset])
AC_DEFINE_UNQUOTED(OSHMEM_OFFSET_DATATYPE, $MPI_OFFSET_DATATYPE, [SHMEM datatype corresponding to SHMEM_Offset])
AC_DEFINE_UNQUOTED(OSHMEM_SHMEM_OFFSET_TYPE, $MPI_OFFSET_TYPE, [Type of OSHMEM_Offset -- has to be defined here and typedef'ed later because shmem.h does not get AC SUBST's])
AC_DEFINE_UNQUOTED(OSHMEM_SHMEM_OFFSET_SIZE, $MPI_OFFSET_SIZE, [Size of the OSHMEM_Offset])
AC_DEFINE_UNQUOTED(OSHMEM_OFFSET_DATATYPE, $MPI_OFFSET_DATATYPE, [OSHMEM datatype corresponding to SHMEM_Offset])
AC_DEFINE_UNQUOTED(OPAL_SIZEOF_LONG, $ac_cv_sizeof_long, "Size of 'long' type")

Просмотреть файл

@ -69,7 +69,6 @@ all: hello_c ring_c connectivity_c mpi
# Always build the C example. Only build the others
# if Open MPI was build with the relevant language bindings.
mpi:
@ if ompi_info --parsable | grep bindings:cxx:yes >/dev/null; then \
$(MAKE) hello_cxx ring_cxx; \
fi

Просмотреть файл

@ -14,16 +14,16 @@ if OSHMEM_SUPPORT
# Do we have profiling?
if OSHMEM_PROFILING
c_pshmem_lib = shmem/c/profile/libshmem_c_pshmem.la
c_pshmem_lib = shmem/c/profile/liboshmem_c_pshmem.la
else
c_pshmem_lib =
endif
# Do we have the Fortran bindings?
if OSHMEM_WANT_FORTRAN_BINDINGS
fortran_shmem_lib = shmem/fortran/libshmem_fortran.la
fortran_oshmem_lib = shmem/fortran/liboshmem_fortran.la
else
fortran_shmem_lib =
fortran_oshmem_lib =
endif
SUBDIRS = \
@ -46,27 +46,27 @@ DIST_SUBDIRS = \
$(MCA_oshmem_FRAMEWORKS_SUBDIRS) \
$(MCA_oshmem_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
#Build The main SHMEM library
lib_LTLIBRARIES = libshmem.la
libshmem_la_SOURCES =
libshmem_la_LIBADD = \
shmem/c/libshmem_c.la \
#Build The main OSHMEM library
lib_LTLIBRARIES = liboshmem.la
liboshmem_la_SOURCES =
liboshmem_la_LIBADD = \
shmem/c/liboshmem_c.la \
$(c_pshmem_lib) \
$(fortran_shmem_lib) \
$(MCA_oshmem_FRAMEWORK_LIBS) \
$(top_ompi_builddir)/ompi/libmpi.la
libshmem_la_DEPENDENCIES = $(libshmem_la_LIBADD)
libshmem_la_LDFLAGS = \
-version-info $(libshmem_so_version) \
liboshmem_la_DEPENDENCIES = $(liboshmem_la_LIBADD)
liboshmem_la_LDFLAGS = \
-version-info $(liboshmem_so_version) \
$(OSHMEM_LIBSHMEM_EXTRA_LDFLAGS)
# included subdirectory Makefile.am's and appended-to variables
headers =
noinst_LTLIBRARIES =
include_HEADERS =
nobase_oshmem_HEADERS =
dist_pkgdata_DATA =
libshmem_la_SOURCES += $(headers)
nobase_oshmem_HEADERS =
dist_pkgdata_DATA =
liboshmem_la_SOURCES += $(headers)
nodist_man_MANS =
# Conditionally install the header files

Просмотреть файл

@ -14,6 +14,6 @@
headers += \
op/op.h
libshmem_la_SOURCES += \
liboshmem_la_SOURCES += \
op/op.c

Просмотреть файл

@ -152,101 +152,101 @@ oshmem_op_t* oshmem_op_prod_freal16 = NULL;
/* Bitwise AND */
#define __and_op(a, b) ((a) & (b))
FUNC_OP_CREATE(and, short, short, __and_op);
FUNC_OP_CREATE(and, int, int, __and_op);
FUNC_OP_CREATE(and, long, long, __and_op);
FUNC_OP_CREATE(and, longlong, long long, __and_op);
FUNC_OP_CREATE(and, fint4, ompi_fortran_integer4_t, __and_op);
FUNC_OP_CREATE(and, fint8, ompi_fortran_integer8_t, __and_op);
FUNC_OP_CREATE(and, short, short, __and_op)
FUNC_OP_CREATE(and, int, int, __and_op)
FUNC_OP_CREATE(and, long, long, __and_op)
FUNC_OP_CREATE(and, longlong, long long, __and_op)
FUNC_OP_CREATE(and, fint4, ompi_fortran_integer4_t, __and_op)
FUNC_OP_CREATE(and, fint8, ompi_fortran_integer8_t, __and_op)
/* Bitwise OR */
#define __or_op(a, b) ((a) | (b))
FUNC_OP_CREATE(or, short, short, __or_op);
FUNC_OP_CREATE(or, int, int, __or_op);
FUNC_OP_CREATE(or, long, long, __or_op);
FUNC_OP_CREATE(or, longlong, long long, __or_op);
FUNC_OP_CREATE(or, fint4, ompi_fortran_integer4_t, __or_op);
FUNC_OP_CREATE(or, fint8, ompi_fortran_integer8_t, __or_op);
FUNC_OP_CREATE(or, short, short, __or_op)
FUNC_OP_CREATE(or, int, int, __or_op)
FUNC_OP_CREATE(or, long, long, __or_op)
FUNC_OP_CREATE(or, longlong, long long, __or_op)
FUNC_OP_CREATE(or, fint4, ompi_fortran_integer4_t, __or_op)
FUNC_OP_CREATE(or, fint8, ompi_fortran_integer8_t, __or_op)
/* Bitwise XOR */
#define __xor_op(a, b) ((a) ^ (b))
FUNC_OP_CREATE(xor, short, short, __xor_op);
FUNC_OP_CREATE(xor, int, int, __xor_op);
FUNC_OP_CREATE(xor, long, long, __xor_op);
FUNC_OP_CREATE(xor, longlong, long long, __xor_op);
FUNC_OP_CREATE(xor, fint4, ompi_fortran_integer4_t, __xor_op);
FUNC_OP_CREATE(xor, fint8, ompi_fortran_integer8_t, __xor_op);
FUNC_OP_CREATE(xor, short, short, __xor_op)
FUNC_OP_CREATE(xor, int, int, __xor_op)
FUNC_OP_CREATE(xor, long, long, __xor_op)
FUNC_OP_CREATE(xor, longlong, long long, __xor_op)
FUNC_OP_CREATE(xor, fint4, ompi_fortran_integer4_t, __xor_op)
FUNC_OP_CREATE(xor, fint8, ompi_fortran_integer8_t, __xor_op)
/* MAX */
#define __max_op(a, b) ((a) > (b) ? (a) : (b))
FUNC_OP_CREATE(max, short, short, __max_op);
FUNC_OP_CREATE(max, int, int, __max_op);
FUNC_OP_CREATE(max, long, long, __max_op);
FUNC_OP_CREATE(max, longlong, long long, __max_op);
FUNC_OP_CREATE(max, float, float, __max_op);
FUNC_OP_CREATE(max, double, double, __max_op);
FUNC_OP_CREATE(max, longdouble, long double, __max_op);
FUNC_OP_CREATE(max, fint4, ompi_fortran_integer4_t, __max_op);
FUNC_OP_CREATE(max, fint8, ompi_fortran_integer8_t, __max_op);
FUNC_OP_CREATE(max, freal4, ompi_fortran_real4_t, __max_op);
FUNC_OP_CREATE(max, freal8, ompi_fortran_real8_t, __max_op);
FUNC_OP_CREATE(max, short, short, __max_op)
FUNC_OP_CREATE(max, int, int, __max_op)
FUNC_OP_CREATE(max, long, long, __max_op)
FUNC_OP_CREATE(max, longlong, long long, __max_op)
FUNC_OP_CREATE(max, float, float, __max_op)
FUNC_OP_CREATE(max, double, double, __max_op)
FUNC_OP_CREATE(max, longdouble, long double, __max_op)
FUNC_OP_CREATE(max, fint4, ompi_fortran_integer4_t, __max_op)
FUNC_OP_CREATE(max, fint8, ompi_fortran_integer8_t, __max_op)
FUNC_OP_CREATE(max, freal4, ompi_fortran_real4_t, __max_op)
FUNC_OP_CREATE(max, freal8, ompi_fortran_real8_t, __max_op)
#if OMPI_HAVE_FORTRAN_REAL16
FUNC_OP_CREATE(max, freal16, ompi_fortran_real16_t, __max_op);
FUNC_OP_CREATE(max, freal16, ompi_fortran_real16_t, __max_op)
#endif
/* MIN */
#define __min_op(a, b) ((a) < (b) ? (a) : (b))
FUNC_OP_CREATE(min, short, short, __min_op);
FUNC_OP_CREATE(min, int, int, __min_op);
FUNC_OP_CREATE(min, long, long, __min_op);
FUNC_OP_CREATE(min, longlong, long long, __min_op);
FUNC_OP_CREATE(min, float, float, __min_op);
FUNC_OP_CREATE(min, double, double, __min_op);
FUNC_OP_CREATE(min, longdouble, long double, __min_op);
FUNC_OP_CREATE(min, fint4, ompi_fortran_integer4_t, __min_op);
FUNC_OP_CREATE(min, fint8, ompi_fortran_integer8_t, __min_op);
FUNC_OP_CREATE(min, freal4, ompi_fortran_real4_t, __min_op);
FUNC_OP_CREATE(min, freal8, ompi_fortran_real8_t, __min_op);
FUNC_OP_CREATE(min, short, short, __min_op)
FUNC_OP_CREATE(min, int, int, __min_op)
FUNC_OP_CREATE(min, long, long, __min_op)
FUNC_OP_CREATE(min, longlong, long long, __min_op)
FUNC_OP_CREATE(min, float, float, __min_op)
FUNC_OP_CREATE(min, double, double, __min_op)
FUNC_OP_CREATE(min, longdouble, long double, __min_op)
FUNC_OP_CREATE(min, fint4, ompi_fortran_integer4_t, __min_op)
FUNC_OP_CREATE(min, fint8, ompi_fortran_integer8_t, __min_op)
FUNC_OP_CREATE(min, freal4, ompi_fortran_real4_t, __min_op)
FUNC_OP_CREATE(min, freal8, ompi_fortran_real8_t, __min_op)
#if OMPI_HAVE_FORTRAN_REAL16
FUNC_OP_CREATE(min, freal16, ompi_fortran_real16_t, __min_op);
FUNC_OP_CREATE(min, freal16, ompi_fortran_real16_t, __min_op)
#endif
/* SUM */
#define __sum_op(a, b) ((a) + (b))
FUNC_OP_CREATE(sum, short, short, __sum_op);
FUNC_OP_CREATE(sum, int, int, __sum_op);
FUNC_OP_CREATE(sum, long, long, __sum_op);
FUNC_OP_CREATE(sum, longlong, long long, __sum_op);
FUNC_OP_CREATE(sum, float, float, __sum_op);
FUNC_OP_CREATE(sum, double, double, __sum_op);
FUNC_OP_CREATE(sum, longdouble, long double, __sum_op);
FUNC_OP_CREATE(sum, complexf, float complex, __sum_op);
FUNC_OP_CREATE(sum, complexd, double complex, __sum_op);
FUNC_OP_CREATE(sum, fint4, ompi_fortran_integer4_t, __sum_op);
FUNC_OP_CREATE(sum, fint8, ompi_fortran_integer8_t, __sum_op);
FUNC_OP_CREATE(sum, freal4, ompi_fortran_real4_t, __sum_op);
FUNC_OP_CREATE(sum, freal8, ompi_fortran_real8_t, __sum_op);
FUNC_OP_CREATE(sum, short, short, __sum_op)
FUNC_OP_CREATE(sum, int, int, __sum_op)
FUNC_OP_CREATE(sum, long, long, __sum_op)
FUNC_OP_CREATE(sum, longlong, long long, __sum_op)
FUNC_OP_CREATE(sum, float, float, __sum_op)
FUNC_OP_CREATE(sum, double, double, __sum_op)
FUNC_OP_CREATE(sum, longdouble, long double, __sum_op)
FUNC_OP_CREATE(sum, complexf, float complex, __sum_op)
FUNC_OP_CREATE(sum, complexd, double complex, __sum_op)
FUNC_OP_CREATE(sum, fint4, ompi_fortran_integer4_t, __sum_op)
FUNC_OP_CREATE(sum, fint8, ompi_fortran_integer8_t, __sum_op)
FUNC_OP_CREATE(sum, freal4, ompi_fortran_real4_t, __sum_op)
FUNC_OP_CREATE(sum, freal8, ompi_fortran_real8_t, __sum_op)
#if OMPI_HAVE_FORTRAN_REAL16
FUNC_OP_CREATE(sum, freal16, ompi_fortran_real16_t, __sum_op);
FUNC_OP_CREATE(sum, freal16, ompi_fortran_real16_t, __sum_op)
#endif
/* PROD */
#define __prod_op(a, b) ((a) * (b))
FUNC_OP_CREATE(prod, short, short, __prod_op);
FUNC_OP_CREATE(prod, int, int, __prod_op);
FUNC_OP_CREATE(prod, long, long, __prod_op);
FUNC_OP_CREATE(prod, longlong, long long, __prod_op);
FUNC_OP_CREATE(prod, float, float, __prod_op);
FUNC_OP_CREATE(prod, double, double, __prod_op);
FUNC_OP_CREATE(prod, longdouble, long double, __prod_op);
FUNC_OP_CREATE(prod, complexf, float complex, __prod_op);
FUNC_OP_CREATE(prod, complexd, double complex, __prod_op);
FUNC_OP_CREATE(prod, fint4, ompi_fortran_integer4_t, __prod_op);
FUNC_OP_CREATE(prod, fint8, ompi_fortran_integer8_t, __prod_op);
FUNC_OP_CREATE(prod, freal4, ompi_fortran_real4_t, __prod_op);
FUNC_OP_CREATE(prod, freal8, ompi_fortran_real8_t, __prod_op);
FUNC_OP_CREATE(prod, short, short, __prod_op)
FUNC_OP_CREATE(prod, int, int, __prod_op)
FUNC_OP_CREATE(prod, long, long, __prod_op)
FUNC_OP_CREATE(prod, longlong, long long, __prod_op)
FUNC_OP_CREATE(prod, float, float, __prod_op)
FUNC_OP_CREATE(prod, double, double, __prod_op)
FUNC_OP_CREATE(prod, longdouble, long double, __prod_op)
FUNC_OP_CREATE(prod, complexf, float complex, __prod_op)
FUNC_OP_CREATE(prod, complexd, double complex, __prod_op)
FUNC_OP_CREATE(prod, fint4, ompi_fortran_integer4_t, __prod_op)
FUNC_OP_CREATE(prod, fint8, ompi_fortran_integer8_t, __prod_op)
FUNC_OP_CREATE(prod, freal4, ompi_fortran_real4_t, __prod_op)
FUNC_OP_CREATE(prod, freal8, ompi_fortran_real8_t, __prod_op)
#if OMPI_HAVE_FORTRAN_REAL16
FUNC_OP_CREATE(prod, freal16, ompi_fortran_real16_t, __prod_op);
FUNC_OP_CREATE(prod, freal16, ompi_fortran_real16_t, __prod_op)
#endif
int oshmem_op_init(void)

Просмотреть файл

@ -15,7 +15,7 @@ headers += \
proc/proc.h \
proc/proc_group_cache.h
libshmem_la_SOURCES += \
liboshmem_la_SOURCES += \
proc/proc.c \
proc/proc_group_cache.c

Просмотреть файл

@ -15,5 +15,5 @@ headers += \
request/request.h \
request/request_dbg.h
libshmem_la_SOURCES += \
liboshmem_la_SOURCES += \
request/request.c

Просмотреть файл

@ -398,7 +398,7 @@ static inline void oshmem_request_wait_any_completion(void)
static inline void oshmem_request_wait_completion(oshmem_request_t *req)
{
if (false == req->req_complete) {
#if OPAL_ENABLE_PROGRESS_THREADS
#if OMPI_ENABLE_PROGRESS_THREADS
if(opal_progress_spin(&req->req_complete)) {
return;
}

Просмотреть файл

@ -18,7 +18,7 @@ headers += \
runtime/oshmem_info_support.h \
runtime/oshmem_shmem_preconnect.h
libshmem_la_SOURCES += \
liboshmem_la_SOURCES += \
runtime/oshmem_shmem_init.c \
runtime/oshmem_shmem_finalize.c \
runtime/oshmem_shmem_abort.c \

Просмотреть файл

@ -13,8 +13,7 @@ if OSHMEM_PROFILING
SUBDIRS = profile
endif
SHMEM_API_SOURCES = \
OSHMEM_API_SOURCES = \
shmem_init.c \
shmem_free.c \
shmem_alloc.c \
@ -58,11 +57,11 @@ SHMEM_API_SOURCES = \
AM_CPPFLAGS = -DOSHMEM_PROFILING=0
noinst_LTLIBRARIES = libshmem_c.la
noinst_LTLIBRARIES = liboshmem_c.la
headers =
libshmem_c_la_SOURCES = $(SHMEM_API_SOURCES)
liboshmem_c_la_SOURCES = $(OSHMEM_API_SOURCES)
if WANT_INSTALL_HEADERS
oshmemdir = $(includedir)/openshmem/oshmem/shmem/c

Просмотреть файл

@ -18,12 +18,12 @@
AM_CPPFLAGS = -DOSHMEM_PROFILING=1
noinst_LTLIBRARIES = libshmem_c_pshmem.la
noinst_LTLIBRARIES = liboshmem_c_pshmem.la
headers = defines.h
SHMEM_API_SOURCES = \
OSHMEM_API_SOURCES = \
shmem_init.c \
shmem_free.c \
shmem_alloc.c \
@ -62,15 +62,14 @@ SHMEM_API_SOURCES = \
shmem_set_lock.c \
shmem_test_lock.c
#nodist_libshmem_c_pshmem_la_SOURCES = $(addprefix p, $(SHMEM_API_SOURCES))
nodist_libshmem_c_pshmem_la_SOURCES = \
$(SHMEM_API_SOURCES)
nodist_liboshmem_c_pshmem_la_SOURCES = \
$(OSHMEM_API_SOURCES)
#
# Sym link in the sources from the real MPI directory
#
$(nodist_libshmem_c_pshmem_la_SOURCES):
$(nodist_liboshmem_c_pshmem_la_SOURCES):
if test ! -r $@ ; then \
pname=`echo $@ | cut -b '1-'` ; \
$(LN_S) $(top_srcdir)/oshmem/shmem/c/$$pname $@ ; \
@ -85,7 +84,7 @@ endif
# These files were created by targets above
MAINTAINERCLEANFILES = $(nodist_libshmem_c_pshmem_la_SOURCES)
MAINTAINERCLEANFILES = $(nodist_liboshmem_c_pshmem_la_SOURCES)
# Don't want these targets in here

Просмотреть файл

@ -12,18 +12,18 @@
AM_CPPFLAGS = -DOSHMEM_PROFILING_DEFINES=0 -DOSHMEM_HAVE_WEAK_SYMBOLS=0
if OSHMEM_WANT_FORTRAN_BINDINGS
shmem_fortran_lib = libshmem_fortran.la
oshmem_fortran_lib = liboshmem_fortran.la
else
shmem_fortran_lib =
oshmem_fortran_lib =
endif
noinst_LTLIBRARIES = $(shmem_fortran_lib)
noinst_LTLIBRARIES = $(oshmem_fortran_lib)
headers = prototypes_shmem.h \
bindings.h \
shmem_fortran_pointer.h
libshmem_fortran_la_SOURCES = \
liboshmem_fortran_la_SOURCES = \
start_pes_f.c \
num_pes_f.c \
my_pe_f.c \

Просмотреть файл

@ -98,5 +98,5 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
}\
}
SHMEM_AND_TO_ALL(shmem_int4_and_to_all_f, oshmem_op_and_fint4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_AND_TO_ALL(shmem_int8_and_to_all_f, oshmem_op_and_fint8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_AND_TO_ALL(shmem_int4_and_to_all_f, oshmem_op_and_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_AND_TO_ALL(shmem_int8_and_to_all_f, oshmem_op_and_fint8, OSHMEM_GROUP_CACHE_ENABLED)

Просмотреть файл

@ -24,7 +24,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
shmem_broadcast4__,
shmem_broadcast4_f,
(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),
(target, source, nlong, PE_root, PE_start, logPE_stride, PE_size, pSync));
(target, source, nlong, PE_root, PE_start, logPE_stride, PE_size, pSync))
SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
SHMEM_BROADCAST8,
@ -32,7 +32,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
shmem_broadcast8__,
shmem_broadcast8_f,
(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),
(target, source, nlong, PE_root, PE_start, logPE_stride, PE_size, pSync));
(target, source, nlong, PE_root, PE_start, logPE_stride, PE_size, pSync))
SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
SHMEM_BROADCAST32,
@ -40,7 +40,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
shmem_broadcast32__,
shmem_broadcast32_f,
(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),
(target, source, nlong, PE_root, PE_start, logPE_stride, PE_size, pSync));
(target, source, nlong, PE_root, PE_start, logPE_stride, PE_size, pSync))
SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
SHMEM_BROADCAST64,
@ -48,7 +48,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
shmem_broadcast64__,
shmem_broadcast64_f,
(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),
(target, source, nlong, PE_root, PE_start, logPE_stride, PE_size, pSync));
(target, source, nlong, PE_root, PE_start, logPE_stride, PE_size, pSync))
#define SHMEM_BROADCAST(F_NAME, T_NAME, OSHMEM_GROUP_CACHE_ENABLED) void F_NAME(FORTRAN_POINTER_T target, \
FORTRAN_POINTER_T source, \
@ -122,7 +122,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
}\
}
SHMEM_BROADCAST(shmem_broadcast4_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_BROADCAST(shmem_broadcast8_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_BROADCAST(shmem_broadcast32_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_BROADCAST(shmem_broadcast64_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_BROADCAST(shmem_broadcast4_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_BROADCAST(shmem_broadcast8_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_BROADCAST(shmem_broadcast32_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_BROADCAST(shmem_broadcast64_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED)

Просмотреть файл

@ -21,7 +21,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
shmem_set_cache_inv__,
shmem_set_cache_inv_f,
(void),
());
())
SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
SHMEM_SET_CACHE_LINE_INV,
@ -29,7 +29,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
shmem_set_cache_line_inv__,
shmem_set_cache_line_inv_f,
(FORTRAN_POINTER_T target),
(target));
(target))
SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
SHMEM_CLEAR_CACHE_INV,
@ -37,7 +37,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
shmem_clear_cache_inv__,
shmem_clear_cache_inv_f,
(void),
());
())
SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
SHMEM_CLEAR_CACHE_LINE_INV,
@ -45,7 +45,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
shmem_clear_cache_line_inv__,
shmem_clear_cache_line_inv_f,
(FORTRAN_POINTER_T target),
(target));
(target))
SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
SHMEM_UDCFLUSH,
@ -53,7 +53,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
shmem_udcflush__,
shmem_udcflush_f,
(void),
());
())
SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
SHMEM_UDCFLUSH_LINE,
@ -61,7 +61,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
shmem_udcflush_line__,
shmem_udcflush_line_f,
(FORTRAN_POINTER_T target),
(target));
(target))
void shmem_set_cache_inv_f(void)
{

Просмотреть файл

@ -141,11 +141,11 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
}\
}
SHMEM_COLLECT(shmem_collect4_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_COLLECT(shmem_collect8_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_COLLECT(shmem_collect32_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_COLLECT(shmem_collect64_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_COLLECT(shmem_fcollect4_f, oshmem_op_prod_freal4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_COLLECT(shmem_fcollect8_f, oshmem_op_prod_freal8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_COLLECT(shmem_fcollect32_f, oshmem_op_prod_freal4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_COLLECT(shmem_fcollect64_f, oshmem_op_prod_freal8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_COLLECT(shmem_collect4_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_COLLECT(shmem_collect8_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_COLLECT(shmem_collect32_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_COLLECT(shmem_collect64_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_COLLECT(shmem_fcollect4_f, oshmem_op_prod_freal4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_COLLECT(shmem_fcollect8_f, oshmem_op_prod_freal8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_COLLECT(shmem_fcollect32_f, oshmem_op_prod_freal4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_COLLECT(shmem_fcollect64_f, oshmem_op_prod_freal8, OSHMEM_GROUP_CACHE_ENABLED)

Просмотреть файл

@ -22,7 +22,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
shmem_set_lock__,
shmem_set_lock_f,
(FORTRAN_POINTER_T lock),
(lock));
(lock))
SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
SHMEM_CLEAR_LOCK,
@ -30,7 +30,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
shmem_clear_lock__,
shmem_clear_lock_f,
(FORTRAN_POINTER_T lock),
(lock));
(lock))
SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (MPI_Fint,
SHMEM_TEST_LOCK,
@ -38,7 +38,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_FUNCTION (MPI_Fint,
shmem_test_lock__,
shmem_test_lock_f,
(FORTRAN_POINTER_T lock),
(lock));
(lock))
void shmem_set_lock_f(FORTRAN_POINTER_T lock)
{

Просмотреть файл

@ -119,8 +119,8 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
}\
}
SHMEM_MAX_TO_ALL(shmem_int4_max_to_all_f, oshmem_op_max_fint4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_MAX_TO_ALL(shmem_int8_max_to_all_f, oshmem_op_max_fint8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_MAX_TO_ALL(shmem_real4_max_to_all_f, oshmem_op_max_freal4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_MAX_TO_ALL(shmem_real8_max_to_all_f, oshmem_op_max_freal8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_MAX_TO_ALL(shmem_real16_max_to_all_f, oshmem_op_max_freal16, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_MAX_TO_ALL(shmem_int4_max_to_all_f, oshmem_op_max_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_MAX_TO_ALL(shmem_int8_max_to_all_f, oshmem_op_max_fint8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_MAX_TO_ALL(shmem_real4_max_to_all_f, oshmem_op_max_freal4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_MAX_TO_ALL(shmem_real8_max_to_all_f, oshmem_op_max_freal8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_MAX_TO_ALL(shmem_real16_max_to_all_f, oshmem_op_max_freal16, OSHMEM_GROUP_CACHE_ENABLED)

Просмотреть файл

@ -111,8 +111,8 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
}\
}
SHMEM_MIN_TO_ALL(shmem_int4_min_to_all_f, oshmem_op_min_fint4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_MIN_TO_ALL(shmem_int8_min_to_all_f, oshmem_op_min_fint8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_MIN_TO_ALL(shmem_real4_min_to_all_f, oshmem_op_min_freal4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_MIN_TO_ALL(shmem_real8_min_to_all_f, oshmem_op_min_freal8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_MIN_TO_ALL(shmem_real16_min_to_all_f, oshmem_op_min_freal16, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_MIN_TO_ALL(shmem_int4_min_to_all_f, oshmem_op_min_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_MIN_TO_ALL(shmem_int8_min_to_all_f, oshmem_op_min_fint8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_MIN_TO_ALL(shmem_real4_min_to_all_f, oshmem_op_min_freal4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_MIN_TO_ALL(shmem_real8_min_to_all_f, oshmem_op_min_freal8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_MIN_TO_ALL(shmem_real16_min_to_all_f, oshmem_op_min_freal16, OSHMEM_GROUP_CACHE_ENABLED)

Просмотреть файл

@ -95,5 +95,5 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
}\
}
SHMEM_OR_TO_ALL(shmem_int4_or_to_all_f, oshmem_op_or_fint4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_OR_TO_ALL(shmem_int8_or_to_all_f, oshmem_op_or_fint8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_OR_TO_ALL(shmem_int4_or_to_all_f, oshmem_op_or_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_OR_TO_ALL(shmem_int8_or_to_all_f, oshmem_op_or_fint8, OSHMEM_GROUP_CACHE_ENABLED)

Просмотреть файл

@ -111,8 +111,8 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
}\
}
SHMEM_PROD_TO_ALL(shmem_int4_prod_to_all_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_PROD_TO_ALL(shmem_int8_prod_to_all_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_PROD_TO_ALL(shmem_real4_prod_to_all_f, oshmem_op_prod_freal4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_PROD_TO_ALL(shmem_real8_prod_to_all_f, oshmem_op_prod_freal8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_PROD_TO_ALL(shmem_real16_prod_to_all_f, oshmem_op_prod_freal16, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_PROD_TO_ALL(shmem_int4_prod_to_all_f, oshmem_op_prod_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_PROD_TO_ALL(shmem_int8_prod_to_all_f, oshmem_op_prod_fint8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_PROD_TO_ALL(shmem_real4_prod_to_all_f, oshmem_op_prod_freal4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_PROD_TO_ALL(shmem_real8_prod_to_all_f, oshmem_op_prod_freal8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_PROD_TO_ALL(shmem_real16_prod_to_all_f, oshmem_op_prod_freal16, OSHMEM_GROUP_CACHE_ENABLED)

Просмотреть файл

@ -111,8 +111,8 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
}\
}
SHMEM_SUM_TO_ALL(shmem_int4_sum_to_all_f, oshmem_op_sum_fint4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_SUM_TO_ALL(shmem_int8_sum_to_all_f, oshmem_op_sum_fint8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_SUM_TO_ALL(shmem_real4_sum_to_all_f, oshmem_op_sum_freal4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_SUM_TO_ALL(shmem_real8_sum_to_all_f, oshmem_op_sum_freal8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_SUM_TO_ALL(shmem_real16_sum_to_all_f, oshmem_op_sum_freal16, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_SUM_TO_ALL(shmem_int4_sum_to_all_f, oshmem_op_sum_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_SUM_TO_ALL(shmem_int8_sum_to_all_f, oshmem_op_sum_fint8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_SUM_TO_ALL(shmem_real4_sum_to_all_f, oshmem_op_sum_freal4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_SUM_TO_ALL(shmem_real8_sum_to_all_f, oshmem_op_sum_freal8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_SUM_TO_ALL(shmem_real16_sum_to_all_f, oshmem_op_sum_freal16, OSHMEM_GROUP_CACHE_ENABLED)

Просмотреть файл

@ -97,7 +97,7 @@ SHMEM_GENERATE_FORTRAN_BINDINGS_SUB (void,
}\
}
SHMEM_XOR_TO_ALL(shmem_int4_xor_to_all_f, oshmem_op_xor_fint4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_XOR_TO_ALL(shmem_int8_xor_to_all_f, oshmem_op_xor_fint8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_XOR_TO_ALL(shmem_comp4_xor_to_all_f, oshmem_op_xor_fint4, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_XOR_TO_ALL(shmem_comp8_xor_to_all_f, oshmem_op_xor_fint8, OSHMEM_GROUP_CACHE_ENABLED);
SHMEM_XOR_TO_ALL(shmem_int4_xor_to_all_f, oshmem_op_xor_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_XOR_TO_ALL(shmem_int8_xor_to_all_f, oshmem_op_xor_fint8, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_XOR_TO_ALL(shmem_comp4_xor_to_all_f, oshmem_op_xor_fint4, OSHMEM_GROUP_CACHE_ENABLED)
SHMEM_XOR_TO_ALL(shmem_comp8_xor_to_all_f, oshmem_op_xor_fint8, OSHMEM_GROUP_CACHE_ENABLED)

Просмотреть файл

@ -58,7 +58,7 @@ oshmem_info_SOURCES = \
param.c
oshmem_info_LDADD = $(top_builddir)/ompi/libmpi.la
oshmem_info_LDADD += $(top_builddir)/oshmem/libshmem.la
oshmem_info_LDADD += $(top_builddir)/oshmem/liboshmem.la
if OMPI_RTE_ORTE
oshmem_info_LDADD += $(top_builddir)/orte/libopen-rte.la
endif

Просмотреть файл

@ -29,10 +29,10 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
# intentionally only link in the MPI libraries (ORTE, OPAL, etc. are
# pulled in implicitly) because we intend MPI applications to only use
# the MPI API.
libs=-lshmem -lmpi @OMPI_WRAPPER_EXTRA_LIBS@
libs_static=-lshmem -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
dyn_lib_file=libshmem.@OPAL_DYN_LIB_SUFFIX@
static_lib_file=libshmem.a
libs=-loshmem -lmpi @OMPI_WRAPPER_EXTRA_LIBS@
libs_static=-loshmem -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
dyn_lib_file=libsohmem.@OPAL_DYN_LIB_SUFFIX@
static_lib_file=liboshmem.a
required_file=
includedir=${includedir}
libdir=${libdir}

Просмотреть файл

@ -28,10 +28,10 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@
# intentionally only link in the SHMEM and MPI libraries (ORTE, OPAL,
# etc. are pulled in implicitly) because we intend MPI applications to
# only use the SHMEM and MPI APIs.
libs=-lshmem -lmpi_mpifh -lmpi @OMPI_WRAPPER_EXTRA_LIBS@
libs_static=-shmem -lmpi_mpifh -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
dyn_lib_file=libshmem.@OPAL_DYN_LIB_SUFFIX@
static_lib_file=libshmem.a
libs=-loshmem -lmpi_mpifh -lmpi @OMPI_WRAPPER_EXTRA_LIBS@
libs_static=-loshmem -lmpi_mpifh -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
dyn_lib_file=liboshmem.@OPAL_DYN_LIB_SUFFIX@
static_lib_file=liboshmem.a
required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@
includedir=${includedir}
libdir=${libdir}