ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

- Move alignment and size output generated by configure-tests

Просмотр исходного кода 
into the OPAL namespace, eliminating cases like opal/util/arch.c
   testing for ompi_fortran_logical_t.
   As this is processor- and compiler-related information
   (e.g. does the compiler/architecture support REAL*16)
   this should have been on the OPAL layer.
 - Unifies f77 code using MPI_Flogical instead of opal_fortran_logical_t

 - Tested locally (Linux/x86-64) with mpich and intel testsuite
   but would like to get this week-ends MTT output


 - PLEASE NOTE: configure-internal macro-names and
   ompi_cv_ variables have not been changed, so that
   external platform (not in contrib/) files still work.

This commit was SVN r21330.
Этот коммит содержится в:
Rainer Keller 2009-05-30 15:54:29 +00:00
родитель 4e0223a638
Коммит 95596d1814
65 изменённых файлов: 1098 добавлений и 1098 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
config/f77_check.m4
Просмотреть файл

@ -36,7 +36,7 @@ AC_DEFUN([OMPI_F77_CHECK], [
ofc_have_type=0 ofc_have_type=0
ofc_type_size=$ac_cv_sizeof_int ofc_type_size=$ac_cv_sizeof_int
ofc_type_alignment=$ac_cv_sizeof_int ofc_type_alignment=$ac_cv_sizeof_int
ofc_c_type=ompi_fortran_bogus_type_t ofc_c_type=opal_fortran_bogus_type_t
# Only check if we actually want the F77 bindings / have a F77 # Only check if we actually want the F77 bindings / have a F77
# compiler. This allows us to call this macro, even if there is # compiler. This allows us to call this macro, even if there is
@ -87,27 +87,27 @@ AC_DEFUN([OMPI_F77_CHECK], [
# We always need these defines -- even if we don't have a given type, # We always need these defines -- even if we don't have a given type,
# there are some places in the code where we have to have *something*. # there are some places in the code where we have to have *something*.
AC_DEFINE_UNQUOTED([OMPI_HAVE_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]), AC_DEFINE_UNQUOTED([OPAL_HAVE_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]),
[$ofc_have_type], [$ofc_have_type],
[Whether we have Fortran 77 $1 or not]) [Whether we have Fortran 77 $1 or not])
AC_DEFINE_UNQUOTED([OMPI_SIZEOF_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]), AC_DEFINE_UNQUOTED([OPAL_SIZEOF_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]),
[$ofc_type_size], [$ofc_type_size],
[Size of Fortran 77 $1]) [Size of Fortran 77 $1])
AC_DEFINE_UNQUOTED([OMPI_ALIGNMENT_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]), AC_DEFINE_UNQUOTED([OPAL_ALIGNMENT_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]),
[$ofc_type_alignment], [$ofc_type_alignment],
[Alignment of Fortran 77 $1]) [Alignment of Fortran 77 $1])
if test "$3" != ""; then if test "$3" != ""; then
AC_DEFINE_UNQUOTED([ompi_fortran_]m4_translit(m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]), [A-Z], [a-z])[_t], AC_DEFINE_UNQUOTED([opal_fortran_]m4_translit(m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]), [A-Z], [a-z])[_t],
[$ofc_c_type], [$ofc_c_type],
[C type corresponding to Fortran 77 $1]) [C type corresponding to Fortran 77 $1])
fi fi
# Save some in shell variables for later use (e.g., need # Save some in shell variables for later use (e.g., need
# OMPI_SIZEOF_FORTRAN_INTEGER in OMPI_F77_GET_FORTRAN_HANDLE_MAX) # OPAL_SIZEOF_FORTRAN_INTEGER in OMPI_F77_GET_FORTRAN_HANDLE_MAX)
[OMPI_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_])[_C_TYPE=$ofc_c_type] [OPAL_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_])[_C_TYPE=$ofc_c_type]
[OMPI_HAVE_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_])[=$ofc_have_type] [OPAL_HAVE_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_])[=$ofc_have_type]
[OMPI_SIZEOF_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_])[=$ofc_type_size] [OPAL_SIZEOF_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_])[=$ofc_type_size]
[OMPI_ALIGNMENT_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_])[=$ofc_type_alignment] [OPAL_ALIGNMENT_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_])[=$ofc_type_alignment]
# Clean up # Clean up
OMPI_VAR_SCOPE_POP OMPI_VAR_SCOPE_POP

6
config/f77_check_logical_array.m4
Просмотреть файл

@ -36,7 +36,7 @@ EOF
# C module # C module
# We really need the confdefs.h Header file for # We really need the confdefs.h Header file for
# the ompi_fortran_logical_t definition # the opal_fortran_logical_t definition
if test \! -f confdefs.h ; then if test \! -f confdefs.h ; then
AC_MSG_WARN([*** Problem running configure test!]) AC_MSG_WARN([*** Problem running configure test!])
AC_MSG_WARN([*** Cannot find confdefs.h file for config test]) AC_MSG_WARN([*** Cannot find confdefs.h file for config test])
@ -52,9 +52,9 @@ EOF
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
void $ompi_check_logical_fn(ompi_fortran_logical_t * logical); void $ompi_check_logical_fn(opal_fortran_logical_t * logical);
void $ompi_check_logical_fn(ompi_fortran_logical_t * logical) void $ompi_check_logical_fn(opal_fortran_logical_t * logical)
{ {
int result = 0; int result = 0;
FILE *f=fopen("conftestval", "w"); FILE *f=fopen("conftestval", "w");

14
config/f77_check_real16_c_equiv.m4
Просмотреть файл

@ -29,13 +29,13 @@ AC_DEFUN([OMPI_F77_CHECK_REAL16_C_EQUIV],[
# We have to do this as a cache check for cross-compilation platforms # We have to do this as a cache check for cross-compilation platforms
AC_CACHE_CHECK([for C type matching bit representation of REAL*16], AC_CACHE_CHECK([for C type matching bit representation of REAL*16],
[real16_matches_c_var], [real16_matches_c_var],
[AS_IF([test "$OMPI_WANT_F77_BINDINGS" = "1" -a "$OMPI_HAVE_FORTRAN_REAL16" = "1"],[ [AS_IF([test "$OMPI_WANT_F77_BINDINGS" = "1" -a "$OPAL_HAVE_FORTRAN_REAL16" = "1"],[
# AC_CACHE_CHECK automatically does its own AC_MSG_CHECKING, so close it out # AC_CACHE_CHECK automatically does its own AC_MSG_CHECKING, so close it out
AC_MSG_RESULT([pending]) AC_MSG_RESULT([pending])
# First check the type that we found was the same length in C # First check the type that we found was the same length in C
AC_MSG_CHECKING([if $OMPI_FORTRAN_REAL16_C_TYPE == REAL*16]) AC_MSG_CHECKING([if $OPAL_FORTRAN_REAL16_C_TYPE == REAL*16])
OMPI_F77_CHECK_REAL16_EQUIV_TYPE([$OMPI_FORTRAN_REAL16_C_TYPE], [L]) OMPI_F77_CHECK_REAL16_EQUIV_TYPE([$OPAL_FORTRAN_REAL16_C_TYPE], [L])
# If that didn't work, see if we have a compiler-specific # If that didn't work, see if we have a compiler-specific
# time that might work # time that might work
AS_IF([test "$happy" = "no"], AS_IF([test "$happy" = "no"],
@ -48,7 +48,7 @@ AC_DEFUN([OMPI_F77_CHECK_REAL16_C_EQUIV],[
OMPI_UNIQ([CFLAGS]) OMPI_UNIQ([CFLAGS])
OMPI_F77_CHECK_REAL16_EQUIV_TYPE([_Quad], [q]) OMPI_F77_CHECK_REAL16_EQUIV_TYPE([_Quad], [q])
AS_IF([test "$happy" = "yes"], AS_IF([test "$happy" = "yes"],
[OMPI_FORTRAN_REAL16_C_TYPE="_Quad" [OPAL_FORTRAN_REAL16_C_TYPE="_Quad"
AC_MSG_RESULT([works!])], AC_MSG_RESULT([works!])],
[CFLAGS="$CFLAGS_save" [CFLAGS="$CFLAGS_save"
AC_MSG_RESULT([does not work])]) AC_MSG_RESULT([does not work])])
@ -67,14 +67,14 @@ AC_DEFUN([OMPI_F77_CHECK_REAL16_C_EQUIV],[
]) ])
]) ])
ompi_real16_matches_c=AS_VAR_GET([real16_matches_c_var]) opal_real16_matches_c=AS_VAR_GET([real16_matches_c_var])
AS_VAR_POPDEF([real16_matches_c_var]) AS_VAR_POPDEF([real16_matches_c_var])
AS_IF([test "$ompi_real16_matches_c" = "yes"], AS_IF([test "$opal_real16_matches_c" = "yes"],
[define_value=1], [define_value=1],
[define_value=0 [define_value=0
AC_MSG_WARN([MPI_REAL16 and MPI_COMPLEX32 support have been disabled])]) AC_MSG_WARN([MPI_REAL16 and MPI_COMPLEX32 support have been disabled])])
AC_DEFINE_UNQUOTED([OMPI_REAL16_MATCHES_C], [$define_value], AC_DEFINE_UNQUOTED([OPAL_REAL16_MATCHES_C], [$define_value],
[Whether Fortran REAL*16 matches the bit format of the equivalent C type]) [Whether Fortran REAL*16 matches the bit format of the equivalent C type])
OMPI_VAR_SCOPE_POP OMPI_VAR_SCOPE_POP
]) ])

4
config/f77_get_fortran_handle_max.m4
Просмотреть файл

@ -33,7 +33,7 @@ AC_DEFUN([OMPI_F77_GET_FORTRAN_HANDLE_MAX],[
# Calculate the number of f's that we need to append to the hex # Calculate the number of f's that we need to append to the hex
# value. Do one less than we really need becaue we assume the # value. Do one less than we really need becaue we assume the
# top nybble is 0x7 to avoid sign issues. # top nybble is 0x7 to avoid sign issues.
ompi_numf=`expr $OMPI_SIZEOF_FORTRAN_INTEGER \* 2 - 1` ompi_numf=`expr $OPAL_SIZEOF_FORTRAN_INTEGER \* 2 - 1`
ompi_fint_max=0x7 ompi_fint_max=0x7
while test "$ompi_numf" -gt "0"; do while test "$ompi_numf" -gt "0"; do
ompi_fint_max=${ompi_fint_max}f ompi_fint_max=${ompi_fint_max}f
@ -76,7 +76,7 @@ fclose(fp);]]),
fi fi
rm -f conftest.out > /dev/null 2>&1 ]) rm -f conftest.out > /dev/null 2>&1 ])
AC_DEFINE_UNQUOTED([OMPI_FORTRAN_HANDLE_MAX], AC_DEFINE_UNQUOTED([OPAL_FORTRAN_HANDLE_MAX],
[$ompi_cv_f77_fortran_handle_max], [$ompi_cv_f77_fortran_handle_max],
[Max handle value for fortran MPI handles, effectively min(INT_MAX, max fortran INTEGER value)]) [Max handle value for fortran MPI handles, effectively min(INT_MAX, max fortran INTEGER value)])
])dnl ])dnl

14
config/f77_get_value_true.m4
Просмотреть файл

@ -35,7 +35,7 @@ AC_DEFUN([OMPI_F77_GET_VALUE_TRUE],[
# #
# C module # C module
# We really need the confdefs.h Header file for # We really need the confdefs.h Header file for
# the ompi_fortran_logical_t definition # the opal_fortran_logical_t definition
# #
if test \! -f confdefs.h ; then if test \! -f confdefs.h ; then
AC_MSG_WARN([*** Problem running configure test!]) AC_MSG_WARN([*** Problem running configure test!])
@ -53,19 +53,19 @@ AC_DEFUN([OMPI_F77_GET_VALUE_TRUE],[
extern "C" { extern "C" {
#endif #endif
void $ompi_print_logical_fn(ompi_fortran_logical_t * logical); void $ompi_print_logical_fn(opal_fortran_logical_t * logical);
void $ompi_print_logical_fn(ompi_fortran_logical_t * logical) void $ompi_print_logical_fn(opal_fortran_logical_t * logical)
{ {
FILE *f=fopen("conftestval", "w"); FILE *f=fopen("conftestval", "w");
if (!f) exit(1); if (!f) exit(1);
if( SIZEOF_INT >= sizeof(ompi_fortran_logical_t) ) { if( SIZEOF_INT >= sizeof(opal_fortran_logical_t) ) {
fprintf(f, "%d\n", (int)*logical); fprintf(f, "%d\n", (int)*logical);
} else if (SIZEOF_LONG >= sizeof(ompi_fortran_logical_t) ) { } else if (SIZEOF_LONG >= sizeof(opal_fortran_logical_t) ) {
fprintf(f, "%ld\n", (long) *logical); fprintf(f, "%ld\n", (long) *logical);
#ifdef HAVE_LONG_LONG #ifdef HAVE_LONG_LONG
} else if (SIZEOF_LONG_LONG >= sizeof(ompi_fortran_logical_t) ) { } else if (SIZEOF_LONG_LONG >= sizeof(opal_fortran_logical_t) ) {
fprintf(f, "%lld\n", (long long) *logical); fprintf(f, "%lld\n", (long long) *logical);
#endif #endif
} else { } else {
@ -105,7 +105,7 @@ EOF
[AC_MSG_ERROR([Could not determine value of Fotran .TRUE.. Aborting.])])]) [AC_MSG_ERROR([Could not determine value of Fotran .TRUE.. Aborting.])])])
fi]) fi])
AC_DEFINE_UNQUOTED([OMPI_FORTRAN_VALUE_TRUE], AC_DEFINE_UNQUOTED([OPAL_FORTRAN_VALUE_TRUE],
[$ompi_cv_f77_true_value], [$ompi_cv_f77_true_value],
[Fortran value for LOGICAL .TRUE. value]) [Fortran value for LOGICAL .TRUE. value])

8
config/f77_purge_unsupported_kind.m4
Просмотреть файл

@ -24,10 +24,10 @@ AC_MSG_CHECKING([whether Fortran $1 has expected size])
val=`echo $1 | cut -f2 -d'*'` val=`echo $1 | cut -f2 -d'*'`
type=`echo $1 | cut -f1 -d'*'` type=`echo $1 | cut -f1 -d'*'`
if test "x$((OMPI_SIZEOF_FORTRAN_$type$val))" != "x$val" ; then if test "x$((OPAL_SIZEOF_FORTRAN_$type$val))" != "x$val" ; then
eval "OMPI_SIZEOF_FORTRAN_$type$val=0" eval "OPAL_SIZEOF_FORTRAN_$type$val=0"
# eval "OMPI_ALIGNMENT_FORTRAN_$type$val=0" # eval "OPAL_ALIGNMENT_FORTRAN_$type$val=0"
eval "OMPI_HAVE_FORTRAN_$type$val=0" eval "OPAL_HAVE_FORTRAN_$type$val=0"
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
else else
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])

10
config/f90_check.m4
Просмотреть файл

@ -106,14 +106,14 @@ AC_DEFUN([OMPI_F90_CHECK], [
else else
# If this type has an F77 counterpart, see if it's # If this type has an F77 counterpart, see if it's
# supported. # supported.
[ofc_f77_have_type=$OMPI_HAVE_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]) [ofc_f77_have_type=$OPAL_HAVE_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_])
if test "$ofc_f77_have_type" = "0"; then if test "$ofc_f77_have_type" = "0"; then
AC_MSG_WARN([*** Corresponding Fortran 77 type ($1) not supported]) AC_MSG_WARN([*** Corresponding Fortran 77 type ($1) not supported])
AC_MSG_WARN([*** Skipping Fortran 90 type ($1)]) AC_MSG_WARN([*** Skipping Fortran 90 type ($1)])
else else
# Check the size of this type against its F77 counterpart # Check the size of this type against its F77 counterpart
[ofc_f77_sizeof=$OMPI_SIZEOF_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]) [ofc_f77_sizeof=$OPAL_SIZEOF_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_])
if test "$ofc_f77_sizeof" != ""; then if test "$ofc_f77_sizeof" != ""; then
AC_MSG_CHECKING([if Fortran 77 and 90 type sizes match]) AC_MSG_CHECKING([if Fortran 77 and 90 type sizes match])
if test "$ofc_f77_sizeof" != "$ofc_type_size"; then if test "$ofc_f77_sizeof" != "$ofc_type_size"; then
@ -158,15 +158,15 @@ AC_DEFUN([OMPI_F90_CHECK], [
# AC_DEFINE_UNQUOTED), autoheader won't put them in the # AC_DEFINE_UNQUOTED), autoheader won't put them in the
# AC_CONFIG_HEADER (or AM_CONFIG_HEADER, in our case). # AC_CONFIG_HEADER (or AM_CONFIG_HEADER, in our case).
AC_DEFINE_UNQUOTED([OMPI_HAVE_F90_]m4_translit(m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]), [a-z], [A-Z]), AC_DEFINE_UNQUOTED([OPAL_HAVE_F90_]m4_translit(m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]), [a-z], [A-Z]),
[$ofc_have_type], [$ofc_have_type],
[Whether we have Fortran 90 $ofc_fortran_type or not]) [Whether we have Fortran 90 $ofc_fortran_type or not])
# Save some in shell variables for later use. Have to use m4 # Save some in shell variables for later use. Have to use m4
# functions here (vs. $ompi_upper_var_name, defined above) because # functions here (vs. $ompi_upper_var_name, defined above) because
# these need to be set at autoconf time, not configure time. # these need to be set at autoconf time, not configure time.
[OMPI_SIZEOF_F90_]m4_translit(m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]), [a-z], [A-Z])[=$ofc_type_size] [OPAL_SIZEOF_F90_]m4_translit(m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]), [a-z], [A-Z])[=$ofc_type_size]
AC_SUBST([OMPI_SIZEOF_F90_]m4_translit(m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]), [a-z], [A-Z])) AC_SUBST([OPAL_SIZEOF_F90_]m4_translit(m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_]), [a-z], [A-Z]))
# Clean up # Clean up
unset ofc_fortran_type ofc_expected_size ofc_want_range ofc_pretty_name unset ofc_fortran_type ofc_expected_size ofc_want_range ofc_pretty_name

20
configure.ac
Просмотреть файл

@ -271,18 +271,18 @@ fi
OMPI_C_GET_ALIGNMENT(char, OPAL_ALIGNMENT_CHAR) OMPI_C_GET_ALIGNMENT(char, OPAL_ALIGNMENT_CHAR)
OMPI_C_GET_ALIGNMENT(short, OPAL_ALIGNMENT_SHORT) OMPI_C_GET_ALIGNMENT(short, OPAL_ALIGNMENT_SHORT)
OMPI_C_GET_ALIGNMENT(wchar_t, OMPI_ALIGNMENT_WCHAR) OMPI_C_GET_ALIGNMENT(wchar_t, OPAL_ALIGNMENT_WCHAR)
OMPI_C_GET_ALIGNMENT(int, OPAL_ALIGNMENT_INT) OMPI_C_GET_ALIGNMENT(int, OPAL_ALIGNMENT_INT)
OMPI_C_GET_ALIGNMENT(long, OPAL_ALIGNMENT_LONG) OMPI_C_GET_ALIGNMENT(long, OPAL_ALIGNMENT_LONG)
if test $ac_cv_type_long_long = yes; then if test $ac_cv_type_long_long = yes; then
OMPI_C_GET_ALIGNMENT(long long, OPAL_ALIGNMENT_LONG_LONG) OMPI_C_GET_ALIGNMENT(long long, OPAL_ALIGNMENT_LONG_LONG)
fi fi
OMPI_C_GET_ALIGNMENT(float, OMPI_ALIGNMENT_FLOAT) OMPI_C_GET_ALIGNMENT(float, OPAL_ALIGNMENT_FLOAT)
OMPI_C_GET_ALIGNMENT(double, OMPI_ALIGNMENT_DOUBLE) OMPI_C_GET_ALIGNMENT(double, OPAL_ALIGNMENT_DOUBLE)
if test $ac_cv_type_long_double = yes; then if test $ac_cv_type_long_double = yes; then
OMPI_C_GET_ALIGNMENT(long double, OPAL_ALIGNMENT_LONG_DOUBLE) OMPI_C_GET_ALIGNMENT(long double, OPAL_ALIGNMENT_LONG_DOUBLE)
fi fi
OMPI_C_GET_ALIGNMENT(void *, OMPI_ALIGNMENT_VOID_P) OMPI_C_GET_ALIGNMENT(void *, OPAL_ALIGNMENT_VOID_P)
# #
# Does the C compiler native support "bool"? (i.e., without # Does the C compiler native support "bool"? (i.e., without
@ -403,7 +403,7 @@ AC_CHECK_SIZEOF(bool)
# check for type alignments # check for type alignments
OMPI_C_GET_ALIGNMENT(bool, OMPI_ALIGNMENT_CXX_BOOL) OMPI_C_GET_ALIGNMENT(bool, OPAL_ALIGNMENT_CXX_BOOL)
AC_LANG_POP(C++) AC_LANG_POP(C++)
# check if we want C++ support # check if we want C++ support
@ -445,7 +445,7 @@ OMPI_SETUP_F77
# This allows us to mark bogus types, but still have them be a valid # This allows us to mark bogus types, but still have them be a valid
# [sentinel] value # [sentinel] value
AC_DEFINE([ompi_fortran_bogus_type_t], [int], AC_DEFINE([opal_fortran_bogus_type_t], [int],
[A bogus type that allows us to have sentinel type values that are still valid]) [A bogus type that allows us to have sentinel type values that are still valid])
# We want to set the #define's for all of these, so invoke the macros # We want to set the #define's for all of these, so invoke the macros
@ -600,13 +600,13 @@ AC_SUBST(OMPI_F90_CKINDS)
# whatever is the same size as a F77 INTEGER -- for the # whatever is the same size as a F77 INTEGER -- for the
# most-likely-will-never-occur case where F77 INTEGER is smaller than # most-likely-will-never-occur case where F77 INTEGER is smaller than
# an F90 INTEGER; see MPI-2 4.12.6.5 # an F90 INTEGER; see MPI-2 4.12.6.5
if test "$OMPI_SIZEOF_FORTRAN_INTEGER" = "2"; then if test "$OPAL_SIZEOF_FORTRAN_INTEGER" = "2"; then
OMPI_F90_GET_INT_KIND(MPI_INTEGER_KIND, 4, OMPI_MPI_INTEGER_KIND) OMPI_F90_GET_INT_KIND(MPI_INTEGER_KIND, 4, OMPI_MPI_INTEGER_KIND)
elif test "$OMPI_SIZEOF_FORTRAN_INTEGER" = "4"; then elif test "$OPAL_SIZEOF_FORTRAN_INTEGER" = "4"; then
OMPI_F90_GET_INT_KIND(MPI_INTEGER_KIND, 9, OMPI_MPI_INTEGER_KIND) OMPI_F90_GET_INT_KIND(MPI_INTEGER_KIND, 9, OMPI_MPI_INTEGER_KIND)
elif test "$OMPI_SIZEOF_FORTRAN_INTEGER" = "8"; then elif test "$OPAL_SIZEOF_FORTRAN_INTEGER" = "8"; then
OMPI_F90_GET_INT_KIND(MPI_INTEGER_KIND, 18, OMPI_MPI_INTEGER_KIND) OMPI_F90_GET_INT_KIND(MPI_INTEGER_KIND, 18, OMPI_MPI_INTEGER_KIND)
elif test "$OMPI_SIZEOF_FORTRAN_INTEGER" = "16"; then elif test "$OPAL_SIZEOF_FORTRAN_INTEGER" = "16"; then
OMPI_F90_GET_INT_KIND(MPI_INTEGER_KIND, 19, OMPI_MPI_INTEGER_KIND) OMPI_F90_GET_INT_KIND(MPI_INTEGER_KIND, 19, OMPI_MPI_INTEGER_KIND)
AC_MSG_ERROR([Cannot support Fortran MPI_INTEGER_KIND!]) AC_MSG_ERROR([Cannot support Fortran MPI_INTEGER_KIND!])
fi fi

24
contrib/platform/win32/CMakeModules/f77_check.cmake
Просмотреть файл

@ -28,13 +28,13 @@ MACRO(OMPI_F77_CHECK FORTRAN_TYPE C_TYPE TYPE_LIST EXPECTED_SIZE)
SET(NEED_RECHECK TRUE) SET(NEED_RECHECK TRUE)
# do we need to check all the features? # do we need to check all the features?
IF(DEFINED OMPI_HAVE_FORTRAN_${TYPE_NAME}) IF(DEFINED OPAL_HAVE_FORTRAN_${TYPE_NAME})
IF(${F77_SETUP_${TYPE_NAME}} STREQUAL ${OMPI_WANT_F77_BINDINGS}) IF(${F77_SETUP_${TYPE_NAME}} STREQUAL ${OMPI_WANT_F77_BINDINGS})
SET(NEED_RECHECK FALSE) SET(NEED_RECHECK FALSE)
ELSE(${F77_SETUP_${TYPE_NAME}} STREQUAL ${OMPI_WANT_F77_BINDINGS}) ELSE(${F77_SETUP_${TYPE_NAME}} STREQUAL ${OMPI_WANT_F77_BINDINGS})
SET(NEED_RECHECK TRUE) SET(NEED_RECHECK TRUE)
ENDIF(${F77_SETUP_${TYPE_NAME}} STREQUAL ${OMPI_WANT_F77_BINDINGS}) ENDIF(${F77_SETUP_${TYPE_NAME}} STREQUAL ${OMPI_WANT_F77_BINDINGS})
ENDIF(DEFINED OMPI_HAVE_FORTRAN_${TYPE_NAME}) ENDIF(DEFINED OPAL_HAVE_FORTRAN_${TYPE_NAME})
# use this variable to check whether user changed F77 option. # use this variable to check whether user changed F77 option.
# every time OMPI_WANT_F77_BINDINGS got changed, we need to re-check everything. # every time OMPI_WANT_F77_BINDINGS got changed, we need to re-check everything.
@ -51,7 +51,7 @@ MACRO(OMPI_F77_CHECK FORTRAN_TYPE C_TYPE TYPE_LIST EXPECTED_SIZE)
SET(ofc_have_type 0) SET(ofc_have_type 0)
SET(ofc_type_size ${SIZEOF_INT}) SET(ofc_type_size ${SIZEOF_INT})
SET(ofc_type_alignment ${SIZEOF_INT}) SET(ofc_type_alignment ${SIZEOF_INT})
SET(ofc_c_type ${ompi_fortran_bogus_type_t}) SET(ofc_c_type ${opal_fortran_bogus_type_t})
# Only check if we actually want the F77 bindings / have a F77 # Only check if we actually want the F77 bindings / have a F77
# compiler. This allows us to call this macro, even if there is # compiler. This allows us to call this macro, even if there is
@ -105,19 +105,19 @@ MACRO(OMPI_F77_CHECK FORTRAN_TYPE C_TYPE TYPE_LIST EXPECTED_SIZE)
# We always need these defines -- even if we don't have a given type, # We always need these defines -- even if we don't have a given type,
# there are some places in the code where we have to have *something*. # there are some places in the code where we have to have *something*.
SET(OMPI_HAVE_FORTRAN_${TYPE_NAME} ${ofc_have_type} CACHE INTERNAL "OMPI_HAVE_FORTRAN_${TYPE_NAME}") SET(OPAL_HAVE_FORTRAN_${TYPE_NAME} ${ofc_have_type} CACHE INTERNAL "OPAL_HAVE_FORTRAN_${TYPE_NAME}")
SET(OMPI_SIZEOF_FORTRAN_${TYPE_NAME} ${ofc_type_size} CACHE INTERNAL "OMPI_SIZEOF_FORTRAN_${TYPE_NAME}") SET(OPAL_SIZEOF_FORTRAN_${TYPE_NAME} ${ofc_type_size} CACHE INTERNAL "OPAL_SIZEOF_FORTRAN_${TYPE_NAME}")
SET(OMPI_ALIGNMENT_FORTRAN_${TYPE_NAME} ${ofc_type_alignment} CACHE INTERNAL "OMPI_ALIGNMENT_FORTRAN_${TYPE_NAME}") SET(OPAL_ALIGNMENT_FORTRAN_${TYPE_NAME} ${ofc_type_alignment} CACHE INTERNAL "OPAL_ALIGNMENT_FORTRAN_${TYPE_NAME}")
IF(NOT "${TYPE_LIST}" STREQUAL "") IF(NOT "${TYPE_LIST}" STREQUAL "")
STRING(TOLOWER ${TYPE_NAME} TYPE_NAME_L) STRING(TOLOWER ${TYPE_NAME} TYPE_NAME_L)
SET(ompi_fortran_${TYPE_NAME_L}_t ${ofc_c_type} CACHE INTERNAL "ompi_fortran_${TYPE_NAME_L}_t") SET(opal_fortran_${TYPE_NAME_L}_t ${ofc_c_type} CACHE INTERNAL "opal_fortran_${TYPE_NAME_L}_t")
ENDIF(NOT "${TYPE_LIST}" STREQUAL "") ENDIF(NOT "${TYPE_LIST}" STREQUAL "")
#MESSAGE("OMPI_HAVE_FORTRAN_${TYPE_NAME}:${OMPI_HAVE_FORTRAN_${TYPE_NAME}}") #MESSAGE("OPAL_HAVE_FORTRAN_${TYPE_NAME}:${OPAL_HAVE_FORTRAN_${TYPE_NAME}}")
#MESSAGE("OMPI_SIZEOF_FORTRAN_${TYPE_NAME}:${OMPI_SIZEOF_FORTRAN_${TYPE_NAME}}") #MESSAGE("OPAL_SIZEOF_FORTRAN_${TYPE_NAME}:${OPAL_SIZEOF_FORTRAN_${TYPE_NAME}}")
#MESSAGE("OMPI_ALIGNMENT_FORTRAN_${TYPE_NAME}:${OMPI_ALIGNMENT_FORTRAN_${TYPE_NAME}}") #MESSAGE("OPAL_ALIGNMENT_FORTRAN_${TYPE_NAME}:${OPAL_ALIGNMENT_FORTRAN_${TYPE_NAME}}")
#MESSAGE("ompi_fortran_${TYPE_NAME_L}_t:${ompi_fortran_${TYPE_NAME_L}_t}") #MESSAGE("opal_fortran_${TYPE_NAME_L}_t:${opal_fortran_${TYPE_NAME_L}_t}")
ENDIF(NEED_RECHECK) ENDIF(NEED_RECHECK)
ENDMACRO(OMPI_F77_CHECK FORTRAN_TYPE C_TYPE TYPE_LIST EXPECTED_SIZE) ENDMACRO(OMPI_F77_CHECK FORTRAN_TYPE C_TYPE TYPE_LIST EXPECTED_SIZE)

12
contrib/platform/win32/CMakeModules/f77_check_real16_c_equiv.cmake
Просмотреть файл

@ -12,11 +12,11 @@
# OMPI_F77_CHECK_REAL16_C_EQUIV # OMPI_F77_CHECK_REAL16_C_EQUIV
# ---------------------------------------------------- # ----------------------------------------------------
MACRO(OMPI_F77_CHECK_REAL16_C_EQUIV) MACRO(OMPI_F77_CHECK_REAL16_C_EQUIV)
SET(OMPI_REAL16_MATCHES_C 0) SET(OPAL_REAL16_MATCHES_C 0)
#MESSAGE(STATUS "OMPI_HAVE_FORTRAN_REAL16:${OMPI_HAVE_FORTRAN_REAL16}") #MESSAGE(STATUS "OPAL_HAVE_FORTRAN_REAL16:${OPAL_HAVE_FORTRAN_REAL16}")
IF(OMPI_WANT_F77_BINDINGS) IF(OMPI_WANT_F77_BINDINGS)
IF(OMPI_HAVE_FORTRAN_REAL16) IF(OPAL_HAVE_FORTRAN_REAL16)
OMPI_F77_MAKE_C_FUNCTION(c ompi_ac_c_fn) OMPI_F77_MAKE_C_FUNCTION(c ompi_ac_c_fn)
FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/conftest_c.c FILE(WRITE ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/conftest_c.c
"#include <stdio.h>" "#include <stdio.h>"
@ -67,15 +67,15 @@ MACRO(OMPI_F77_CHECK_REAL16_C_EQUIV)
# read out type size value from the file, and write back to the output variable # read out type size value from the file, and write back to the output variable
FILE(READ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/conftestval ${OUTPUT_VARIABLE}) FILE(READ ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/conftestval ${OUTPUT_VARIABLE})
MESSAGE(STATUS "Check if REAL*16 bit-matches C...${OUTPUT_VARIABLE}") MESSAGE(STATUS "Check if REAL*16 bit-matches C...${OUTPUT_VARIABLE}")
SET(OMPI_REAL16_MATCHES_C 1) SET(OPAL_REAL16_MATCHES_C 1)
ELSE(EXISTS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/conftestval) ELSE(EXISTS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/conftestval)
MESSAGE(STATUS "Check if REAL*16 bit-matches C...failed") MESSAGE(STATUS "Check if REAL*16 bit-matches C...failed")
ENDIF(EXISTS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/conftestval) ENDIF(EXISTS ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/conftestval)
ENDIF(RESULT) ENDIF(RESULT)
ELSE(OMPI_HAVE_FORTRAN_REAL16) ELSE(OPAL_HAVE_FORTRAN_REAL16)
MESSAGE(STATUS "Check if REAL*16 bit-matches C...skipped") MESSAGE(STATUS "Check if REAL*16 bit-matches C...skipped")
ENDIF(OMPI_HAVE_FORTRAN_REAL16) ENDIF(OPAL_HAVE_FORTRAN_REAL16)
ENDIF(OMPI_WANT_F77_BINDINGS) ENDIF(OMPI_WANT_F77_BINDINGS)
ENDMACRO(OMPI_F77_CHECK_REAL16_C_EQUIV) ENDMACRO(OMPI_F77_CHECK_REAL16_C_EQUIV)

154
contrib/platform/win32/CMakeModules/ompi_configure.cmake
Просмотреть файл

@ -1115,7 +1115,7 @@ INCLUDE(f77_check)
# This allows us to mark bogus types, but still have them be a valid # This allows us to mark bogus types, but still have them be a valid
# [sentinel] value # [sentinel] value
SET(ompi_fortran_bogus_type_t "int") SET(opal_fortran_bogus_type_t "int")
# We want to set the #define's for all of these, so invoke the macros # We want to set the #define's for all of these, so invoke the macros
# regardless of whether we have F77 support or not. # regardless of whether we have F77 support or not.
@ -1205,17 +1205,17 @@ ENDIF(WANT_MPI_PROFILINGAND AND OMPI_WANT_F77_BINDINGS)
#/* Max handle value for fortran MPI handles, effectively min(INT_MAX, max #/* Max handle value for fortran MPI handles, effectively min(INT_MAX, max
# fortran INTEGER value) */ # fortran INTEGER value) */
#/* #undef OMPI_FORTRAN_HANDLE_MAX */ #/* #undef OPAL_FORTRAN_HANDLE_MAX */
# Need to be fixed. # Need to be fixed.
IF(WIN32) IF(WIN32)
SET (OMPI_FORTRAN_HANDLE_MAX "2147483647") SET (OPAL_FORTRAN_HANDLE_MAX "2147483647")
ENDIF(WIN32) ENDIF(WIN32)
# #
#/* Fortran value for LOGICAL .TRUE. value */ #/* Fortran value for LOGICAL .TRUE. value */
#/* #undef OMPI_FORTRAN_VALUE_TRUE */ #/* #undef OPAL_FORTRAN_VALUE_TRUE */
# Need to be fixed. # Need to be fixed.
IF(WIN32) IF(WIN32)
SET (OMPI_FORTRAN_VALUE_TRUE 0) SET (OPAL_FORTRAN_VALUE_TRUE 0)
ENDIF(WIN32) ENDIF(WIN32)
@ -1227,58 +1227,58 @@ ENDIF(WIN32)
#/* #undef OMPI_F90 */ #/* #undef OMPI_F90 */
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_COMPLEX */ #/* #undef OPAL_HAVE_F90_COMPLEX */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_COMPLEX16 */ #/* #undef OPAL_HAVE_F90_COMPLEX16 */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_COMPLEX32 */ #/* #undef OPAL_HAVE_F90_COMPLEX32 */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_COMPLEX8 */ #/* #undef OPAL_HAVE_F90_COMPLEX8 */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_DOUBLE_COMPLEX */ #/* #undef OPAL_HAVE_F90_DOUBLE_COMPLEX */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_DOUBLE_PRECISION */ #/* #undef OPAL_HAVE_F90_DOUBLE_PRECISION */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_INTEGER */ #/* #undef OPAL_HAVE_F90_INTEGER */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_INTEGER1 */ #/* #undef OPAL_HAVE_F90_INTEGER1 */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_INTEGER16 */ #/* #undef OPAL_HAVE_F90_INTEGER16 */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_INTEGER2 */ #/* #undef OPAL_HAVE_F90_INTEGER2 */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_INTEGER4 */ #/* #undef OPAL_HAVE_F90_INTEGER4 */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_INTEGER8 */ #/* #undef OPAL_HAVE_F90_INTEGER8 */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_LOGICAL */ #/* #undef OPAL_HAVE_F90_LOGICAL */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_REAL */ #/* #undef OPAL_HAVE_F90_REAL */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_REAL16 */ #/* #undef OPAL_HAVE_F90_REAL16 */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_REAL2 */ #/* #undef OPAL_HAVE_F90_REAL2 */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_REAL4 */ #/* #undef OPAL_HAVE_F90_REAL4 */
# #
#/* Whether we have Fortran 90 $ofc_fortran_type or not */ #/* Whether we have Fortran 90 $ofc_fortran_type or not */
#/* #undef OMPI_HAVE_F90_REAL8 */ #/* #undef OPAL_HAVE_F90_REAL8 */
# #
########################################################################################### ###########################################################################################
@ -1729,127 +1729,127 @@ SET (PACKAGE_VERSION ${VERSION_STRING})
# #
#/* A bogus type that allows us to have sentinel type values that are still #/* A bogus type that allows us to have sentinel type values that are still
# valid */ # valid */
#/* #undef ompi_fortran_bogus_type_t */ #/* #undef opal_fortran_bogus_type_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_bogus_type_t 1) # SET(opal_fortran_bogus_type_t 1)
# SET(ompi_fortran_bogus_type_t_STRING "int") # SET(opal_fortran_bogus_type_t_STRING "int")
#ENDIF(WIN32) #ENDIF(WIN32)
# #
#/* C type corresponding to Fortran 77 COMPLEX*16 */ #/* C type corresponding to Fortran 77 COMPLEX*16 */
#/* #undef ompi_fortran_complex16_t */ #/* #undef opal_fortran_complex16_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_complex16_t 1) # SET(opal_fortran_complex16_t 1)
# SET(ompi_fortran_complex16_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_complex16_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 COMPLEX*32 */ ##/* C type corresponding to Fortran 77 COMPLEX*32 */
##/* #undef ompi_fortran_complex32_t */ ##/* #undef opal_fortran_complex32_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_complex32_t 1) # SET(opal_fortran_complex32_t 1)
# SET(ompi_fortran_complex32_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_complex32_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 COMPLEX*8 */ ##/* C type corresponding to Fortran 77 COMPLEX*8 */
##/* #undef ompi_fortran_complex8_t */ ##/* #undef opal_fortran_complex8_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_complex8_t 1) # SET(opal_fortran_complex8_t 1)
# SET(ompi_fortran_complex8_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_complex8_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 COMPLEX */ ##/* C type corresponding to Fortran 77 COMPLEX */
##/* #undef ompi_fortran_complex_t */ ##/* #undef opal_fortran_complex_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_complex_t 1) # SET(opal_fortran_complex_t 1)
# SET(ompi_fortran_complex_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_complex_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 DOUBLE PRECISION */ ##/* C type corresponding to Fortran 77 DOUBLE PRECISION */
##/* #undef ompi_fortran_double_precision_t */ ##/* #undef opal_fortran_double_precision_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_double_precision_t 1) # SET(opal_fortran_double_precision_t 1)
# SET(ompi_fortran_double_precision_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_double_precision_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 INTEGER*16 */ ##/* C type corresponding to Fortran 77 INTEGER*16 */
##/* #undef ompi_fortran_integer16_t */ ##/* #undef opal_fortran_integer16_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_integer16_t 1) # SET(opal_fortran_integer16_t 1)
# SET(ompi_fortran_integer16_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_integer16_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 INTEGER*1 */ ##/* C type corresponding to Fortran 77 INTEGER*1 */
##/* #undef ompi_fortran_integer1_t */ ##/* #undef opal_fortran_integer1_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_integer1_t 1) # SET(opal_fortran_integer1_t 1)
# SET(ompi_fortran_integer1_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_integer1_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 INTEGER*2 */ ##/* C type corresponding to Fortran 77 INTEGER*2 */
##/* #undef ompi_fortran_integer2_t */ ##/* #undef opal_fortran_integer2_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_integer2_t 1) # SET(opal_fortran_integer2_t 1)
# SET(ompi_fortran_integer2_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_integer2_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 INTEGER*4 */ ##/* C type corresponding to Fortran 77 INTEGER*4 */
##/* #undef ompi_fortran_integer4_t */ ##/* #undef opal_fortran_integer4_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_integer4_t 1) # SET(opal_fortran_integer4_t 1)
# SET(ompi_fortran_integer4_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_integer4_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 INTEGER*8 */ ##/* C type corresponding to Fortran 77 INTEGER*8 */
##/* #undef ompi_fortran_integer8_t */ ##/* #undef opal_fortran_integer8_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_integer8_t 1) # SET(opal_fortran_integer8_t 1)
# SET(ompi_fortran_integer8_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_integer8_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 INTEGER */ ##/* C type corresponding to Fortran 77 INTEGER */
##/* #undef ompi_fortran_integer_t */ ##/* #undef opal_fortran_integer_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_integer_t 1) # SET(opal_fortran_integer_t 1)
# SET(ompi_fortran_integer_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_integer_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 LOGICAL */ ##/* C type corresponding to Fortran 77 LOGICAL */
##/* #undef ompi_fortran_logical_t */ ##/* #undef opal_fortran_logical_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_logical_t 1) # SET(opal_fortran_logical_t 1)
# SET(ompi_fortran_logical_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_logical_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 REAL*16 */ ##/* C type corresponding to Fortran 77 REAL*16 */
##/* #undef ompi_fortran_real16_t */ ##/* #undef opal_fortran_real16_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_real16_t 1) # SET(opal_fortran_real16_t 1)
# SET(ompi_fortran_real16_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_real16_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 REAL*2 */ ##/* C type corresponding to Fortran 77 REAL*2 */
##/* #undef ompi_fortran_real2_t */ ##/* #undef opal_fortran_real2_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_real2_t 1) # SET(opal_fortran_real2_t 1)
# SET(ompi_fortran_real2_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_real2_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 REAL*4 */ ##/* C type corresponding to Fortran 77 REAL*4 */
##/* #undef ompi_fortran_real4_t */ ##/* #undef opal_fortran_real4_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_real4_t 1) # SET(opal_fortran_real4_t 1)
# SET(ompi_fortran_real4_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_real4_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 REAL*8 */ ##/* C type corresponding to Fortran 77 REAL*8 */
##/* #undef ompi_fortran_real8_t */ ##/* #undef opal_fortran_real8_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_real8_t 1) # SET(opal_fortran_real8_t 1)
# SET(ompi_fortran_real8_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_real8_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)
## ##
##/* C type corresponding to Fortran 77 REAL */ ##/* C type corresponding to Fortran 77 REAL */
##/* #undef ompi_fortran_real_t */ ##/* #undef opal_fortran_real_t */
#IF(WIN32) #IF(WIN32)
# SET(ompi_fortran_real_t 1) # SET(opal_fortran_real_t 1)
# SET(ompi_fortran_real_t_STRING "ompi_fortran_bogus_type_t") # SET(opal_fortran_real_t_STRING "opal_fortran_bogus_type_t")
#ENDIF(WIN32) #ENDIF(WIN32)

96
contrib/platform/win32/ConfigFiles/mpi.h.cmake
Просмотреть файл

@ -65,43 +65,43 @@
#cmakedefine OPAL_SIZEOF_INT ${SIZEOF_INT} #cmakedefine OPAL_SIZEOF_INT ${SIZEOF_INT}
/* Whether we have FORTRAN LOGICAL*1 or not */ /* Whether we have FORTRAN LOGICAL*1 or not */
#define OMPI_HAVE_FORTRAN_LOGICAL1 ${OMPI_HAVE_FORTRAN_LOGICAL1} #define OPAL_HAVE_FORTRAN_LOGICAL1 ${OPAL_HAVE_FORTRAN_LOGICAL1}
/* Whether we have FORTRAN LOGICAL*2 or not */ /* Whether we have FORTRAN LOGICAL*2 or not */
#define OMPI_HAVE_FORTRAN_LOGICAL2 ${OMPI_HAVE_FORTRAN_LOGICAL2} #define OPAL_HAVE_FORTRAN_LOGICAL2 ${OPAL_HAVE_FORTRAN_LOGICAL2}
/* Whether we have FORTRAN LOGICAL*4 or not */ /* Whether we have FORTRAN LOGICAL*4 or not */
#define OMPI_HAVE_FORTRAN_LOGICAL4 ${OMPI_HAVE_FORTRAN_LOGICAL4} #define OPAL_HAVE_FORTRAN_LOGICAL4 ${OPAL_HAVE_FORTRAN_LOGICAL4}
/* Whether we have FORTRAN LOGICAL*8 or not */ /* Whether we have FORTRAN LOGICAL*8 or not */
#define OMPI_HAVE_FORTRAN_LOGICAL8 ${OMPI_HAVE_FORTRAN_LOGICAL8} #define OPAL_HAVE_FORTRAN_LOGICAL8 ${OPAL_HAVE_FORTRAN_LOGICAL8}
/* Whether we have FORTRAN INTEGER*1 or not */ /* Whether we have FORTRAN INTEGER*1 or not */
#define OMPI_HAVE_FORTRAN_INTEGER1 ${OMPI_HAVE_FORTRAN_INTEGER1} #define OPAL_HAVE_FORTRAN_INTEGER1 ${OPAL_HAVE_FORTRAN_INTEGER1}
/* Whether we have FORTRAN INTEGER*16 or not */ /* Whether we have FORTRAN INTEGER*16 or not */
#define OMPI_HAVE_FORTRAN_INTEGER16 ${OMPI_HAVE_FORTRAN_INTEGER16} #define OPAL_HAVE_FORTRAN_INTEGER16 ${OPAL_HAVE_FORTRAN_INTEGER16}
/* Whether we have FORTRAN INTEGER*2 or not */ /* Whether we have FORTRAN INTEGER*2 or not */
#define OMPI_HAVE_FORTRAN_INTEGER2 ${OMPI_HAVE_FORTRAN_INTEGER2} #define OPAL_HAVE_FORTRAN_INTEGER2 ${OPAL_HAVE_FORTRAN_INTEGER2}
/* Whether we have FORTRAN INTEGER*4 or not */ /* Whether we have FORTRAN INTEGER*4 or not */
#define OMPI_HAVE_FORTRAN_INTEGER4 ${OMPI_HAVE_FORTRAN_INTEGER4} #define OPAL_HAVE_FORTRAN_INTEGER4 ${OPAL_HAVE_FORTRAN_INTEGER4}
/* Whether we have FORTRAN INTEGER*8 or not */ /* Whether we have FORTRAN INTEGER*8 or not */
#define OMPI_HAVE_FORTRAN_INTEGER8 ${OMPI_HAVE_FORTRAN_INTEGER8} #define OPAL_HAVE_FORTRAN_INTEGER8 ${OPAL_HAVE_FORTRAN_INTEGER8}
/* Whether we have FORTRAN REAL*16 or not */ /* Whether we have FORTRAN REAL*16 or not */
#define OMPI_HAVE_FORTRAN_REAL16 ${OMPI_HAVE_FORTRAN_REAL16} #define OPAL_HAVE_FORTRAN_REAL16 ${OPAL_HAVE_FORTRAN_REAL16}
/* Whether we have FORTRAN REAL*2 or not */ /* Whether we have FORTRAN REAL*2 or not */
#define OMPI_HAVE_FORTRAN_REAL2 ${OMPI_HAVE_FORTRAN_REAL2} #define OPAL_HAVE_FORTRAN_REAL2 ${OPAL_HAVE_FORTRAN_REAL2}
/* Whether we have FORTRAN REAL*4 or not */ /* Whether we have FORTRAN REAL*4 or not */
#define OMPI_HAVE_FORTRAN_REAL4 ${OMPI_HAVE_FORTRAN_REAL4} #define OPAL_HAVE_FORTRAN_REAL4 ${OPAL_HAVE_FORTRAN_REAL4}
/* Whether we have FORTRAN REAL*8 or not */ /* Whether we have FORTRAN REAL*8 or not */
#define OMPI_HAVE_FORTRAN_REAL8 ${OMPI_HAVE_FORTRAN_REAL8} #define OPAL_HAVE_FORTRAN_REAL8 ${OPAL_HAVE_FORTRAN_REAL8}
/* Type of MPI_Offset -- has to be defined here and typedef'ed later because mpi.h does not get AC SUBST's */ /* Type of MPI_Offset -- has to be defined here and typedef'ed later because mpi.h does not get AC SUBST's */
#cmakedefine OMPI_MPI_OFFSET_TYPE ${OMPI_MPI_OFFSET_TYPE_STRING} #cmakedefine OMPI_MPI_OFFSET_TYPE ${OMPI_MPI_OFFSET_TYPE_STRING}
@ -144,10 +144,10 @@
/* A type that allows us to have sentinel type values that are still /* A type that allows us to have sentinel type values that are still
valid */ valid */
#cmakedefine ompi_fortran_bogus_type_t ${ompi_fortran_bogus_type_t} #cmakedefine opal_fortran_bogus_type_t ${opal_fortran_bogus_type_t}
/* C type corresponding to FORTRAN INTEGER */ /* C type corresponding to FORTRAN INTEGER */
#cmakedefine ompi_fortran_integer_t ${ompi_fortran_integer_t} #cmakedefine opal_fortran_integer_t ${opal_fortran_integer_t}
/* Whether C compiler supports -fvisibility */ /* Whether C compiler supports -fvisibility */
#cmakedefine OPAL_C_HAVE_VISIBILITY ${OPAL_C_HAVE_VISIBILITY} #cmakedefine OPAL_C_HAVE_VISIBILITY ${OPAL_C_HAVE_VISIBILITY}
@ -175,8 +175,8 @@
#endif #endif
#ifndef MPI_Fint #ifndef MPI_Fint
/* MPI_Fint is the same as ompi_fortran_INTEGER_t */ /* MPI_Fint is the same as opal_fortran_integer_t */
#define MPI_Fint ompi_fortran_integer_t #define MPI_Fint opal_fortran_integer_t
#endif #endif
#endif /* #ifndef OMPI_CONFIG_H */ #endif /* #ifndef OMPI_CONFIG_H */
@ -747,52 +747,52 @@ OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_cxx_ldblcplex;
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_cxx_bool; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_cxx_bool;
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_2cplex, ompi_mpi_2dblcplex; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_2cplex, ompi_mpi_2dblcplex;
/* other MPI2 datatypes */ /* other MPI2 datatypes */
#if OMPI_HAVE_FORTRAN_LOGICAL1 #if OPAL_HAVE_FORTRAN_LOGICAL1
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical1; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical1;
#endif #endif
#if OMPI_HAVE_FORTRAN_LOGICAL2 #if OPAL_HAVE_FORTRAN_LOGICAL2
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical2; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical2;
#endif #endif
#if OMPI_HAVE_FORTRAN_LOGICAL4 #if OPAL_HAVE_FORTRAN_LOGICAL4
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical4; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical4;
#endif #endif
#if OMPI_HAVE_FORTRAN_LOGICAL8 #if OPAL_HAVE_FORTRAN_LOGICAL8
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical8; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical8;
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER1 #if OPAL_HAVE_FORTRAN_INTEGER1
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer1; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer1;
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER2 #if OPAL_HAVE_FORTRAN_INTEGER2
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer2; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer2;
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER4 #if OPAL_HAVE_FORTRAN_INTEGER4
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer4; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer4;
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER8 #if OPAL_HAVE_FORTRAN_INTEGER8
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer8; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer8;
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER16 #if OPAL_HAVE_FORTRAN_INTEGER16
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer16; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer16;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL2 #if OPAL_HAVE_FORTRAN_REAL2
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real2; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real2;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real4; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real4;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real8; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real8;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 #if OPAL_HAVE_FORTRAN_REAL16
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real16; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real16;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_complex8; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_complex8;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_complex16; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_complex16;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 #if OPAL_HAVE_FORTRAN_REAL16
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_complex32; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_complex32;
#endif #endif
@ -866,53 +866,53 @@ OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUSES_IGNORE;
/* Fortran datatype bindings */ /* Fortran datatype bindings */
#define MPI_CHARACTER OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_character) #define MPI_CHARACTER OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_character)
#define MPI_LOGICAL OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logic) #define MPI_LOGICAL OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logic)
#if OMPI_HAVE_FORTRAN_LOGICAL1 #if OPAL_HAVE_FORTRAN_LOGICAL1
#define MPI_LOGICAL1 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical1) #define MPI_LOGICAL1 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical1)
#endif #endif
#if OMPI_HAVE_FORTRAN_LOGICAL2 #if OPAL_HAVE_FORTRAN_LOGICAL2
#define MPI_LOGICAL2 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical2) #define MPI_LOGICAL2 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical2)
#endif #endif
#if OMPI_HAVE_FORTRAN_LOGICAL4 #if OPAL_HAVE_FORTRAN_LOGICAL4
#define MPI_LOGICAL4 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical4) #define MPI_LOGICAL4 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical4)
#endif #endif
#if OMPI_HAVE_FORTRAN_LOGICAL8 #if OPAL_HAVE_FORTRAN_LOGICAL8
#define MPI_LOGICAL8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical8) #define MPI_LOGICAL8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical8)
#endif #endif
#define MPI_INTEGER OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer) #define MPI_INTEGER OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer)
#if OMPI_HAVE_FORTRAN_INTEGER1 #if OPAL_HAVE_FORTRAN_INTEGER1
#define MPI_INTEGER1 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer1) #define MPI_INTEGER1 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer1)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER2 #if OPAL_HAVE_FORTRAN_INTEGER2
#define MPI_INTEGER2 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer2) #define MPI_INTEGER2 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer2)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER4 #if OPAL_HAVE_FORTRAN_INTEGER4
#define MPI_INTEGER4 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer4) #define MPI_INTEGER4 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer4)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER8 #if OPAL_HAVE_FORTRAN_INTEGER8
#define MPI_INTEGER8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer8) #define MPI_INTEGER8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer8)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER16 #if OPAL_HAVE_FORTRAN_INTEGER16
#define MPI_INTEGER16 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer16) #define MPI_INTEGER16 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer16)
#endif #endif
#define MPI_REAL OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real) #define MPI_REAL OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real)
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
#define MPI_REAL4 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real4) #define MPI_REAL4 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real4)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
#define MPI_REAL8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real8) #define MPI_REAL8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real8)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 #if OPAL_HAVE_FORTRAN_REAL16
#define MPI_REAL16 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real16) #define MPI_REAL16 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real16)
#endif #endif
#define MPI_DOUBLE_PRECISION OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_dblprec) #define MPI_DOUBLE_PRECISION OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_dblprec)
#define MPI_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_cplex) #define MPI_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_cplex)
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
#define MPI_COMPLEX8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_complex8) #define MPI_COMPLEX8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_complex8)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
#define MPI_COMPLEX16 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_complex16) #define MPI_COMPLEX16 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_complex16)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 #if OPAL_HAVE_FORTRAN_REAL16
#define MPI_COMPLEX32 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_complex32) #define MPI_COMPLEX32 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_complex32)
#endif #endif
#define MPI_DOUBLE_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_dblcplex) #define MPI_DOUBLE_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_dblcplex)

222
contrib/platform/win32/ConfigFiles/opal_config.h.cmake
Просмотреть файл

@ -637,76 +637,76 @@
#define OPAL_ALIGNMENT_CHAR ${CHAR_ALIGNMENT} #define OPAL_ALIGNMENT_CHAR ${CHAR_ALIGNMENT}
/* Alignment of type bool */ /* Alignment of type bool */
#define OMPI_ALIGNMENT_CXX_BOOL ${BOOL_ALIGNMENT} #define OPAL_ALIGNMENT_CXX_BOOL ${BOOL_ALIGNMENT}
/* Alignment of type double */ /* Alignment of type double */
#define OMPI_ALIGNMENT_DOUBLE ${DOUBLE_ALIGNMENT} #define OPAL_ALIGNMENT_DOUBLE ${DOUBLE_ALIGNMENT}
/* Alignment of type float */ /* Alignment of type float */
#define OMPI_ALIGNMENT_FLOAT ${FLOAT_ALIGNMENT} #define OPAL_ALIGNMENT_FLOAT ${FLOAT_ALIGNMENT}
/* Alignment of Fortran 77 COMPLEX */ /* Alignment of Fortran 77 COMPLEX */
#define OMPI_ALIGNMENT_FORTRAN_COMPLEX ${OMPI_ALIGNMENT_FORTRAN_COMPLEX} #define OPAL_ALIGNMENT_FORTRAN_COMPLEX ${OPAL_ALIGNMENT_FORTRAN_COMPLEX}
/* Alignment of Fortran 77 COMPLEX*16 */ /* Alignment of Fortran 77 COMPLEX*16 */
#define OMPI_ALIGNMENT_FORTRAN_COMPLEX16 ${OMPI_ALIGNMENT_FORTRAN_COMPLEX16} #define OPAL_ALIGNMENT_FORTRAN_COMPLEX16 ${OPAL_ALIGNMENT_FORTRAN_COMPLEX16}
/* Alignment of Fortran 77 COMPLEX*32 */ /* Alignment of Fortran 77 COMPLEX*32 */
#define OMPI_ALIGNMENT_FORTRAN_COMPLEX32 ${OMPI_ALIGNMENT_FORTRAN_COMPLEX32} #define OPAL_ALIGNMENT_FORTRAN_COMPLEX32 ${OPAL_ALIGNMENT_FORTRAN_COMPLEX32}
/* Alignment of Fortran 77 COMPLEX*8 */ /* Alignment of Fortran 77 COMPLEX*8 */
#define OMPI_ALIGNMENT_FORTRAN_COMPLEX8 ${OMPI_ALIGNMENT_FORTRAN_COMPLEX8} #define OPAL_ALIGNMENT_FORTRAN_COMPLEX8 ${OPAL_ALIGNMENT_FORTRAN_COMPLEX8}
/* Alignment of Fortran 77 DOUBLE PRECISION */ /* Alignment of Fortran 77 DOUBLE PRECISION */
#define OMPI_ALIGNMENT_FORTRAN_DOUBLE_PRECISION ${OMPI_ALIGNMENT_FORTRAN_DOUBLE_PRECISION} #define OPAL_ALIGNMENT_FORTRAN_DOUBLE_PRECISION ${OPAL_ALIGNMENT_FORTRAN_DOUBLE_PRECISION}
/* Alignment of Fortran 77 INTEGER */ /* Alignment of Fortran 77 INTEGER */
#define OMPI_ALIGNMENT_FORTRAN_INTEGER ${OMPI_ALIGNMENT_FORTRAN_INTEGER} #define OPAL_ALIGNMENT_FORTRAN_INTEGER ${OPAL_ALIGNMENT_FORTRAN_INTEGER}
/* Alignment of Fortran 77 INTEGER*1 */ /* Alignment of Fortran 77 INTEGER*1 */
#define OMPI_ALIGNMENT_FORTRAN_INTEGER1 ${OMPI_ALIGNMENT_FORTRAN_INTEGER1} #define OPAL_ALIGNMENT_FORTRAN_INTEGER1 ${OPAL_ALIGNMENT_FORTRAN_INTEGER1}
/* Alignment of Fortran 77 INTEGER*16 */ /* Alignment of Fortran 77 INTEGER*16 */
#define OMPI_ALIGNMENT_FORTRAN_INTEGER16 ${OMPI_ALIGNMENT_FORTRAN_INTEGER16} #define OPAL_ALIGNMENT_FORTRAN_INTEGER16 ${OPAL_ALIGNMENT_FORTRAN_INTEGER16}
/* Alignment of Fortran 77 INTEGER*2 */ /* Alignment of Fortran 77 INTEGER*2 */
#define OMPI_ALIGNMENT_FORTRAN_INTEGER2 ${OMPI_ALIGNMENT_FORTRAN_INTEGER2} #define OPAL_ALIGNMENT_FORTRAN_INTEGER2 ${OPAL_ALIGNMENT_FORTRAN_INTEGER2}
/* Alignment of Fortran 77 INTEGER*4 */ /* Alignment of Fortran 77 INTEGER*4 */
#define OMPI_ALIGNMENT_FORTRAN_INTEGER4 ${OMPI_ALIGNMENT_FORTRAN_INTEGER4} #define OPAL_ALIGNMENT_FORTRAN_INTEGER4 ${OPAL_ALIGNMENT_FORTRAN_INTEGER4}
/* Alignment of Fortran 77 INTEGER*8 */ /* Alignment of Fortran 77 INTEGER*8 */
#define OMPI_ALIGNMENT_FORTRAN_INTEGER8 ${OMPI_ALIGNMENT_FORTRAN_INTEGER8} #define OPAL_ALIGNMENT_FORTRAN_INTEGER8 ${OPAL_ALIGNMENT_FORTRAN_INTEGER8}
/* Alignment of Fortran 77 LOGICAL */ /* Alignment of Fortran 77 LOGICAL */
#define OMPI_ALIGNMENT_FORTRAN_LOGICAL ${OMPI_ALIGNMENT_FORTRAN_LOGICAL} #define OPAL_ALIGNMENT_FORTRAN_LOGICAL ${OPAL_ALIGNMENT_FORTRAN_LOGICAL}
/* Alignment of Fortran 77 LOGICAL*1 */ /* Alignment of Fortran 77 LOGICAL*1 */
#define OMPI_ALIGNMENT_FORTRAN_LOGICAL1 ${OMPI_ALIGNMENT_FORTRAN_LOGICAL1} #define OPAL_ALIGNMENT_FORTRAN_LOGICAL1 ${OPAL_ALIGNMENT_FORTRAN_LOGICAL1}
/* Alignment of Fortran 77 LOGICAL*2 */ /* Alignment of Fortran 77 LOGICAL*2 */
#define OMPI_ALIGNMENT_FORTRAN_LOGICAL2 ${OMPI_ALIGNMENT_FORTRAN_LOGICAL2} #define OPAL_ALIGNMENT_FORTRAN_LOGICAL2 ${OPAL_ALIGNMENT_FORTRAN_LOGICAL2}
/* Alignment of Fortran 77 LOGICAL*4 */ /* Alignment of Fortran 77 LOGICAL*4 */
#define OMPI_ALIGNMENT_FORTRAN_LOGICAL4 ${OMPI_ALIGNMENT_FORTRAN_LOGICAL4} #define OPAL_ALIGNMENT_FORTRAN_LOGICAL4 ${OPAL_ALIGNMENT_FORTRAN_LOGICAL4}
/* Alignment of Fortran 77 LOGICAL*8 */ /* Alignment of Fortran 77 LOGICAL*8 */
#define OMPI_ALIGNMENT_FORTRAN_LOGICAL8 ${OMPI_ALIGNMENT_FORTRAN_LOGICAL8} #define OPAL_ALIGNMENT_FORTRAN_LOGICAL8 ${OPAL_ALIGNMENT_FORTRAN_LOGICAL8}
/* Alignment of Fortran 77 REAL */ /* Alignment of Fortran 77 REAL */
#define OMPI_ALIGNMENT_FORTRAN_REAL ${OMPI_ALIGNMENT_FORTRAN_REAL} #define OPAL_ALIGNMENT_FORTRAN_REAL ${OPAL_ALIGNMENT_FORTRAN_REAL}
/* Alignment of Fortran 77 REAL*16 */ /* Alignment of Fortran 77 REAL*16 */
#define OMPI_ALIGNMENT_FORTRAN_REAL16 ${OMPI_ALIGNMENT_FORTRAN_REAL16} #define OPAL_ALIGNMENT_FORTRAN_REAL16 ${OPAL_ALIGNMENT_FORTRAN_REAL16}
/* Alignment of Fortran 77 REAL*2 */ /* Alignment of Fortran 77 REAL*2 */
#define OMPI_ALIGNMENT_FORTRAN_REAL2 ${OMPI_ALIGNMENT_FORTRAN_REAL2} #define OPAL_ALIGNMENT_FORTRAN_REAL2 ${OPAL_ALIGNMENT_FORTRAN_REAL2}
/* Alignment of Fortran 77 REAL*4 */ /* Alignment of Fortran 77 REAL*4 */
#define OMPI_ALIGNMENT_FORTRAN_REAL4 ${OMPI_ALIGNMENT_FORTRAN_REAL4} #define OPAL_ALIGNMENT_FORTRAN_REAL4 ${OPAL_ALIGNMENT_FORTRAN_REAL4}
/* Alignment of Fortran 77 REAL*8 */ /* Alignment of Fortran 77 REAL*8 */
#define OMPI_ALIGNMENT_FORTRAN_REAL8 ${OMPI_ALIGNMENT_FORTRAN_REAL8} #define OPAL_ALIGNMENT_FORTRAN_REAL8 ${OPAL_ALIGNMENT_FORTRAN_REAL8}
/* Alignment of type int */ /* Alignment of type int */
#define OPAL_ALIGNMENT_INT ${INT_ALIGNMENT} #define OPAL_ALIGNMENT_INT ${INT_ALIGNMENT}
@ -724,10 +724,10 @@
#define OPAL_ALIGNMENT_SHORT ${SHORT_ALIGNMENT} #define OPAL_ALIGNMENT_SHORT ${SHORT_ALIGNMENT}
/* Alignment of type void * */ /* Alignment of type void * */
#define OMPI_ALIGNMENT_VOID_P ${VOID_P_ALIGNMENT} #define OPAL_ALIGNMENT_VOID_P ${VOID_P_ALIGNMENT}
/* Alignment of type wchar_t */ /* Alignment of type wchar_t */
#define OMPI_ALIGNMENT_WCHAR ${WCHAR_T_ALIGNMENT} #define OPAL_ALIGNMENT_WCHAR ${WCHAR_T_ALIGNMENT}
/* OMPI architecture string */ /* OMPI architecture string */
#define OPAL_ARCH "${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_SYSTEM}" #define OPAL_ARCH "${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_SYSTEM}"
@ -852,10 +852,10 @@
/* Max handle value for fortran MPI handles, effectively min(INT_MAX, max /* Max handle value for fortran MPI handles, effectively min(INT_MAX, max
fortran INTEGER value) */ fortran INTEGER value) */
#cmakedefine OMPI_FORTRAN_HANDLE_MAX ${OMPI_FORTRAN_HANDLE_MAX} #cmakedefine OPAL_FORTRAN_HANDLE_MAX ${OPAL_FORTRAN_HANDLE_MAX}
/* Fortran value for LOGICAL .TRUE. value */ /* Fortran value for LOGICAL .TRUE. value */
#define OMPI_FORTRAN_VALUE_TRUE ${OMPI_FORTRAN_VALUE_TRUE} #define OPAL_FORTRAN_VALUE_TRUE ${OPAL_FORTRAN_VALUE_TRUE}
/* Greek - alpha, beta, etc - release number of Open MPI */ /* Greek - alpha, beta, etc - release number of Open MPI */
#cmakedefine OMPI_GREEK_VERSION "${OMPI_GREEK_VERSION_STRING}" #cmakedefine OMPI_GREEK_VERSION "${OMPI_GREEK_VERSION_STRING}"
@ -927,123 +927,123 @@
#define OMPI_HAVE_CXX_EXCEPTION_SUPPORT ${OMPI_HAVE_CXX_EXCEPTION_SUPPORT} #define OMPI_HAVE_CXX_EXCEPTION_SUPPORT ${OMPI_HAVE_CXX_EXCEPTION_SUPPORT}
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_COMPLEX #cmakedefine OPAL_HAVE_F90_COMPLEX
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_COMPLEX16 #cmakedefine OPAL_HAVE_F90_COMPLEX16
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_COMPLEX32 #cmakedefine OPAL_HAVE_F90_COMPLEX32
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_COMPLEX8 #cmakedefine OPAL_HAVE_F90_COMPLEX8
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_DOUBLE_COMPLEX #cmakedefine OPAL_HAVE_F90_DOUBLE_COMPLEX
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_DOUBLE_PRECISION #cmakedefine OPAL_HAVE_F90_DOUBLE_PRECISION
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_INTEGER #cmakedefine OPAL_HAVE_F90_INTEGER
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_INTEGER1 #cmakedefine OPAL_HAVE_F90_INTEGER1
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_INTEGER16 #cmakedefine OPAL_HAVE_F90_INTEGER16
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_INTEGER2 #cmakedefine OPAL_HAVE_F90_INTEGER2
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_INTEGER4 #cmakedefine OPAL_HAVE_F90_INTEGER4
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_INTEGER8 #cmakedefine OPAL_HAVE_F90_INTEGER8
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_LOGICAL #cmakedefine OPAL_HAVE_F90_LOGICAL
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_REAL #cmakedefine OPAL_HAVE_F90_REAL
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_REAL16 #cmakedefine OPAL_HAVE_F90_REAL16
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_REAL2 #cmakedefine OPAL_HAVE_F90_REAL2
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_REAL4 #cmakedefine OPAL_HAVE_F90_REAL4
/* Whether we have Fortran 90 $ofc_fortran_type or not */ /* Whether we have Fortran 90 $ofc_fortran_type or not */
#cmakedefine OMPI_HAVE_F90_REAL8 #cmakedefine OPAL_HAVE_F90_REAL8
/* Whether we have Fortran 77 COMPLEX or not */ /* Whether we have Fortran 77 COMPLEX or not */
#define OMPI_HAVE_FORTRAN_COMPLEX ${OMPI_HAVE_FORTRAN_COMPLEX} #define OPAL_HAVE_FORTRAN_COMPLEX ${OPAL_HAVE_FORTRAN_COMPLEX}
/* Whether we have Fortran 77 COMPLEX*16 or not */ /* Whether we have Fortran 77 COMPLEX*16 or not */
#define OMPI_HAVE_FORTRAN_COMPLEX16 ${OMPI_HAVE_FORTRAN_COMPLEX16} #define OPAL_HAVE_FORTRAN_COMPLEX16 ${OPAL_HAVE_FORTRAN_COMPLEX16}
/* Whether we have Fortran 77 COMPLEX*32 or not */ /* Whether we have Fortran 77 COMPLEX*32 or not */
#define OMPI_HAVE_FORTRAN_COMPLEX32 ${OMPI_HAVE_FORTRAN_COMPLEX32} #define OPAL_HAVE_FORTRAN_COMPLEX32 ${OPAL_HAVE_FORTRAN_COMPLEX32}
/* Whether we have Fortran 77 COMPLEX*8 or not */ /* Whether we have Fortran 77 COMPLEX*8 or not */
#define OMPI_HAVE_FORTRAN_COMPLEX8 ${OMPI_HAVE_FORTRAN_COMPLEX8} #define OPAL_HAVE_FORTRAN_COMPLEX8 ${OPAL_HAVE_FORTRAN_COMPLEX8}
/* Whether we have Fortran 77 DOUBLE PRECISION or not */ /* Whether we have Fortran 77 DOUBLE PRECISION or not */
#define OMPI_HAVE_FORTRAN_DOUBLE_PRECISION ${OMPI_HAVE_FORTRAN_DOUBLE_PRECISION} #define OPAL_HAVE_FORTRAN_DOUBLE_PRECISION ${OPAL_HAVE_FORTRAN_DOUBLE_PRECISION}
/* Whether we have Fortran 77 INTEGER or not */ /* Whether we have Fortran 77 INTEGER or not */
#define OMPI_HAVE_FORTRAN_INTEGER ${OMPI_HAVE_FORTRAN_INTEGER} #define OPAL_HAVE_FORTRAN_INTEGER ${OPAL_HAVE_FORTRAN_INTEGER}
/* Whether we have Fortran 77 INTEGER*1 or not */ /* Whether we have Fortran 77 INTEGER*1 or not */
#define OMPI_HAVE_FORTRAN_INTEGER1 ${OMPI_HAVE_FORTRAN_INTEGER1} #define OPAL_HAVE_FORTRAN_INTEGER1 ${OPAL_HAVE_FORTRAN_INTEGER1}
/* Whether we have Fortran 77 INTEGER*16 or not */ /* Whether we have Fortran 77 INTEGER*16 or not */
#define OMPI_HAVE_FORTRAN_INTEGER16 ${OMPI_HAVE_FORTRAN_INTEGER16} #define OPAL_HAVE_FORTRAN_INTEGER16 ${OPAL_HAVE_FORTRAN_INTEGER16}
/* Whether we have Fortran 77 INTEGER*2 or not */ /* Whether we have Fortran 77 INTEGER*2 or not */
#define OMPI_HAVE_FORTRAN_INTEGER2 ${OMPI_HAVE_FORTRAN_INTEGER2} #define OPAL_HAVE_FORTRAN_INTEGER2 ${OPAL_HAVE_FORTRAN_INTEGER2}
/* Whether we have Fortran 77 INTEGER*4 or not */ /* Whether we have Fortran 77 INTEGER*4 or not */
#define OMPI_HAVE_FORTRAN_INTEGER4 ${OMPI_HAVE_FORTRAN_INTEGER4} #define OPAL_HAVE_FORTRAN_INTEGER4 ${OPAL_HAVE_FORTRAN_INTEGER4}
/* Whether we have Fortran 77 INTEGER*8 or not */ /* Whether we have Fortran 77 INTEGER*8 or not */
#define OMPI_HAVE_FORTRAN_INTEGER8 ${OMPI_HAVE_FORTRAN_INTEGER8} #define OPAL_HAVE_FORTRAN_INTEGER8 ${OPAL_HAVE_FORTRAN_INTEGER8}
/* Whether we have Fortran 77 LOGICAL or not */ /* Whether we have Fortran 77 LOGICAL or not */
#define OMPI_HAVE_FORTRAN_LOGICAL ${OMPI_HAVE_FORTRAN_LOGICAL} #define OPAL_HAVE_FORTRAN_LOGICAL ${OPAL_HAVE_FORTRAN_LOGICAL}
/* Whether we have Fortran 77 LOGICAL1 or not */ /* Whether we have Fortran 77 LOGICAL1 or not */
#define OMPI_HAVE_FORTRAN_LOGICAL1 ${OMPI_HAVE_FORTRAN_LOGICAL1} #define OPAL_HAVE_FORTRAN_LOGICAL1 ${OPAL_HAVE_FORTRAN_LOGICAL1}
/* Whether we have Fortran 77 LOGICAL2 or not */ /* Whether we have Fortran 77 LOGICAL2 or not */
#define OMPI_HAVE_FORTRAN_LOGICAL2 ${OMPI_HAVE_FORTRAN_LOGICAL2} #define OPAL_HAVE_FORTRAN_LOGICAL2 ${OPAL_HAVE_FORTRAN_LOGICAL2}
/* Whether we have Fortran 77 LOGICAL4 or not */ /* Whether we have Fortran 77 LOGICAL4 or not */
#define OMPI_HAVE_FORTRAN_LOGICAL4 ${OMPI_HAVE_FORTRAN_LOGICAL4} #define OPAL_HAVE_FORTRAN_LOGICAL4 ${OPAL_HAVE_FORTRAN_LOGICAL4}
/* Whether we have Fortran 77 LOGICAL8 or not */ /* Whether we have Fortran 77 LOGICAL8 or not */
#define OMPI_HAVE_FORTRAN_LOGICAL8 ${OMPI_HAVE_FORTRAN_LOGICAL8} #define OPAL_HAVE_FORTRAN_LOGICAL8 ${OPAL_HAVE_FORTRAN_LOGICAL8}
/* Whether we have Fortran 77 REAL or not */ /* Whether we have Fortran 77 REAL or not */
#define OMPI_HAVE_FORTRAN_REAL ${OMPI_HAVE_FORTRAN_REAL} #define OPAL_HAVE_FORTRAN_REAL ${OPAL_HAVE_FORTRAN_REAL}
/* Whether we have Fortran 77 REAL*16 or not */ /* Whether we have Fortran 77 REAL*16 or not */
#define OMPI_HAVE_FORTRAN_REAL16 ${OMPI_HAVE_FORTRAN_REAL16} #define OPAL_HAVE_FORTRAN_REAL16 ${OPAL_HAVE_FORTRAN_REAL16}
/* Whether we have Fortran 77 REAL*2 or not */ /* Whether we have Fortran 77 REAL*2 or not */
#define OMPI_HAVE_FORTRAN_REAL2 ${OMPI_HAVE_FORTRAN_REAL2} #define OPAL_HAVE_FORTRAN_REAL2 ${OPAL_HAVE_FORTRAN_REAL2}
/* Whether we have Fortran 77 REAL*4 or not */ /* Whether we have Fortran 77 REAL*4 or not */
#define OMPI_HAVE_FORTRAN_REAL4 ${OMPI_HAVE_FORTRAN_REAL4} #define OPAL_HAVE_FORTRAN_REAL4 ${OPAL_HAVE_FORTRAN_REAL4}
/* Whether we have Fortran 77 REAL*8 or not */ /* Whether we have Fortran 77 REAL*8 or not */
#define OMPI_HAVE_FORTRAN_REAL8 ${OMPI_HAVE_FORTRAN_REAL8} #define OPAL_HAVE_FORTRAN_REAL8 ${OPAL_HAVE_FORTRAN_REAL8}
#define OMPI_REAL16_MATCHES_C ${OMPI_REAL16_MATCHES_C} #define OPAL_REAL16_MATCHES_C ${OPAL_REAL16_MATCHES_C}
/* Do not use outside of mpi.h. Define to 1 if the system has the type 'long /* Do not use outside of mpi.h. Define to 1 if the system has the type 'long
long'. */ long'. */
@ -1145,67 +1145,67 @@
#cmakedefine OMPI_RML_CNOS_HAVE_BARRIER #cmakedefine OMPI_RML_CNOS_HAVE_BARRIER
/* Size of Fortran 77 COMPLEX */ /* Size of Fortran 77 COMPLEX */
#define OMPI_SIZEOF_FORTRAN_COMPLEX ${OMPI_SIZEOF_FORTRAN_COMPLEX} #define OPAL_SIZEOF_FORTRAN_COMPLEX ${OPAL_SIZEOF_FORTRAN_COMPLEX}
/* Size of Fortran 77 COMPLEX*16 */ /* Size of Fortran 77 COMPLEX*16 */
#define OMPI_SIZEOF_FORTRAN_COMPLEX16 ${OMPI_SIZEOF_FORTRAN_COMPLEX16} #define OPAL_SIZEOF_FORTRAN_COMPLEX16 ${OPAL_SIZEOF_FORTRAN_COMPLEX16}
/* Size of Fortran 77 COMPLEX*32 */ /* Size of Fortran 77 COMPLEX*32 */
#define OMPI_SIZEOF_FORTRAN_COMPLEX32 ${OMPI_SIZEOF_FORTRAN_COMPLEX32} #define OPAL_SIZEOF_FORTRAN_COMPLEX32 ${OPAL_SIZEOF_FORTRAN_COMPLEX32}
/* Size of Fortran 77 COMPLEX*8 */ /* Size of Fortran 77 COMPLEX*8 */
#define OMPI_SIZEOF_FORTRAN_COMPLEX8 ${OMPI_SIZEOF_FORTRAN_COMPLEX8} #define OPAL_SIZEOF_FORTRAN_COMPLEX8 ${OPAL_SIZEOF_FORTRAN_COMPLEX8}
/* Size of Fortran 77 DOUBLE PRECISION */ /* Size of Fortran 77 DOUBLE PRECISION */
#define OMPI_SIZEOF_FORTRAN_DOUBLE_PRECISION ${OMPI_SIZEOF_FORTRAN_DOUBLE_PRECISION} #define OPAL_SIZEOF_FORTRAN_DOUBLE_PRECISION ${OPAL_SIZEOF_FORTRAN_DOUBLE_PRECISION}
/* Size of Fortran 77 INTEGER */ /* Size of Fortran 77 INTEGER */
#define OMPI_SIZEOF_FORTRAN_INTEGER ${OMPI_SIZEOF_FORTRAN_INTEGER} #define OPAL_SIZEOF_FORTRAN_INTEGER ${OPAL_SIZEOF_FORTRAN_INTEGER}
/* Size of Fortran 77 INTEGER*1 */ /* Size of Fortran 77 INTEGER*1 */
#define OMPI_SIZEOF_FORTRAN_INTEGER1 ${OMPI_SIZEOF_FORTRAN_INTEGER1} #define OPAL_SIZEOF_FORTRAN_INTEGER1 ${OPAL_SIZEOF_FORTRAN_INTEGER1}
/* Size of Fortran 77 INTEGER*16 */ /* Size of Fortran 77 INTEGER*16 */
#define OMPI_SIZEOF_FORTRAN_INTEGER16 ${OMPI_SIZEOF_FORTRAN_INTEGER16} #define OPAL_SIZEOF_FORTRAN_INTEGER16 ${OPAL_SIZEOF_FORTRAN_INTEGER16}
/* Size of Fortran 77 INTEGER*2 */ /* Size of Fortran 77 INTEGER*2 */
#define OMPI_SIZEOF_FORTRAN_INTEGER2 ${OMPI_SIZEOF_FORTRAN_INTEGER2} #define OPAL_SIZEOF_FORTRAN_INTEGER2 ${OPAL_SIZEOF_FORTRAN_INTEGER2}
/* Size of Fortran 77 INTEGER*4 */ /* Size of Fortran 77 INTEGER*4 */
#define OMPI_SIZEOF_FORTRAN_INTEGER4 ${OMPI_SIZEOF_FORTRAN_INTEGER4} #define OPAL_SIZEOF_FORTRAN_INTEGER4 ${OPAL_SIZEOF_FORTRAN_INTEGER4}
/* Size of Fortran 77 INTEGER*8 */ /* Size of Fortran 77 INTEGER*8 */
#define OMPI_SIZEOF_FORTRAN_INTEGER8 ${OMPI_SIZEOF_FORTRAN_INTEGER8} #define OPAL_SIZEOF_FORTRAN_INTEGER8 ${OPAL_SIZEOF_FORTRAN_INTEGER8}
/* Size of Fortran 77 LOGICAL */ /* Size of Fortran 77 LOGICAL */
#define OMPI_SIZEOF_FORTRAN_LOGICAL ${OMPI_SIZEOF_FORTRAN_LOGICAL} #define OPAL_SIZEOF_FORTRAN_LOGICAL ${OPAL_SIZEOF_FORTRAN_LOGICAL}
/* Size of Fortran 77 LOGICAL1 */ /* Size of Fortran 77 LOGICAL1 */
#define OMPI_SIZEOF_FORTRAN_LOGICAL1 ${OMPI_SIZEOF_FORTRAN_LOGICAL1} #define OPAL_SIZEOF_FORTRAN_LOGICAL1 ${OPAL_SIZEOF_FORTRAN_LOGICAL1}
/* Size of Fortran 77 LOGICAL2 */ /* Size of Fortran 77 LOGICAL2 */
#define OMPI_SIZEOF_FORTRAN_LOGICAL2 ${OMPI_SIZEOF_FORTRAN_LOGICAL2} #define OPAL_SIZEOF_FORTRAN_LOGICAL2 ${OPAL_SIZEOF_FORTRAN_LOGICAL2}
/* Size of Fortran 77 LOGICAL4 */ /* Size of Fortran 77 LOGICAL4 */
#define OMPI_SIZEOF_FORTRAN_LOGICAL4 ${OMPI_SIZEOF_FORTRAN_LOGICAL4} #define OPAL_SIZEOF_FORTRAN_LOGICAL4 ${OPAL_SIZEOF_FORTRAN_LOGICAL4}
/* Size of Fortran 77 LOGICAL8 */ /* Size of Fortran 77 LOGICAL8 */
#define OMPI_SIZEOF_FORTRAN_LOGICAL8 ${OMPI_SIZEOF_FORTRAN_LOGICAL8} #define OPAL_SIZEOF_FORTRAN_LOGICAL8 ${OPAL_SIZEOF_FORTRAN_LOGICAL8}
/* Size of Fortran 77 REAL */ /* Size of Fortran 77 REAL */
#define OMPI_SIZEOF_FORTRAN_REAL ${OMPI_SIZEOF_FORTRAN_REAL} #define OPAL_SIZEOF_FORTRAN_REAL ${OPAL_SIZEOF_FORTRAN_REAL}
/* Size of Fortran 77 REAL*16 */ /* Size of Fortran 77 REAL*16 */
#define OMPI_SIZEOF_FORTRAN_REAL16 ${OMPI_SIZEOF_FORTRAN_REAL16} #define OPAL_SIZEOF_FORTRAN_REAL16 ${OPAL_SIZEOF_FORTRAN_REAL16}
/* Size of Fortran 77 REAL*2 */ /* Size of Fortran 77 REAL*2 */
#define OMPI_SIZEOF_FORTRAN_REAL2 ${OMPI_SIZEOF_FORTRAN_REAL2} #define OPAL_SIZEOF_FORTRAN_REAL2 ${OPAL_SIZEOF_FORTRAN_REAL2}
/* Size of Fortran 77 REAL*4 */ /* Size of Fortran 77 REAL*4 */
#define OMPI_SIZEOF_FORTRAN_REAL4 ${OMPI_SIZEOF_FORTRAN_REAL4} #define OPAL_SIZEOF_FORTRAN_REAL4 ${OPAL_SIZEOF_FORTRAN_REAL4}
/* Size of Fortran 77 REAL*8 */ /* Size of Fortran 77 REAL*8 */
#define OMPI_SIZEOF_FORTRAN_REAL8 ${OMPI_SIZEOF_FORTRAN_REAL8} #define OPAL_SIZEOF_FORTRAN_REAL8 ${OPAL_SIZEOF_FORTRAN_REAL8}
/* Do threads have different pids (pthreads on linux) */ /* Do threads have different pids (pthreads on linux) */
#cmakedefine OPAL_THREADS_HAVE_DIFFERENT_PIDS #cmakedefine OPAL_THREADS_HAVE_DIFFERENT_PIDS
@ -1420,70 +1420,70 @@
/* A bogus type that allows us to have sentinel type values that are still /* A bogus type that allows us to have sentinel type values that are still
valid */ valid */
#cmakedefine ompi_fortran_bogus_type_t ${ompi_fortran_bogus_type_t} #cmakedefine opal_fortran_bogus_type_t ${opal_fortran_bogus_type_t}
/* C type corresponding to Fortran 77 COMPLEX*16 */ /* C type corresponding to Fortran 77 COMPLEX*16 */
#cmakedefine ompi_fortran_complex16_t ${ompi_fortran_complex16_t} #cmakedefine opal_fortran_complex16_t ${opal_fortran_complex16_t}
/* C type corresponding to Fortran 77 COMPLEX*32 */ /* C type corresponding to Fortran 77 COMPLEX*32 */
#cmakedefine ompi_fortran_complex32_t ${ompi_fortran_complex32_t} #cmakedefine opal_fortran_complex32_t ${opal_fortran_complex32_t}
/* C type corresponding to Fortran 77 COMPLEX*8 */ /* C type corresponding to Fortran 77 COMPLEX*8 */
#cmakedefine ompi_fortran_complex8_t ${ompi_fortran_complex8_t} #cmakedefine opal_fortran_complex8_t ${opal_fortran_complex8_t}
/* C type corresponding to Fortran 77 COMPLEX */ /* C type corresponding to Fortran 77 COMPLEX */
#cmakedefine ompi_fortran_complex_t ${ompi_fortran_complex_t} #cmakedefine opal_fortran_complex_t ${opal_fortran_complex_t}
/* C type corresponding to Fortran 77 DOUBLE PRECISION */ /* C type corresponding to Fortran 77 DOUBLE PRECISION */
#cmakedefine ompi_fortran_double_precision_t ${ompi_fortran_double_precision_t} #cmakedefine opal_fortran_double_precision_t ${opal_fortran_double_precision_t}
/* C type corresponding to Fortran 77 INTEGER*16 */ /* C type corresponding to Fortran 77 INTEGER*16 */
#cmakedefine ompi_fortran_integer16_t ${ompi_fortran_integer16_t} #cmakedefine opal_fortran_integer16_t ${opal_fortran_integer16_t}
/* C type corresponding to Fortran 77 INTEGER*1 */ /* C type corresponding to Fortran 77 INTEGER*1 */
#cmakedefine ompi_fortran_integer1_t ${ompi_fortran_integer1_t} #cmakedefine opal_fortran_integer1_t ${opal_fortran_integer1_t}
/* C type corresponding to Fortran 77 INTEGER*2 */ /* C type corresponding to Fortran 77 INTEGER*2 */
#cmakedefine ompi_fortran_integer2_t ${ompi_fortran_integer2_t} #cmakedefine opal_fortran_integer2_t ${opal_fortran_integer2_t}
/* C type corresponding to Fortran 77 INTEGER*4 */ /* C type corresponding to Fortran 77 INTEGER*4 */
#cmakedefine ompi_fortran_integer4_t ${ompi_fortran_integer4_t} #cmakedefine opal_fortran_integer4_t ${opal_fortran_integer4_t}
/* C type corresponding to Fortran 77 INTEGER*8 */ /* C type corresponding to Fortran 77 INTEGER*8 */
#cmakedefine ompi_fortran_integer8_t ${ompi_fortran_integer8_t} #cmakedefine opal_fortran_integer8_t ${opal_fortran_integer8_t}
/* C type corresponding to Fortran 77 INTEGER */ /* C type corresponding to Fortran 77 INTEGER */
#cmakedefine ompi_fortran_integer_t ${ompi_fortran_integer_t} #cmakedefine opal_fortran_integer_t ${opal_fortran_integer_t}
/* C type corresponding to Fortran 77 LOGICAL */ /* C type corresponding to Fortran 77 LOGICAL */
#cmakedefine ompi_fortran_logical_t ${ompi_fortran_logical_t} #cmakedefine opal_fortran_logical_t ${opal_fortran_logical_t}
/* C type corresponding to Fortran 77 LOGICAL*1 */ /* C type corresponding to Fortran 77 LOGICAL*1 */
#cmakedefine ompi_fortran_logical1_t ${ompi_fortran_logical1_t} #cmakedefine opal_fortran_logical1_t ${opal_fortran_logical1_t}
/* C type corresponding to Fortran 77 LOGICAL*2 */ /* C type corresponding to Fortran 77 LOGICAL*2 */
#cmakedefine ompi_fortran_logical2_t ${ompi_fortran_logical2_t} #cmakedefine opal_fortran_logical2_t ${opal_fortran_logical2_t}
/* C type corresponding to Fortran 77 LOGICAL*4 */ /* C type corresponding to Fortran 77 LOGICAL*4 */
#cmakedefine ompi_fortran_logical4_t ${ompi_fortran_logical4_t} #cmakedefine opal_fortran_logical4_t ${opal_fortran_logical4_t}
/* C type corresponding to Fortran 77 LOGICAL*8 */ /* C type corresponding to Fortran 77 LOGICAL*8 */
#cmakedefine ompi_fortran_logical8_t ${ompi_fortran_logical8_t} #cmakedefine opal_fortran_logical8_t ${opal_fortran_logical8_t}
/* C type corresponding to Fortran 77 REAL*16 */ /* C type corresponding to Fortran 77 REAL*16 */
#cmakedefine ompi_fortran_real16_t ${ompi_fortran_real16_t} #cmakedefine opal_fortran_real16_t ${opal_fortran_real16_t}
/* C type corresponding to Fortran 77 REAL*2 */ /* C type corresponding to Fortran 77 REAL*2 */
#cmakedefine ompi_fortran_real2_t ${ompi_fortran_real2_t} #cmakedefine opal_fortran_real2_t ${opal_fortran_real2_t}
/* C type corresponding to Fortran 77 REAL*4 */ /* C type corresponding to Fortran 77 REAL*4 */
#cmakedefine ompi_fortran_real4_t ${ompi_fortran_real4_t} #cmakedefine opal_fortran_real4_t ${opal_fortran_real4_t}
/* C type corresponding to Fortran 77 REAL*8 */ /* C type corresponding to Fortran 77 REAL*8 */
#cmakedefine ompi_fortran_real8_t ${ompi_fortran_real8_t} #cmakedefine opal_fortran_real8_t ${opal_fortran_real8_t}
/* C type corresponding to Fortran 77 REAL */ /* C type corresponding to Fortran 77 REAL */
#cmakedefine ompi_fortran_real_t ${ompi_fortran_real_t} #cmakedefine opal_fortran_real_t ${opal_fortran_real_t}
/* Define to `int' if <sys/types.h> does not define. */ /* Define to `int' if <sys/types.h> does not define. */
#define pid_t ${PID_T} #define pid_t ${PID_T}

6
ompi/attribute/attribute.c
Просмотреть файл

@ -294,7 +294,7 @@
if (0 != (keyval_obj->attr_flag & OMPI_KEYVAL_F77)) { \ if (0 != (keyval_obj->attr_flag & OMPI_KEYVAL_F77)) { \
MPI_Fint f_key = OMPI_INT_2_FINT(key); \ MPI_Fint f_key = OMPI_INT_2_FINT(key); \
MPI_Fint f_err; \ MPI_Fint f_err; \
ompi_fortran_logical_t f_flag; \ opal_fortran_logical_t f_flag; \
/* MPI-1 Fortran-style */ \ /* MPI-1 Fortran-style */ \
if (0 != (keyval_obj->attr_flag & OMPI_KEYVAL_F77_MPI1)) { \ if (0 != (keyval_obj->attr_flag & OMPI_KEYVAL_F77_MPI1)) { \
MPI_Fint in, out; \ MPI_Fint in, out; \
@ -486,9 +486,9 @@ int ompi_attr_init(void)
} }
key_bitmap = OBJ_NEW(opal_bitmap_t); key_bitmap = OBJ_NEW(opal_bitmap_t);
/* /*
* Set the max size to OMPI_FORTRAN_HANDLE_MAX to enforce bound * Set the max size to OPAL_FORTRAN_HANDLE_MAX to enforce bound
*/ */
opal_bitmap_set_max_size (key_bitmap, OMPI_FORTRAN_HANDLE_MAX); opal_bitmap_set_max_size (key_bitmap, OPAL_FORTRAN_HANDLE_MAX);
if (0 != opal_bitmap_init(key_bitmap, 32)) { if (0 != opal_bitmap_init(key_bitmap, 32)) {
return MPI_ERR_SYSRESOURCE; return MPI_ERR_SYSRESOURCE;
} }

4
ompi/attribute/attribute.h
Просмотреть файл

@ -67,7 +67,7 @@ typedef void (ompi_mpi1_fortran_copy_attr_function)(MPI_Fint *oldobj,
MPI_Fint *extra_state, MPI_Fint *extra_state,
MPI_Fint *attr_in, MPI_Fint *attr_in,
MPI_Fint *attr_out, MPI_Fint *attr_out,
ompi_fortran_logical_t *flag, MPI_Flogical *flag,
MPI_Fint *ierr); MPI_Fint *ierr);
typedef void (ompi_mpi1_fortran_delete_attr_function)(MPI_Fint *obj, typedef void (ompi_mpi1_fortran_delete_attr_function)(MPI_Fint *obj,
MPI_Fint *keyval, MPI_Fint *keyval,
@ -84,7 +84,7 @@ typedef void (ompi_mpi2_fortran_copy_attr_function)(MPI_Fint *oldobj,
void *extra_state, void *extra_state,
void *attr_in, void *attr_in,
void *attr_out, void *attr_out,
ompi_fortran_logical_t *flag, MPI_Flogical *flag,
MPI_Fint *ierr); MPI_Fint *ierr);
typedef void (ompi_mpi2_fortran_delete_attr_function)(MPI_Fint *obj, typedef void (ompi_mpi2_fortran_delete_attr_function)(MPI_Fint *obj,
MPI_Fint *keyval, MPI_Fint *keyval,

2
ompi/communicator/comm_init.c
Просмотреть файл

@ -70,7 +70,7 @@ int ompi_comm_init(void)
/* Setup communicator array */ /* Setup communicator array */
OBJ_CONSTRUCT(&ompi_mpi_communicators, opal_pointer_array_t); OBJ_CONSTRUCT(&ompi_mpi_communicators, opal_pointer_array_t);
if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_mpi_communicators, 0, if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_mpi_communicators, 0,
OMPI_FORTRAN_HANDLE_MAX, 64) ) { OPAL_FORTRAN_HANDLE_MAX, 64) ) {
return OMPI_ERROR; return OMPI_ERROR;
} }

10
ompi/datatype/copy_functions.c
Просмотреть файл

@ -139,19 +139,19 @@ COPY_TYPE( 2double, double, 2 )
COPY_TYPE( 2complex_float, ompi_complex_float_t, 2 ) COPY_TYPE( 2complex_float, ompi_complex_float_t, 2 )
COPY_TYPE( 2complex_double, ompi_complex_double_t, 2 ) COPY_TYPE( 2complex_double, ompi_complex_double_t, 2 )
#if OMPI_SIZEOF_FORTRAN_LOGICAL == 1 || SIZEOF_BOOL == 1 #if OPAL_SIZEOF_FORTRAN_LOGICAL == 1 || SIZEOF_BOOL == 1
#define REQUIRE_COPY_BYTES_1 1 #define REQUIRE_COPY_BYTES_1 1
#else #else
#define REQUIRE_COPY_BYTES_1 0 #define REQUIRE_COPY_BYTES_1 0
#endif #endif
#if OMPI_SIZEOF_FORTRAN_LOGICAL == 2 || SIZEOF_BOOL == 2 #if OPAL_SIZEOF_FORTRAN_LOGICAL == 2 || SIZEOF_BOOL == 2
#define REQUIRE_COPY_BYTES_2 1 #define REQUIRE_COPY_BYTES_2 1
#else #else
#define REQUIRE_COPY_BYTES_2 0 #define REQUIRE_COPY_BYTES_2 0
#endif #endif
#if OMPI_SIZEOF_FORTRAN_LOGICAL == 4 || SIZEOF_BOOL == 4 #if OPAL_SIZEOF_FORTRAN_LOGICAL == 4 || SIZEOF_BOOL == 4
#define REQUIRE_COPY_BYTES_4 1 #define REQUIRE_COPY_BYTES_4 1
#else #else
#define REQUIRE_COPY_BYTES_4 0 #define REQUIRE_COPY_BYTES_4 0
@ -236,9 +236,9 @@ conversion_fct_t ompi_ddt_copy_functions[DT_MAX_PREDEFINED] = {
#else #else
#error Complete me please #error Complete me please
#endif #endif
#if OMPI_SIZEOF_FORTRAN_LOGICAL == 1 #if OPAL_SIZEOF_FORTRAN_LOGICAL == 1
(conversion_fct_t)copy_bytes_1, /* DT_LOGIC */ (conversion_fct_t)copy_bytes_1, /* DT_LOGIC */
#elif OMPI_SIZEOF_FORTRAN_LOGICAL == 4 #elif OPAL_SIZEOF_FORTRAN_LOGICAL == 4
(conversion_fct_t)copy_bytes_4, /* DT_LOGIC */ (conversion_fct_t)copy_bytes_4, /* DT_LOGIC */
#elif 1 /* always, some compiler complain if there is not value */ #elif 1 /* always, some compiler complain if there is not value */
NULL, /* DT_LOGIC */ NULL, /* DT_LOGIC */

14
ompi/datatype/copy_functions_heterogeneous.c
Просмотреть файл

@ -269,8 +269,8 @@ copy_cxx_bool_heterogeneous(ompi_convertor_t *pConvertor, uint32_t count,
#define FORTRAN_LOGICAL_COPY_LOOP(TYPE) \ #define FORTRAN_LOGICAL_COPY_LOOP(TYPE) \
for( i = 0; i < count; i++ ) { \ for( i = 0; i < count; i++ ) { \
ompi_fortran_logical_t *to_real = (ompi_fortran_logical_t*) to; \ opal_fortran_logical_t *to_real = (opal_fortran_logical_t*) to; \
*to_real = *((TYPE*) from) == 0 ? 0 : OMPI_FORTRAN_VALUE_TRUE; \ *to_real = *((TYPE*) from) == 0 ? 0 : OPAL_FORTRAN_VALUE_TRUE; \
to += to_extent; \ to += to_extent; \
from += from_extent; \ from += from_extent; \
} }
@ -298,13 +298,13 @@ copy_fortran_logical_heterogeneous(ompi_convertor_t *pConvertor, uint32_t count,
} }
} }
datatype_check( "logical", sizeof(ompi_fortran_logical_t), datatype_check( "logical", sizeof(opal_fortran_logical_t),
sizeof(ompi_fortran_logical_t), &count, sizeof(opal_fortran_logical_t), &count,
from, from_len, from_extent, from, from_len, from_extent,
to, to_length, to_extent); to, to_length, to_extent);
if ((to_extent != sizeof(ompi_fortran_logical_t) || if ((to_extent != sizeof(opal_fortran_logical_t) ||
from_extent != sizeof(ompi_fortran_logical_t)) || from_extent != sizeof(opal_fortran_logical_t)) ||
((pConvertor->remoteArch & OPAL_ARCH_LOGICALISxx) != ((pConvertor->remoteArch & OPAL_ARCH_LOGICALISxx) !=
(ompi_mpi_local_arch & OPAL_ARCH_LOGICALISxx))) { (ompi_mpi_local_arch & OPAL_ARCH_LOGICALISxx))) {
switch (pConvertor->remoteArch & OPAL_ARCH_LOGICALISxx) { switch (pConvertor->remoteArch & OPAL_ARCH_LOGICALISxx) {
@ -319,7 +319,7 @@ copy_fortran_logical_heterogeneous(ompi_convertor_t *pConvertor, uint32_t count,
break; break;
} }
} else { } else {
MEMCPY( to, from, count * sizeof(ompi_fortran_logical_t) ); MEMCPY( to, from, count * sizeof(opal_fortran_logical_t) );
} }
*advance = count * from_extent; *advance = count * from_extent;

224
ompi/datatype/dt_module.c
Просмотреть файл

@ -118,25 +118,25 @@ OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned_long_long = { INIT_BA
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_long_long_int = { INIT_UNAVAILABLE_DATA( LONG_LONG_INT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_long_long_int = { INIT_UNAVAILABLE_DATA( LONG_LONG_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned_long_long = { INIT_UNAVAILABLE_DATA( UNIGNED_LONG_LONG) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned_long_long = { INIT_UNAVAILABLE_DATA( UNIGNED_LONG_LONG) };
#endif /* HAVE_LONG_LONG */ #endif /* HAVE_LONG_LONG */
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_float = { INIT_BASIC_DATA( float, OMPI_ALIGNMENT_FLOAT, FLOAT, DT_FLAG_DATA_C | DT_FLAG_DATA_FLOAT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_float = { INIT_BASIC_DATA( float, OPAL_ALIGNMENT_FLOAT, FLOAT, DT_FLAG_DATA_C | DT_FLAG_DATA_FLOAT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_double = { INIT_BASIC_DATA( double, OMPI_ALIGNMENT_DOUBLE, DOUBLE, DT_FLAG_DATA_C | DT_FLAG_DATA_FLOAT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_double = { INIT_BASIC_DATA( double, OPAL_ALIGNMENT_DOUBLE, DOUBLE, DT_FLAG_DATA_C | DT_FLAG_DATA_FLOAT) };
#if HAVE_LONG_DOUBLE #if HAVE_LONG_DOUBLE
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_long_double = { INIT_BASIC_DATA( long double, OPAL_ALIGNMENT_LONG_DOUBLE, LONG_DOUBLE, DT_FLAG_DATA_C | DT_FLAG_DATA_FLOAT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_long_double = { INIT_BASIC_DATA( long double, OPAL_ALIGNMENT_LONG_DOUBLE, LONG_DOUBLE, DT_FLAG_DATA_C | DT_FLAG_DATA_FLOAT) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_long_double = { INIT_UNAVAILABLE_DATA( LONG_DOUBLE) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_long_double = { INIT_UNAVAILABLE_DATA( LONG_DOUBLE) };
#endif /* HAVE_LONG_DOUBLE */ #endif /* HAVE_LONG_DOUBLE */
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_packed = { INIT_BASIC_DATA( char, OPAL_ALIGNMENT_CHAR, PACKED, 0) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_packed = { INIT_BASIC_DATA( char, OPAL_ALIGNMENT_CHAR, PACKED, 0) };
#if OMPI_ALIGNMENT_WCHAR != 0 #if OPAL_ALIGNMENT_WCHAR != 0
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_wchar = { INIT_BASIC_DATA( wchar_t, OMPI_ALIGNMENT_WCHAR, WCHAR, DT_FLAG_DATA_C) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_wchar = { INIT_BASIC_DATA( wchar_t, OPAL_ALIGNMENT_WCHAR, WCHAR, DT_FLAG_DATA_C) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_wchar = { INIT_UNAVAILABLE_DATA( WCHAR) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_wchar = { INIT_UNAVAILABLE_DATA( WCHAR) };
#endif /* OMPI_ALIGNMENT_WCHAR */ #endif /* OPAL_ALIGNMENT_WCHAR */
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_cxx_bool = { INIT_BASIC_DATA( bool, OMPI_ALIGNMENT_CXX_BOOL, CXX_BOOL, DT_FLAG_DATA_CPP) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_cxx_bool = { INIT_BASIC_DATA( bool, OPAL_ALIGNMENT_CXX_BOOL, CXX_BOOL, DT_FLAG_DATA_CPP) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logic = { INIT_BASIC_FORTRAN_TYPE( DT_LOGIC, LOGIC, OMPI_SIZEOF_FORTRAN_LOGICAL, OMPI_ALIGNMENT_FORTRAN_LOGICAL, 0) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logic = { INIT_BASIC_FORTRAN_TYPE( DT_LOGIC, LOGIC, OPAL_SIZEOF_FORTRAN_LOGICAL, OPAL_ALIGNMENT_FORTRAN_LOGICAL, 0) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer = { INIT_BASIC_FORTRAN_TYPE( DT_INTEGER, INTEGER, OMPI_SIZEOF_FORTRAN_INTEGER, OMPI_ALIGNMENT_FORTRAN_INTEGER, DT_FLAG_DATA_INT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer = { INIT_BASIC_FORTRAN_TYPE( DT_INTEGER, INTEGER, OPAL_SIZEOF_FORTRAN_INTEGER, OPAL_ALIGNMENT_FORTRAN_INTEGER, DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real = { INIT_BASIC_FORTRAN_TYPE( DT_REAL, REAL, OMPI_SIZEOF_FORTRAN_REAL, OMPI_ALIGNMENT_FORTRAN_REAL, DT_FLAG_DATA_FLOAT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real = { INIT_BASIC_FORTRAN_TYPE( DT_REAL, REAL, OPAL_SIZEOF_FORTRAN_REAL, OPAL_ALIGNMENT_FORTRAN_REAL, DT_FLAG_DATA_FLOAT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_dblprec = { INIT_BASIC_FORTRAN_TYPE( DT_DBLPREC, DOUBLE_PRECISION, OMPI_SIZEOF_FORTRAN_DOUBLE_PRECISION, OMPI_ALIGNMENT_FORTRAN_DOUBLE_PRECISION, DT_FLAG_DATA_FLOAT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_dblprec = { INIT_BASIC_FORTRAN_TYPE( DT_DBLPREC, DOUBLE_PRECISION, OPAL_SIZEOF_FORTRAN_DOUBLE_PRECISION, OPAL_ALIGNMENT_FORTRAN_DOUBLE_PRECISION, DT_FLAG_DATA_FLOAT) };
#if HAVE_LONG_DOUBLE #if HAVE_LONG_DOUBLE
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_ldblcplex = { INIT_BASIC_DATA( ompi_complex_long_double_t, OPAL_ALIGNMENT_LONG_DOUBLE, COMPLEX_LONG_DOUBLE, DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_COMPLEX) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_ldblcplex = { INIT_BASIC_DATA( ompi_complex_long_double_t, OPAL_ALIGNMENT_LONG_DOUBLE, COMPLEX_LONG_DOUBLE, DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_COMPLEX) };
@ -144,8 +144,8 @@ OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_ldblcplex = { INIT_BASIC_DATA(
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_ldblcplex = { INIT_UNAVAILABLE_DATA( COMPLEX_LONG_DOUBLE) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_ldblcplex = { INIT_UNAVAILABLE_DATA( COMPLEX_LONG_DOUBLE) };
#endif /* HAVE_LONG_DOUBLE */ #endif /* HAVE_LONG_DOUBLE */
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_cplex = { INIT_BASIC_DATA( ompi_complex_float_t, OMPI_ALIGNMENT_FLOAT, COMPLEX_FLOAT, DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_COMPLEX) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_cplex = { INIT_BASIC_DATA( ompi_complex_float_t, OPAL_ALIGNMENT_FLOAT, COMPLEX_FLOAT, DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_COMPLEX) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_dblcplex = { INIT_BASIC_DATA( ompi_complex_double_t, OMPI_ALIGNMENT_DOUBLE, COMPLEX_DOUBLE, DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_COMPLEX) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_dblcplex = { INIT_BASIC_DATA( ompi_complex_double_t, OPAL_ALIGNMENT_DOUBLE, COMPLEX_DOUBLE, DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_COMPLEX) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_float_int = { INIT_BASIC_TYPE( DT_FLOAT_INT, FLOAT_INT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_float_int = { INIT_BASIC_TYPE( DT_FLOAT_INT, FLOAT_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_double_int = { INIT_BASIC_TYPE( DT_DOUBLE_INT, DOUBLE_INT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_double_int = { INIT_BASIC_TYPE( DT_DOUBLE_INT, DOUBLE_INT) };
#if HAVE_LONG_DOUBLE #if HAVE_LONG_DOUBLE
@ -161,8 +161,8 @@ OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_2real = { INIT_BASIC_TYPE( DT_
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_2dblprec = { INIT_BASIC_TYPE( DT_2DBLPREC, 2DBLPREC) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_2dblprec = { INIT_BASIC_TYPE( DT_2DBLPREC, 2DBLPREC) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_2integer = { INIT_BASIC_TYPE( DT_2INTEGER, 2INTEGER) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_2integer = { INIT_BASIC_TYPE( DT_2INTEGER, 2INTEGER) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_cxx_cplex = { INIT_BASIC_DATA( ompi_complex_float_t, OMPI_ALIGNMENT_FLOAT, COMPLEX_FLOAT, DT_FLAG_DATA_CPP | DT_FLAG_DATA_COMPLEX) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_cxx_cplex = { INIT_BASIC_DATA( ompi_complex_float_t, OPAL_ALIGNMENT_FLOAT, COMPLEX_FLOAT, DT_FLAG_DATA_CPP | DT_FLAG_DATA_COMPLEX) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_cxx_dblcplex = { INIT_BASIC_DATA( ompi_complex_double_t, OMPI_ALIGNMENT_DOUBLE, COMPLEX_DOUBLE, DT_FLAG_DATA_CPP | DT_FLAG_DATA_COMPLEX) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_cxx_dblcplex = { INIT_BASIC_DATA( ompi_complex_double_t, OPAL_ALIGNMENT_DOUBLE, COMPLEX_DOUBLE, DT_FLAG_DATA_CPP | DT_FLAG_DATA_COMPLEX) };
#if HAVE_LONG_DOUBLE #if HAVE_LONG_DOUBLE
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_cxx_ldblcplex = { INIT_BASIC_DATA( ompi_complex_long_double_t, OPAL_ALIGNMENT_LONG_DOUBLE, COMPLEX_LONG_DOUBLE, DT_FLAG_DATA_CPP | DT_FLAG_DATA_COMPLEX) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_cxx_ldblcplex = { INIT_BASIC_DATA( ompi_complex_long_double_t, OPAL_ALIGNMENT_LONG_DOUBLE, COMPLEX_LONG_DOUBLE, DT_FLAG_DATA_CPP | DT_FLAG_DATA_COMPLEX) };
#else #else
@ -173,86 +173,86 @@ OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_2cplex = { INIT_BASIC_TYPE( DT
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_2dblcplex = { INIT_BASIC_TYPE( DT_2DOUBLE_COMPLEX, 2DOUBLE_COMPLEX) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_2dblcplex = { INIT_BASIC_TYPE( DT_2DOUBLE_COMPLEX, 2DOUBLE_COMPLEX) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unavailable = { INIT_UNAVAILABLE_DATA( UNAVAILABLE) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unavailable = { INIT_UNAVAILABLE_DATA( UNAVAILABLE) };
#if OMPI_HAVE_FORTRAN_LOGICAL1 #if OPAL_HAVE_FORTRAN_LOGICAL1
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical1 = { INIT_BASIC_FORTRAN_TYPE( DT_LOGIC, LOGICAL1, OMPI_SIZEOF_FORTRAN_LOGICAL1, OMPI_ALIGNMENT_FORTRAN_LOGICAL1, 0) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical1 = { INIT_BASIC_FORTRAN_TYPE( DT_LOGIC, LOGICAL1, OPAL_SIZEOF_FORTRAN_LOGICAL1, OPAL_ALIGNMENT_FORTRAN_LOGICAL1, 0) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical1 = { INIT_UNAVAILABLE_DATA( LOGICAL1) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical1 = { INIT_UNAVAILABLE_DATA( LOGICAL1) };
#endif /* OMPI_HAVE_FORTRAN_LOGICAL1 */ #endif /* OPAL_HAVE_FORTRAN_LOGICAL1 */
#if OMPI_HAVE_FORTRAN_LOGICAL2 #if OPAL_HAVE_FORTRAN_LOGICAL2
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical2 = { INIT_BASIC_FORTRAN_TYPE( DT_LOGIC, LOGICAL2, OMPI_SIZEOF_FORTRAN_LOGICAL2, OMPI_ALIGNMENT_FORTRAN_LOGICAL2, 0) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical2 = { INIT_BASIC_FORTRAN_TYPE( DT_LOGIC, LOGICAL2, OPAL_SIZEOF_FORTRAN_LOGICAL2, OPAL_ALIGNMENT_FORTRAN_LOGICAL2, 0) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical2 = { INIT_UNAVAILABLE_DATA( LOGICAL2) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical2 = { INIT_UNAVAILABLE_DATA( LOGICAL2) };
#endif /* OMPI_HAVE_FORTRAN_LOGICAL2 */ #endif /* OPAL_HAVE_FORTRAN_LOGICAL2 */
#if OMPI_HAVE_FORTRAN_LOGICAL4 #if OPAL_HAVE_FORTRAN_LOGICAL4
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical4 = { INIT_BASIC_FORTRAN_TYPE( DT_LOGIC, LOGICAL4, OMPI_SIZEOF_FORTRAN_LOGICAL4, OMPI_ALIGNMENT_FORTRAN_LOGICAL4, 0) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical4 = { INIT_BASIC_FORTRAN_TYPE( DT_LOGIC, LOGICAL4, OPAL_SIZEOF_FORTRAN_LOGICAL4, OPAL_ALIGNMENT_FORTRAN_LOGICAL4, 0) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical4 = { INIT_UNAVAILABLE_DATA( LOGICAL4) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical4 = { INIT_UNAVAILABLE_DATA( LOGICAL4) };
#endif /* OMPI_HAVE_FORTRAN_LOGICAL4 */ #endif /* OPAL_HAVE_FORTRAN_LOGICAL4 */
#if OMPI_HAVE_FORTRAN_LOGICAL8 #if OPAL_HAVE_FORTRAN_LOGICAL8
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical8 = { INIT_BASIC_FORTRAN_TYPE( DT_LOGIC, LOGICAL8, OMPI_SIZEOF_FORTRAN_LOGICAL8, OMPI_ALIGNMENT_FORTRAN_LOGICAL8, 0) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical8 = { INIT_BASIC_FORTRAN_TYPE( DT_LOGIC, LOGICAL8, OPAL_SIZEOF_FORTRAN_LOGICAL8, OPAL_ALIGNMENT_FORTRAN_LOGICAL8, 0) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical8 = { INIT_UNAVAILABLE_DATA( LOGICAL8) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_logical8 = { INIT_UNAVAILABLE_DATA( LOGICAL8) };
#endif /* OMPI_HAVE_FORTRAN_LOGICAL8 */ #endif /* OPAL_HAVE_FORTRAN_LOGICAL8 */
#if OMPI_HAVE_FORTRAN_REAL2 #if OPAL_HAVE_FORTRAN_REAL2
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real2 = { INIT_BASIC_FORTRAN_TYPE( DT_FLOAT, REAL2, OMPI_SIZEOF_FORTRAN_REAL2, OMPI_ALIGNMENT_FORTRAN_REAL2, DT_FLAG_DATA_FLOAT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real2 = { INIT_BASIC_FORTRAN_TYPE( DT_FLOAT, REAL2, OPAL_SIZEOF_FORTRAN_REAL2, OPAL_ALIGNMENT_FORTRAN_REAL2, DT_FLAG_DATA_FLOAT) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real2 = { INIT_UNAVAILABLE_DATA( REAL2) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real2 = { INIT_UNAVAILABLE_DATA( REAL2) };
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real4 = { INIT_BASIC_FORTRAN_TYPE( DT_FLOAT, REAL4, OMPI_SIZEOF_FORTRAN_REAL4, OMPI_ALIGNMENT_FORTRAN_REAL4, DT_FLAG_DATA_FLOAT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real4 = { INIT_BASIC_FORTRAN_TYPE( DT_FLOAT, REAL4, OPAL_SIZEOF_FORTRAN_REAL4, OPAL_ALIGNMENT_FORTRAN_REAL4, DT_FLAG_DATA_FLOAT) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real4 = { INIT_UNAVAILABLE_DATA( REAL4) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real4 = { INIT_UNAVAILABLE_DATA( REAL4) };
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real8 = { INIT_BASIC_FORTRAN_TYPE( DT_DOUBLE, REAL8, OMPI_SIZEOF_FORTRAN_REAL8, OMPI_ALIGNMENT_FORTRAN_REAL8, DT_FLAG_DATA_FLOAT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real8 = { INIT_BASIC_FORTRAN_TYPE( DT_DOUBLE, REAL8, OPAL_SIZEOF_FORTRAN_REAL8, OPAL_ALIGNMENT_FORTRAN_REAL8, DT_FLAG_DATA_FLOAT) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real8 = { INIT_UNAVAILABLE_DATA( REAL8) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real8 = { INIT_UNAVAILABLE_DATA( REAL8) };
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_REAL16_MATCHES_C #if OPAL_HAVE_FORTRAN_REAL16 && OPAL_REAL16_MATCHES_C
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real16 = { INIT_BASIC_FORTRAN_TYPE( DT_LONG_DOUBLE, REAL16, OMPI_SIZEOF_FORTRAN_REAL16, OMPI_ALIGNMENT_FORTRAN_REAL16, DT_FLAG_DATA_FLOAT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real16 = { INIT_BASIC_FORTRAN_TYPE( DT_LONG_DOUBLE, REAL16, OPAL_SIZEOF_FORTRAN_REAL16, OPAL_ALIGNMENT_FORTRAN_REAL16, DT_FLAG_DATA_FLOAT) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real16 = { INIT_UNAVAILABLE_DATA( REAL16) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real16 = { INIT_UNAVAILABLE_DATA( REAL16) };
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER1 #if OPAL_HAVE_FORTRAN_INTEGER1
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer1 = { INIT_BASIC_FORTRAN_TYPE( DT_CHAR, INTEGER1, OMPI_SIZEOF_FORTRAN_INTEGER1, OMPI_ALIGNMENT_FORTRAN_INTEGER1, DT_FLAG_DATA_INT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer1 = { INIT_BASIC_FORTRAN_TYPE( DT_CHAR, INTEGER1, OPAL_SIZEOF_FORTRAN_INTEGER1, OPAL_ALIGNMENT_FORTRAN_INTEGER1, DT_FLAG_DATA_INT) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer1 = { INIT_UNAVAILABLE_DATA( INTEGER1) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer1 = { INIT_UNAVAILABLE_DATA( INTEGER1) };
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER2 #if OPAL_HAVE_FORTRAN_INTEGER2
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer2 = { INIT_BASIC_FORTRAN_TYPE( DT_SHORT, INTEGER2, OMPI_SIZEOF_FORTRAN_INTEGER2, OMPI_ALIGNMENT_FORTRAN_INTEGER2, DT_FLAG_DATA_INT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer2 = { INIT_BASIC_FORTRAN_TYPE( DT_SHORT, INTEGER2, OPAL_SIZEOF_FORTRAN_INTEGER2, OPAL_ALIGNMENT_FORTRAN_INTEGER2, DT_FLAG_DATA_INT) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer2 = { INIT_UNAVAILABLE_DATA( INTEGER2) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer2 = { INIT_UNAVAILABLE_DATA( INTEGER2) };
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER4 #if OPAL_HAVE_FORTRAN_INTEGER4
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer4 = { INIT_BASIC_FORTRAN_TYPE( DT_INT, INTEGER4, OMPI_SIZEOF_FORTRAN_INTEGER4, OMPI_ALIGNMENT_FORTRAN_INTEGER4, DT_FLAG_DATA_INT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer4 = { INIT_BASIC_FORTRAN_TYPE( DT_INT, INTEGER4, OPAL_SIZEOF_FORTRAN_INTEGER4, OPAL_ALIGNMENT_FORTRAN_INTEGER4, DT_FLAG_DATA_INT) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer4 = { INIT_UNAVAILABLE_DATA( INTEGER4) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer4 = { INIT_UNAVAILABLE_DATA( INTEGER4) };
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER8 #if OPAL_HAVE_FORTRAN_INTEGER8
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer8 = { INIT_BASIC_FORTRAN_TYPE( DT_LONG_LONG_INT, INTEGER8, OMPI_SIZEOF_FORTRAN_INTEGER8, OMPI_ALIGNMENT_FORTRAN_INTEGER8, DT_FLAG_DATA_INT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer8 = { INIT_BASIC_FORTRAN_TYPE( DT_LONG_LONG_INT, INTEGER8, OPAL_SIZEOF_FORTRAN_INTEGER8, OPAL_ALIGNMENT_FORTRAN_INTEGER8, DT_FLAG_DATA_INT) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer8 = { INIT_UNAVAILABLE_DATA( INTEGER8) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer8 = { INIT_UNAVAILABLE_DATA( INTEGER8) };
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER16 #if OPAL_HAVE_FORTRAN_INTEGER16
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer16 = { INIT_BASIC_FORTRAN_TYPE( DT_LONG_LONG_INT, INTEGER16, OMPI_SIZEOF_FORTRAN_INTEGER16, OMPI_ALIGNMENT_FORTRAN_INTEGER16, DT_FLAG_DATA_INT) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer16 = { INIT_BASIC_FORTRAN_TYPE( DT_LONG_LONG_INT, INTEGER16, OPAL_SIZEOF_FORTRAN_INTEGER16, OPAL_ALIGNMENT_FORTRAN_INTEGER16, DT_FLAG_DATA_INT) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer16 = { INIT_UNAVAILABLE_DATA( INTEGER16) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_integer16 = { INIT_UNAVAILABLE_DATA( INTEGER16) };
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL4 && OMPI_HAVE_FORTRAN_COMPLEX8 #if OPAL_HAVE_FORTRAN_REAL4 && OPAL_HAVE_FORTRAN_COMPLEX8
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_complex8 = { INIT_BASIC_FORTRAN_TYPE( DT_COMPLEX_FLOAT, COMPLEX8, OMPI_SIZEOF_FORTRAN_COMPLEX, OMPI_ALIGNMENT_FORTRAN_REAL, DT_FLAG_DATA_COMPLEX) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_complex8 = { INIT_BASIC_FORTRAN_TYPE( DT_COMPLEX_FLOAT, COMPLEX8, OPAL_SIZEOF_FORTRAN_COMPLEX, OPAL_ALIGNMENT_FORTRAN_REAL, DT_FLAG_DATA_COMPLEX) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_complex8 = { INIT_UNAVAILABLE_DATA( COMPLEX8) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_complex8 = { INIT_UNAVAILABLE_DATA( COMPLEX8) };
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 && OMPI_HAVE_FORTRAN_COMPLEX16 #if OPAL_HAVE_FORTRAN_REAL8 && OPAL_HAVE_FORTRAN_COMPLEX16
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_complex16 = { INIT_BASIC_FORTRAN_TYPE( DT_COMPLEX_DOUBLE, COMPLEX16, OMPI_SIZEOF_FORTRAN_COMPLEX16, OMPI_ALIGNMENT_FORTRAN_COMPLEX16, DT_FLAG_DATA_COMPLEX) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_complex16 = { INIT_BASIC_FORTRAN_TYPE( DT_COMPLEX_DOUBLE, COMPLEX16, OPAL_SIZEOF_FORTRAN_COMPLEX16, OPAL_ALIGNMENT_FORTRAN_COMPLEX16, DT_FLAG_DATA_COMPLEX) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_complex16 = { INIT_UNAVAILABLE_DATA( COMPLEX16) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_complex16 = { INIT_UNAVAILABLE_DATA( COMPLEX16) };
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_HAVE_FORTRAN_COMPLEX32 && OMPI_REAL16_MATCHES_C #if OPAL_HAVE_FORTRAN_REAL16 && OPAL_HAVE_FORTRAN_COMPLEX32 && OPAL_REAL16_MATCHES_C
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_complex32 = { INIT_BASIC_FORTRAN_TYPE( DT_COMPLEX_LONG_DOUBLE, COMPLEX32, OMPI_SIZEOF_FORTRAN_COMPLEX32, OMPI_ALIGNMENT_FORTRAN_COMPLEX32, DT_FLAG_DATA_COMPLEX) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_complex32 = { INIT_BASIC_FORTRAN_TYPE( DT_COMPLEX_LONG_DOUBLE, COMPLEX32, OPAL_SIZEOF_FORTRAN_COMPLEX32, OPAL_ALIGNMENT_FORTRAN_COMPLEX32, DT_FLAG_DATA_COMPLEX) };
#else #else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_complex32 = { INIT_UNAVAILABLE_DATA( COMPLEX32) }; OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_complex32 = { INIT_UNAVAILABLE_DATA( COMPLEX32) };
#endif #endif
@ -455,7 +455,7 @@ int32_t ompi_ddt_init( void )
/* Create the f2c translation table */ /* Create the f2c translation table */
OBJ_CONSTRUCT(&ompi_datatype_f_to_c_table, opal_pointer_array_t); OBJ_CONSTRUCT(&ompi_datatype_f_to_c_table, opal_pointer_array_t);
if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_datatype_f_to_c_table, if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_datatype_f_to_c_table,
0, OMPI_FORTRAN_HANDLE_MAX, 64)) { 0, OPAL_FORTRAN_HANDLE_MAX, 64)) {
return OMPI_ERROR; return OMPI_ERROR;
} }
/* All temporary datatypes created on the following statement will get registered /* All temporary datatypes created on the following statement will get registered
@ -520,197 +520,197 @@ int32_t ompi_ddt_init( void )
#endif /* HAVE_LONG_DOUBLE */ #endif /* HAVE_LONG_DOUBLE */
/* Optional Fortran LOGICAL types */ /* Optional Fortran LOGICAL types */
#if OMPI_HAVE_FORTRAN_LOGICAL1 #if OPAL_HAVE_FORTRAN_LOGICAL1
#if (OMPI_SIZEOF_FORTRAN_LOGICAL1 == SIZEOF_CHAR) #if (OPAL_SIZEOF_FORTRAN_LOGICAL1 == SIZEOF_CHAR)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical1.dt, "MPI_LOGICAL1", &ompi_mpi_char.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical1.dt, "MPI_LOGICAL1", &ompi_mpi_char.dt );
#elif (OMPI_SIZEOF_FORTRAN_LOGICAL1 == SIZEOF_SHORT) #elif (OPAL_SIZEOF_FORTRAN_LOGICAL1 == SIZEOF_SHORT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical1.dt, "MPI_LOGICAL1", &ompi_mpi_short.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical1.dt, "MPI_LOGICAL1", &ompi_mpi_short.dt );
#elif (OMPI_SIZEOF_FORTRAN_LOGICAL1 == SIZEOF_INT) #elif (OPAL_SIZEOF_FORTRAN_LOGICAL1 == SIZEOF_INT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical1.dt, "MPI_LOGICAL1", &ompi_mpi_int.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical1.dt, "MPI_LOGICAL1", &ompi_mpi_int.dt );
#else #else
# warning "No proper C type found for LOGICAL1" # warning "No proper C type found for LOGICAL1"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical1.dt, "MPI_LOGICAL1", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical1.dt, "MPI_LOGICAL1", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_logical1.dt.flags |= DT_FLAG_DATA_FORTRAN; ompi_mpi_logical1.dt.flags |= DT_FLAG_DATA_FORTRAN;
#endif /* OMPI_HAVE_FORTRAN_LOGICAL1 */ #endif /* OPAL_HAVE_FORTRAN_LOGICAL1 */
#if OMPI_HAVE_FORTRAN_LOGICAL2 #if OPAL_HAVE_FORTRAN_LOGICAL2
#if (OMPI_SIZEOF_FORTRAN_LOGICAL2 == SIZEOF_SHORT) #if (OPAL_SIZEOF_FORTRAN_LOGICAL2 == SIZEOF_SHORT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical2.dt, "MPI_LOGICAL2", &ompi_mpi_short.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical2.dt, "MPI_LOGICAL2", &ompi_mpi_short.dt );
#elif (OMPI_SIZEOF_FORTRAN_LOGICAL2 == SIZEOF_INT) #elif (OPAL_SIZEOF_FORTRAN_LOGICAL2 == SIZEOF_INT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical2.dt, "MPI_LOGICAL2", &ompi_mpi_int.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical2.dt, "MPI_LOGICAL2", &ompi_mpi_int.dt );
#else #else
# warning "No proper C type found for LOGICAL2" # warning "No proper C type found for LOGICAL2"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical2.dt, "MPI_LOGICAL2", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical2.dt, "MPI_LOGICAL2", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_logical2.dt.flags |= DT_FLAG_DATA_FORTRAN; ompi_mpi_logical2.dt.flags |= DT_FLAG_DATA_FORTRAN;
#endif /* OMPI_HAVE_FORTRAN_LOGICAL2 */ #endif /* OPAL_HAVE_FORTRAN_LOGICAL2 */
#if OMPI_HAVE_FORTRAN_LOGICAL4 #if OPAL_HAVE_FORTRAN_LOGICAL4
#if (OMPI_SIZEOF_FORTRAN_LOGICAL4 == SIZEOF_INT) #if (OPAL_SIZEOF_FORTRAN_LOGICAL4 == SIZEOF_INT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical4.dt, "MPI_LOGICAL4", &ompi_mpi_int.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical4.dt, "MPI_LOGICAL4", &ompi_mpi_int.dt );
#elif (OMPI_SIZEOF_FORTRAN_LOGICAL4 == SIZEOF_LONG) #elif (OPAL_SIZEOF_FORTRAN_LOGICAL4 == SIZEOF_LONG)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical4.dt, "MPI_LOGICAL4", &ompi_mpi_long.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical4.dt, "MPI_LOGICAL4", &ompi_mpi_long.dt );
#else #else
# warning "No proper C type found for LOGICAL4" # warning "No proper C type found for LOGICAL4"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical4.dt, "MPI_LOGICAL4", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical4.dt, "MPI_LOGICAL4", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_logical4.dt.flags |= DT_FLAG_DATA_FORTRAN; ompi_mpi_logical4.dt.flags |= DT_FLAG_DATA_FORTRAN;
#endif /* OMPI_HAVE_FORTRAN_LOGICAL4 */ #endif /* OPAL_HAVE_FORTRAN_LOGICAL4 */
#if OMPI_HAVE_FORTRAN_LOGICAL8 #if OPAL_HAVE_FORTRAN_LOGICAL8
#if (OMPI_SIZEOF_FORTRAN_LOGICAL8 == SIZEOF_LONG) #if (OPAL_SIZEOF_FORTRAN_LOGICAL8 == SIZEOF_LONG)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical8.dt, "MPI_LOGICAL8", &ompi_mpi_long.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical8.dt, "MPI_LOGICAL8", &ompi_mpi_long.dt );
#elif (OMPI_SIZEOF_FORTRAN_LOGICAL8 == SIZEOF_LONG_LONG) #elif (OPAL_SIZEOF_FORTRAN_LOGICAL8 == SIZEOF_LONG_LONG)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical8.dt, "MPI_LOGICAL8", &ompi_mpi_long_long_int.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical8.dt, "MPI_LOGICAL8", &ompi_mpi_long_long_int.dt );
#else #else
# warning "No proper C type found for LOGICAL8" # warning "No proper C type found for LOGICAL8"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical8.dt, "MPI_LOGICAL8", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_logical8.dt, "MPI_LOGICAL8", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_logical8.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT; ompi_mpi_logical8.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT;
#endif /* OMPI_HAVE_FORTRAN_INTEGER8 */ #endif /* OPAL_HAVE_FORTRAN_INTEGER8 */
/* Optional Fortran REAL types */ /* Optional Fortran REAL types */
#if OMPI_HAVE_FORTRAN_REAL2 #if OPAL_HAVE_FORTRAN_REAL2
#if (OMPI_SIZEOF_FORTRAN_REAL2 == SIZEOF_FLOAT) #if (OPAL_SIZEOF_FORTRAN_REAL2 == SIZEOF_FLOAT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real2.dt, "MPI_REAL2", &ompi_mpi_float.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real2.dt, "MPI_REAL2", &ompi_mpi_float.dt );
#else #else
# warning "No proper C type found for REAL2" # warning "No proper C type found for REAL2"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real2.dt, "MPI_REAL2", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real2.dt, "MPI_REAL2", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_real2.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_FLOAT; ompi_mpi_real2.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_FLOAT;
#endif /* OMPI_HAVE_FORTRAN_REAL2 */ #endif /* OPAL_HAVE_FORTRAN_REAL2 */
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
#if (OMPI_SIZEOF_FORTRAN_REAL4 == SIZEOF_FLOAT) #if (OPAL_SIZEOF_FORTRAN_REAL4 == SIZEOF_FLOAT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real4.dt, "MPI_REAL4", &ompi_mpi_float.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real4.dt, "MPI_REAL4", &ompi_mpi_float.dt );
#else #else
# warning "No proper C type found for REAL4" # warning "No proper C type found for REAL4"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real4.dt, "MPI_REAL4", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real4.dt, "MPI_REAL4", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_real4.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_FLOAT; ompi_mpi_real4.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_FLOAT;
#endif /* OMPI_HAVE_FORTRAN_REAL4 */ #endif /* OPAL_HAVE_FORTRAN_REAL4 */
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
#if (OMPI_SIZEOF_FORTRAN_REAL8 == SIZEOF_FLOAT) #if (OPAL_SIZEOF_FORTRAN_REAL8 == SIZEOF_FLOAT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real8.dt, "MPI_REAL8", &ompi_mpi_float.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real8.dt, "MPI_REAL8", &ompi_mpi_float.dt );
#elif (OMPI_SIZEOF_FORTRAN_REAL8 == SIZEOF_DOUBLE) #elif (OPAL_SIZEOF_FORTRAN_REAL8 == SIZEOF_DOUBLE)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real8.dt, "MPI_REAL8", &ompi_mpi_double.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real8.dt, "MPI_REAL8", &ompi_mpi_double.dt );
#elif (OMPI_SIZEOF_FORTRAN_REAL8 == SIZEOF_LONG_DOUBLE) #elif (OPAL_SIZEOF_FORTRAN_REAL8 == SIZEOF_LONG_DOUBLE)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real8.dt, "MPI_REAL8", &ompi_mpi_long_double.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real8.dt, "MPI_REAL8", &ompi_mpi_long_double.dt );
#else #else
# warning "No proper C type found for REAL8" # warning "No proper C type found for REAL8"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real8.dt, "MPI_REAL8", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real8.dt, "MPI_REAL8", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_real8.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_FLOAT; ompi_mpi_real8.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_FLOAT;
#endif /* OMPI_HAVE_FORTRAN_REAL8 */ #endif /* OPAL_HAVE_FORTRAN_REAL8 */
#if OMPI_HAVE_FORTRAN_REAL16 #if OPAL_HAVE_FORTRAN_REAL16
#if (OMPI_SIZEOF_FORTRAN_REAL16 == SIZEOF_LONG_DOUBLE) #if (OPAL_SIZEOF_FORTRAN_REAL16 == SIZEOF_LONG_DOUBLE)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real16.dt, "MPI_REAL16", &ompi_mpi_long_double.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real16.dt, "MPI_REAL16", &ompi_mpi_long_double.dt );
#else #else
# warning "No proper C type found for REAL16" # warning "No proper C type found for REAL16"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real16.dt, "MPI_REAL16", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_real16.dt, "MPI_REAL16", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_real16.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_FLOAT; ompi_mpi_real16.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_FLOAT;
#endif /* OMPI_HAVE_FORTRAN_REAL16 */ #endif /* OPAL_HAVE_FORTRAN_REAL16 */
/* Optional Fortran INTEGER types */ /* Optional Fortran INTEGER types */
#if OMPI_HAVE_FORTRAN_INTEGER1 #if OPAL_HAVE_FORTRAN_INTEGER1
#if (OMPI_SIZEOF_FORTRAN_INTEGER1 == SIZEOF_CHAR) #if (OPAL_SIZEOF_FORTRAN_INTEGER1 == SIZEOF_CHAR)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer1.dt, "MPI_INTEGER1", &ompi_mpi_char.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer1.dt, "MPI_INTEGER1", &ompi_mpi_char.dt );
#elif (OMPI_SIZEOF_FORTRAN_INTEGER1 == SIZEOF_SHORT) #elif (OPAL_SIZEOF_FORTRAN_INTEGER1 == SIZEOF_SHORT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer1.dt, "MPI_INTEGER1", &ompi_mpi_short.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer1.dt, "MPI_INTEGER1", &ompi_mpi_short.dt );
#elif (OMPI_SIZEOF_FORTRAN_INTEGER1 == SIZEOF_INT) #elif (OPAL_SIZEOF_FORTRAN_INTEGER1 == SIZEOF_INT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer1.dt, "MPI_INTEGER1", &ompi_mpi_int.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer1.dt, "MPI_INTEGER1", &ompi_mpi_int.dt );
#else #else
# warning "No proper C type found for INTEGER1" # warning "No proper C type found for INTEGER1"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer1.dt, "MPI_INTEGER1", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer1.dt, "MPI_INTEGER1", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_integer1.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT; ompi_mpi_integer1.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT;
#endif /* OMPI_HAVE_FORTRAN_INTEGER1 */ #endif /* OPAL_HAVE_FORTRAN_INTEGER1 */
#if OMPI_HAVE_FORTRAN_INTEGER2 #if OPAL_HAVE_FORTRAN_INTEGER2
#if (OMPI_SIZEOF_FORTRAN_INTEGER2 == SIZEOF_SHORT) #if (OPAL_SIZEOF_FORTRAN_INTEGER2 == SIZEOF_SHORT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer2.dt, "MPI_INTEGER2", &ompi_mpi_short.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer2.dt, "MPI_INTEGER2", &ompi_mpi_short.dt );
#elif (OMPI_SIZEOF_FORTRAN_INTEGER2 == SIZEOF_INT) #elif (OPAL_SIZEOF_FORTRAN_INTEGER2 == SIZEOF_INT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer2.dt, "MPI_INTEGER2", &ompi_mpi_int.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer2.dt, "MPI_INTEGER2", &ompi_mpi_int.dt );
#else #else
# warning "No proper C type found for INTEGER2" # warning "No proper C type found for INTEGER2"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer2.dt, "MPI_INTEGER2", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer2.dt, "MPI_INTEGER2", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_integer2.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT; ompi_mpi_integer2.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT;
#endif /* OMPI_HAVE_FORTRAN_INTEGER2 */ #endif /* OPAL_HAVE_FORTRAN_INTEGER2 */
#if OMPI_HAVE_FORTRAN_INTEGER4 #if OPAL_HAVE_FORTRAN_INTEGER4
#if (OMPI_SIZEOF_FORTRAN_INTEGER4 == SIZEOF_INT) #if (OPAL_SIZEOF_FORTRAN_INTEGER4 == SIZEOF_INT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer4.dt, "MPI_INTEGER4", &ompi_mpi_int.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer4.dt, "MPI_INTEGER4", &ompi_mpi_int.dt );
#elif (OMPI_SIZEOF_FORTRAN_INTEGER4 == SIZEOF_LONG) #elif (OPAL_SIZEOF_FORTRAN_INTEGER4 == SIZEOF_LONG)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer4.dt, "MPI_INTEGER4", &ompi_mpi_long.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer4.dt, "MPI_INTEGER4", &ompi_mpi_long.dt );
#else #else
# warning "No proper C type found for INTEGER4" # warning "No proper C type found for INTEGER4"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer4.dt, "MPI_INTEGER4", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer4.dt, "MPI_INTEGER4", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_integer4.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT; ompi_mpi_integer4.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT;
#endif /* OMPI_HAVE_FORTRAN_INTEGER4 */ #endif /* OPAL_HAVE_FORTRAN_INTEGER4 */
#if OMPI_HAVE_FORTRAN_INTEGER8 #if OPAL_HAVE_FORTRAN_INTEGER8
#if (OMPI_SIZEOF_FORTRAN_INTEGER8 == SIZEOF_LONG) #if (OPAL_SIZEOF_FORTRAN_INTEGER8 == SIZEOF_LONG)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer8.dt, "MPI_INTEGER8", &ompi_mpi_long.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer8.dt, "MPI_INTEGER8", &ompi_mpi_long.dt );
#elif (OMPI_SIZEOF_FORTRAN_INTEGER8 == SIZEOF_LONG_LONG) #elif (OPAL_SIZEOF_FORTRAN_INTEGER8 == SIZEOF_LONG_LONG)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer8.dt, "MPI_INTEGER8", &ompi_mpi_long_long_int.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer8.dt, "MPI_INTEGER8", &ompi_mpi_long_long_int.dt );
#else #else
# warning "No proper C type found for INTEGER8" # warning "No proper C type found for INTEGER8"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer8.dt, "MPI_INTEGER8", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer8.dt, "MPI_INTEGER8", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_integer8.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT; ompi_mpi_integer8.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT;
#endif /* OMPI_HAVE_FORTRAN_INTEGER8 */ #endif /* OPAL_HAVE_FORTRAN_INTEGER8 */
#if OMPI_HAVE_FORTRAN_INTEGER16 #if OPAL_HAVE_FORTRAN_INTEGER16
#if (OMPI_SIZEOF_FORTRAN_INTEGER16 == SIZEOF_LONG_LONG) #if (OPAL_SIZEOF_FORTRAN_INTEGER16 == SIZEOF_LONG_LONG)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer16.dt, "MPI_INTEGER16", &ompi_mpi_long_long_int.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer16.dt, "MPI_INTEGER16", &ompi_mpi_long_long_int.dt );
#else #else
# warning "No proper C type found for INTEGER16" # warning "No proper C type found for INTEGER16"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer16.dt, "MPI_INTEGER16", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_integer16.dt, "MPI_INTEGER16", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_integer16.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT; ompi_mpi_integer16.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_INT;
#endif /* OMPI_HAVE_FORTRAN_INTEGER16 */ #endif /* OPAL_HAVE_FORTRAN_INTEGER16 */
/* Optional Fortran COMPLEX types */ /* Optional Fortran COMPLEX types */
#if OMPI_HAVE_FORTRAN_COMPLEX8 #if OPAL_HAVE_FORTRAN_COMPLEX8
#if (OMPI_SIZEOF_FORTRAN_COMPLEX8 == 2*SIZEOF_FLOAT) #if (OPAL_SIZEOF_FORTRAN_COMPLEX8 == 2*SIZEOF_FLOAT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex8.dt, "MPI_COMPLEX8", &ompi_mpi_cplex.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex8.dt, "MPI_COMPLEX8", &ompi_mpi_cplex.dt );
#else #else
# warning "No proper C type found for COMPLEX8" # warning "No proper C type found for COMPLEX8"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex8.dt, "MPI_COMPLEX8", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex8.dt, "MPI_COMPLEX8", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_complex8.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_COMPLEX; ompi_mpi_complex8.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_COMPLEX;
#endif /* OMPI_HAVE_FORTRAN_COMPLEX8 */ #endif /* OPAL_HAVE_FORTRAN_COMPLEX8 */
#if OMPI_HAVE_FORTRAN_COMPLEX16 #if OPAL_HAVE_FORTRAN_COMPLEX16
#if (OMPI_SIZEOF_FORTRAN_COMPLEX16 == 2*SIZEOF_FLOAT) #if (OPAL_SIZEOF_FORTRAN_COMPLEX16 == 2*SIZEOF_FLOAT)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex16.dt, "MPI_COMPLEX16", &ompi_mpi_cplex.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex16.dt, "MPI_COMPLEX16", &ompi_mpi_cplex.dt );
#elif (OMPI_SIZEOF_FORTRAN_COMPLEX16 == 2*SIZEOF_DOUBLE) #elif (OPAL_SIZEOF_FORTRAN_COMPLEX16 == 2*SIZEOF_DOUBLE)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex16.dt, "MPI_COMPLEX16", &ompi_mpi_dblcplex.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex16.dt, "MPI_COMPLEX16", &ompi_mpi_dblcplex.dt );
#else #else
# warning "No proper C type found for COMPLEX16" # warning "No proper C type found for COMPLEX16"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex16.dt, "MPI_COMPLEX16", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex16.dt, "MPI_COMPLEX16", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_complex16.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_COMPLEX; ompi_mpi_complex16.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_COMPLEX;
#endif /* OMPI_HAVE_FORTRAN_COMPLEX16 */ #endif /* OPAL_HAVE_FORTRAN_COMPLEX16 */
#if OMPI_HAVE_FORTRAN_COMPLEX32 #if OPAL_HAVE_FORTRAN_COMPLEX32
#if OMPI_REAL16_MATCHES_C && (OMPI_SIZEOF_FORTRAN_COMPLEX32 == 2*SIZEOF_LONG_DOUBLE) #if OPAL_REAL16_MATCHES_C && (OPAL_SIZEOF_FORTRAN_COMPLEX32 == 2*SIZEOF_LONG_DOUBLE)
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex32.dt, "MPI_COMPLEX32", &ompi_mpi_ldblcplex.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex32.dt, "MPI_COMPLEX32", &ompi_mpi_ldblcplex.dt );
#else #else
# warning "No proper C type found for COMPLEX32" # warning "No proper C type found for COMPLEX32"
DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex32.dt, "MPI_COMPLEX32", &ompi_mpi_unavailable.dt ); DECLARE_MPI_SYNONYM_DDT( &ompi_mpi_complex32.dt, "MPI_COMPLEX32", &ompi_mpi_unavailable.dt );
#endif #endif
ompi_mpi_complex32.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_COMPLEX; ompi_mpi_complex32.dt.flags |= DT_FLAG_DATA_FORTRAN | DT_FLAG_DATA_COMPLEX;
#endif /* OMPI_HAVE_FORTRAN_COMPLEX32 */ #endif /* OPAL_HAVE_FORTRAN_COMPLEX32 */
/* Start to populate the f2c index translation table */ /* Start to populate the f2c index translation table */

2
ompi/errhandler/errcode-internal.c
Просмотреть файл

@ -61,7 +61,7 @@ int ompi_errcode_intern_init (void)
the error objects */ the error objects */
OBJ_CONSTRUCT(&ompi_errcodes_intern, opal_pointer_array_t); OBJ_CONSTRUCT(&ompi_errcodes_intern, opal_pointer_array_t);
if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_errcodes_intern, if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_errcodes_intern,
0, OMPI_FORTRAN_HANDLE_MAX, 64) ) { 0, OPAL_FORTRAN_HANDLE_MAX, 64) ) {
return OMPI_ERROR; return OMPI_ERROR;
} }

2
ompi/errhandler/errcode.c
Просмотреть файл

@ -111,7 +111,7 @@ int ompi_mpi_errcode_init (void)
the error objects */ the error objects */
OBJ_CONSTRUCT(&ompi_mpi_errcodes, opal_pointer_array_t); OBJ_CONSTRUCT(&ompi_mpi_errcodes, opal_pointer_array_t);
if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_mpi_errcodes, 0, if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_mpi_errcodes, 0,
OMPI_FORTRAN_HANDLE_MAX, 64) ) { OPAL_FORTRAN_HANDLE_MAX, 64) ) {
return OMPI_ERROR; return OMPI_ERROR;
} }

2
ompi/errhandler/errhandler.c
Просмотреть файл

@ -76,7 +76,7 @@ int ompi_errhandler_init(void)
OBJ_CONSTRUCT( &ompi_errhandler_f_to_c_table, opal_pointer_array_t); OBJ_CONSTRUCT( &ompi_errhandler_f_to_c_table, opal_pointer_array_t);
if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_errhandler_f_to_c_table, 0, if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_errhandler_f_to_c_table, 0,
OMPI_FORTRAN_HANDLE_MAX, 64) ) { OPAL_FORTRAN_HANDLE_MAX, 64) ) {
return OMPI_ERROR; return OMPI_ERROR;
} }

2
ompi/file/file.c
Просмотреть файл

@ -64,7 +64,7 @@ int ompi_file_init(void)
OBJ_CONSTRUCT(&ompi_file_f_to_c_table, opal_pointer_array_t); OBJ_CONSTRUCT(&ompi_file_f_to_c_table, opal_pointer_array_t);
if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_file_f_to_c_table, 0, if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_file_f_to_c_table, 0,
OMPI_FORTRAN_HANDLE_MAX, 64) ) { OPAL_FORTRAN_HANDLE_MAX, 64) ) {
return OMPI_ERROR; return OMPI_ERROR;
} }

2
ompi/group/group_init.c
Просмотреть файл

@ -308,7 +308,7 @@ int ompi_group_init(void)
/* initialize ompi_group_f_to_c_table */ /* initialize ompi_group_f_to_c_table */
OBJ_CONSTRUCT( &ompi_group_f_to_c_table, opal_pointer_array_t); OBJ_CONSTRUCT( &ompi_group_f_to_c_table, opal_pointer_array_t);
if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_group_f_to_c_table, 0, if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_group_f_to_c_table, 0,
OMPI_FORTRAN_HANDLE_MAX, 64) ) { OPAL_FORTRAN_HANDLE_MAX, 64) ) {
return OMPI_ERROR; return OMPI_ERROR;
} }

96
ompi/include/mpi.h.in
Просмотреть файл

@ -87,43 +87,43 @@
#undef OPAL_MAX_PROCESSOR_NAME #undef OPAL_MAX_PROCESSOR_NAME
/* Whether we have FORTRAN LOGICAL*1 or not */ /* Whether we have FORTRAN LOGICAL*1 or not */
#undef OMPI_HAVE_FORTRAN_LOGICAL1 #undef OPAL_HAVE_FORTRAN_LOGICAL1
/* Whether we have FORTRAN LOGICAL*2 or not */ /* Whether we have FORTRAN LOGICAL*2 or not */
#undef OMPI_HAVE_FORTRAN_LOGICAL2 #undef OPAL_HAVE_FORTRAN_LOGICAL2
/* Whether we have FORTRAN LOGICAL*4 or not */ /* Whether we have FORTRAN LOGICAL*4 or not */
#undef OMPI_HAVE_FORTRAN_LOGICAL4 #undef OPAL_HAVE_FORTRAN_LOGICAL4
/* Whether we have FORTRAN LOGICAL*8 or not */ /* Whether we have FORTRAN LOGICAL*8 or not */
#undef OMPI_HAVE_FORTRAN_LOGICAL8 #undef OPAL_HAVE_FORTRAN_LOGICAL8
/* Whether we have FORTRAN INTEGER*1 or not */ /* Whether we have FORTRAN INTEGER*1 or not */
#undef OMPI_HAVE_FORTRAN_INTEGER1 #undef OPAL_HAVE_FORTRAN_INTEGER1
/* Whether we have FORTRAN INTEGER*16 or not */ /* Whether we have FORTRAN INTEGER*16 or not */
#undef OMPI_HAVE_FORTRAN_INTEGER16 #undef OPAL_HAVE_FORTRAN_INTEGER16
/* Whether we have FORTRAN INTEGER*2 or not */ /* Whether we have FORTRAN INTEGER*2 or not */
#undef OMPI_HAVE_FORTRAN_INTEGER2 #undef OPAL_HAVE_FORTRAN_INTEGER2
/* Whether we have FORTRAN INTEGER*4 or not */ /* Whether we have FORTRAN INTEGER*4 or not */
#undef OMPI_HAVE_FORTRAN_INTEGER4 #undef OPAL_HAVE_FORTRAN_INTEGER4
/* Whether we have FORTRAN INTEGER*8 or not */ /* Whether we have FORTRAN INTEGER*8 or not */
#undef OMPI_HAVE_FORTRAN_INTEGER8 #undef OPAL_HAVE_FORTRAN_INTEGER8
/* Whether we have FORTRAN REAL*16 or not */ /* Whether we have FORTRAN REAL*16 or not */
#undef OMPI_HAVE_FORTRAN_REAL16 #undef OPAL_HAVE_FORTRAN_REAL16
/* Whether we have FORTRAN REAL*2 or not */ /* Whether we have FORTRAN REAL*2 or not */
#undef OMPI_HAVE_FORTRAN_REAL2 #undef OPAL_HAVE_FORTRAN_REAL2
/* Whether we have FORTRAN REAL*4 or not */ /* Whether we have FORTRAN REAL*4 or not */
#undef OMPI_HAVE_FORTRAN_REAL4 #undef OPAL_HAVE_FORTRAN_REAL4
/* Whether we have FORTRAN REAL*8 or not */ /* Whether we have FORTRAN REAL*8 or not */
#undef OMPI_HAVE_FORTRAN_REAL8 #undef OPAL_HAVE_FORTRAN_REAL8
/* Type of MPI_Offset -- has to be defined here and typedef'ed later because mpi.h does not get AC SUBST's */ /* Type of MPI_Offset -- has to be defined here and typedef'ed later because mpi.h does not get AC SUBST's */
#undef OMPI_MPI_OFFSET_TYPE #undef OMPI_MPI_OFFSET_TYPE
@ -166,10 +166,10 @@
/* A type that allows us to have sentinel type values that are still /* A type that allows us to have sentinel type values that are still
valid */ valid */
#undef ompi_fortran_bogus_type_t #undef opal_fortran_bogus_type_t
/* C type corresponding to FORTRAN INTEGER */ /* C type corresponding to FORTRAN INTEGER */
#undef ompi_fortran_integer_t #undef opal_fortran_integer_t
/* Whether C compiler supports -fvisibility */ /* Whether C compiler supports -fvisibility */
#undef OPAL_C_HAVE_VISIBILITY #undef OPAL_C_HAVE_VISIBILITY
@ -194,8 +194,8 @@
#endif #endif
#ifndef MPI_Fint #ifndef MPI_Fint
/* MPI_Fint is the same as ompi_fortran_INTEGER_t */ /* MPI_Fint is the same as opal_fortran_integer_t */
#define MPI_Fint ompi_fortran_integer_t #define MPI_Fint opal_fortran_integer_t
#endif #endif
#endif /* #ifndef OMPI_CONFIG_H */ #endif /* #ifndef OMPI_CONFIG_H */
@ -766,52 +766,52 @@ OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_cxx_ldblcplex;
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_cxx_bool; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_cxx_bool;
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_2cplex, ompi_mpi_2dblcplex; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_2cplex, ompi_mpi_2dblcplex;
/* other MPI2 datatypes */ /* other MPI2 datatypes */
#if OMPI_HAVE_FORTRAN_LOGICAL1 #if OPAL_HAVE_FORTRAN_LOGICAL1
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical1; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical1;
#endif #endif
#if OMPI_HAVE_FORTRAN_LOGICAL2 #if OPAL_HAVE_FORTRAN_LOGICAL2
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical2; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical2;
#endif #endif
#if OMPI_HAVE_FORTRAN_LOGICAL4 #if OPAL_HAVE_FORTRAN_LOGICAL4
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical4; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical4;
#endif #endif
#if OMPI_HAVE_FORTRAN_LOGICAL8 #if OPAL_HAVE_FORTRAN_LOGICAL8
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical8; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_logical8;
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER1 #if OPAL_HAVE_FORTRAN_INTEGER1
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer1; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer1;
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER2 #if OPAL_HAVE_FORTRAN_INTEGER2
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer2; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer2;
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER4 #if OPAL_HAVE_FORTRAN_INTEGER4
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer4; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer4;
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER8 #if OPAL_HAVE_FORTRAN_INTEGER8
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer8; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer8;
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER16 #if OPAL_HAVE_FORTRAN_INTEGER16
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer16; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_integer16;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL2 #if OPAL_HAVE_FORTRAN_REAL2
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real2; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real2;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real4; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real4;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real8; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real8;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 #if OPAL_HAVE_FORTRAN_REAL16
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real16; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_real16;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_complex8; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_complex8;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_complex16; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_complex16;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 #if OPAL_HAVE_FORTRAN_REAL16
OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_complex32; OMPI_DECLSPEC extern struct ompi_predefined_datatype_t ompi_mpi_complex32;
#endif #endif
@ -885,53 +885,53 @@ OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUSES_IGNORE;
/* Fortran datatype bindings */ /* Fortran datatype bindings */
#define MPI_CHARACTER OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_character) #define MPI_CHARACTER OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_character)
#define MPI_LOGICAL OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logic) #define MPI_LOGICAL OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logic)
#if OMPI_HAVE_FORTRAN_LOGICAL1 #if OPAL_HAVE_FORTRAN_LOGICAL1
#define MPI_LOGICAL1 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical1) #define MPI_LOGICAL1 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical1)
#endif #endif
#if OMPI_HAVE_FORTRAN_LOGICAL2 #if OPAL_HAVE_FORTRAN_LOGICAL2
#define MPI_LOGICAL2 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical2) #define MPI_LOGICAL2 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical2)
#endif #endif
#if OMPI_HAVE_FORTRAN_LOGICAL4 #if OPAL_HAVE_FORTRAN_LOGICAL4
#define MPI_LOGICAL4 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical4) #define MPI_LOGICAL4 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical4)
#endif #endif
#if OMPI_HAVE_FORTRAN_LOGICAL8 #if OPAL_HAVE_FORTRAN_LOGICAL8
#define MPI_LOGICAL8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical8) #define MPI_LOGICAL8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_logical8)
#endif #endif
#define MPI_INTEGER OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer) #define MPI_INTEGER OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer)
#if OMPI_HAVE_FORTRAN_INTEGER1 #if OPAL_HAVE_FORTRAN_INTEGER1
#define MPI_INTEGER1 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer1) #define MPI_INTEGER1 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer1)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER2 #if OPAL_HAVE_FORTRAN_INTEGER2
#define MPI_INTEGER2 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer2) #define MPI_INTEGER2 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer2)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER4 #if OPAL_HAVE_FORTRAN_INTEGER4
#define MPI_INTEGER4 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer4) #define MPI_INTEGER4 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer4)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER8 #if OPAL_HAVE_FORTRAN_INTEGER8
#define MPI_INTEGER8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer8) #define MPI_INTEGER8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer8)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER16 #if OPAL_HAVE_FORTRAN_INTEGER16
#define MPI_INTEGER16 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer16) #define MPI_INTEGER16 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_integer16)
#endif #endif
#define MPI_REAL OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real) #define MPI_REAL OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real)
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
#define MPI_REAL4 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real4) #define MPI_REAL4 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real4)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
#define MPI_REAL8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real8) #define MPI_REAL8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real8)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 #if OPAL_HAVE_FORTRAN_REAL16
#define MPI_REAL16 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real16) #define MPI_REAL16 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_real16)
#endif #endif
#define MPI_DOUBLE_PRECISION OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_dblprec) #define MPI_DOUBLE_PRECISION OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_dblprec)
#define MPI_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_cplex) #define MPI_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_cplex)
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
#define MPI_COMPLEX8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_complex8) #define MPI_COMPLEX8 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_complex8)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
#define MPI_COMPLEX16 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_complex16) #define MPI_COMPLEX16 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_complex16)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 #if OPAL_HAVE_FORTRAN_REAL16
#define MPI_COMPLEX32 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_complex32) #define MPI_COMPLEX32 OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_complex32)
#endif #endif
#define MPI_DOUBLE_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_dblcplex) #define MPI_DOUBLE_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_dblcplex)

48
ompi/include/ompi_config.h.in
Просмотреть файл

@ -35,50 +35,50 @@
* *
**********************************************************************/ **********************************************************************/
/* MPI_Fint is the same as ompi_fortran_INTEGER_t */ /* MPI_Fint is the same as opal_fortran_integer_t */
#define MPI_Fint ompi_fortran_integer_t #define MPI_Fint opal_fortran_integer_t
/* MPI_Flogical is the same as the ompi_fortran_logical_t */ /* MPI_Flogical is the same as the opal_fortran_logical_t */
#define MPI_Flogical ompi_fortran_logical_t #define MPI_Flogical opal_fortran_logical_t
#if OMPI_HAVE_FORTRAN_REAL && OMPI_HAVE_FORTRAN_COMPLEX #if OPAL_HAVE_FORTRAN_REAL && OPAL_HAVE_FORTRAN_COMPLEX
/* * C type for Fortran COMPLEX */ /* * C type for Fortran COMPLEX */
typedef struct { typedef struct {
ompi_fortran_real_t real; opal_fortran_real_t real;
ompi_fortran_real_t imag; opal_fortran_real_t imag;
} ompi_fortran_complex_t; } opal_fortran_complex_t;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL4 && OMPI_HAVE_FORTRAN_COMPLEX8 #if OPAL_HAVE_FORTRAN_REAL4 && OPAL_HAVE_FORTRAN_COMPLEX8
/* * C type for Fortran COMPLEX*8 */ /* * C type for Fortran COMPLEX*8 */
typedef struct { typedef struct {
ompi_fortran_real4_t real; opal_fortran_real4_t real;
ompi_fortran_real4_t imag; opal_fortran_real4_t imag;
} ompi_fortran_complex8_t; } opal_fortran_complex8_t;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 && OMPI_HAVE_FORTRAN_COMPLEX16 #if OPAL_HAVE_FORTRAN_REAL8 && OPAL_HAVE_FORTRAN_COMPLEX16
/* * C type for Fortran COMPLEX*16 */ /* * C type for Fortran COMPLEX*16 */
typedef struct { typedef struct {
ompi_fortran_real8_t real; opal_fortran_real8_t real;
ompi_fortran_real8_t imag; opal_fortran_real8_t imag;
} ompi_fortran_complex16_t; } opal_fortran_complex16_t;
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 && OMPI_HAVE_FORTRAN_COMPLEX32 #if OPAL_HAVE_FORTRAN_REAL16 && OPAL_HAVE_FORTRAN_COMPLEX32
/* * C type for Fortran COMPLEX*32 */ /* * C type for Fortran COMPLEX*32 */
typedef struct { typedef struct {
ompi_fortran_real16_t real; opal_fortran_real16_t real;
ompi_fortran_real16_t imag; opal_fortran_real16_t imag;
} ompi_fortran_complex32_t; } opal_fortran_complex32_t;
#endif #endif
#if OMPI_HAVE_FORTRAN_DOUBLE_PRECISION #if OPAL_HAVE_FORTRAN_DOUBLE_PRECISION
/* * C type for Fortran DOUBLE COMPLEX */ /* * C type for Fortran DOUBLE COMPLEX */
typedef struct { typedef struct {
ompi_fortran_double_precision_t real; opal_fortran_double_precision_t real;
ompi_fortran_double_precision_t imag; opal_fortran_double_precision_t imag;
} ompi_fortran_double_complex_t; } opal_fortran_double_complex_t;
#endif #endif

2
ompi/info/info.c
Просмотреть файл

@ -85,7 +85,7 @@ int ompi_info_init(void)
OBJ_CONSTRUCT(&ompi_info_f_to_c_table, opal_pointer_array_t); OBJ_CONSTRUCT(&ompi_info_f_to_c_table, opal_pointer_array_t);
if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_info_f_to_c_table, 0, if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_info_f_to_c_table, 0,
OMPI_FORTRAN_HANDLE_MAX, 64) ) { OPAL_FORTRAN_HANDLE_MAX, 64) ) {
return OMPI_ERROR; return OMPI_ERROR;
} }

56
ompi/mca/op/base/functions.h
Просмотреть файл

@ -56,31 +56,31 @@
#define OMPI_OP_HANDLER_FORTRAN_INTEGER_INTRINSIC(name) \ #define OMPI_OP_HANDLER_FORTRAN_INTEGER_INTRINSIC(name) \
void ompi_op_base_##name##_fortran_integer OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_integer OMPI_OP_PROTO;
#if OMPI_HAVE_FORTRAN_INTEGER1 #if OPAL_HAVE_FORTRAN_INTEGER1
#define OMPI_OP_HANDLER_FORTRAN_INTEGER1(name) \ #define OMPI_OP_HANDLER_FORTRAN_INTEGER1(name) \
void ompi_op_base_##name##_fortran_integer1 OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_integer1 OMPI_OP_PROTO;
#else #else
#define OMPI_OP_HANDLER_FORTRAN_INTEGER1(name) #define OMPI_OP_HANDLER_FORTRAN_INTEGER1(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER2 #if OPAL_HAVE_FORTRAN_INTEGER2
#define OMPI_OP_HANDLER_FORTRAN_INTEGER2(name) \ #define OMPI_OP_HANDLER_FORTRAN_INTEGER2(name) \
void ompi_op_base_##name##_fortran_integer2 OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_integer2 OMPI_OP_PROTO;
#else #else
#define OMPI_OP_HANDLER_FORTRAN_INTEGER2(name) #define OMPI_OP_HANDLER_FORTRAN_INTEGER2(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER4 #if OPAL_HAVE_FORTRAN_INTEGER4
#define OMPI_OP_HANDLER_FORTRAN_INTEGER4(name) \ #define OMPI_OP_HANDLER_FORTRAN_INTEGER4(name) \
void ompi_op_base_##name##_fortran_integer4 OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_integer4 OMPI_OP_PROTO;
#else #else
#define OMPI_OP_HANDLER_FORTRAN_INTEGER4(name) #define OMPI_OP_HANDLER_FORTRAN_INTEGER4(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER8 #if OPAL_HAVE_FORTRAN_INTEGER8
#define OMPI_OP_HANDLER_FORTRAN_INTEGER8(name) \ #define OMPI_OP_HANDLER_FORTRAN_INTEGER8(name) \
void ompi_op_base_##name##_fortran_integer8 OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_integer8 OMPI_OP_PROTO;
#else #else
#define OMPI_OP_HANDLER_FORTRAN_INTEGER8(name) #define OMPI_OP_HANDLER_FORTRAN_INTEGER8(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER16 #if OPAL_HAVE_FORTRAN_INTEGER16
#define OMPI_OP_HANDLER_FORTRAN_INTEGER16(name) \ #define OMPI_OP_HANDLER_FORTRAN_INTEGER16(name) \
void ompi_op_base_##name##_fortran_integer16 OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_integer16 OMPI_OP_PROTO;
#else #else
@ -102,25 +102,25 @@
void ompi_op_base_##name##_fortran_real OMPI_OP_PROTO; \ void ompi_op_base_##name##_fortran_real OMPI_OP_PROTO; \
void ompi_op_base_##name##_fortran_double_precision OMPI_OP_PROTO; \ void ompi_op_base_##name##_fortran_double_precision OMPI_OP_PROTO; \
void ompi_op_base_##name##_long_double OMPI_OP_PROTO; void ompi_op_base_##name##_long_double OMPI_OP_PROTO;
#if OMPI_HAVE_FORTRAN_REAL2 #if OPAL_HAVE_FORTRAN_REAL2
#define OMPI_OP_HANDLER_FLOATING_POINT_REAL2(name) \ #define OMPI_OP_HANDLER_FLOATING_POINT_REAL2(name) \
void ompi_op_base_##name##_fortran_real2 OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_real2 OMPI_OP_PROTO;
#else #else
#define OMPI_OP_HANDLER_FLOATING_POINT_REAL2(name) #define OMPI_OP_HANDLER_FLOATING_POINT_REAL2(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
#define OMPI_OP_HANDLER_FLOATING_POINT_REAL4(name) \ #define OMPI_OP_HANDLER_FLOATING_POINT_REAL4(name) \
void ompi_op_base_##name##_fortran_real4 OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_real4 OMPI_OP_PROTO;
#else #else
#define OMPI_OP_HANDLER_FLOATING_POINT_REAL4(name) #define OMPI_OP_HANDLER_FLOATING_POINT_REAL4(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
#define OMPI_OP_HANDLER_FLOATING_POINT_REAL8(name) \ #define OMPI_OP_HANDLER_FLOATING_POINT_REAL8(name) \
void ompi_op_base_##name##_fortran_real8 OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_real8 OMPI_OP_PROTO;
#else #else
#define OMPI_OP_HANDLER_FLOATING_POINT_REAL8(name) #define OMPI_OP_HANDLER_FLOATING_POINT_REAL8(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 #if OPAL_HAVE_FORTRAN_REAL16
#define OMPI_OP_HANDLER_FLOATING_POINT_REAL16(name) \ #define OMPI_OP_HANDLER_FLOATING_POINT_REAL16(name) \
void ompi_op_base_##name##_fortran_real16 OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_real16 OMPI_OP_PROTO;
#else #else
@ -140,31 +140,31 @@
/* Complex */ /* Complex */
#if OMPI_HAVE_FORTRAN_REAL #if OPAL_HAVE_FORTRAN_REAL
#define OMPI_OP_HANDLER_COMPLEX_INTRINSIC(name) \ #define OMPI_OP_HANDLER_COMPLEX_INTRINSIC(name) \
void ompi_op_base_##name##_fortran_complex OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_complex OMPI_OP_PROTO;
#else #else
#define OMPI_OP_HANDLER_COMPLEX_INTRINSIC(name) #define OMPI_OP_HANDLER_COMPLEX_INTRINSIC(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_DOUBLE_PRECISION #if OPAL_HAVE_FORTRAN_DOUBLE_PRECISION
#define OMPI_OP_HANDLER_DOUBLE_COMPLEX_INTRINSIC(name) \ #define OMPI_OP_HANDLER_DOUBLE_COMPLEX_INTRINSIC(name) \
void ompi_op_base_##name##_fortran_double_complex OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_double_complex OMPI_OP_PROTO;
#else #else
#define OMPI_OP_HANDLER_DOUBLE_COMPLEX_INTRINSIC(name) #define OMPI_OP_HANDLER_DOUBLE_COMPLEX_INTRINSIC(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
#define OMPI_OP_HANDLER_COMPLEX8(name) \ #define OMPI_OP_HANDLER_COMPLEX8(name) \
void ompi_op_base_##name##_fortran_complex8 OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_complex8 OMPI_OP_PROTO;
#else #else
#define OMPI_OP_HANDLER_COMPLEX8(name) #define OMPI_OP_HANDLER_COMPLEX8(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
#define OMPI_OP_HANDLER_COMPLEX16(name) \ #define OMPI_OP_HANDLER_COMPLEX16(name) \
void ompi_op_base_##name##_fortran_complex16 OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_complex16 OMPI_OP_PROTO;
#else #else
#define OMPI_OP_HANDLER_COMPLEX16(name) #define OMPI_OP_HANDLER_COMPLEX16(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 #if OPAL_HAVE_FORTRAN_REAL16
#define OMPI_OP_HANDLER_COMPLEX32(name) \ #define OMPI_OP_HANDLER_COMPLEX32(name) \
void ompi_op_base_##name##_fortran_complex32 OMPI_OP_PROTO; void ompi_op_base_##name##_fortran_complex32 OMPI_OP_PROTO;
#else #else
@ -311,31 +311,31 @@ BEGIN_C_DECLS
#define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER_INTRINSIC(name) \ #define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER_INTRINSIC(name) \
void ompi_op_base_3buff_##name##_fortran_integer OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_integer OMPI_OP_PROTO_3BUF;
#if OMPI_HAVE_FORTRAN_INTEGER1 #if OPAL_HAVE_FORTRAN_INTEGER1
#define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER1(name) \ #define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER1(name) \
void ompi_op_base_3buff_##name##_fortran_integer1 OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_integer1 OMPI_OP_PROTO_3BUF;
#else #else
#define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER1(name) #define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER1(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER2 #if OPAL_HAVE_FORTRAN_INTEGER2
#define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER2(name) \ #define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER2(name) \
void ompi_op_base_3buff_##name##_fortran_integer2 OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_integer2 OMPI_OP_PROTO_3BUF;
#else #else
#define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER2(name) #define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER2(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER4 #if OPAL_HAVE_FORTRAN_INTEGER4
#define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER4(name) \ #define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER4(name) \
void ompi_op_base_3buff_##name##_fortran_integer4 OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_integer4 OMPI_OP_PROTO_3BUF;
#else #else
#define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER4(name) #define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER4(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER8 #if OPAL_HAVE_FORTRAN_INTEGER8
#define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER8(name) \ #define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER8(name) \
void ompi_op_base_3buff_##name##_fortran_integer8 OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_integer8 OMPI_OP_PROTO_3BUF;
#else #else
#define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER8(name) #define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER8(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_INTEGER16 #if OPAL_HAVE_FORTRAN_INTEGER16
#define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER16(name) \ #define OMPI_OP_3BUFF_HANDLER_FORTRAN_INTEGER16(name) \
void ompi_op_base_3buff_##name##_fortran_integer16 OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_integer16 OMPI_OP_PROTO_3BUF;
#else #else
@ -357,25 +357,25 @@ BEGIN_C_DECLS
void ompi_op_base_3buff_##name##_fortran_real OMPI_OP_PROTO_3BUF; \ void ompi_op_base_3buff_##name##_fortran_real OMPI_OP_PROTO_3BUF; \
void ompi_op_base_3buff_##name##_fortran_double_precision OMPI_OP_PROTO_3BUF; \ void ompi_op_base_3buff_##name##_fortran_double_precision OMPI_OP_PROTO_3BUF; \
void ompi_op_base_3buff_##name##_long_double OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_long_double OMPI_OP_PROTO_3BUF;
#if OMPI_HAVE_FORTRAN_REAL2 #if OPAL_HAVE_FORTRAN_REAL2
#define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL2(name) \ #define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL2(name) \
void ompi_op_base_3buff_##name##_fortran_real2 OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_real2 OMPI_OP_PROTO_3BUF;
#else #else
#define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL2(name) #define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL2(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
#define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL4(name) \ #define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL4(name) \
void ompi_op_base_3buff_##name##_fortran_real4 OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_real4 OMPI_OP_PROTO_3BUF;
#else #else
#define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL4(name) #define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL4(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
#define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL8(name) \ #define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL8(name) \
void ompi_op_base_3buff_##name##_fortran_real8 OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_real8 OMPI_OP_PROTO_3BUF;
#else #else
#define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL8(name) #define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL8(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 #if OPAL_HAVE_FORTRAN_REAL16
#define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL16(name) \ #define OMPI_OP_3BUFF_HANDLER_FLOATING_POINT_REAL16(name) \
void ompi_op_base_3buff_##name##_fortran_real16 OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_real16 OMPI_OP_PROTO_3BUF;
#else #else
@ -395,31 +395,31 @@ BEGIN_C_DECLS
/* Complex */ /* Complex */
#if OMPI_HAVE_FORTRAN_REAL #if OPAL_HAVE_FORTRAN_REAL
#define OMPI_OP_3BUFF_HANDLER_COMPLEX_INTRINSIC(name) \ #define OMPI_OP_3BUFF_HANDLER_COMPLEX_INTRINSIC(name) \
void ompi_op_base_3buff_##name##_fortran_complex OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_complex OMPI_OP_PROTO_3BUF;
#else #else
#define OMPI_OP_3BUFF_HANDLER_COMPLEX_INTRINSIC(name) #define OMPI_OP_3BUFF_HANDLER_COMPLEX_INTRINSIC(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_DOUBLE_PRECISION #if OPAL_HAVE_FORTRAN_DOUBLE_PRECISION
#define OMPI_OP_3BUFF_HANDLER_DOUBLE_COMPLEX_INTRINSIC(name) \ #define OMPI_OP_3BUFF_HANDLER_DOUBLE_COMPLEX_INTRINSIC(name) \
void ompi_op_base_3buff_##name##_fortran_double_complex OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_double_complex OMPI_OP_PROTO_3BUF;
#else #else
#define OMPI_OP_3BUFF_HANDLER_DOUBLE_COMPLEX_INTRINSIC(name) #define OMPI_OP_3BUFF_HANDLER_DOUBLE_COMPLEX_INTRINSIC(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL4 #if OPAL_HAVE_FORTRAN_REAL4
#define OMPI_OP_3BUFF_HANDLER_COMPLEX8(name) \ #define OMPI_OP_3BUFF_HANDLER_COMPLEX8(name) \
void ompi_op_base_3buff_##name##_fortran_complex8 OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_complex8 OMPI_OP_PROTO_3BUF;
#else #else
#define OMPI_OP_3BUFF_HANDLER_COMPLEX8(name) #define OMPI_OP_3BUFF_HANDLER_COMPLEX8(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL8 #if OPAL_HAVE_FORTRAN_REAL8
#define OMPI_OP_3BUFF_HANDLER_COMPLEX16(name) \ #define OMPI_OP_3BUFF_HANDLER_COMPLEX16(name) \
void ompi_op_base_3buff_##name##_fortran_complex16 OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_complex16 OMPI_OP_PROTO_3BUF;
#else #else
#define OMPI_OP_3BUFF_HANDLER_COMPLEX16(name) #define OMPI_OP_3BUFF_HANDLER_COMPLEX16(name)
#endif #endif
#if OMPI_HAVE_FORTRAN_REAL16 #if OPAL_HAVE_FORTRAN_REAL16
#define OMPI_OP_3BUFF_HANDLER_COMPLEX32(name) \ #define OMPI_OP_3BUFF_HANDLER_COMPLEX32(name) \
void ompi_op_base_3buff_##name##_fortran_complex32 OMPI_OP_PROTO_3BUF; void ompi_op_base_3buff_##name##_fortran_complex32 OMPI_OP_PROTO_3BUF;
#else #else

722
ompi/mca/op/base/op_base_functions.c
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

8
ompi/mca/osc/base/osc_base_obj_convert.c
Просмотреть файл

@ -149,13 +149,13 @@ static conversion_fct_t ompi_osc_base_copy_functions[DT_MAX_PREDEFINED] = {
#else #else
(conversion_fct_t)NULL, /* DT_CXX_BOOL */ (conversion_fct_t)NULL, /* DT_CXX_BOOL */
#endif #endif
#if OMPI_SIZEOF_FORTRAN_LOGICAL == SIZEOF_CHAR #if OPAL_SIZEOF_FORTRAN_LOGICAL == SIZEOF_CHAR
(conversion_fct_t)copy_char, /* DT_LOGIC */ (conversion_fct_t)copy_char, /* DT_LOGIC */
#elif OMPI_SIZEOF_FORTRAN_LOGICAL == SIZEOF_SHORT #elif OPAL_SIZEOF_FORTRAN_LOGICAL == SIZEOF_SHORT
(conversion_fct_t)copy_short, /* DT_LOGIC */ (conversion_fct_t)copy_short, /* DT_LOGIC */
#elif OMPI_SIZEOF_FORTRAN_LOGICAL == SIZEOF_INT #elif OPAL_SIZEOF_FORTRAN_LOGICAL == SIZEOF_INT
(conversion_fct_t)copy_int, /* DT_LOGIC */ (conversion_fct_t)copy_int, /* DT_LOGIC */
#elif OMPI_SIZEOF_FORTRAN_LOGICAL == SIZEOF_LONG #elif OPAL_SIZEOF_FORTRAN_LOGICAL == SIZEOF_LONG
(conversion_fct_t)copy_long, /* DT_LOGIC */ (conversion_fct_t)copy_long, /* DT_LOGIC */
#else #else
(conversion_fct_t)NULL, /* DT_LOGIC */ (conversion_fct_t)NULL, /* DT_LOGIC */

4
ompi/mpi/c/type_create_f90_integer.c
Просмотреть файл

@ -60,11 +60,11 @@ int MPI_Type_create_f90_integer(int r, MPI_Datatype *newtype)
*/ */
if (r > 38) *newtype = &ompi_mpi_datatype_null.dt; if (r > 38) *newtype = &ompi_mpi_datatype_null.dt;
#if OMPI_HAVE_F90_INTEGER16 #if OPAL_HAVE_F90_INTEGER16
else if (r > 18) *newtype = &ompi_mpi_long_long_int.dt; else if (r > 18) *newtype = &ompi_mpi_long_long_int.dt;
#else #else
else if (r > 18) *newtype = &ompi_mpi_datatype_null.dt; else if (r > 18) *newtype = &ompi_mpi_datatype_null.dt;
#endif /* OMPI_HAVE_F90_INTEGER16 */ #endif /* OPAL_HAVE_F90_INTEGER16 */
#if SIZEOF_LONG > SIZEOF_INT #if SIZEOF_LONG > SIZEOF_INT
else if (r > 9) *newtype = &ompi_mpi_long.dt; else if (r > 9) *newtype = &ompi_mpi_long.dt;
#else #else

48
ompi/mpi/f77/base/attr_fn_f.c
Просмотреть файл

@ -85,14 +85,14 @@ OMPI_GENERATE_F77_BINDINGS( MPI_TYPE_NULL_COPY_FN,
mpi_type_null_copy_fn_, mpi_type_null_copy_fn_,
mpi_type_null_copy_fn__, mpi_type_null_copy_fn__,
mpi_type_null_copy_fn_f, mpi_type_null_copy_fn_f,
(MPI_Fint* type, MPI_Fint* type_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, ompi_fortran_logical_t* flag, MPI_Fint* ierr), (MPI_Fint* type, MPI_Fint* type_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, MPI_Flogical* flag, MPI_Fint* ierr),
(type, type_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) ) (type, type_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) )
OMPI_GENERATE_F77_BINDINGS( MPI_TYPE_DUP_FN, OMPI_GENERATE_F77_BINDINGS( MPI_TYPE_DUP_FN,
mpi_type_dup_fn, mpi_type_dup_fn,
mpi_type_dup_fn_, mpi_type_dup_fn_,
mpi_type_dup_fn__, mpi_type_dup_fn__,
mpi_type_dup_fn_f, mpi_type_dup_fn_f,
(MPI_Fint* type, MPI_Fint* type_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, ompi_fortran_logical_t* flag, MPI_Fint* ierr), (MPI_Fint* type, MPI_Fint* type_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, MPI_Flogical* flag, MPI_Fint* ierr),
(type, type_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) ) (type, type_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) )
OMPI_GENERATE_F77_BINDINGS( MPI_COMM_NULL_DELETE_FN, OMPI_GENERATE_F77_BINDINGS( MPI_COMM_NULL_DELETE_FN,
mpi_comm_null_delete_fn, mpi_comm_null_delete_fn,
@ -106,14 +106,14 @@ OMPI_GENERATE_F77_BINDINGS( MPI_COMM_NULL_COPY_FN,
mpi_comm_null_copy_fn_, mpi_comm_null_copy_fn_,
mpi_comm_null_copy_fn__, mpi_comm_null_copy_fn__,
mpi_comm_null_copy_fn_f, mpi_comm_null_copy_fn_f,
(MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, ompi_fortran_logical_t* flag, MPI_Fint* ierr), (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, MPI_Flogical* flag, MPI_Fint* ierr),
(comm, comm_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) ) (comm, comm_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) )
OMPI_GENERATE_F77_BINDINGS( MPI_COMM_DUP_FN, OMPI_GENERATE_F77_BINDINGS( MPI_COMM_DUP_FN,
mpi_comm_dup_fn, mpi_comm_dup_fn,
mpi_comm_dup_fn_, mpi_comm_dup_fn_,
mpi_comm_dup_fn__, mpi_comm_dup_fn__,
mpi_comm_dup_fn_f, mpi_comm_dup_fn_f,
(MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, ompi_fortran_logical_t* flag, MPI_Fint* ierr), (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, MPI_Flogical* flag, MPI_Fint* ierr),
(comm, comm_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) ) (comm, comm_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) )
OMPI_GENERATE_F77_BINDINGS( MPI_NULL_DELETE_FN, OMPI_GENERATE_F77_BINDINGS( MPI_NULL_DELETE_FN,
mpi_null_delete_fn, mpi_null_delete_fn,
@ -127,14 +127,14 @@ OMPI_GENERATE_F77_BINDINGS( MPI_NULL_COPY_FN,
mpi_null_copy_fn_, mpi_null_copy_fn_,
mpi_null_copy_fn__, mpi_null_copy_fn__,
mpi_null_copy_fn_f, mpi_null_copy_fn_f,
(MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Fint* extra_state, MPI_Fint* attribute_val_in, MPI_Fint* attribute_val_out, ompi_fortran_logical_t* flag, MPI_Fint* ierr), (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Fint* extra_state, MPI_Fint* attribute_val_in, MPI_Fint* attribute_val_out, MPI_Flogical* flag, MPI_Fint* ierr),
(comm, comm_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) ) (comm, comm_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) )
OMPI_GENERATE_F77_BINDINGS( MPI_DUP_FN, OMPI_GENERATE_F77_BINDINGS( MPI_DUP_FN,
mpi_dup_fn, mpi_dup_fn,
mpi_dup_fn_, mpi_dup_fn_,
mpi_dup_fn__, mpi_dup_fn__,
mpi_dup_fn_f, mpi_dup_fn_f,
(MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Fint* extra_state, MPI_Fint* attribute_val_in, MPI_Fint* attribute_val_out, ompi_fortran_logical_t* flag, MPI_Fint* ierr), (MPI_Fint* comm, MPI_Fint* comm_keyval, MPI_Fint* extra_state, MPI_Fint* attribute_val_in, MPI_Fint* attribute_val_out, MPI_Flogical* flag, MPI_Fint* ierr),
(comm, comm_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) ) (comm, comm_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) )
OMPI_GENERATE_F77_BINDINGS( MPI_WIN_NULL_DELETE_FN, OMPI_GENERATE_F77_BINDINGS( MPI_WIN_NULL_DELETE_FN,
@ -149,14 +149,14 @@ OMPI_GENERATE_F77_BINDINGS( MPI_WIN_NULL_COPY_FN,
mpi_win_null_copy_fn_, mpi_win_null_copy_fn_,
mpi_win_null_copy_fn__, mpi_win_null_copy_fn__,
mpi_win_null_copy_fn_f, mpi_win_null_copy_fn_f,
(MPI_Fint* window, MPI_Fint* win_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, ompi_fortran_logical_t* flag, MPI_Fint* ierr), (MPI_Fint* window, MPI_Fint* win_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, MPI_Flogical* flag, MPI_Fint* ierr),
(window, win_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) ) (window, win_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) )
OMPI_GENERATE_F77_BINDINGS( MPI_WIN_DUP_FN, OMPI_GENERATE_F77_BINDINGS( MPI_WIN_DUP_FN,
mpi_win_dup_fn, mpi_win_dup_fn,
mpi_win_dup_fn_, mpi_win_dup_fn_,
mpi_win_dup_fn__, mpi_win_dup_fn__,
mpi_win_dup_fn_f, mpi_win_dup_fn_f,
(MPI_Fint* window, MPI_Fint* win_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, ompi_fortran_logical_t* flag, MPI_Fint* ierr), (MPI_Fint* window, MPI_Fint* win_keyval, MPI_Aint* extra_state, MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_out, MPI_Flogical* flag, MPI_Fint* ierr),
(window, win_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) ) (window, win_keyval, extra_state, attribute_val_in, attribute_val_out, flag, ierr) )
#endif #endif
@ -194,9 +194,9 @@ void mpi_type_null_copy_fn_f(MPI_Fint* type, MPI_Fint* type_keyval,
MPI_Aint* extra_state, MPI_Aint* extra_state,
MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_in,
MPI_Aint* attribute_val_out, MPI_Aint* attribute_val_out,
ompi_fortran_logical_t* flag, MPI_Fint* ierr) MPI_Flogical* flag, MPI_Fint* ierr)
{ {
*flag = (ompi_fortran_logical_t) 0; *flag = (MPI_Flogical) 0;
*ierr = OMPI_INT_2_FINT(MPI_SUCCESS); *ierr = OMPI_INT_2_FINT(MPI_SUCCESS);
} }
@ -204,9 +204,9 @@ void mpi_type_dup_fn_f(MPI_Fint* type, MPI_Fint* type_keyval,
MPI_Aint* extra_state, MPI_Aint* extra_state,
MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_in,
MPI_Aint* attribute_val_out, MPI_Aint* attribute_val_out,
ompi_fortran_logical_t* flag, MPI_Fint* ierr ) MPI_Flogical* flag, MPI_Fint* ierr )
{ {
*flag = (ompi_fortran_logical_t) 1; *flag = (MPI_Flogical) 1;
*attribute_val_out = *attribute_val_in; *attribute_val_out = *attribute_val_in;
*ierr = OMPI_INT_2_FINT(MPI_SUCCESS); *ierr = OMPI_INT_2_FINT(MPI_SUCCESS);
} }
@ -222,9 +222,9 @@ void mpi_comm_null_copy_fn_f( MPI_Fint* comm, MPI_Fint* comm_keyval,
MPI_Aint* extra_state, MPI_Aint* extra_state,
MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_in,
MPI_Aint* attribute_val_out, MPI_Aint* attribute_val_out,
ompi_fortran_logical_t* flag, MPI_Fint* ierr ) MPI_Flogical* flag, MPI_Fint* ierr )
{ {
*flag = (ompi_fortran_logical_t) 0; *flag = (MPI_Flogical) 0;
*ierr = OMPI_INT_2_FINT(MPI_SUCCESS); *ierr = OMPI_INT_2_FINT(MPI_SUCCESS);
} }
@ -232,9 +232,9 @@ void mpi_comm_dup_fn_f( MPI_Fint* comm, MPI_Fint* comm_keyval,
MPI_Aint* extra_state, MPI_Aint* extra_state,
MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_in,
MPI_Aint* attribute_val_out, MPI_Aint* attribute_val_out,
ompi_fortran_logical_t* flag, MPI_Fint* ierr ) MPI_Flogical* flag, MPI_Fint* ierr )
{ {
*flag = (ompi_fortran_logical_t) 1; *flag = (MPI_Flogical) 1;
*attribute_val_out = *attribute_val_in; *attribute_val_out = *attribute_val_in;
*ierr = OMPI_INT_2_FINT(MPI_SUCCESS); *ierr = OMPI_INT_2_FINT(MPI_SUCCESS);
} }
@ -250,9 +250,9 @@ void mpi_null_copy_fn_f( MPI_Fint* comm, MPI_Fint* comm_keyval,
MPI_Fint* extra_state, MPI_Fint* extra_state,
MPI_Fint* attribute_val_in, MPI_Fint* attribute_val_in,
MPI_Fint* attribute_val_out, MPI_Fint* attribute_val_out,
ompi_fortran_logical_t* flag, MPI_Fint* ierr ) MPI_Flogical* flag, MPI_Fint* ierr )
{ {
*flag = (ompi_fortran_logical_t) 0; *flag = (MPI_Flogical) 0;
*ierr = OMPI_INT_2_FINT(MPI_SUCCESS); *ierr = OMPI_INT_2_FINT(MPI_SUCCESS);
} }
@ -261,9 +261,9 @@ void mpi_dup_fn_f( MPI_Fint* comm, MPI_Fint* comm_keyval,
MPI_Fint* extra_state, MPI_Fint* extra_state,
MPI_Fint* attribute_val_in, MPI_Fint* attribute_val_in,
MPI_Fint* attribute_val_out, MPI_Fint* attribute_val_out,
ompi_fortran_logical_t* flag, MPI_Fint* ierr ) MPI_Flogical* flag, MPI_Fint* ierr )
{ {
*flag = (ompi_fortran_logical_t) 1; *flag = (MPI_Flogical) 1;
*attribute_val_out = *attribute_val_in; *attribute_val_out = *attribute_val_in;
*ierr = OMPI_INT_2_FINT(MPI_SUCCESS); *ierr = OMPI_INT_2_FINT(MPI_SUCCESS);
} }
@ -279,9 +279,9 @@ void mpi_win_null_copy_fn_f( MPI_Fint* window, MPI_Fint* win_keyval,
MPI_Aint* extra_state, MPI_Aint* extra_state,
MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_in,
MPI_Aint* attribute_val_out, MPI_Aint* attribute_val_out,
ompi_fortran_logical_t* flag, MPI_Fint* ierr ) MPI_Flogical* flag, MPI_Fint* ierr )
{ {
*flag = (ompi_fortran_logical_t) 0; *flag = (MPI_Flogical) 0;
*ierr = OMPI_INT_2_FINT(MPI_SUCCESS); *ierr = OMPI_INT_2_FINT(MPI_SUCCESS);
} }
@ -289,9 +289,9 @@ void mpi_win_dup_fn_f( MPI_Fint* window, MPI_Fint* win_keyval,
MPI_Aint* extra_state, MPI_Aint* extra_state,
MPI_Aint* attribute_val_in, MPI_Aint* attribute_val_in,
MPI_Aint* attribute_val_out, MPI_Aint* attribute_val_out,
ompi_fortran_logical_t* flag, MPI_Fint* ierr ) MPI_Flogical* flag, MPI_Fint* ierr )
{ {
*flag = (ompi_fortran_logical_t) 1; *flag = (MPI_Flogical) 1;
*attribute_val_out = *attribute_val_in; *attribute_val_out = *attribute_val_in;
*ierr = OMPI_INT_2_FINT(MPI_SUCCESS); *ierr = OMPI_INT_2_FINT(MPI_SUCCESS);
} }

6
ompi/mpi/f77/file_read_all_end_f.c
Просмотреть файл

@ -62,7 +62,7 @@ void mpi_file_read_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status,
MPI_Fint *ierr) MPI_Fint *ierr)
{ {
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
@ -77,7 +77,7 @@ void mpi_file_read_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -86,7 +86,7 @@ void mpi_file_read_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status,
*ierr = OMPI_INT_2_FINT(MPI_File_read_all_end(c_fh, buf, c_status)); *ierr = OMPI_INT_2_FINT(MPI_File_read_all_end(c_fh, buf, c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_read_all_f.c
Просмотреть файл

@ -64,7 +64,7 @@ void mpi_file_read_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Datatype c_type = MPI_Type_f2c(*datatype); MPI_Datatype c_type = MPI_Type_f2c(*datatype);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -76,7 +76,7 @@ void mpi_file_read_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -87,7 +87,7 @@ void mpi_file_read_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
OMPI_FINT_2_INT(*count), OMPI_FINT_2_INT(*count),
c_type, c_status)); c_type, c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_read_at_all_end_f.c
Просмотреть файл

@ -63,7 +63,7 @@ void mpi_file_read_at_all_end_f(MPI_Fint *fh, char *buf,
{ {
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -77,7 +77,7 @@ void mpi_file_read_at_all_end_f(MPI_Fint *fh, char *buf,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -86,7 +86,7 @@ void mpi_file_read_at_all_end_f(MPI_Fint *fh, char *buf,
*ierr = OMPI_FINT_2_INT(MPI_File_read_at_all_end(c_fh, buf, c_status)); *ierr = OMPI_FINT_2_INT(MPI_File_read_at_all_end(c_fh, buf, c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_read_at_all_f.c
Просмотреть файл

@ -67,7 +67,7 @@ void mpi_file_read_at_all_f(MPI_Fint *fh, MPI_Offset *offset,
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Datatype c_type = MPI_Type_f2c(*datatype); MPI_Datatype c_type = MPI_Type_f2c(*datatype);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -79,7 +79,7 @@ void mpi_file_read_at_all_f(MPI_Fint *fh, MPI_Offset *offset,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -93,7 +93,7 @@ void mpi_file_read_at_all_f(MPI_Fint *fh, MPI_Offset *offset,
c_type, c_type,
c_status)); c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_read_at_f.c
Просмотреть файл

@ -66,7 +66,7 @@ void mpi_file_read_at_f(MPI_Fint *fh, MPI_Offset *offset, char *buf,
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Datatype c_type = MPI_Type_f2c(*datatype); MPI_Datatype c_type = MPI_Type_f2c(*datatype);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -80,7 +80,7 @@ void mpi_file_read_at_f(MPI_Fint *fh, MPI_Offset *offset, char *buf,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -93,7 +93,7 @@ void mpi_file_read_at_f(MPI_Fint *fh, MPI_Offset *offset, char *buf,
OMPI_FINT_2_INT(*count), OMPI_FINT_2_INT(*count),
c_type, c_status)); c_type, c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_read_f.c
Просмотреть файл

@ -65,7 +65,7 @@ void mpi_file_read_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Datatype c_type = MPI_Type_f2c(*datatype); MPI_Datatype c_type = MPI_Type_f2c(*datatype);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -77,7 +77,7 @@ void mpi_file_read_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -88,7 +88,7 @@ void mpi_file_read_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
OMPI_FINT_2_INT(*count), OMPI_FINT_2_INT(*count),
c_type, c_status)); c_type, c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_read_ordered_end_f.c
Просмотреть файл

@ -64,7 +64,7 @@ void mpi_file_read_ordered_end_f(MPI_Fint *fh, char *buf,
{ {
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -78,7 +78,7 @@ void mpi_file_read_ordered_end_f(MPI_Fint *fh, char *buf,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -87,7 +87,7 @@ void mpi_file_read_ordered_end_f(MPI_Fint *fh, char *buf,
*ierr = OMPI_INT_2_FINT(MPI_File_read_ordered_end(c_fh, buf, c_status)); *ierr = OMPI_INT_2_FINT(MPI_File_read_ordered_end(c_fh, buf, c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_read_ordered_f.c
Просмотреть файл

@ -65,7 +65,7 @@ void mpi_file_read_ordered_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Datatype c_type = MPI_Type_f2c(*datatype); MPI_Datatype c_type = MPI_Type_f2c(*datatype);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -77,7 +77,7 @@ void mpi_file_read_ordered_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -90,7 +90,7 @@ void mpi_file_read_ordered_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
c_type, c_type,
c_status)); c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_read_shared_f.c
Просмотреть файл

@ -65,7 +65,7 @@ void mpi_file_read_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Datatype c_type = MPI_Type_f2c(*datatype); MPI_Datatype c_type = MPI_Type_f2c(*datatype);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -77,7 +77,7 @@ void mpi_file_read_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -90,7 +90,7 @@ void mpi_file_read_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
c_type, c_type,
c_status)); c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_write_all_end_f.c
Просмотреть файл

@ -62,7 +62,7 @@ void mpi_file_write_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status,
MPI_Fint *ierr) MPI_Fint *ierr)
{ {
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
@ -77,7 +77,7 @@ void mpi_file_write_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -86,7 +86,7 @@ void mpi_file_write_all_end_f(MPI_Fint *fh, char *buf, MPI_Fint *status,
*ierr = OMPI_INT_2_FINT(MPI_File_write_all_end(c_fh, buf, c_status)); *ierr = OMPI_INT_2_FINT(MPI_File_write_all_end(c_fh, buf, c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_write_all_f.c
Просмотреть файл

@ -64,7 +64,7 @@ void mpi_file_write_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Datatype c_type = MPI_Type_f2c(*datatype); MPI_Datatype c_type = MPI_Type_f2c(*datatype);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -76,7 +76,7 @@ void mpi_file_write_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -87,7 +87,7 @@ void mpi_file_write_all_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
OMPI_FINT_2_INT(*count), OMPI_FINT_2_INT(*count),
c_type, c_status)); c_type, c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_write_at_all_end_f.c
Просмотреть файл

@ -63,7 +63,7 @@ void mpi_file_write_at_all_end_f(MPI_Fint *fh, char *buf,
{ {
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -77,7 +77,7 @@ void mpi_file_write_at_all_end_f(MPI_Fint *fh, char *buf,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -86,7 +86,7 @@ void mpi_file_write_at_all_end_f(MPI_Fint *fh, char *buf,
*ierr = OMPI_FINT_2_INT(MPI_File_write_at_all_end(c_fh, buf, c_status)); *ierr = OMPI_FINT_2_INT(MPI_File_write_at_all_end(c_fh, buf, c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_write_at_all_f.c
Просмотреть файл

@ -66,7 +66,7 @@ void mpi_file_write_at_all_f(MPI_Fint *fh, MPI_Offset *offset,
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Datatype c_type = MPI_Type_f2c(*datatype); MPI_Datatype c_type = MPI_Type_f2c(*datatype);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -78,7 +78,7 @@ void mpi_file_write_at_all_f(MPI_Fint *fh, MPI_Offset *offset,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -92,7 +92,7 @@ void mpi_file_write_at_all_f(MPI_Fint *fh, MPI_Offset *offset,
c_type, c_type,
c_status)); c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_write_at_f.c
Просмотреть файл

@ -64,7 +64,7 @@ void mpi_file_write_at_f(MPI_Fint *fh, MPI_Offset *offset,
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Datatype c_type = MPI_Type_f2c(*datatype); MPI_Datatype c_type = MPI_Type_f2c(*datatype);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -76,7 +76,7 @@ void mpi_file_write_at_f(MPI_Fint *fh, MPI_Offset *offset,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -89,7 +89,7 @@ void mpi_file_write_at_f(MPI_Fint *fh, MPI_Offset *offset,
OMPI_FINT_2_INT(*count), OMPI_FINT_2_INT(*count),
c_type, c_status)); c_type, c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_write_f.c
Просмотреть файл

@ -64,7 +64,7 @@ void mpi_file_write_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Datatype c_type = MPI_Type_f2c(*datatype); MPI_Datatype c_type = MPI_Type_f2c(*datatype);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -76,7 +76,7 @@ void mpi_file_write_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -87,7 +87,7 @@ void mpi_file_write_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
OMPI_FINT_2_INT(*count), OMPI_FINT_2_INT(*count),
c_type, c_status)); c_type, c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_write_ordered_end_f.c
Просмотреть файл

@ -63,7 +63,7 @@ void mpi_file_write_ordered_end_f(MPI_Fint *fh, char *buf,
{ {
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -77,7 +77,7 @@ void mpi_file_write_ordered_end_f(MPI_Fint *fh, char *buf,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -86,7 +86,7 @@ void mpi_file_write_ordered_end_f(MPI_Fint *fh, char *buf,
*ierr = OMPI_INT_2_FINT(MPI_File_write_ordered_end(c_fh, buf, c_status)); *ierr = OMPI_INT_2_FINT(MPI_File_write_ordered_end(c_fh, buf, c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_write_ordered_f.c
Просмотреть файл

@ -65,7 +65,7 @@ void mpi_file_write_ordered_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Datatype c_type = MPI_Type_f2c(*datatype); MPI_Datatype c_type = MPI_Type_f2c(*datatype);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -77,7 +77,7 @@ void mpi_file_write_ordered_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -90,7 +90,7 @@ void mpi_file_write_ordered_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
c_type, c_type,
c_status)); c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/file_write_shared_f.c
Просмотреть файл

@ -65,7 +65,7 @@ void mpi_file_write_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
MPI_File c_fh = MPI_File_f2c(*fh); MPI_File c_fh = MPI_File_f2c(*fh);
MPI_Datatype c_type = MPI_Type_f2c(*datatype); MPI_Datatype c_type = MPI_Type_f2c(*datatype);
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -77,7 +77,7 @@ void mpi_file_write_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -90,7 +90,7 @@ void mpi_file_write_shared_f(MPI_Fint *fh, char *buf, MPI_Fint *count,
c_type, c_type,
c_status)); c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

16
ompi/mpi/f77/fint_2_int.h
Просмотреть файл

@ -27,7 +27,7 @@
* Define MACROS to take account of different size of MPI_Fint from int * Define MACROS to take account of different size of MPI_Fint from int
*/ */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
#define OMPI_ARRAY_NAME_DECL(a) #define OMPI_ARRAY_NAME_DECL(a)
#define OMPI_2_DIM_ARRAY_NAME_DECL(a, dim2) #define OMPI_2_DIM_ARRAY_NAME_DECL(a, dim2)
#define OMPI_SINGLE_NAME_DECL(a) #define OMPI_SINGLE_NAME_DECL(a)
@ -43,7 +43,7 @@
#define OMPI_SINGLE_INT_2_FINT(in) #define OMPI_SINGLE_INT_2_FINT(in)
#define OMPI_ARRAY_INT_2_FINT(in, n) #define OMPI_ARRAY_INT_2_FINT(in, n)
#elif OMPI_SIZEOF_FORTRAN_INTEGER > SIZEOF_INT #elif OPAL_SIZEOF_FORTRAN_INTEGER > SIZEOF_INT
#define OMPI_ARRAY_NAME_DECL(a) int *c_##a #define OMPI_ARRAY_NAME_DECL(a) int *c_##a
#define OMPI_2_DIM_ARRAY_NAME_DECL(a, dim2) int (*c_##a)[dim2], dim2_index #define OMPI_2_DIM_ARRAY_NAME_DECL(a, dim2) int (*c_##a)[dim2], dim2_index
#define OMPI_SINGLE_NAME_DECL(a) int c_##a #define OMPI_SINGLE_NAME_DECL(a) int c_##a
@ -156,7 +156,7 @@
* Define MACROS to take account of different size of logical from int * Define MACROS to take account of different size of logical from int
*/ */
#if OMPI_SIZEOF_FORTRAN_LOGICAL == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_LOGICAL == SIZEOF_INT
# define OMPI_LOGICAL_NAME_DECL(in) /* Not needed for int==logical */ # define OMPI_LOGICAL_NAME_DECL(in) /* Not needed for int==logical */
# define OMPI_LOGICAL_NAME_CONVERT(in) in /* Not needed for int==logical */ # define OMPI_LOGICAL_NAME_CONVERT(in) in /* Not needed for int==logical */
# define OMPI_LOGICAL_SINGLE_NAME_CONVERT(in) in /* Not needed for int==logical */ # define OMPI_LOGICAL_SINGLE_NAME_CONVERT(in) in /* Not needed for int==logical */
@ -165,7 +165,7 @@
# define OMPI_ARRAY_LOGICAL_2_INT_ALLOC(in,n) /* Not needed for int==logical */ # define OMPI_ARRAY_LOGICAL_2_INT_ALLOC(in,n) /* Not needed for int==logical */
# define OMPI_ARRAY_LOGICAL_2_INT_CLEANUP(in) /* Not needed for int==logical */ # define OMPI_ARRAY_LOGICAL_2_INT_CLEANUP(in) /* Not needed for int==logical */
# if OMPI_FORTRAN_VALUE_TRUE == 1 # if OPAL_FORTRAN_VALUE_TRUE == 1
# define OMPI_FORTRAN_MUST_CONVERT_LOGICAL_2_INT 0 # define OMPI_FORTRAN_MUST_CONVERT_LOGICAL_2_INT 0
# define OMPI_LOGICAL_2_INT(a) a # define OMPI_LOGICAL_2_INT(a) a
# define OMPI_INT_2_LOGICAL(a) a # define OMPI_INT_2_LOGICAL(a) a
@ -175,7 +175,7 @@
# else # else
# define OMPI_FORTRAN_MUST_CONVERT_LOGICAL_2_INT 1 # define OMPI_FORTRAN_MUST_CONVERT_LOGICAL_2_INT 1
# define OMPI_LOGICAL_2_INT(a) ((a)==0? 0 : 1) # define OMPI_LOGICAL_2_INT(a) ((a)==0? 0 : 1)
# define OMPI_INT_2_LOGICAL(a) ((a)==0? 0 : OMPI_FORTRAN_VALUE_TRUE) # define OMPI_INT_2_LOGICAL(a) ((a)==0? 0 : OPAL_FORTRAN_VALUE_TRUE)
# define OMPI_SINGLE_INT_2_LOGICAL(a) *a=OMPI_INT_2_LOGICAL(OMPI_LOGICAL_NAME_CONVERT(*a)) # define OMPI_SINGLE_INT_2_LOGICAL(a) *a=OMPI_INT_2_LOGICAL(OMPI_LOGICAL_NAME_CONVERT(*a))
# define OMPI_ARRAY_LOGICAL_2_INT(in, n) do { \ # define OMPI_ARRAY_LOGICAL_2_INT(in, n) do { \
int converted_n = (int)(n); \ int converted_n = (int)(n); \
@ -208,13 +208,13 @@
# define OMPI_ARRAY_LOGICAL_2_INT_CLEANUP(in) \ # define OMPI_ARRAY_LOGICAL_2_INT_CLEANUP(in) \
free(OMPI_LOGICAL_ARRAY_NAME_CONVERT(in)) free(OMPI_LOGICAL_ARRAY_NAME_CONVERT(in))
# if OMPI_FORTRAN_VALUE_TRUE == 1 # if OPAL_FORTRAN_VALUE_TRUE == 1
# define OMPI_LOGICAL_2_INT(a) (int)a # define OMPI_LOGICAL_2_INT(a) (int)a
# define OMPI_INT_2_LOGICAL(a) (MPI_Flogical)a # define OMPI_INT_2_LOGICAL(a) (MPI_Flogical)a
# define OMPI_SINGLE_INT_2_LOGICAL(a) *a=(OMPI_INT_2_LOGICAL(OMPI_LOGICAL_NAME_CONVERT(a))) # define OMPI_SINGLE_INT_2_LOGICAL(a) *a=(OMPI_INT_2_LOGICAL(OMPI_LOGICAL_NAME_CONVERT(a)))
# else # else
# define OMPI_LOGICAL_2_INT(a) ((a)==0? 0 : 1) # define OMPI_LOGICAL_2_INT(a) ((a)==0? 0 : 1)
# define OMPI_INT_2_LOGICAL(a) ((a)==0? 0 : OMPI_FORTRAN_VALUE_TRUE) # define OMPI_INT_2_LOGICAL(a) ((a)==0? 0 : OPAL_FORTRAN_VALUE_TRUE)
# define OMPI_SINGLE_INT_2_LOGICAL(a) *a=(OMPI_INT_2_LOGICAL(OMPI_LOGICAL_NAME_CONVERT(a))) # define OMPI_SINGLE_INT_2_LOGICAL(a) *a=(OMPI_INT_2_LOGICAL(OMPI_LOGICAL_NAME_CONVERT(a)))
# endif # endif
# define OMPI_ARRAY_LOGICAL_2_INT(in, n) do { \ # define OMPI_ARRAY_LOGICAL_2_INT(in, n) do { \
@ -231,7 +231,7 @@
} \ } \
} while (0) \ } while (0) \
/* free(OMPI_LOGICAL_ARRAY_NAME_CONVERT(in)) * No Need to free, here */ /* free(OMPI_LOGICAL_ARRAY_NAME_CONVERT(in)) * No Need to free, here */
#endif /* OMPI_SIZEOF_FORTRAN_LOGICAL */ #endif /* OPAL_SIZEOF_FORTRAN_LOGICAL */
#endif /* OMPI_FINT_2_INT_H */ #endif /* OMPI_FINT_2_INT_H */

6
ompi/mpi/f77/iprobe_f.c
Просмотреть файл

@ -64,7 +64,7 @@ void mpi_iprobe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm,
{ {
MPI_Status *c_status; MPI_Status *c_status;
MPI_Comm c_comm; MPI_Comm c_comm;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
OMPI_LOGICAL_NAME_DECL(flag); OMPI_LOGICAL_NAME_DECL(flag);
@ -80,7 +80,7 @@ void mpi_iprobe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -93,7 +93,7 @@ void mpi_iprobe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm,
c_status)); c_status));
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) { if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr)) {
OMPI_SINGLE_INT_2_LOGICAL(flag); OMPI_SINGLE_INT_2_LOGICAL(flag);
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_STATUS_IGNORE != c_status) { if (MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);
} }

6
ompi/mpi/f77/probe_f.c
Просмотреть файл

@ -63,7 +63,7 @@ void mpi_probe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *stat
{ {
MPI_Status *c_status; MPI_Status *c_status;
MPI_Comm c_comm; MPI_Comm c_comm;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
@ -78,7 +78,7 @@ void mpi_probe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *stat
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -89,7 +89,7 @@ void mpi_probe_f(MPI_Fint *source, MPI_Fint *tag, MPI_Fint *comm, MPI_Fint *stat
OMPI_FINT_2_INT(*tag), OMPI_FINT_2_INT(*tag),
c_comm, c_status)); c_comm, c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

6
ompi/mpi/f77/recv_f.c
Просмотреть файл

@ -64,7 +64,7 @@ void mpi_recv_f(char *buf, MPI_Fint *count, MPI_Fint *datatype,
MPI_Fint *status, MPI_Fint *ierr) MPI_Fint *status, MPI_Fint *ierr)
{ {
MPI_Status *c_status; MPI_Status *c_status;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
MPI_Status c_status2; MPI_Status c_status2;
#endif #endif
MPI_Comm c_comm = MPI_Comm_f2c(*comm); MPI_Comm c_comm = MPI_Comm_f2c(*comm);
@ -78,7 +78,7 @@ void mpi_recv_f(char *buf, MPI_Fint *count, MPI_Fint *datatype,
translation necessary -- let the underlying functions write translation necessary -- let the underlying functions write
directly into the Fortran status */ directly into the Fortran status */
#if OMPI_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER == SIZEOF_INT
c_status = (MPI_Status *) status; c_status = (MPI_Status *) status;
#else #else
c_status = &c_status2; c_status = &c_status2;
@ -90,7 +90,7 @@ void mpi_recv_f(char *buf, MPI_Fint *count, MPI_Fint *datatype,
c_type, OMPI_FINT_2_INT(*source), c_type, OMPI_FINT_2_INT(*source),
OMPI_FINT_2_INT(*tag), c_comm, OMPI_FINT_2_INT(*tag), c_comm,
c_status)); c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) && if (MPI_SUCCESS == OMPI_FINT_2_INT(*ierr) &&
MPI_STATUS_IGNORE != c_status) { MPI_STATUS_IGNORE != c_status) {
MPI_Status_c2f(c_status, status); MPI_Status_c2f(c_status, status);

4
ompi/mpi/f77/testsome_f.c
Просмотреть файл

@ -71,7 +71,7 @@ void mpi_testsome_f(MPI_Fint *incount, MPI_Fint *array_of_requests,
MPI_Request *c_req; MPI_Request *c_req;
MPI_Status *c_status; MPI_Status *c_status;
int i; int i;
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
int int_c; int int_c;
#endif #endif
OMPI_SINGLE_NAME_DECL(outcount); OMPI_SINGLE_NAME_DECL(outcount);
@ -97,7 +97,7 @@ void mpi_testsome_f(MPI_Fint *incount, MPI_Fint *array_of_requests,
OMPI_ARRAY_NAME_CONVERT(array_of_indices), OMPI_ARRAY_NAME_CONVERT(array_of_indices),
c_status)); c_status));
#if OMPI_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT #if OPAL_SIZEOF_FORTRAN_INTEGER != SIZEOF_INT
OMPI_SINGLE_INT_2_FINT(outcount); OMPI_SINGLE_INT_2_FINT(outcount);
int_c = OMPI_FINT_2_INT(*incount); int_c = OMPI_FINT_2_INT(*incount);
OMPI_ARRAY_INT_2_FINT(array_of_indices, int_c); OMPI_ARRAY_INT_2_FINT(array_of_indices, int_c);

52
ompi/mpi/f90/fortran_sizes.h.in
Просмотреть файл

@ -19,36 +19,36 @@
! This file is used by scripts/mpi_sizeof.f90.sh (and therefore mpi_sizeof.f90) ! This file is used by scripts/mpi_sizeof.f90.sh (and therefore mpi_sizeof.f90)
integer :: OMPI_SIZEOF_F90_LOGICAL integer :: OPAL_SIZEOF_F90_LOGICAL
integer :: OMPI_SIZEOF_F90_INT1 integer :: OPAL_SIZEOF_F90_INT1
integer :: OMPI_SIZEOF_F90_INT2 integer :: OPAL_SIZEOF_F90_INT2
integer :: OMPI_SIZEOF_F90_INT4 integer :: OPAL_SIZEOF_F90_INT4
integer :: OMPI_SIZEOF_F90_INT8 integer :: OPAL_SIZEOF_F90_INT8
integer :: OMPI_SIZEOF_F90_INT16 integer :: OPAL_SIZEOF_F90_INT16
integer :: OMPI_SIZEOF_F90_REAL2 integer :: OPAL_SIZEOF_F90_REAL2
integer :: OMPI_SIZEOF_F90_REAL4 integer :: OPAL_SIZEOF_F90_REAL4
integer :: OMPI_SIZEOF_F90_REAL8 integer :: OPAL_SIZEOF_F90_REAL8
integer :: OMPI_SIZEOF_F90_REAL16 integer :: OPAL_SIZEOF_F90_REAL16
integer :: OMPI_SIZEOF_F90_COMPLEX8 integer :: OPAL_SIZEOF_F90_COMPLEX8
integer :: OMPI_SIZEOF_F90_COMPLEX16 integer :: OPAL_SIZEOF_F90_COMPLEX16
integer :: OMPI_SIZEOF_F90_COMPLEX32 integer :: OPAL_SIZEOF_F90_COMPLEX32
parameter(OMPI_SIZEOF_F90_LOGICAL = @OMPI_SIZEOF_F90_LOGICAL@) parameter(OPAL_SIZEOF_F90_LOGICAL = @OPAL_SIZEOF_F90_LOGICAL@)
parameter(OMPI_SIZEOF_F90_INT1 = @OMPI_SIZEOF_F90_INTEGER1@) parameter(OPAL_SIZEOF_F90_INT1 = @OPAL_SIZEOF_F90_INTEGER1@)
parameter(OMPI_SIZEOF_F90_INT2 = @OMPI_SIZEOF_F90_INTEGER2@) parameter(OPAL_SIZEOF_F90_INT2 = @OPAL_SIZEOF_F90_INTEGER2@)
parameter(OMPI_SIZEOF_F90_INT4 = @OMPI_SIZEOF_F90_INTEGER4@) parameter(OPAL_SIZEOF_F90_INT4 = @OPAL_SIZEOF_F90_INTEGER4@)
parameter(OMPI_SIZEOF_F90_INT8 = @OMPI_SIZEOF_F90_INTEGER8@) parameter(OPAL_SIZEOF_F90_INT8 = @OPAL_SIZEOF_F90_INTEGER8@)
parameter(OMPI_SIZEOF_F90_INT16 = @OMPI_SIZEOF_F90_INTEGER16@) parameter(OPAL_SIZEOF_F90_INT16 = @OPAL_SIZEOF_F90_INTEGER16@)
parameter(OMPI_SIZEOF_F90_REAL2 = @OMPI_SIZEOF_F90_REAL2@) parameter(OPAL_SIZEOF_F90_REAL2 = @OPAL_SIZEOF_F90_REAL2@)
parameter(OMPI_SIZEOF_F90_REAL4 = @OMPI_SIZEOF_F90_REAL4@) parameter(OPAL_SIZEOF_F90_REAL4 = @OPAL_SIZEOF_F90_REAL4@)
parameter(OMPI_SIZEOF_F90_REAL8 = @OMPI_SIZEOF_F90_REAL8@) parameter(OPAL_SIZEOF_F90_REAL8 = @OPAL_SIZEOF_F90_REAL8@)
parameter(OMPI_SIZEOF_F90_REAL16 = @OMPI_SIZEOF_F90_REAL16@) parameter(OPAL_SIZEOF_F90_REAL16 = @OPAL_SIZEOF_F90_REAL16@)
parameter(OMPI_SIZEOF_F90_COMPLEX8 = @OMPI_SIZEOF_F90_COMPLEX8@) parameter(OPAL_SIZEOF_F90_COMPLEX8 = @OPAL_SIZEOF_F90_COMPLEX8@)
parameter(OMPI_SIZEOF_F90_COMPLEX16 = @OMPI_SIZEOF_F90_COMPLEX16@) parameter(OPAL_SIZEOF_F90_COMPLEX16 = @OPAL_SIZEOF_F90_COMPLEX16@)
parameter(OMPI_SIZEOF_F90_COMPLEX32 = @OMPI_SIZEOF_F90_COMPLEX32@) parameter(OPAL_SIZEOF_F90_COMPLEX32 = @OPAL_SIZEOF_F90_COMPLEX32@)

16
ompi/mpi/f90/scripts/mpi_sizeof.f90.sh
Просмотреть файл

@ -32,7 +32,7 @@ do
echo " logical*${kind}, intent(in) :: x" echo " logical*${kind}, intent(in) :: x"
echo " integer, intent(out) :: size" echo " integer, intent(out) :: size"
echo " integer, intent(out) :: ierr" echo " integer, intent(out) :: ierr"
echo " size = OMPI_SIZEOF_F90_LOGICAL${kind}" echo " size = OPAL_SIZEOF_F90_LOGICAL${kind}"
echo " ierr = 0" echo " ierr = 0"
echo "end subroutine ${proc}" echo "end subroutine ${proc}"
echo echo
@ -47,7 +47,7 @@ do
echo " integer*${kind}, intent(in) :: x" echo " integer*${kind}, intent(in) :: x"
echo " integer, intent(out) :: size" echo " integer, intent(out) :: size"
echo " integer, intent(out) :: ierr" echo " integer, intent(out) :: ierr"
echo " size = OMPI_SIZEOF_F90_INT${kind}" echo " size = OPAL_SIZEOF_F90_INT${kind}"
echo " ierr = 0" echo " ierr = 0"
echo "end subroutine ${proc}" echo "end subroutine ${proc}"
echo echo
@ -62,7 +62,7 @@ do
echo " real*${kind}, intent(in) :: x" echo " real*${kind}, intent(in) :: x"
echo " integer, intent(out) :: size" echo " integer, intent(out) :: size"
echo " integer, intent(out) :: ierr" echo " integer, intent(out) :: ierr"
echo " size = OMPI_SIZEOF_F90_REAL${kind}" echo " size = OPAL_SIZEOF_F90_REAL${kind}"
echo " ierr = 0" echo " ierr = 0"
echo "end subroutine ${proc}" echo "end subroutine ${proc}"
echo echo
@ -77,7 +77,7 @@ do
echo " complex*${kind}, intent(in) :: x" echo " complex*${kind}, intent(in) :: x"
echo " integer, intent(out) :: size" echo " integer, intent(out) :: size"
echo " integer, intent(out) :: ierr" echo " integer, intent(out) :: ierr"
echo " size = OMPI_SIZEOF_F90_COMPLEX${kind}" echo " size = OPAL_SIZEOF_F90_COMPLEX${kind}"
echo " ierr = 0" echo " ierr = 0"
echo "end subroutine ${proc}" echo "end subroutine ${proc}"
echo echo
@ -103,7 +103,7 @@ do
echo " logical*${kind}, dimension(${dim}), intent(in) :: x" echo " logical*${kind}, dimension(${dim}), intent(in) :: x"
echo " integer, intent(out) :: size" echo " integer, intent(out) :: size"
echo " integer, intent(out) :: ierr" echo " integer, intent(out) :: ierr"
echo " size = OMPI_SIZEOF_F90_LOGICAL${kind}" echo " size = OPAL_SIZEOF_F90_LOGICAL${kind}"
echo " ierr = 0" echo " ierr = 0"
echo "end subroutine ${proc}" echo "end subroutine ${proc}"
echo echo
@ -118,7 +118,7 @@ do
echo " integer*${kind}, dimension(${dim}), intent(in) :: x" echo " integer*${kind}, dimension(${dim}), intent(in) :: x"
echo " integer, intent(out) :: size" echo " integer, intent(out) :: size"
echo " integer, intent(out) :: ierr" echo " integer, intent(out) :: ierr"
echo " size = OMPI_SIZEOF_F90_INT${kind}" echo " size = OPAL_SIZEOF_F90_INT${kind}"
echo " ierr = 0" echo " ierr = 0"
echo "end subroutine ${proc}" echo "end subroutine ${proc}"
echo echo
@ -133,7 +133,7 @@ do
echo " real*${kind}, dimension(${dim}), intent(in) :: x" echo " real*${kind}, dimension(${dim}), intent(in) :: x"
echo " integer, intent(out) :: size" echo " integer, intent(out) :: size"
echo " integer, intent(out) :: ierr" echo " integer, intent(out) :: ierr"
echo " size = OMPI_SIZEOF_F90_REAL${kind}" echo " size = OPAL_SIZEOF_F90_REAL${kind}"
echo " ierr = 0" echo " ierr = 0"
echo "end subroutine ${proc}" echo "end subroutine ${proc}"
echo echo
@ -148,7 +148,7 @@ do
echo " complex*${kind}, dimension(${dim}), intent(in) :: x" echo " complex*${kind}, dimension(${dim}), intent(in) :: x"
echo " integer, intent(out) :: size" echo " integer, intent(out) :: size"
echo " integer, intent(out) :: ierr" echo " integer, intent(out) :: ierr"
echo " size = OMPI_SIZEOF_F90_COMPLEX${kind}" echo " size = OPAL_SIZEOF_F90_COMPLEX${kind}"
echo " ierr = 0" echo " ierr = 0"
echo "end subroutine ${proc}" echo "end subroutine ${proc}"
echo echo

2
ompi/request/request.c
Просмотреть файл

@ -103,7 +103,7 @@ int ompi_request_init(void)
OBJ_CONSTRUCT(&ompi_request_null, ompi_request_t); OBJ_CONSTRUCT(&ompi_request_null, ompi_request_t);
OBJ_CONSTRUCT(&ompi_request_f_to_c_table, opal_pointer_array_t); OBJ_CONSTRUCT(&ompi_request_f_to_c_table, opal_pointer_array_t);
if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_request_f_to_c_table, if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_request_f_to_c_table,
0, OMPI_FORTRAN_HANDLE_MAX, 64) ) { 0, OPAL_FORTRAN_HANDLE_MAX, 64) ) {
return OMPI_ERROR; return OMPI_ERROR;
} }
ompi_request_null.request.req_type = OMPI_REQUEST_NULL; ompi_request_null.request.req_type = OMPI_REQUEST_NULL;

96
ompi/tools/ompi_info/param.cc
Просмотреть файл

@ -584,10 +584,10 @@ void ompi_info::do_config(bool want_all)
out("C double size", "compiler:c:sizeof:double", sizeof(double)); out("C double size", "compiler:c:sizeof:double", sizeof(double));
out("C pointer size", "compiler:c:sizeof:pointer", sizeof(void *)); out("C pointer size", "compiler:c:sizeof:pointer", sizeof(void *));
out("C char align", "compiler:c:align:char", OPAL_ALIGNMENT_CHAR); out("C char align", "compiler:c:align:char", OPAL_ALIGNMENT_CHAR);
out("C bool align", "compiler:c:align:bool", OMPI_ALIGNMENT_CXX_BOOL); out("C bool align", "compiler:c:align:bool", OPAL_ALIGNMENT_CXX_BOOL);
out("C int align", "compiler:c:align:int", OPAL_ALIGNMENT_INT); out("C int align", "compiler:c:align:int", OPAL_ALIGNMENT_INT);
out("C float align", "compiler:c:align:float", OMPI_ALIGNMENT_FLOAT); out("C float align", "compiler:c:align:float", OPAL_ALIGNMENT_FLOAT);
out("C double align", "compiler:c:align:double", OMPI_ALIGNMENT_DOUBLE); out("C double align", "compiler:c:align:double", OPAL_ALIGNMENT_DOUBLE);
} }
out("C++ compiler", "compiler:cxx:command", OMPI_CXX); out("C++ compiler", "compiler:cxx:command", OMPI_CXX);
@ -605,115 +605,115 @@ void ompi_info::do_config(bool want_all)
// Will always have the size of Fortran integer // Will always have the size of Fortran integer
out("Fort integer size", "compiler:fortran:sizeof:integer", out("Fort integer size", "compiler:fortran:sizeof:integer",
OMPI_SIZEOF_FORTRAN_INTEGER); OPAL_SIZEOF_FORTRAN_INTEGER);
out("Fort logical size", "compiler:fortran:sizeof:logical", out("Fort logical size", "compiler:fortran:sizeof:logical",
OMPI_SIZEOF_FORTRAN_LOGICAL); OPAL_SIZEOF_FORTRAN_LOGICAL);
out("Fort logical value true", "compiler:fortran:value:true", out("Fort logical value true", "compiler:fortran:value:true",
OMPI_FORTRAN_VALUE_TRUE); OPAL_FORTRAN_VALUE_TRUE);
// May or may not have the other Fortran sizes // May or may not have the other Fortran sizes
if (OMPI_WANT_F77_BINDINGS || OMPI_WANT_F90_BINDINGS) { if (OMPI_WANT_F77_BINDINGS || OMPI_WANT_F90_BINDINGS) {
out("Fort have integer1", "compiler:fortran:have:integer1", out("Fort have integer1", "compiler:fortran:have:integer1",
OMPI_HAVE_FORTRAN_INTEGER1 ? "yes" : "no"); OPAL_HAVE_FORTRAN_INTEGER1 ? "yes" : "no");
out("Fort have integer2", "compiler:fortran:have:integer2", out("Fort have integer2", "compiler:fortran:have:integer2",
OMPI_HAVE_FORTRAN_INTEGER2 ? "yes" : "no"); OPAL_HAVE_FORTRAN_INTEGER2 ? "yes" : "no");
out("Fort have integer4", "compiler:fortran:have:integer4", out("Fort have integer4", "compiler:fortran:have:integer4",
OMPI_HAVE_FORTRAN_INTEGER4 ? "yes" : "no"); OPAL_HAVE_FORTRAN_INTEGER4 ? "yes" : "no");
out("Fort have integer8", "compiler:fortran:have:integer8", out("Fort have integer8", "compiler:fortran:have:integer8",
OMPI_HAVE_FORTRAN_INTEGER8 ? "yes" : "no"); OPAL_HAVE_FORTRAN_INTEGER8 ? "yes" : "no");
out("Fort have integer16", "compiler:fortran:have:integer16", out("Fort have integer16", "compiler:fortran:have:integer16",
OMPI_HAVE_FORTRAN_INTEGER16 ? "yes" : "no"); OPAL_HAVE_FORTRAN_INTEGER16 ? "yes" : "no");
out("Fort have real4", "compiler:fortran:have:real4", out("Fort have real4", "compiler:fortran:have:real4",
OMPI_HAVE_FORTRAN_REAL4 ? "yes" : "no"); OPAL_HAVE_FORTRAN_REAL4 ? "yes" : "no");
out("Fort have real8", "compiler:fortran:have:real8", out("Fort have real8", "compiler:fortran:have:real8",
OMPI_HAVE_FORTRAN_REAL8 ? "yes" : "no"); OPAL_HAVE_FORTRAN_REAL8 ? "yes" : "no");
out("Fort have real16", "compiler:fortran:have:real16", out("Fort have real16", "compiler:fortran:have:real16",
OMPI_HAVE_FORTRAN_REAL16 && OMPI_REAL16_MATCHES_C ? "yes" : "no"); OPAL_HAVE_FORTRAN_REAL16 && OPAL_REAL16_MATCHES_C ? "yes" : "no");
out("Fort have complex8", "compiler:fortran:have:complex8", out("Fort have complex8", "compiler:fortran:have:complex8",
OMPI_HAVE_FORTRAN_COMPLEX8 ? "yes" : "no"); OPAL_HAVE_FORTRAN_COMPLEX8 ? "yes" : "no");
out("Fort have complex16", "compiler:fortran:have:complex16", out("Fort have complex16", "compiler:fortran:have:complex16",
OMPI_HAVE_FORTRAN_COMPLEX16 ? "yes" : "no"); OPAL_HAVE_FORTRAN_COMPLEX16 ? "yes" : "no");
out("Fort have complex32", "compiler:fortran:have:complex32", out("Fort have complex32", "compiler:fortran:have:complex32",
OMPI_HAVE_FORTRAN_COMPLEX32 && OMPI_REAL16_MATCHES_C ? "yes" : "no"); OPAL_HAVE_FORTRAN_COMPLEX32 && OPAL_REAL16_MATCHES_C ? "yes" : "no");
out("Fort integer1 size", "compiler:fortran:sizeof:integer1", out("Fort integer1 size", "compiler:fortran:sizeof:integer1",
OMPI_HAVE_FORTRAN_INTEGER1 ? OMPI_SIZEOF_FORTRAN_INTEGER1 : -1); OPAL_HAVE_FORTRAN_INTEGER1 ? OPAL_SIZEOF_FORTRAN_INTEGER1 : -1);
out("Fort integer2 size", "compiler:fortran:sizeof:integer2", out("Fort integer2 size", "compiler:fortran:sizeof:integer2",
OMPI_HAVE_FORTRAN_INTEGER2 ? OMPI_SIZEOF_FORTRAN_INTEGER2 : -1); OPAL_HAVE_FORTRAN_INTEGER2 ? OPAL_SIZEOF_FORTRAN_INTEGER2 : -1);
out("Fort integer4 size", "compiler:fortran:sizeof:integer4", out("Fort integer4 size", "compiler:fortran:sizeof:integer4",
OMPI_HAVE_FORTRAN_INTEGER4 ? OMPI_SIZEOF_FORTRAN_INTEGER4 : -1); OPAL_HAVE_FORTRAN_INTEGER4 ? OPAL_SIZEOF_FORTRAN_INTEGER4 : -1);
out("Fort integer8 size", "compiler:fortran:sizeof:integer8", out("Fort integer8 size", "compiler:fortran:sizeof:integer8",
OMPI_HAVE_FORTRAN_INTEGER8 ? OMPI_SIZEOF_FORTRAN_INTEGER8 : -1); OPAL_HAVE_FORTRAN_INTEGER8 ? OPAL_SIZEOF_FORTRAN_INTEGER8 : -1);
out("Fort integer16 size", "compiler:fortran:sizeof:integer17", out("Fort integer16 size", "compiler:fortran:sizeof:integer17",
OMPI_HAVE_FORTRAN_INTEGER16 ? OMPI_SIZEOF_FORTRAN_INTEGER16 : -1); OPAL_HAVE_FORTRAN_INTEGER16 ? OPAL_SIZEOF_FORTRAN_INTEGER16 : -1);
out("Fort real size", "compiler:fortran:sizeof:real", out("Fort real size", "compiler:fortran:sizeof:real",
OMPI_SIZEOF_FORTRAN_REAL); OPAL_SIZEOF_FORTRAN_REAL);
out("Fort real4 size", "compiler:fortran:sizeof:real4", out("Fort real4 size", "compiler:fortran:sizeof:real4",
OMPI_HAVE_FORTRAN_REAL4 ? OMPI_SIZEOF_FORTRAN_REAL4 : -1); OPAL_HAVE_FORTRAN_REAL4 ? OPAL_SIZEOF_FORTRAN_REAL4 : -1);
out("Fort real8 size", "compiler:fortran:sizeof:real8", out("Fort real8 size", "compiler:fortran:sizeof:real8",
OMPI_HAVE_FORTRAN_REAL8 ? OMPI_SIZEOF_FORTRAN_REAL8 : -1); OPAL_HAVE_FORTRAN_REAL8 ? OPAL_SIZEOF_FORTRAN_REAL8 : -1);
out("Fort real16 size", "compiler:fortran:sizeof:real17", out("Fort real16 size", "compiler:fortran:sizeof:real17",
OMPI_HAVE_FORTRAN_REAL16 ? OMPI_SIZEOF_FORTRAN_REAL16 : -1); OPAL_HAVE_FORTRAN_REAL16 ? OPAL_SIZEOF_FORTRAN_REAL16 : -1);
out("Fort dbl prec size", out("Fort dbl prec size",
"compiler:fortran:sizeof:double_precision", "compiler:fortran:sizeof:double_precision",
OMPI_SIZEOF_FORTRAN_REAL); OPAL_SIZEOF_FORTRAN_REAL);
out("Fort cplx size", "compiler:fortran:sizeof:complex", out("Fort cplx size", "compiler:fortran:sizeof:complex",
OMPI_SIZEOF_FORTRAN_REAL); OPAL_SIZEOF_FORTRAN_REAL);
out("Fort dbl cplx size", out("Fort dbl cplx size",
"compiler:fortran:sizeof:double_complex", "compiler:fortran:sizeof:double_complex",
OMPI_SIZEOF_FORTRAN_REAL); OPAL_SIZEOF_FORTRAN_REAL);
out("Fort cplx8 size", "compiler:fortran:sizeof:complex8", out("Fort cplx8 size", "compiler:fortran:sizeof:complex8",
OMPI_HAVE_FORTRAN_COMPLEX8 ? OMPI_SIZEOF_FORTRAN_COMPLEX8 : -1); OPAL_HAVE_FORTRAN_COMPLEX8 ? OPAL_SIZEOF_FORTRAN_COMPLEX8 : -1);
out("Fort cplx16 size", "compiler:fortran:sizeof:complex16", out("Fort cplx16 size", "compiler:fortran:sizeof:complex16",
OMPI_HAVE_FORTRAN_COMPLEX16 ? OMPI_SIZEOF_FORTRAN_COMPLEX16 : -1); OPAL_HAVE_FORTRAN_COMPLEX16 ? OPAL_SIZEOF_FORTRAN_COMPLEX16 : -1);
out("Fort cplx32 size", "compiler:fortran:sizeof:complex32", out("Fort cplx32 size", "compiler:fortran:sizeof:complex32",
OMPI_HAVE_FORTRAN_COMPLEX32 ? OMPI_SIZEOF_FORTRAN_COMPLEX32 : -1); OPAL_HAVE_FORTRAN_COMPLEX32 ? OPAL_SIZEOF_FORTRAN_COMPLEX32 : -1);
out("Fort integer align", "compiler:fortran:align:integer", out("Fort integer align", "compiler:fortran:align:integer",
OMPI_ALIGNMENT_FORTRAN_INTEGER); OPAL_ALIGNMENT_FORTRAN_INTEGER);
out("Fort integer1 align", "compiler:fortran:align:integer1", out("Fort integer1 align", "compiler:fortran:align:integer1",
OMPI_HAVE_FORTRAN_INTEGER1 ? OMPI_ALIGNMENT_FORTRAN_INTEGER1 : -1); OPAL_HAVE_FORTRAN_INTEGER1 ? OPAL_ALIGNMENT_FORTRAN_INTEGER1 : -1);
out("Fort integer2 align", "compiler:fortran:align:integer2", out("Fort integer2 align", "compiler:fortran:align:integer2",
OMPI_HAVE_FORTRAN_INTEGER2 ? OMPI_ALIGNMENT_FORTRAN_INTEGER2 : -1); OPAL_HAVE_FORTRAN_INTEGER2 ? OPAL_ALIGNMENT_FORTRAN_INTEGER2 : -1);
out("Fort integer4 align", "compiler:fortran:align:integer4", out("Fort integer4 align", "compiler:fortran:align:integer4",
OMPI_HAVE_FORTRAN_INTEGER4 ? OMPI_ALIGNMENT_FORTRAN_INTEGER4 : -1); OPAL_HAVE_FORTRAN_INTEGER4 ? OPAL_ALIGNMENT_FORTRAN_INTEGER4 : -1);
out("Fort integer8 align", "compiler:fortran:align:integer8", out("Fort integer8 align", "compiler:fortran:align:integer8",
OMPI_HAVE_FORTRAN_INTEGER8 ? OMPI_ALIGNMENT_FORTRAN_INTEGER8 : -1); OPAL_HAVE_FORTRAN_INTEGER8 ? OPAL_ALIGNMENT_FORTRAN_INTEGER8 : -1);
out("Fort integer16 align", "compiler:fortran:align:integer16", out("Fort integer16 align", "compiler:fortran:align:integer16",
OMPI_HAVE_FORTRAN_INTEGER16 ? OMPI_ALIGNMENT_FORTRAN_INTEGER16 : -1); OPAL_HAVE_FORTRAN_INTEGER16 ? OPAL_ALIGNMENT_FORTRAN_INTEGER16 : -1);
out("Fort real align", "compiler:fortran:align:real", out("Fort real align", "compiler:fortran:align:real",
OMPI_ALIGNMENT_FORTRAN_REAL); OPAL_ALIGNMENT_FORTRAN_REAL);
out("Fort real4 align", "compiler:fortran:align:real4", out("Fort real4 align", "compiler:fortran:align:real4",
OMPI_HAVE_FORTRAN_REAL4 ? OMPI_ALIGNMENT_FORTRAN_REAL4 : -1); OPAL_HAVE_FORTRAN_REAL4 ? OPAL_ALIGNMENT_FORTRAN_REAL4 : -1);
out("Fort real8 align", "compiler:fortran:align:real8", out("Fort real8 align", "compiler:fortran:align:real8",
OMPI_HAVE_FORTRAN_REAL8 ? OMPI_ALIGNMENT_FORTRAN_REAL8 : -1); OPAL_HAVE_FORTRAN_REAL8 ? OPAL_ALIGNMENT_FORTRAN_REAL8 : -1);
out("Fort real16 align", "compiler:fortran:align:real16", out("Fort real16 align", "compiler:fortran:align:real16",
OMPI_HAVE_FORTRAN_REAL16 ? OMPI_ALIGNMENT_FORTRAN_REAL16 : -1); OPAL_HAVE_FORTRAN_REAL16 ? OPAL_ALIGNMENT_FORTRAN_REAL16 : -1);
out("Fort dbl prec align", out("Fort dbl prec align",
"compiler:fortran:align:double_precision", "compiler:fortran:align:double_precision",
OMPI_ALIGNMENT_FORTRAN_REAL); OPAL_ALIGNMENT_FORTRAN_REAL);
out("Fort cplx align", "compiler:fortran:align:complex", out("Fort cplx align", "compiler:fortran:align:complex",
OMPI_ALIGNMENT_FORTRAN_REAL); OPAL_ALIGNMENT_FORTRAN_REAL);
out("Fort dbl cplx align", out("Fort dbl cplx align",
"compiler:fortran:align:double_complex", "compiler:fortran:align:double_complex",
OMPI_ALIGNMENT_FORTRAN_REAL); OPAL_ALIGNMENT_FORTRAN_REAL);
out("Fort cplx8 align", "compiler:fortran:align:complex8", out("Fort cplx8 align", "compiler:fortran:align:complex8",
OMPI_HAVE_FORTRAN_COMPLEX8 ? OMPI_ALIGNMENT_FORTRAN_COMPLEX8 : -1); OPAL_HAVE_FORTRAN_COMPLEX8 ? OPAL_ALIGNMENT_FORTRAN_COMPLEX8 : -1);
out("Fort cplx16 align", "compiler:fortran:align:complex16", out("Fort cplx16 align", "compiler:fortran:align:complex16",
OMPI_HAVE_FORTRAN_COMPLEX16 ? OMPI_ALIGNMENT_FORTRAN_COMPLEX16 : -1); OPAL_HAVE_FORTRAN_COMPLEX16 ? OPAL_ALIGNMENT_FORTRAN_COMPLEX16 : -1);
out("Fort cplx32 align", "compiler:fortran:align:complex32", out("Fort cplx32 align", "compiler:fortran:align:complex32",
OMPI_HAVE_FORTRAN_COMPLEX32 ? OMPI_ALIGNMENT_FORTRAN_COMPLEX32 : -1); OPAL_HAVE_FORTRAN_COMPLEX32 ? OPAL_ALIGNMENT_FORTRAN_COMPLEX32 : -1);
} else { } else {
out("Fort real size", "compiler:fortran:sizeof:real", "skipped"); out("Fort real size", "compiler:fortran:sizeof:real", "skipped");

2
ompi/win/win.c
Просмотреть файл

@ -51,7 +51,7 @@ ompi_win_init(void)
/* setup window Fortran array */ /* setup window Fortran array */
OBJ_CONSTRUCT(&ompi_mpi_windows, opal_pointer_array_t); OBJ_CONSTRUCT(&ompi_mpi_windows, opal_pointer_array_t);
if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_mpi_windows, 0, if( OPAL_SUCCESS != opal_pointer_array_init(&ompi_mpi_windows, 0,
OMPI_FORTRAN_HANDLE_MAX, 64) ) { OPAL_FORTRAN_HANDLE_MAX, 64) ) {
return OMPI_ERROR; return OMPI_ERROR;
} }

2
opal/class/opal_bitmap.c
Просмотреть файл

@ -133,7 +133,7 @@ opal_bitmap_set_bit(opal_bitmap_t *bm, int bit)
new_size = (int) new_size_large; new_size = (int) new_size_large;
/* /*
* No further tests against max_size (or OMPI_FORTRAN_HANDLE_MAX) are * No further tests against max_size (or OPAL_FORTRAN_HANDLE_MAX) are
* necessary, since we validated above, that the bit already is contained! * necessary, since we validated above, that the bit already is contained!
*/ */

2
opal/class/opal_bitmap.h
Просмотреть файл

@ -33,7 +33,7 @@
* To allow these bitmaps to track fortran handles (which MPI defines * To allow these bitmaps to track fortran handles (which MPI defines
* to be Fortran INTEGER), we offer a opal_bitmap_set_max_size, so that * to be Fortran INTEGER), we offer a opal_bitmap_set_max_size, so that
* the upper layer can ask to never have more than * the upper layer can ask to never have more than
* OMPI_FORTRAN_HANDLE_MAX, which is min(INT_MAX, fortran INTEGER max). * OPAL_FORTRAN_HANDLE_MAX, which is min(INT_MAX, fortran INTEGER max).
* Currently the only user of this is ompi/attribute/attribute.c * Currently the only user of this is ompi/attribute/attribute.c
* *
*/ */

4
opal/class/opal_pointer_array.c
Просмотреть файл

@ -116,7 +116,7 @@ int opal_pointer_array_add(opal_pointer_array_t *table, void *ptr)
/* need to grow table */ /* need to grow table */
if (!grow_table(table, if (!grow_table(table,
(NULL == table->addr ? TABLE_INIT : table->size * TABLE_GROW), (NULL == table->addr ? TABLE_INIT : table->size * TABLE_GROW),
OMPI_FORTRAN_HANDLE_MAX)) { OPAL_FORTRAN_HANDLE_MAX)) {
OPAL_THREAD_UNLOCK(&(table->lock)); OPAL_THREAD_UNLOCK(&(table->lock));
return OPAL_ERR_OUT_OF_RESOURCE; return OPAL_ERR_OUT_OF_RESOURCE;
} }
@ -330,7 +330,7 @@ static bool grow_table(opal_pointer_array_t *table, int soft, int hard)
} }
/* We've already established (above) that the arithmetic /* We've already established (above) that the arithmetic
below will be less than OMPI_FORTRAN_HANDLE_MAX */ below will be less than OPAL_FORTRAN_HANDLE_MAX */
new_size_int = (int) new_size; new_size_int = (int) new_size;
table->number_free += new_size_int - table->size; table->number_free += new_size_int - table->size;

10
opal/include/opal_config_bottom.h
Просмотреть файл

@ -298,15 +298,15 @@ typedef OPAL_PTRDIFF_TYPE ptrdiff_t;
alignment */ alignment */
# define false 0 # define false 0
# define true 1 # define true 1
# if SIZEOF_BOOL == SIZEOF_CHAR && OMPI_ALIGNMENT_CXX_BOOL == OPAL_ALIGNMENT_CHAR # if SIZEOF_BOOL == SIZEOF_CHAR && OPAL_ALIGNMENT_CXX_BOOL == OPAL_ALIGNMENT_CHAR
typedef unsigned char bool; typedef unsigned char bool;
# elif SIZEOF_BOOL == SIZEOF_SHORT && OMPI_ALIGNMENT_CXX_BOOL == OPAL_ALIGNMENT_SHORT # elif SIZEOF_BOOL == SIZEOF_SHORT && OPAL_ALIGNMENT_CXX_BOOL == OPAL_ALIGNMENT_SHORT
typedef short bool; typedef short bool;
# elif SIZEOF_BOOL == SIZEOF_INT && OMPI_ALIGNMENT_CXX_BOOL == OPAL_ALIGNMENT_INT # elif SIZEOF_BOOL == SIZEOF_INT && OPAL_ALIGNMENT_CXX_BOOL == OPAL_ALIGNMENT_INT
typedef int bool; typedef int bool;
# elif SIZEOF_BOOL == SIZEOF_LONG && OMPI_ALIGNMENT_CXX_BOOL == OPAL_ALIGNMENT_LONG # elif SIZEOF_BOOL == SIZEOF_LONG && OPAL_ALIGNMENT_CXX_BOOL == OPAL_ALIGNMENT_LONG
typedef long bool; typedef long bool;
# elif defined(SIZEOF_LONG_LONG) && defined(OPAL_ALIGNMENT_LONG) && SIZEOF_BOOL == SIZEOF_LONG && OMPI_ALIGNMENT_CXX_BOOL == OPAL_ALIGNMENT_LONG # elif defined(SIZEOF_LONG_LONG) && defined(OPAL_ALIGNMENT_LONG) && SIZEOF_BOOL == SIZEOF_LONG && OPAL_ALIGNMENT_CXX_BOOL == OPAL_ALIGNMENT_LONG
typedef long long bool; typedef long long bool;
# else # else
# error Cannot find a C type that corresponds to the size and alignment of C++ bool! # error Cannot find a C type that corresponds to the size and alignment of C++ bool!

6
opal/util/arch.c
Просмотреть файл

@ -49,11 +49,11 @@ int32_t opal_arch_compute_local_id( uint32_t *me )
* placed here to explain the abstraction break and * placed here to explain the abstraction break and
* indicate that it will eventually be fixed * indicate that it will eventually be fixed
*/ */
if (1 == sizeof(ompi_fortran_logical_t) ) { if (1 == sizeof(opal_fortran_logical_t) ) {
opal_arch_setmask( me, OPAL_ARCH_LOGICALIS8); opal_arch_setmask( me, OPAL_ARCH_LOGICALIS8);
} else if (2 == sizeof(ompi_fortran_logical_t)) { } else if (2 == sizeof(opal_fortran_logical_t)) {
opal_arch_setmask( me, OPAL_ARCH_LOGICALIS16); opal_arch_setmask( me, OPAL_ARCH_LOGICALIS16);
} else if (4 == sizeof(ompi_fortran_logical_t)) { } else if (4 == sizeof(opal_fortran_logical_t)) {
opal_arch_setmask( me, OPAL_ARCH_LOGICALIS32); opal_arch_setmask( me, OPAL_ARCH_LOGICALIS32);
} }