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

This is a very large change to rename several #define values from

Просмотр исходного кода 
OMPI_* to OPAL_*.  This allows opal layer to be used more independent
from the whole of ompi.

NOTE: 9 "svn mv" operations immediately follow this commit.

This commit was SVN r21180.
Этот коммит содержится в:
Greg Koenig 2009-05-06 20:11:28 +00:00
родитель 64585600fc
Коммит 60485ff95f
843 изменённых файлов: 2841 добавлений и 2841 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -160,7 +160,7 @@ Trunk (not on release branches yet)
set the MCA parameter orte_forward_job_control to 1.
- Allow the sm BTL to allocate larger amounts of shared memory if
desired (helpful for very large multi-core boxen).
- Fix a few places where we used PATH_MAX instead of OMPI_PATH_MAX,
- Fix a few places where we used PATH_MAX instead of OPAL_PATH_MAX,
leading to compile problems on some platforms. Thanks to Andrea Iob
for the bug report.
- Fix mca_btl_openib_warn_no_device_params_found MCA parameter; it

2
README.WINDOWS
Просмотреть файл

@ -70,7 +70,7 @@ Step 3: Add the following to ompi/tools/ompi_info/ompi_info.h and
#define OMPI_BUILD_FCFLAGS ""
#define OMPI_BUILD_LDFLAGS " "
#define OMPI_BUILD_LIBS " "
#define OMPI_CC_ABSOLUTE "cl"
#define OPAL_CC_ABSOLUTE "cl"
#define OMPI_CXX_ABSOLUTE "cl"
#define OMPI_F77_ABSOLUTE "none"
#define OMPI_F90_ABSOLUTE "none"

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

@ -66,5 +66,5 @@ AC_DEFUN([OMPI_C_WEAK_SYMBOLS],[
[ompi_cv_c_weak_symbols="no"])])
AS_IF([test "$ompi_cv_c_weak_symbols" = "yes"],
[OMPI_C_HAVE_WEAK_SYMBOLS=1], [OMPI_C_HAVE_WEAK_SYMBOLS=0])
[OPAL_C_HAVE_WEAK_SYMBOLS=1], [OPAL_C_HAVE_WEAK_SYMBOLS=0])
]) dnl

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

@ -22,14 +22,14 @@ dnl Tests provided by OMPI
dnl General tests
dnl
sinclude(@M4DIR@/ompi_functions.m4)
sinclude(@M4DIR@/opal_functions.m4)
sinclude(@M4DIR@/ompi_get_version.m4)
dnl
dnl C compiler tests
dnl
sinclude(@M4DIR@/ompi_setup_cc.m4)
sinclude(@M4DIR@/opal_setup_cc.m4)
sinclude(@M4DIR@/ompi_check_optflags.m4)
sinclude(@M4DIR@/ompi_check_vendor.m4)

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

@ -29,7 +29,7 @@ AC_DEFUN([_OMPI_ATTRIBUTE_FAIL_SEARCH],[
for i in ignore skip ; do
$GREP -iq $i conftest.err
if test "$?" = "0" ; then
ompi_cv___attribute__[$1]=0
opal_cv___attribute__[$1]=0
break;
fi
done
@ -51,7 +51,7 @@ AC_DEFUN([_OMPI_ATTRIBUTE_FAIL_SEARCH],[
#
AC_DEFUN([_OMPI_CHECK_SPECIFIC_ATTRIBUTE], [
AC_MSG_CHECKING([for __attribute__([$1])])
AC_CACHE_VAL(ompi_cv___attribute__[$1], [
AC_CACHE_VAL(opal_cv___attribute__[$1], [
#
# Try to compile using the C compiler, then C++
#
@ -62,20 +62,20 @@ AC_DEFUN([_OMPI_CHECK_SPECIFIC_ATTRIBUTE], [
# attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
# and if found, reset the ompi_cv__attribute__var=0
#
ompi_cv___attribute__[$1]=1
opal_cv___attribute__[$1]=1
_OMPI_ATTRIBUTE_FAIL_SEARCH([$1])
],
[ompi_cv___attribute__[$1]=0])
if test "$ompi_cv___attribute__[$1]" = "1" ; then
[opal_cv___attribute__[$1]=0])
if test "$opal_cv___attribute__[$1]" = "1" ; then
AC_LANG_PUSH(C++)
AC_TRY_COMPILE([
extern "C" {
$2
}],[],
[
ompi_cv___attribute__[$1]=1
opal_cv___attribute__[$1]=1
_OMPI_ATTRIBUTE_FAIL_SEARCH([$1])
],[ompi_cv___attribute__[$1]=0])
],[opal_cv___attribute__[$1]=0])
AC_LANG_POP(C++)
fi
@ -83,7 +83,7 @@ AC_DEFUN([_OMPI_CHECK_SPECIFIC_ATTRIBUTE], [
# If the attribute is supported by both compilers,
# try to recompile a *cross-check*, IFF defined.
#
if test '(' "$ompi_cv___attribute__[$1]" = "1" -a "[$3]" != "" ')' ; then
if test '(' "$opal_cv___attribute__[$1]" = "1" -a "[$3]" != "" ')' ; then
ac_c_werror_flag_safe=$ac_c_werror_flag
ac_c_werror_flag="yes"
CFLAGS_safe=$CFLAGS
@ -94,14 +94,14 @@ AC_DEFUN([_OMPI_CHECK_SPECIFIC_ATTRIBUTE], [
int i=4711;
i=usage(&i);
],
[ompi_cv___attribute__[$1]=0],
[opal_cv___attribute__[$1]=0],
[
#
# In case we did NOT succeed: Fine, but was this due to the
# attribute being ignored? Grep for IgNoRe in conftest.err
# and if found, reset the ompi_cv__attribute__var=0
#
ompi_cv___attribute__[$1]=1
opal_cv___attribute__[$1]=1
_OMPI_ATTRIBUTE_FAIL_SEARCH([$1])
])
@ -110,7 +110,7 @@ AC_DEFUN([_OMPI_CHECK_SPECIFIC_ATTRIBUTE], [
fi
])
if test "$ompi_cv___attribute__[$1]" = "1" ; then
if test "$opal_cv___attribute__[$1]" = "1" ; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
@ -127,11 +127,11 @@ AC_DEFUN([_OMPI_CHECK_SPECIFIC_ATTRIBUTE], [
# The compilers output is parsed in _OMPI_ATTRIBUTE_FAIL_SEARCH
#
# To add a new attributes __NAME__ add the
# ompi_cv___attribute__NAME
# opal_cv___attribute__NAME
# add a new check with _OMPI_CHECK_SPECIFIC_ATTRIBUTE (possibly with a cross-check)
# _OMPI_CHECK_SPECIFIC_ATTRIBUTE([name], [int foo (int arg) __attribute__ ((__name__));], [], [])
# and define the corresponding
# AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_NAME, [$ompi_cv___attribute__NAME],
# AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_NAME, [$opal_cv___attribute__NAME],
# [Whether your compiler has __attribute__ NAME or not])
# and decide on a correct macro (in opal/include/opal_config_bottom.h):
# # define __opal_attribute_NAME(x) __attribute__(__NAME__)
@ -145,7 +145,7 @@ AC_DEFUN([_OMPI_CHECK_SPECIFIC_ATTRIBUTE], [
AC_DEFUN([OMPI_CHECK_ATTRIBUTES], [
AC_MSG_CHECKING(for __attribute__)
AC_CACHE_VAL(ompi_cv___attribute__, [
AC_CACHE_VAL(opal_cv___attribute__, [
AC_TRY_COMPILE(
[#include <stdlib.h>
/* Check for the longest available __attribute__ (since gcc-2.3) */
@ -155,11 +155,11 @@ AC_DEFUN([OMPI_CHECK_ATTRIBUTES], [
};
],
[],
[ompi_cv___attribute__=1],
[ompi_cv___attribute__=0],
[opal_cv___attribute__=1],
[opal_cv___attribute__=0],
)
if test "$ompi_cv___attribute__" = "1" ; then
if test "$opal_cv___attribute__" = "1" ; then
AC_TRY_COMPILE(
[#include <stdlib.h>
/* Check for the longest available __attribute__ (since gcc-2.3) */
@ -169,39 +169,39 @@ AC_DEFUN([OMPI_CHECK_ATTRIBUTES], [
};
],
[],
[ompi_cv___attribute__=1],
[ompi_cv___attribute__=0],
[opal_cv___attribute__=1],
[opal_cv___attribute__=0],
)
fi
])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE, [$ompi_cv___attribute__],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE, [$opal_cv___attribute__],
[Whether your compiler has __attribute__ or not])
#
# Now that we know the compiler support __attribute__ let's check which kind of
# attributed are supported.
#
if test "$ompi_cv___attribute__" = "0" ; then
if test "$opal_cv___attribute__" = "0" ; then
AC_MSG_RESULT([no])
ompi_cv___attribute__aligned=0
ompi_cv___attribute__always_inline=0
ompi_cv___attribute__cold=0
ompi_cv___attribute__const=0
ompi_cv___attribute__deprecated=0
ompi_cv___attribute__format=0
ompi_cv___attribute__hot=0
ompi_cv___attribute__malloc=0
ompi_cv___attribute__may_alias=0
ompi_cv___attribute__no_instrument_function=0
ompi_cv___attribute__nonnull=0
ompi_cv___attribute__noreturn=0
ompi_cv___attribute__packed=0
ompi_cv___attribute__pure=0
ompi_cv___attribute__sentinel=0
ompi_cv___attribute__unused=0
ompi_cv___attribute__visibility=0
ompi_cv___attribute__warn_unused_result=0
ompi_cv___attribute__weak_alias=0
opal_cv___attribute__aligned=0
opal_cv___attribute__always_inline=0
opal_cv___attribute__cold=0
opal_cv___attribute__const=0
opal_cv___attribute__deprecated=0
opal_cv___attribute__format=0
opal_cv___attribute__hot=0
opal_cv___attribute__malloc=0
opal_cv___attribute__may_alias=0
opal_cv___attribute__no_instrument_function=0
opal_cv___attribute__nonnull=0
opal_cv___attribute__noreturn=0
opal_cv___attribute__packed=0
opal_cv___attribute__pure=0
opal_cv___attribute__sentinel=0
opal_cv___attribute__unused=0
opal_cv___attribute__visibility=0
opal_cv___attribute__warn_unused_result=0
opal_cv___attribute__weak_alias=0
else
AC_MSG_RESULT([yes])
@ -476,42 +476,42 @@ AC_DEFUN([OMPI_CHECK_ATTRIBUTES], [
# Now that all the values are set, define them
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_ALIGNED, [$ompi_cv___attribute__aligned],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_ALIGNED, [$opal_cv___attribute__aligned],
[Whether your compiler has __attribute__ aligned or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_ALWAYS_INLINE, [$ompi_cv___attribute__always_inline],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_ALWAYS_INLINE, [$opal_cv___attribute__always_inline],
[Whether your compiler has __attribute__ always_inline or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_COLD, [$ompi_cv___attribute__cold],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_COLD, [$opal_cv___attribute__cold],
[Whether your compiler has __attribute__ cold or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_CONST, [$ompi_cv___attribute__const],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_CONST, [$opal_cv___attribute__const],
[Whether your compiler has __attribute__ const or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_DEPRECATED, [$ompi_cv___attribute__deprecated],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_DEPRECATED, [$opal_cv___attribute__deprecated],
[Whether your compiler has __attribute__ deprecated or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_FORMAT, [$ompi_cv___attribute__format],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_FORMAT, [$opal_cv___attribute__format],
[Whether your compiler has __attribute__ format or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_HOT, [$ompi_cv___attribute__hot],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_HOT, [$opal_cv___attribute__hot],
[Whether your compiler has __attribute__ hot or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_MALLOC, [$ompi_cv___attribute__malloc],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_MALLOC, [$opal_cv___attribute__malloc],
[Whether your compiler has __attribute__ malloc or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_MAY_ALIAS, [$ompi_cv___attribute__may_alias],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_MAY_ALIAS, [$opal_cv___attribute__may_alias],
[Whether your compiler has __attribute__ may_alias or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION, [$ompi_cv___attribute__no_instrument_function],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION, [$opal_cv___attribute__no_instrument_function],
[Whether your compiler has __attribute__ no_instrument_function or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_NONNULL, [$ompi_cv___attribute__nonnull],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_NONNULL, [$opal_cv___attribute__nonnull],
[Whether your compiler has __attribute__ nonnull or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_NORETURN, [$ompi_cv___attribute__noreturn],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_NORETURN, [$opal_cv___attribute__noreturn],
[Whether your compiler has __attribute__ noreturn or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_PACKED, [$ompi_cv___attribute__packed],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_PACKED, [$opal_cv___attribute__packed],
[Whether your compiler has __attribute__ packed or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_PURE, [$ompi_cv___attribute__pure],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_PURE, [$opal_cv___attribute__pure],
[Whether your compiler has __attribute__ pure or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_SENTINEL, [$ompi_cv___attribute__sentinel],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_SENTINEL, [$opal_cv___attribute__sentinel],
[Whether your compiler has __attribute__ sentinel or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_UNUSED, [$ompi_cv___attribute__unused],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_UNUSED, [$opal_cv___attribute__unused],
[Whether your compiler has __attribute__ unused or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_VISIBILITY, [$ompi_cv___attribute__visibility],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_VISIBILITY, [$opal_cv___attribute__visibility],
[Whether your compiler has __attribute__ visibility or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT, [$ompi_cv___attribute__warn_unused_result],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT, [$opal_cv___attribute__warn_unused_result],
[Whether your compiler has __attribute__ warn unused result or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_ATTRIBUTE_WEAK_ALIAS, [$ompi_cv___attribute__weak_alias],
AC_DEFINE_UNQUOTED(OPAL_HAVE_ATTRIBUTE_WEAK_ALIAS, [$opal_cv___attribute__weak_alias],
[Whether your compiler has __attribute__ weak alias or not])
])

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

@ -48,6 +48,6 @@ AC_DEFUN([OMPI_CHECK_BROKEN_QSORT],[
define_result=0
fi
AC_MSG_RESULT([$result])
AC_DEFINE_UNQUOTED([OMPI_HAVE_BROKEN_QSORT], [$define_result],
AC_DEFINE_UNQUOTED([OPAL_HAVE_BROKEN_QSORT], [$define_result],
[whether qsort is broken or not])
])

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

@ -8,9 +8,9 @@ dnl
dnl $HEADER$
dnl
dnl defines:
dnl OMPI_$1_USE_PRAGMA_IDENT
dnl OMPI_$1_USE_IDENT
dnl OMPI_$1_USE_CONST_CHAR_IDENT
dnl OPAL_$1_USE_PRAGMA_IDENT
dnl OPAL_$1_USE_IDENT
dnl OPAL_$1_USE_CONST_CHAR_IDENT
dnl
# OMPI_CHECK_IDENT(compiler-env, compiler-flags,
@ -21,39 +21,39 @@ dnl
AC_DEFUN([OMPI_CHECK_IDENT], [
AC_MSG_CHECKING([for $4 ident string support])
ompi_pragma_ident_happy=0
ompi_ident_happy=0
ompi_static_const_char_happy=0
opal_pragma_ident_happy=0
opal_ident_happy=0
opal_static_const_char_happy=0
_OMPI_CHECK_IDENT(
[$1], [$2], [$3],
[[#]pragma ident], [],
[ompi_pragma_ident_happy=1
[opal_pragma_ident_happy=1
ompi_message="[#]pragma ident"],
_OMPI_CHECK_IDENT(
[$1], [$2], [$3],
[[#]ident], [],
[ompi_ident_happy=1
[opal_ident_happy=1
ompi_message="[#]ident"],
_OMPI_CHECK_IDENT(
[$1], [$2], [$3],
[[#]pragma comment(exestr, ], [)],
[ompi_pragma_comment_happy=1
[opal_pragma_comment_happy=1
ompi_message="[#]pragma comment"],
[ompi_static_const_char_happy=1
[opal_static_const_char_happy=1
ompi_message="static const char[[]]"])))
AC_DEFINE_UNQUOTED([OMPI_$1_USE_PRAGMA_IDENT],
[$ompi_pragma_ident_happy], [Use #pragma ident strings for $4 files])
AC_DEFINE_UNQUOTED([OMPI_$1_USE_IDENT],
[$ompi_ident_happy], [Use #ident strings for $4 files])
AC_DEFINE_UNQUOTED([OMPI_$1_USE_PRAGMA_COMMENT],
[$ompi_pragma_comment_happy], [Use #pragma comment for $4 files])
AC_DEFINE_UNQUOTED([OMPI_$1_USE_CONST_CHAR_IDENT],
[$ompi_static_const_char_happy], [Use static const char[] strings for $4 files])
AC_DEFINE_UNQUOTED([OPAL_$1_USE_PRAGMA_IDENT],
[$opal_pragma_ident_happy], [Use #pragma ident strings for $4 files])
AC_DEFINE_UNQUOTED([OPAL_$1_USE_IDENT],
[$opal_ident_happy], [Use #ident strings for $4 files])
AC_DEFINE_UNQUOTED([OPAL_$1_USE_PRAGMA_COMMENT],
[$opal_pragma_comment_happy], [Use #pragma comment for $4 files])
AC_DEFINE_UNQUOTED([OPAL_$1_USE_CONST_CHAR_IDENT],
[$opal_static_const_char_happy], [Use static const char[] strings for $4 files])
AC_MSG_RESULT([$ompi_message])
unset ompi_pragma_ident_happy ompi_ident_happy ompi_static_const_char_happy ompi_message
unset opal_pragma_ident_happy opal_ident_happy opal_static_const_char_happy ompi_message
])
# _OMPI_CHECK_IDENT(compiler-env, compiler-flags,

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

@ -24,7 +24,7 @@ AC_DEFUN([OMPI_CHECK_PTHREAD_PIDS],[
# Dependencies: None
#
# Sets:
# OMPI_THREADS_HAVE_DIFFERENT_PIDS (variable)
# OPAL_THREADS_HAVE_DIFFERENT_PIDS (variable)
#
# Test for Linux-like threads in the system. We will need to handle things like
# getpid() differently in the case of a Linux-like threads model.
@ -61,16 +61,16 @@ void *checkpid(void *arg) {
ret = 1;
pthread_exit((void *) &ret);
}],
[MSG=no OMPI_THREADS_HAVE_DIFFERENT_PIDS=0],
[MSG=yes OMPI_THREADS_HAVE_DIFFERENT_PIDS=1],
[MSG=no OPAL_THREADS_HAVE_DIFFERENT_PIDS=0],
[MSG=yes OPAL_THREADS_HAVE_DIFFERENT_PIDS=1],
[case $host in
*-linux*)
MSG="cross compiling - assuming yes"
OMPI_THREADS_HAVE_DIFFERENT_PIDS=1
OPAL_THREADS_HAVE_DIFFERENT_PIDS=1
;;
*)
MSG="cross compiling - assuming no"
OMPI_THREADS_HAVE_DIFFERENT_PIDS=0
OPAL_THREADS_HAVE_DIFFERENT_PIDS=0
;;
esac
])
@ -81,7 +81,7 @@ LDFLAGS="$LDFLAGS_save"
LIBS="$LIBS_save"
AC_MSG_RESULT([$MSG])
AC_DEFINE_UNQUOTED(OMPI_THREADS_HAVE_DIFFERENT_PIDS, $OMPI_THREADS_HAVE_DIFFERENT_PIDS)
AC_DEFINE_UNQUOTED(OPAL_THREADS_HAVE_DIFFERENT_PIDS, $OPAL_THREADS_HAVE_DIFFERENT_PIDS)
#
# if pthreads is not available, then the system does not have an insane threads

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

@ -29,7 +29,7 @@ AC_DEFUN([OMPI_CHECK_VISIBILITY],[
AC_ARG_ENABLE(visibility,
AC_HELP_STRING([--enable-visibility],
[enable visibility feature of certain compilers/linkers (default: enabled)]))
if test "$enable_visibility" = "no" -o "$ompi_cv___attribute__visibility" = "0"; then
if test "$enable_visibility" = "no" -o "$opal_cv___attribute__visibility" = "0"; then
AC_MSG_CHECKING([enable symbol visibility])
AC_MSG_RESULT([no])
have_visibility=0
@ -103,7 +103,7 @@ AC_DEFUN([OMPI_CHECK_VISIBILITY],[
CFLAGS="$CFLAGS_orig$add"
unset add
fi
AC_DEFINE_UNQUOTED([OMPI_C_HAVE_VISIBILITY], [$have_visibility],
AC_DEFINE_UNQUOTED([OPAL_C_HAVE_VISIBILITY], [$have_visibility],
[Whether C compiler supports -fvisibility])
])

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

@ -27,26 +27,26 @@ dnl
dnl #################################################################
AC_DEFUN([OMPI_CHECK_ASM_TEXT],[
AC_MSG_CHECKING([directive for setting text section])
ompi_cv_asm_text=""
opal_cv_asm_text=""
if test "$ompi_cv_c_compiler_vendor" = "microsoft" ; then
# text section will be brought in with the rest of
# header for MS - leave blank for now
ompi_cv_asm_text=""
opal_cv_asm_text=""
else
case $host in
*-aix*)
ompi_cv_asm_text=[".csect .text[PR]"]
opal_cv_asm_text=[".csect .text[PR]"]
;;
*)
ompi_cv_asm_text=".text"
opal_cv_asm_text=".text"
;;
esac
fi
AC_MSG_RESULT([$ompi_cv_asm_text])
AC_DEFINE_UNQUOTED([OMPI_ASM_TEXT], ["$ompi_cv_asm_text"],
AC_MSG_RESULT([$opal_cv_asm_text])
AC_DEFINE_UNQUOTED([OPAL_ASM_TEXT], ["$opal_cv_asm_text"],
[Assembly directive for setting text section])
OMPI_ASM_TEXT="$ompi_cv_asm_text"
AC_SUBST(OMPI_ASM_TEXT)
OPAL_ASM_TEXT="$opal_cv_asm_text"
AC_SUBST(OPAL_ASM_TEXT)
])dnl
@ -54,7 +54,7 @@ dnl #################################################################
dnl
dnl OMPI_CHECK_ASM_GLOBAL
dnl
dnl Sets OMPI_ASM_GLOBAL to the value to prefix global values
dnl Sets OPAL_ASM_GLOBAL to the value to prefix global values
dnl
dnl I'm sure if I don't have a test for this, there will be some
dnl dumb platform that uses something else
@ -62,20 +62,20 @@ dnl
dnl #################################################################
AC_DEFUN([OMPI_CHECK_ASM_GLOBAL],[
AC_MSG_CHECKING([directive for exporting symbols])
ompi_cv_asm_global=""
opal_cv_asm_global=""
if test "$ompi_cv_c_compiler_vendor" = "microsoft" ; then
ompi_cv_asm_global="PUBLIC"
opal_cv_asm_global="PUBLIC"
else
case $host in
*)
ompi_cv_asm_global=".globl"
opal_cv_asm_global=".globl"
;;
esac
fi
AC_MSG_RESULT([$ompi_cv_asm_global])
AC_DEFINE_UNQUOTED([OMPI_ASM_GLOBAL], ["$ompi_cv_asm_global"],
AC_MSG_RESULT([$opal_cv_asm_global])
AC_DEFINE_UNQUOTED([OPAL_ASM_GLOBAL], ["$opal_cv_asm_global"],
[Assembly directive for exporting symbols])
OMPI_ASM_GLOBAL="$ompi_cv_asm_global"
OPAL_ASM_GLOBAL="$opal_cv_asm_global"
AC_SUBST(OMPI_AS_GLOBAL)
])dnl
@ -84,7 +84,7 @@ dnl #################################################################
dnl
dnl OMPI_CHECK_ASM_LSYM
dnl
dnl Sets OMPI_ASM_LSYM to the prefix value on a symbol to make it
dnl Sets OPAL_ASM_LSYM to the prefix value on a symbol to make it
dnl an internal label (jump target and whatnot)
dnl
dnl We look for L .L $ L$ (in that order) for something that both
@ -103,8 +103,8 @@ AC_DEFUN([_OMPI_CHECK_ASM_LSYM],[
for sym in L .L $ L$ ; do
asm_result=0
echo "configure: trying $sym" >&AC_FD_CC
OMPI_TRY_ASSEMBLE([foobar$ompi_cv_asm_label_suffix
${sym}mytestlabel$ompi_cv_asm_label_suffix],
OMPI_TRY_ASSEMBLE([foobar$opal_cv_asm_label_suffix
${sym}mytestlabel$opal_cv_asm_label_suffix],
[# ok, we succeeded at assembling. see if we can nm,
# throwing the results in a file
if $NM conftest.$OBJEXT > conftest.out 2>&AC_FD_CC ; then
@ -138,12 +138,12 @@ AC_DEFUN([OMPI_CHECK_ASM_LSYM],[
AC_REQUIRE([AC_PROG_NM])
AC_CACHE_CHECK([prefix for lsym labels],
[ompi_cv_asm_lsym],
[_OMPI_CHECK_ASM_LSYM([ompi_cv_asm_lsym])])
AC_DEFINE_UNQUOTED([OMPI_ASM_LSYM], ["$ompi_cv_asm_lsym"],
[opal_cv_asm_lsym],
[_OMPI_CHECK_ASM_LSYM([opal_cv_asm_lsym])])
AC_DEFINE_UNQUOTED([OPAL_ASM_LSYM], ["$opal_cv_asm_lsym"],
[Assembly prefix for lsym labels])
OMPI_ASM_LSYM="$ompi_cv_asm_lsym"
AC_SUBST(OMPI_ASM_LSYM)
OPAL_ASM_LSYM="$opal_cv_asm_lsym"
AC_SUBST(OPAL_ASM_LSYM)
])dnl
dnl #################################################################
@ -179,28 +179,28 @@ dnl #################################################################
dnl
dnl OMPI_CHECK_ASM_GSYM
dnl
dnl Sets OMPI_ASM_GSYM to the prefix value on a symbol to make it
dnl Sets OPAL_ASM_GSYM to the prefix value on a symbol to make it
dnl a global linkable from C. Basically, an _ or not.
dnl
dnl #################################################################
AC_DEFUN([OMPI_CHECK_ASM_GSYM],[
AC_CACHE_CHECK([prefix for global symbol labels],
[ompi_cv_asm_gsym],
[opal_cv_asm_gsym],
[_OMPI_CHECK_ASM_GSYM])
if test "$ompi_cv_asm_gsym" = "none" ; then
if test "$opal_cv_asm_gsym" = "none" ; then
AC_MSG_ERROR([Could not determine global symbol label prefix])
fi
AC_DEFINE_UNQUOTED([OMPI_ASM_GSYM], ["$ompi_cv_asm_gsym"],
AC_DEFINE_UNQUOTED([OPAL_ASM_GSYM], ["$opal_cv_asm_gsym"],
[Assembly prefix for gsym labels])
OMPI_ASM_GSYM="$ompi_cv_asm_gsym"
AC_SUBST(OMPI_ASM_GSYM)
OPAL_ASM_GSYM="$opal_cv_asm_gsym"
AC_SUBST(OPAL_ASM_GSYM)
])
AC_DEFUN([_OMPI_CHECK_ASM_GSYM],[
ompi_cv_asm_gsym="none"
opal_cv_asm_gsym="none"
for sym in "_" "" "." ; do
asm_result=0
@ -221,10 +221,10 @@ main()
}
EOF
OMPI_TRY_ASSEMBLE([
$ompi_cv_asm_text
$opal_cv_asm_text
$ompi_cv_asm_proc ${sym}gsym_test_func
$ompi_cv_asm_global ${sym}gsym_test_func
${sym}gsym_test_func${ompi_cv_asm_label_suffix}
$opal_cv_asm_global ${sym}gsym_test_func
${sym}gsym_test_func${opal_cv_asm_label_suffix}
$ompi_cv_asm_endproc ${sym}gsym_test_func
],
[ompi_compile="$CC $CFLAGS -I. conftest_c.c -c > conftest.cmpl 2>&1"
@ -253,7 +253,7 @@ $ompi_cv_asm_endproc ${sym}gsym_test_func
fi],
[asm_result=0])
if test "$asm_result" = "1" ; then
ompi_cv_asm_gsym="$sym"
opal_cv_asm_gsym="$sym"
break
fi
done
@ -265,7 +265,7 @@ dnl #################################################################
dnl
dnl OMPI_CHECK_ASM_LABEL_SUFFIX
dnl
dnl Sets OMPI_ASM_LABEL_SUFFIX to the value to suffix for labels
dnl Sets OPAL_ASM_LABEL_SUFFIX to the value to suffix for labels
dnl
dnl I'm sure if I don't have a test for this, there will be some
dnl dumb platform that uses something else
@ -273,16 +273,16 @@ dnl
dnl #################################################################
AC_DEFUN([OMPI_CHECK_ASM_LABEL_SUFFIX],[
AC_MSG_CHECKING([suffix for labels])
ompi_cv_asm_label_suffix=""
opal_cv_asm_label_suffix=""
case $host in
*)
ompi_cv_asm_label_suffix=":"
opal_cv_asm_label_suffix=":"
;;
esac
AC_MSG_RESULT([$ompi_cv_asm_label_suffix])
AC_DEFINE_UNQUOTED([OMPI_ASM_LABEL_SUFFIX], ["$ompi_cv_asm_label_suffix"],
AC_MSG_RESULT([$opal_cv_asm_label_suffix])
AC_DEFINE_UNQUOTED([OPAL_ASM_LABEL_SUFFIX], ["$opal_cv_asm_label_suffix"],
[Assembly suffix for labels])
OMPI_ASM_LABEL_SUFFIX="$ompi_cv_asm_label_suffix"
OPAL_ASM_LABEL_SUFFIX="$opal_cv_asm_label_suffix"
AC_SUBST(OMPI_AS_LABEL_SUFFIX)
])dnl
@ -291,7 +291,7 @@ dnl #################################################################
dnl
dnl OMPI_CHECK_ASM_ALIGN_LOG
dnl
dnl Sets OMPI_ASM_ALIGN_LOG to 1 if align is specified
dnl Sets OPAL_ASM_ALIGN_LOG to 1 if align is specified
dnl logarithmically, 0 otherwise
dnl
dnl #################################################################
@ -301,12 +301,12 @@ AC_DEFUN([OMPI_CHECK_ASM_ALIGN_LOG],[
AC_CACHE_CHECK([if .align directive takes logarithmic value],
[ompi_cv_asm_align_log],
[ OMPI_TRY_ASSEMBLE([ $ompi_cv_asm_text
[ OMPI_TRY_ASSEMBLE([ $opal_cv_asm_text
.align 4
$ompi_cv_asm_global foo
$opal_cv_asm_global foo
.byte 1
.align 4
foo$ompi_cv_asm_label_suffix
foo$opal_cv_asm_label_suffix
.byte 2],
[ompi_asm_addr=[`$NM conftest.$OBJEXT | $GREP foo | sed -e 's/.*\([0-9a-fA-F][0-9a-fA-F]\).*foo.*/\1/'`]],
[ompi_asm_addr=""])
@ -324,7 +324,7 @@ foo$ompi_cv_asm_label_suffix
ompi_asm_align_log_result=0
fi
AC_DEFINE_UNQUOTED([OMPI_ASM_ALIGN_LOG],
AC_DEFINE_UNQUOTED([OPAL_ASM_ALIGN_LOG],
[$asm_align_log_result],
[Assembly align directive expects logarithmic value])
@ -336,9 +336,9 @@ dnl #################################################################
dnl
dnl OMPI_CHECK_ASM_TYPE
dnl
dnl Sets OMPI_ASM_TYPE to the prefix for the function type to
dnl Sets OPAL_ASM_TYPE to the prefix for the function type to
dnl set a symbol's type as function (needed on ELF for shared
dnl libaries). If no .type directive is needed, sets OMPI_ASM_TYPE
dnl libaries). If no .type directive is needed, sets OPAL_ASM_TYPE
dnl to an empty string
dnl
dnl We look for @ \# %
@ -346,24 +346,24 @@ dnl
dnl #################################################################
AC_DEFUN([OMPI_CHECK_ASM_TYPE],[
AC_CACHE_CHECK([prefix for function in .type],
[ompi_cv_asm_type],
[opal_cv_asm_type],
[_OMPI_CHECK_ASM_TYPE])
AC_DEFINE_UNQUOTED([OMPI_ASM_TYPE], ["$ompi_cv_asm_type"],
AC_DEFINE_UNQUOTED([OPAL_ASM_TYPE], ["$opal_cv_asm_type"],
[How to set function type in .type directive])
OMPI_ASM_TYPE="$ompi_cv_asm_type"
AC_SUBST(OMPI_ASM_TYPE)
OPAL_ASM_TYPE="$opal_cv_asm_type"
AC_SUBST(OPAL_ASM_TYPE)
])
AC_DEFUN([_OMPI_CHECK_ASM_TYPE],[
ompi_cv_asm_type=""
opal_cv_asm_type=""
case "${host}" in
*-sun-solaris*)
# GCC on solaris seems to accept just about anything, not
# that what it defines actually works... So just hardwire
# to the right answer
ompi_cv_asm_type="#"
opal_cv_asm_type="#"
;;
*)
for type in @ \# % ; do
@ -371,7 +371,7 @@ AC_DEFUN([_OMPI_CHECK_ASM_TYPE],[
echo "configure: trying $type" >&AC_FD_CC
OMPI_TRY_ASSEMBLE([ .type mysym, ${type}function
mysym:],
[ompi_cv_asm_type="${type}"
[opal_cv_asm_type="${type}"
asm_result=1])
if test "$asm_result" = "1" ; then
break
@ -389,7 +389,7 @@ dnl #################################################################
dnl
dnl OMPI_CHECK_ASM_SIZE
dnl
dnl Sets OMPI_ASM_SIZE to 1 if we should set .size directives for
dnl Sets OPAL_ASM_SIZE to 1 if we should set .size directives for
dnl each function, 0 otherwise.
dnl
dnl #################################################################
@ -402,15 +402,15 @@ AC_DEFUN([OMPI_CHECK_ASM_SIZE],[
rm -f conftest.out])
if test "$ompi_cv_asm_need_size" = "yes" ; then
ompi_asm_size=1
opal_asm_size=1
else
ompi_asm_size=0
opal_asm_size=0
fi
AC_DEFINE_UNQUOTED([OMPI_ASM_SIZE], ["$ompi_asm_size"],
AC_DEFINE_UNQUOTED([OPAL_ASM_SIZE], ["$opal_asm_size"],
[Do we need to give a .size directive])
OMPI_ASM_SIZE="$ompi_asm_size"
AC_SUBST(OMPI_ASM_TYPE)
OPAL_ASM_SIZE="$opal_asm_size"
AC_SUBST(OPAL_ASM_TYPE)
unset asm_result
])dnl
@ -458,21 +458,21 @@ dnl
dnl #################################################################
AC_DEFUN([OMPI_CHECK_POWERPC_REG],[
AC_MSG_CHECKING([if PowerPC registers have r prefix])
OMPI_TRY_ASSEMBLE([$ompi_cv_asm_text
OMPI_TRY_ASSEMBLE([$opal_cv_asm_text
addi 1,1,0],
[ompi_cv_asm_powerpc_r_reg=0],
[OMPI_TRY_ASSEMBLE([$ompi_cv_asm_text
[opal_cv_asm_powerpc_r_reg=0],
[OMPI_TRY_ASSEMBLE([$opal_cv_asm_text
addi r1,r1,0],
[ompi_cv_asm_powerpc_r_reg=1],
[opal_cv_asm_powerpc_r_reg=1],
[AC_MSG_ERROR([Can not determine how to use PPC registers])])])
if test "$ompi_cv_asm_powerpc_r_reg" = "1" ; then
if test "$opal_cv_asm_powerpc_r_reg" = "1" ; then
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
fi
AC_DEFINE_UNQUOTED([OMPI_POWERPC_R_REGISTERS],
[$ompi_cv_asm_powerpc_r_reg],
AC_DEFINE_UNQUOTED([OPAL_POWERPC_R_REGISTERS],
[$opal_cv_asm_powerpc_r_reg],
[Whether r notation is used for ppc registers])
])dnl
@ -496,12 +496,12 @@ AC_DEFUN([OMPI_CHECK_POWERPC_64BIT],[
case $host in
*-darwin*)
ppc64_result=0
if test "$ompi_cv_asm_powerpc_r_reg" = "1" ; then
if test "$opal_cv_asm_powerpc_r_reg" = "1" ; then
ldarx_asm=" ldarx r1,r1,r1";
else
ldarx_asm=" ldarx 1,1,1";
fi
OMPI_TRY_ASSEMBLE([$ompi_cv_asm_text
OMPI_TRY_ASSEMBLE([$opal_cv_asm_text
$ldarx_asm],
[ppc64_result=1],
[ppc64_result=0])
@ -531,7 +531,7 @@ dnl #################################################################
AC_DEFUN([OMPI_CHECK_SPARCV8PLUS],[
AC_MSG_CHECKING([if have Sparc v8+/v9 support])
sparc_result=0
OMPI_TRY_ASSEMBLE([$ompi_cv_asm_text
OMPI_TRY_ASSEMBLE([$opal_cv_asm_text
casa [%o0] 0x80, %o1, %o2],
[sparc_result=1],
[sparc_result=0])
@ -612,16 +612,16 @@ return ret;]]),
AC_MSG_RESULT([$asm_result])
if test "$asm_result" = "yes" ; then
OMPI_C_GCC_INLINE_ASSEMBLY=1
OPAL_C_GCC_INLINE_ASSEMBLY=1
else
OMPI_C_GCC_INLINE_ASSEMBLY=0
OPAL_C_GCC_INLINE_ASSEMBLY=0
fi
AC_DEFINE_UNQUOTED([OMPI_C_GCC_INLINE_ASSEMBLY],
[$OMPI_C_GCC_INLINE_ASSEMBLY],
AC_DEFINE_UNQUOTED([OPAL_C_GCC_INLINE_ASSEMBLY],
[$OPAL_C_GCC_INLINE_ASSEMBLY],
[Whether C compiler supports GCC style inline assembly])
unset OMPI_C_GCC_INLINE_ASSEMBLY assembly asm_result
unset OPAL_C_GCC_INLINE_ASSEMBLY assembly asm_result
])dnl
AC_DEFUN([OMPI_CHECK_INLINE_CXX_GCC],[
@ -700,16 +700,16 @@ return 0;]]),
AC_MSG_RESULT([$asm_result])
if test "$asm_result" = "yes" ; then
OMPI_C_DEC_INLINE_ASSEMBLY=1
OPAL_C_DEC_INLINE_ASSEMBLY=1
else
OMPI_C_DEC_INLINE_ASSEMBLY=0
OPAL_C_DEC_INLINE_ASSEMBLY=0
fi
AC_DEFINE_UNQUOTED([OMPI_C_DEC_INLINE_ASSEMBLY],
[$OMPI_C_DEC_INLINE_ASSEMBLY],
AC_DEFINE_UNQUOTED([OPAL_C_DEC_INLINE_ASSEMBLY],
[$OPAL_C_DEC_INLINE_ASSEMBLY],
[Whether C compiler supports DEC style inline assembly])
unset OMPI_C_DEC_INLINE_ASSEMBLY asm_result
unset OPAL_C_DEC_INLINE_ASSEMBLY asm_result
])dnl
AC_DEFUN([OMPI_CHECK_INLINE_CXX_DEC],[
@ -753,7 +753,7 @@ AC_DEFUN([OMPI_CHECK_INLINE_C_XLC],[
AC_MSG_CHECKING([if $CC supports XLC inline assembly])
OMPI_C_XLC_INLINE_ASSEMBLY=0
OPAL_C_XLC_INLINE_ASSEMBLY=0
asm_result="no"
if test "$CC" = "xlc" ; then
OMPI_XLC_INLINE_ASSEMBLY=1
@ -761,11 +761,11 @@ AC_DEFUN([OMPI_CHECK_INLINE_C_XLC],[
fi
AC_MSG_RESULT([$asm_result])
AC_DEFINE_UNQUOTED([OMPI_C_XLC_INLINE_ASSEMBLY],
[$OMPI_C_XLC_INLINE_ASSEMBLY],
AC_DEFINE_UNQUOTED([OPAL_C_XLC_INLINE_ASSEMBLY],
[$OPAL_C_XLC_INLINE_ASSEMBLY],
[Whether C compiler supports XLC style inline assembly])
unset OMPI_C_XLC_INLINE_ASSEMBLY
unset OPAL_C_XLC_INLINE_ASSEMBLY
])dnl
AC_DEFUN([OMPI_CHECK_INLINE_CXX_XLC],[
@ -792,10 +792,10 @@ dnl #################################################################
dnl
dnl OMPI_CONFIG_ASM
dnl
dnl DEFINE OMPI_ASSEMBLY_ARCH to something in sys/architecture.h
dnl DEFINE OMPI_ASSEMBLY_FORMAT to string containing correct
dnl DEFINE OPAL_ASSEMBLY_ARCH to something in sys/architecture.h
dnl DEFINE OPAL_ASSEMBLY_FORMAT to string containing correct
dnl format for assembly (not user friendly)
dnl SUBST OMPI_ASSEMBLY_FORMAT to string containing correct
dnl SUBST OPAL_ASSEMBLY_FORMAT to string containing correct
dnl format for assembly (not user friendly)
dnl
dnl #################################################################
@ -843,7 +843,7 @@ AC_DEFUN([OMPI_CONFIG_ASM],[
AC_MSG_RESULT([no])
want_smp_locks=0
fi
AC_DEFINE_UNQUOTED([OMPI_WANT_SMP_LOCKS], [$want_smp_locks],
AC_DEFINE_UNQUOTED([OPAL_WANT_SMP_LOCKS], [$want_smp_locks],
[whether we want to have smp locks in atomic ops or not])
if test "$ompi_cv_c_compiler_vendor" = "microsoft" ; then
@ -863,7 +863,7 @@ AC_DEFUN([OMPI_CONFIG_ASM],[
# find our architecture for purposes of assembly stuff
ompi_cv_asm_arch="UNSUPPORTED"
OMPI_GCC_INLINE_ASSIGN=""
OMPI_ASM_SUPPORT_64BIT=0
OPAL_ASM_SUPPORT_64BIT=0
case "${host}" in
i?86-*|x86_64*)
if test "$ac_cv_sizeof_long" = "4" ; then
@ -871,19 +871,19 @@ AC_DEFUN([OMPI_CONFIG_ASM],[
else
ompi_cv_asm_arch="AMD64"
fi
OMPI_ASM_SUPPORT_64BIT=1
OPAL_ASM_SUPPORT_64BIT=1
OMPI_GCC_INLINE_ASSIGN='"movl [$]0, %0" : "=&r"(ret)'
;;
ia64-*)
ompi_cv_asm_arch="IA64"
OMPI_ASM_SUPPORT_64BIT=1
OPAL_ASM_SUPPORT_64BIT=1
OMPI_GCC_INLINE_ASSIGN='"mov %0=r0\n;;\n" : "=&r"(ret)'
;;
alpha-*|alphaev[[4-8]]-*|alphaev56-*|alphaev6[[78]]-*)
ompi_cv_asm_arch="ALPHA"
OMPI_ASM_SUPPORT_64BIT=1
OPAL_ASM_SUPPORT_64BIT=1
OMPI_GCC_INLINE_ASSIGN='"bis [$]31,[$]31,%0" : "=&r"(ret)'
;;
@ -891,7 +891,7 @@ AC_DEFUN([OMPI_CONFIG_ASM],[
# Should really find some way to make sure that we are on
# a MIPS III machine (r4000 and later)
ompi_cv_asm_arch="MIPS"
OMPI_ASM_SUPPORT_64BIT=1
OPAL_ASM_SUPPORT_64BIT=1
OMPI_GCC_INLINE_ASSIGN='"or %0,[$]0,[$]0" : "=&r"(ret)'
;;
@ -904,9 +904,9 @@ AC_DEFUN([OMPI_CONFIG_ASM],[
# compiling in 32 bit mode (and therefore should assume
# sizeof(long) == 4), we can use the 64 bit test and set
# operations.
OMPI_CHECK_POWERPC_64BIT(OMPI_ASM_SUPPORT_64BIT=1)
OMPI_CHECK_POWERPC_64BIT(OPAL_ASM_SUPPORT_64BIT=1)
elif test "$ac_cv_sizeof_long" = "8" ; then
OMPI_ASM_SUPPORT_64BIT=1
OPAL_ASM_SUPPORT_64BIT=1
ompi_cv_asm_arch="POWERPC64"
else
AC_MSG_ERROR([Could not determine PowerPC word size: $ac_cv_sizeof_long])
@ -922,7 +922,7 @@ AC_DEFUN([OMPI_CONFIG_ASM],[
have_v8plus=0
OMPI_CHECK_SPARCV8PLUS([have_v8plus=1])
if test "$have_v8plus" = "0" ; then
OMPI_ASM_SUPPORT_64BIT=0
OPAL_ASM_SUPPORT_64BIT=0
ompi_cv_asm_arch="SPARC"
AC_MSG_WARN([Sparc v8 target is not supported in this release of Open MPI.])
AC_MSG_WARN([You must specify the target architecture v8plus])
@ -931,12 +931,12 @@ AC_MSG_WARN([FFLAGS, and FCFLAGS to compile Open MPI in 32 bit mode on])
AC_MSG_WARN([Sparc processors])
AC_MSG_ERROR([Can not continue.])
else
OMPI_ASM_SUPPORT_64BIT=1
OPAL_ASM_SUPPORT_64BIT=1
ompi_cv_asm_arch="SPARCV9_32"
fi
elif test "$ac_cv_sizeof_long" = "8" ; then
OMPI_ASM_SUPPORT_64BIT=1
OPAL_ASM_SUPPORT_64BIT=1
ompi_cv_asm_arch="SPARCV9_64"
else
AC_MSG_ERROR([Could not determine Sparc word size: $ac_cv_sizeof_long])
@ -949,10 +949,10 @@ AC_MSG_ERROR([Can not continue.])
;;
esac
AC_DEFINE_UNQUOTED([OMPI_ASM_SUPPORT_64BIT],
[$OMPI_ASM_SUPPORT_64BIT],
AC_DEFINE_UNQUOTED([OPAL_ASM_SUPPORT_64BIT],
[$OPAL_ASM_SUPPORT_64BIT],
[Whether we can do 64bit assembly operations or not. Should not be used outside of the assembly header files])
AC_SUBST([OMPI_ASM_SUPPORT_64BIT])
AC_SUBST([OPAL_ASM_SUPPORT_64BIT])
#
# figure out if we need any special function start / stop code
@ -977,37 +977,37 @@ AC_MSG_ERROR([Can not continue.])
# format:
# config_file-text-global-label_suffix-gsym-lsym-type-size-align_log-ppc_r_reg-64_bit-gnu_stack
asm_format="${ompi_asm_arch_config}"
asm_format="${asm_format}-${ompi_cv_asm_text}-${ompi_cv_asm_global}"
asm_format="${asm_format}-${ompi_cv_asm_label_suffix}-${ompi_cv_asm_gsym}"
asm_format="${asm_format}-${ompi_cv_asm_lsym}"
asm_format="${asm_format}-${ompi_cv_asm_type}-${ompi_asm_size}"
asm_format="${asm_format}-${opal_cv_asm_text}-${opal_cv_asm_global}"
asm_format="${asm_format}-${opal_cv_asm_label_suffix}-${opal_cv_asm_gsym}"
asm_format="${asm_format}-${opal_cv_asm_lsym}"
asm_format="${asm_format}-${opal_cv_asm_type}-${opal_asm_size}"
asm_format="${asm_format}-${ompi_asm_align_log_result}"
if test "$ompi_cv_asm_arch" = "POWERPC32" -o "$ompi_cv_asm_arch" = "POWERPC64" ; then
asm_format="${asm_format}-${ompi_cv_asm_powerpc_r_reg}"
asm_format="${asm_format}-${opal_cv_asm_powerpc_r_reg}"
else
asm_format="${asm_format}-1"
fi
asm_format="${asm_format}-${OMPI_ASM_SUPPORT_64BIT}"
asm_format="${asm_format}-${OPAL_ASM_SUPPORT_64BIT}"
ompi_cv_asm_format="${asm_format}-${ompi_cv_asm_gnu_stack}"
# For the Makefile, need to escape the $ as $$. Don't display
# this version, but make sure the Makefile gives the right thing
# when regenerating the files because the base has been touched.
OMPI_ASSEMBLY_FORMAT=`echo "$ompi_cv_asm_format" | sed -e 's/\\\$/\\\$\\\$/'`
OPAL_ASSEMBLY_FORMAT=`echo "$ompi_cv_asm_format" | sed -e 's/\\\$/\\\$\\\$/'`
AC_MSG_CHECKING([for assembly format])
AC_MSG_RESULT([$ompi_cv_asm_format])
AC_DEFINE_UNQUOTED([OMPI_ASSEMBLY_FORMAT], ["$OMPI_ASSEMBLY_FORMAT"],
AC_DEFINE_UNQUOTED([OPAL_ASSEMBLY_FORMAT], ["$OPAL_ASSEMBLY_FORMAT"],
[Format of assembly file])
AC_SUBST([OMPI_ASSEMBLY_FORMAT])
AC_SUBST([OPAL_ASSEMBLY_FORMAT])
fi # if cv_c_compiler_vendor = microsoft
result="OMPI_$ompi_cv_asm_arch"
OMPI_ASSEMBLY_ARCH="$ompi_cv_asm_arch"
OPAL_ASSEMBLY_ARCH="$ompi_cv_asm_arch"
AC_MSG_CHECKING([for asssembly architecture])
AC_MSG_RESULT([$ompi_cv_asm_arch])
AC_DEFINE_UNQUOTED([OMPI_ASSEMBLY_ARCH], [$result],
AC_DEFINE_UNQUOTED([OPAL_ASSEMBLY_ARCH], [$result],
[Architecture type of assembly to use for atomic operations])
AC_SUBST([OMPI_ASSEMBLY_ARCH])
AC_SUBST([OPAL_ASSEMBLY_ARCH])
OMPI_ASM_FIND_FILE
@ -1089,9 +1089,9 @@ fi
result=1
fi
AC_DEFINE_UNQUOTED([OMPI_HAVE_ASM_FILE], [$result],
AC_DEFINE_UNQUOTED([OPAL_HAVE_ASM_FILE], [$result],
[Whether there is an atomic assembly file available])
AM_CONDITIONAL([OMPI_HAVE_ASM_FILE], [test "$result" = "1"])
AM_CONDITIONAL([OPAL_HAVE_ASM_FILE], [test "$result" = "1"])
OMPI_ASM_FILE=$ompi_cv_asm_file
AC_SUBST(OMPI_ASM_FILE)

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

@ -30,9 +30,9 @@ AC_DEFUN([OMPI_CONFIG_THREADS],[
#
# create templates
AH_TEMPLATE([OMPI_HAVE_SOLARIS_THREADS],
AH_TEMPLATE([OPAL_HAVE_SOLARIS_THREADS],
[Do we have native Solaris threads])
AH_TEMPLATE([OMPI_HAVE_POSIX_THREADS],
AH_TEMPLATE([OPAL_HAVE_POSIX_THREADS],
[Do we have POSIX threads])
#
@ -117,13 +117,13 @@ AC_MSG_RESULT($THREAD_TYPE)
#
# Blah - this should be made better, but I don't know how...
#
AH_TEMPLATE([OMPI_THREADS_HAVE_DIFFERENT_PIDS],
AH_TEMPLATE([OPAL_THREADS_HAVE_DIFFERENT_PIDS],
[Do threads have different pids (pthreads on linux)])
if test "$THREAD_TYPE" = "solaris"; then
AC_DEFINE(OMPI_HAVE_SOLARIS_THREADS, 1)
AC_DEFINE(OMPI_HAVE_POSIX_THREADS, 0)
AC_DEFINE(OMPI_THREADS_HAVE_DIFFERENT_PIDS, 0)
AC_DEFINE(OPAL_HAVE_SOLARIS_THREADS, 1)
AC_DEFINE(OPAL_HAVE_POSIX_THREADS, 0)
AC_DEFINE(OPAL_THREADS_HAVE_DIFFERENT_PIDS, 0)
THREAD_CFLAGS="$STHREAD_CFLAGS"
THREAD_FFLAGS="$STHREAD_FFLAGS"
@ -133,8 +133,8 @@ if test "$THREAD_TYPE" = "solaris"; then
THREAD_LDFLAGS="$STHREAD_LDFLAGS"
THREAD_LIBS="$STHREAD_LIBS"
elif test "$THREAD_TYPE" = "posix"; then
AC_DEFINE(OMPI_HAVE_SOLARIS_THREADS, 0)
AC_DEFINE(OMPI_HAVE_POSIX_THREADS, 1)
AC_DEFINE(OPAL_HAVE_SOLARIS_THREADS, 0)
AC_DEFINE(OPAL_HAVE_POSIX_THREADS, 1)
THREAD_CFLAGS="$PTHREAD_CFLAGS"
THREAD_FFLAGS="$PTHREAD_FFLAGS"
@ -146,9 +146,9 @@ elif test "$THREAD_TYPE" = "posix"; then
OMPI_CHECK_PTHREAD_PIDS
else
AC_DEFINE(OMPI_HAVE_SOLARIS_THREADS, 0)
AC_DEFINE(OMPI_HAVE_POSIX_THREADS, 0)
AC_DEFINE(OMPI_THREADS_HAVE_DIFFERENT_PIDS, 0)
AC_DEFINE(OPAL_HAVE_SOLARIS_THREADS, 0)
AC_DEFINE(OPAL_HAVE_POSIX_THREADS, 0)
AC_DEFINE(OPAL_THREADS_HAVE_DIFFERENT_PIDS, 0)
TRHEAD_CFLAGS=
THREAD_FFLAGS=
@ -175,8 +175,8 @@ EOF
fi
fi
AM_CONDITIONAL(OMPI_HAVE_POSIX_THREADS, test "$THREAD_TYPE" = "posix")
AM_CONDITIONAL(OMPI_HAVE_SOLARIS_THREADS, test "$THREAD_TYPE" = "solaris")
AM_CONDITIONAL(OPAL_HAVE_POSIX_THREADS, test "$THREAD_TYPE" = "posix")
AM_CONDITIONAL(OPAL_HAVE_SOLARIS_THREADS, test "$THREAD_TYPE" = "solaris")
#
# Now configure the whole MPI and progress thread gorp
@ -191,27 +191,27 @@ if test "$enable_mpi_threads" = "" ; then
dnl # no argument given either way. Default to whether
dnl # we have threads or not
dnl if test "$THREAD_TYPE" != "none" ; then
dnl OMPI_ENABLE_MPI_THREADS=1
dnl OPAL_ENABLE_MPI_THREADS=1
dnl enable_mpi_threads="yes"
dnl else
dnl OMPI_ENABLE_MPI_THREADS=0
dnl OPAL_ENABLE_MPI_THREADS=0
dnl enable_mpi_threads="no"
dnl fi
# no argument - default to no
OMPI_ENABLE_MPI_THREADS=0
OPAL_ENABLE_MPI_THREADS=0
enable_mpi_threads="no"
elif test "$enable_mpi_threads" = "no" ; then
OMPI_ENABLE_MPI_THREADS=0
OPAL_ENABLE_MPI_THREADS=0
else
# they want MPI threads. Make sure we have threads
if test "$THREAD_TYPE" != "none" ; then
OMPI_ENABLE_MPI_THREADS=1
OPAL_ENABLE_MPI_THREADS=1
enable_mpi_threads="yes"
else
AC_MSG_ERROR([User requested MPI threads, but no threading model supported])
fi
fi
AC_DEFINE_UNQUOTED([OMPI_ENABLE_MPI_THREADS], [$OMPI_ENABLE_MPI_THREADS],
AC_DEFINE_UNQUOTED([OPAL_ENABLE_MPI_THREADS], [$OPAL_ENABLE_MPI_THREADS],
[Whether we should enable support for multiple user threads])
AC_MSG_RESULT([$enable_mpi_threads])
@ -224,21 +224,21 @@ AC_ARG_ENABLE([progress-threads],
if test "$enable_progress_threads" = "" ; then
# no argument given either way. Default to no.
OMPI_ENABLE_PROGRESS_THREADS=0
OPAL_ENABLE_PROGRESS_THREADS=0
enable_progress_threads="no"
elif test "$enable_progress_threads" = "no" ; then
OMPI_ENABLE_PROGRESS_THREADS=0
OPAL_ENABLE_PROGRESS_THREADS=0
enable_progress_threads="no"
else
# they want threaded progress
if test "$THREAD_TYPE" != "none" ; then
OMPI_ENABLE_PROGRESS_THREADS=1
OPAL_ENABLE_PROGRESS_THREADS=1
enable_progress_threads="yes"
else
AC_MSG_ERROR([User requested progress threads, but no threading model supported])
fi
fi
AC_DEFINE_UNQUOTED([OMPI_ENABLE_PROGRESS_THREADS], [$OMPI_ENABLE_PROGRESS_THREADS],
AC_DEFINE_UNQUOTED([OPAL_ENABLE_PROGRESS_THREADS], [$OPAL_ENABLE_PROGRESS_THREADS],
[Whether we should use progress threads rather than polling])
AC_MSG_RESULT([$enable_progress_threads])

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

@ -95,7 +95,7 @@ if test "$WANT_MEM_DEBUG" = "0" -a -z "$enable_mem_debug" -a "$OMPI_DEVEL" = 1;
echo "--> developer override: enable mem profiling by default"
fi
#################### Early development override ####################
AC_DEFINE_UNQUOTED(OMPI_ENABLE_MEM_DEBUG, $WANT_MEM_DEBUG,
AC_DEFINE_UNQUOTED(OPAL_ENABLE_MEM_DEBUG, $WANT_MEM_DEBUG,
[Whether we want the memory profiling or not])
#
@ -119,7 +119,7 @@ if test "$WANT_MEM_PROFILE" = "0" -a -z "$enable_mem_profile" -a "$OMPI_DEVEL" =
echo "--> developer override: enable mem profiling by default"
fi
#################### Early development override ####################
AC_DEFINE_UNQUOTED(OMPI_ENABLE_MEM_PROFILE, $WANT_MEM_PROFILE,
AC_DEFINE_UNQUOTED(OPAL_ENABLE_MEM_PROFILE, $WANT_MEM_PROFILE,
[Whether we want the memory profiling or not])
#
@ -169,7 +169,7 @@ if test "$WANT_DEBUG" = "0"; then
CFLAGS="-DNDEBUG $CFLAGS"
CXXFLAGS="-DNDEBUG $CXXFLAGS"
fi
AC_DEFINE_UNQUOTED(OMPI_ENABLE_DEBUG, $WANT_DEBUG,
AC_DEFINE_UNQUOTED(OPAL_ENABLE_DEBUG, $WANT_DEBUG,
[Whether we want developer-level debugging code or not])
AC_ARG_ENABLE(debug-symbols,
@ -399,7 +399,7 @@ else
AC_MSG_RESULT([yes])
WANT_PRETTY_PRINT_STACKTRACE=1
fi
AC_DEFINE_UNQUOTED([OMPI_WANT_PRETTY_PRINT_STACKTRACE],
AC_DEFINE_UNQUOTED([OPAL_WANT_PRETTY_PRINT_STACKTRACE],
[$WANT_PRETTY_PRINT_STACKTRACE],
[if want pretty-print stack trace feature])
@ -457,12 +457,12 @@ AC_ARG_ENABLE(pty-support,
[Enable/disable PTY support for STDIO forwarding. (default: enabled)]))
if test "$enable_pty_support" = "no" ; then
AC_MSG_RESULT([no])
OMPI_ENABLE_PTY_SUPPORT=0
OPAL_ENABLE_PTY_SUPPORT=0
else
AC_MSG_RESULT([yes])
OMPI_ENABLE_PTY_SUPPORT=1
OPAL_ENABLE_PTY_SUPPORT=1
fi
AC_DEFINE_UNQUOTED([OMPI_ENABLE_PTY_SUPPORT], [$OMPI_ENABLE_PTY_SUPPORT],
AC_DEFINE_UNQUOTED([OPAL_ENABLE_PTY_SUPPORT], [$OPAL_ENABLE_PTY_SUPPORT],
[Whether user wants PTY support or not])
#
@ -478,10 +478,10 @@ AC_ARG_ENABLE([dlopen],
if test "$enable_dlopen" = "no" ; then
enable_mca_dso="no"
enable_mca_static="yes"
OMPI_ENABLE_DLOPEN_SUPPORT=0
OPAL_ENABLE_DLOPEN_SUPPORT=0
AC_MSG_RESULT([no])
else
OMPI_ENABLE_DLOPEN_SUPPORT=1
OPAL_ENABLE_DLOPEN_SUPPORT=1
AC_MSG_RESULT([yes])
fi
@ -501,7 +501,7 @@ else
AC_MSG_RESULT([no])
ompi_want_heterogeneous=0
fi
AC_DEFINE_UNQUOTED([OMPI_ENABLE_HETEROGENEOUS_SUPPORT],
AC_DEFINE_UNQUOTED([OPAL_ENABLE_HETEROGENEOUS_SUPPORT],
[$ompi_want_heterogeneous],
[Enable features required for heterogeneous support])
@ -655,7 +655,7 @@ if test "$enable_per_user_config_files" = "no" ; then
else
result=1
fi
AC_DEFINE_UNQUOTED([OMPI_WANT_HOME_CONFIG_FILES], [$result],
AC_DEFINE_UNQUOTED([OPAL_WANT_HOME_CONFIG_FILES], [$result],
[Enable per-user config files])
#

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

@ -96,7 +96,7 @@ AC_SUBST(CLEANFILES)
#
AC_CANONICAL_HOST
AC_DEFINE_UNQUOTED(OMPI_ARCH, "$host", [OMPI architecture string])
AC_DEFINE_UNQUOTED(OPAL_ARCH, "$host", [OMPI architecture string])
#
# See if we can find an old installation of OMPI to overwrite

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

@ -228,7 +228,7 @@ AC_DEFUN([OMPI_SETUP_CC],[
else
have_builtin_expect=0
fi
AC_DEFINE_UNQUOTED([OMPI_C_HAVE_BUILTIN_EXPECT], [$have_builtin_expect],
AC_DEFINE_UNQUOTED([OPAL_C_HAVE_BUILTIN_EXPECT], [$have_builtin_expect],
[Whether C compiler supports __builtin_expect])
# see if the C compiler supports __builtin_prefetch
@ -244,7 +244,7 @@ AC_DEFUN([OMPI_SETUP_CC],[
else
have_builtin_prefetch=0
fi
AC_DEFINE_UNQUOTED([OMPI_C_HAVE_BUILTIN_PREFETCH], [$have_builtin_prefetch],
AC_DEFINE_UNQUOTED([OPAL_C_HAVE_BUILTIN_PREFETCH], [$have_builtin_prefetch],
[Whether C compiler supports __builtin_prefetch])
# Preload the optflags for the case where the user didn't specify
@ -320,9 +320,9 @@ AC_DEFUN([_OMPI_PROG_CC],[
AC_PROG_CC
BASECC="`basename $CC`"
CFLAGS="$ompi_cflags_save"
AC_DEFINE_UNQUOTED(OMPI_CC, "$CC", [OMPI underlying C compiler])
AC_DEFINE_UNQUOTED(OPAL_CC, "$CC", [OMPI underlying C compiler])
set dummy $CC
ompi_cc_argv0=[$]2
OMPI_WHICH([$ompi_cc_argv0], [OMPI_CC_ABSOLUTE])
AC_SUBST(OMPI_CC_ABSOLUTE)
OMPI_WHICH([$ompi_cc_argv0], [OPAL_CC_ABSOLUTE])
AC_SUBST(OPAL_CC_ABSOLUTE)
])

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

@ -266,18 +266,18 @@ fi
# Check for type alignments
#
OMPI_C_GET_ALIGNMENT(char, OMPI_ALIGNMENT_CHAR)
OMPI_C_GET_ALIGNMENT(short, OMPI_ALIGNMENT_SHORT)
OMPI_C_GET_ALIGNMENT(char, OPAL_ALIGNMENT_CHAR)
OMPI_C_GET_ALIGNMENT(short, OPAL_ALIGNMENT_SHORT)
OMPI_C_GET_ALIGNMENT(wchar_t, OMPI_ALIGNMENT_WCHAR)
OMPI_C_GET_ALIGNMENT(int, OMPI_ALIGNMENT_INT)
OMPI_C_GET_ALIGNMENT(long, OMPI_ALIGNMENT_LONG)
OMPI_C_GET_ALIGNMENT(int, OPAL_ALIGNMENT_INT)
OMPI_C_GET_ALIGNMENT(long, OPAL_ALIGNMENT_LONG)
if test $ac_cv_type_long_long = yes; then
OMPI_C_GET_ALIGNMENT(long long, OMPI_ALIGNMENT_LONG_LONG)
OMPI_C_GET_ALIGNMENT(long long, OPAL_ALIGNMENT_LONG_LONG)
fi
OMPI_C_GET_ALIGNMENT(float, OMPI_ALIGNMENT_FLOAT)
OMPI_C_GET_ALIGNMENT(double, OMPI_ALIGNMENT_DOUBLE)
if test $ac_cv_type_long_double = yes; then
OMPI_C_GET_ALIGNMENT(long double, OMPI_ALIGNMENT_LONG_DOUBLE)
OMPI_C_GET_ALIGNMENT(long double, OPAL_ALIGNMENT_LONG_DOUBLE)
fi
OMPI_C_GET_ALIGNMENT(void *, OMPI_ALIGNMENT_VOID_P)
@ -290,8 +290,8 @@ AC_MSG_CHECKING(for C bool type)
AC_COMPILE_IFELSE(AC_LANG_PROGRAM([[
AC_INCLUDES_DEFAULT]],
[[bool bar, foo = true; bar = foo;]]),
[OMPI_NEED_C_BOOL=0 MSG=yes],[OMPI_NEED_C_BOOL=1 MSG=no])
AC_DEFINE_UNQUOTED(OMPI_NEED_C_BOOL, $OMPI_NEED_C_BOOL,
[OPAL_NEED_C_BOOL=0 MSG=yes],[OPAL_NEED_C_BOOL=1 MSG=no])
AC_DEFINE_UNQUOTED(OPAL_NEED_C_BOOL, $OPAL_NEED_C_BOOL,
[Whether the C compiler supports "bool" without any other help (such as <stdbool.h>)])
AC_MSG_RESULT([$MSG])
@ -344,10 +344,10 @@ fi
# separate directory.
if test "$WANT_WEAK_SYMBOLS" = "0"; then
OMPI_C_HAVE_WEAK_SYMBOLS=0
OPAL_C_HAVE_WEAK_SYMBOLS=0
fi
if test "$WANT_MPI_PROFILING" = "1"; then
if test "$OMPI_C_HAVE_WEAK_SYMBOLS" = "1"; then
if test "$OPAL_C_HAVE_WEAK_SYMBOLS" = "1"; then
OMPI_PROFILING_COMPILE_SEPARATELY=0
else
OMPI_PROFILING_COMPILE_SEPARATELY=1
@ -379,7 +379,7 @@ AM_CONDITIONAL(COMPILE_PROFILING_SEPARATELY,
test "$OMPI_PROFILING_COMPILE_SEPARATELY" = 1)
AC_DEFINE_UNQUOTED(OMPI_ENABLE_MPI_PROFILING, $WANT_MPI_PROFILING,
[Whether we want MPI profiling or not])
AC_DEFINE_UNQUOTED(OMPI_HAVE_WEAK_SYMBOLS, $OMPI_C_HAVE_WEAK_SYMBOLS,
AC_DEFINE_UNQUOTED(OPAL_HAVE_WEAK_SYMBOLS, $OPAL_C_HAVE_WEAK_SYMBOLS,
[Whether we have weak symbols or not])
@ -676,7 +676,7 @@ AC_CHECK_HEADERS([net/if.h], [], [],
# So first figure out if we have <stdbool.h> (i.e., check the value of
# the macro HAVE_STDBOOL_H from the result of AC_CHECK_HEADERS,
# above). If we do have it, then check to see if it actually works.
# Define OMPI_USE_STDBOOL_H as approrpaite.
# Define OPAL_USE_STDBOOL_H as approrpaite.
AC_CHECK_HEADERS([stdbool.h], [have_stdbool_h=1], [have_stdbool_h=0])
AC_MSG_CHECKING([if <stdbool.h> works])
if test "$have_stdbool_h" = "1"; then
@ -686,12 +686,12 @@ AC_INCLUDES_DEFAULT
#include <stdbool.h>
#endif]],
[[bool bar, foo = true; bar = foo;]]),
[OMPI_USE_STDBOOL_H=1 MSG=yes],[OMPI_USE_STDBOOL_H=0 MSG=no])
[OPAL_USE_STDBOOL_H=1 MSG=yes],[OPAL_USE_STDBOOL_H=0 MSG=no])
else
OMPI_USE_STDBOOL_H=0
OPAL_USE_STDBOOL_H=0
MSG="no (don't have <stdbool.h>)"
fi
AC_DEFINE_UNQUOTED(OMPI_USE_STDBOOL_H, $OMPI_USE_STDBOOL_H,
AC_DEFINE_UNQUOTED(OPAL_USE_STDBOOL_H, $OPAL_USE_STDBOOL_H,
[Whether to use <stdbool.h> or not])
AC_MSG_RESULT([$MSG])
@ -734,7 +734,7 @@ AC_EGREP_CPP(yes, [
#ifdef SA_RESTART
yes
#endif ], [MSG=yes VALUE=1], [MSG=no VALUE=0])
AC_DEFINE_UNQUOTED(OMPI_HAVE_SA_RESTART, $VALUE,
AC_DEFINE_UNQUOTED(OPAL_HAVE_SA_RESTART, $VALUE,
[Whether we have SA_RESTART in <signal.h> or not])
AC_MSG_RESULT([$MSG])
@ -809,14 +809,14 @@ AS_IF([test "$ompi_cv_htonl_define" = "yes" -o "$ompi_have_htonl" = "yes"],
# Make sure we can copy va_lists (need check declared, not linkable)
#
AC_CHECK_DECL(va_copy, OMPI_HAVE_VA_COPY=1, OMPI_HAVE_VA_COPY=0,
AC_CHECK_DECL(va_copy, OPAL_HAVE_VA_COPY=1, OPAL_HAVE_VA_COPY=0,
[#include <stdarg.h>])
AC_DEFINE_UNQUOTED(OMPI_HAVE_VA_COPY, $OMPI_HAVE_VA_COPY,
AC_DEFINE_UNQUOTED(OPAL_HAVE_VA_COPY, $OPAL_HAVE_VA_COPY,
[Whether we have va_copy or not])
AC_CHECK_DECL(__va_copy, OMPI_HAVE_UNDERSCORE_VA_COPY=1,
OMPI_HAVE_UNDERSCORE_VA_COPY=0, [#include <stdarg.h>])
AC_DEFINE_UNQUOTED(OMPI_HAVE_UNDERSCORE_VA_COPY, $OMPI_HAVE_UNDERSCORE_VA_COPY,
AC_CHECK_DECL(__va_copy, OPAL_HAVE_UNDERSCORE_VA_COPY=1,
OPAL_HAVE_UNDERSCORE_VA_COPY=0, [#include <stdarg.h>])
AC_DEFINE_UNQUOTED(OPAL_HAVE_UNDERSCORE_VA_COPY, $OPAL_HAVE_UNDERSCORE_VA_COPY,
[Whether we have __va_copy or not])
AC_CHECK_DECLS(__func__)
@ -876,15 +876,15 @@ AC_DEFINE_UNQUOTED(OMPI_MPI_OFFSET_TYPE, $MPI_OFFSET_TYPE, [Type of MPI_Offset -
# sizeof(void*) != sizeof(long) (64 bit Windows, apparently).
#
if test $ac_cv_type_ptrdiff_t = yes ; then
ompi_ptrdiff_t="ptrdiff_t"
opal_ptrdiff_t="ptrdiff_t"
elif test $ac_cv_sizeof_void_p -eq $ac_cv_sizeof_long ; then
ompi_ptrdiff_t="long"
opal_ptrdiff_t="long"
elif test $ac_cv_type_long_long = yes -a $ac_cv_sizeof_void_p -eq $ac_cv_sizeof_long_long ; then
ompi_ptrdiff_t="long long"
opal_ptrdiff_t="long long"
else
AC_MSG_ERROR([Could not find datatype to emulate ptrdiff_t. Cannot continue])
fi
AC_DEFINE_UNQUOTED([OMPI_PTRDIFF_TYPE], [$ompi_ptrdiff_t],
AC_DEFINE_UNQUOTED([OPAL_PTRDIFF_TYPE], [$opal_ptrdiff_t],
[type to use for ptrdiff_t])
#
@ -938,7 +938,7 @@ AC_CACHE_CHECK([if word-sized integers must be word-size aligned],
[ompi_cv_c_word_size_align=yes],
[ompi_cv_c_word_size_align=yes])])
AS_IF([test $ompi_cv_c_word_size_align = yes], [results=1], [results=0])
AC_DEFINE_UNQUOTED([OMPI_ALIGN_WORD_SIZE_INTEGERS], [$results],
AC_DEFINE_UNQUOTED([OPAL_ALIGN_WORD_SIZE_INTEGERS], [$results],
[set to 1 if word-size integers must be aligned to word-size padding to prevent bus errors])
# all: SYSV semaphores
@ -1148,7 +1148,7 @@ ompi_show_subtitle "GNU libltdl setup"
# $enable_shared and $enable_static and pass down the corresponding
# flags.
if test "$OMPI_ENABLE_DLOPEN_SUPPORT" = "1" ; then
if test "$OPAL_ENABLE_DLOPEN_SUPPORT" = "1" ; then
ompi_subdir_args="$ompi_subdir_args --enable-ltdl-convenience --disable-ltdl-install"
if test "$enable_shared" = "yes"; then
ompi_subdir_args="$ompi_subdir_args --enable-shared"
@ -1209,7 +1209,7 @@ AC_SUBST(LTDLINCL)
AC_SUBST(LIBLTDL)
AC_SUBST(LIBLTDL_SUBDIR)
AC_DEFINE_UNQUOTED(OMPI_WANT_LIBLTDL, $OMPI_ENABLE_DLOPEN_SUPPORT,
AC_DEFINE_UNQUOTED(OPAL_WANT_LIBLTDL, $OPAL_ENABLE_DLOPEN_SUPPORT,
[Whether to include support for libltdl or not])
AC_DEFINE_UNQUOTED(OPAL_HAVE_LTDL_ADVISE, $OPAL_HAVE_LTDL_ADVISE,
@ -1300,25 +1300,25 @@ OMPI_SETUP_WRAPPER_FINAL
# things are defined as null tokens or an integer result, two projects
# with different versions of AC can cause problems.
if test $ac_cv_header_stdc = yes; then
AC_DEFINE(OMPI_STDC_HEADERS, 1,
AC_DEFINE(OPAL_STDC_HEADERS, 1,
[Do not use outside of mpi.h. Define to 1 if you have the ANSI C header files.])
fi
if test $ac_cv_header_sys_time_h = yes ; then
AC_DEFINE(OMPI_HAVE_SYS_TIME_H, 1,
AC_DEFINE(OPAL_HAVE_SYS_TIME_H, 1,
[Do not use outside of mpi.h. Define to 1 if you have the <sys/time.h> header file.])
fi
if test $ac_cv_type_long_long = yes ; then
AC_DEFINE(OMPI_HAVE_LONG_LONG, 1,
AC_DEFINE(OPAL_HAVE_LONG_LONG, 1,
[Do not use outside of mpi.h. Define to 1 if the system has the type `long long'.]) dnl `
fi
if test $ac_cv_header_sys_synch_h = yes ; then
AC_DEFINE(OMPI_HAVE_SYS_SYNCH_H, 1,
AC_DEFINE(OPAL_HAVE_SYS_SYNCH_H, 1,
[Do not use outside of mpi.h. Define to 1 if you have the <sys/synch.h> header file.])
fi
AC_DEFINE_UNQUOTED(OMPI_SIZEOF_BOOL, $ac_cv_sizeof_bool,
AC_DEFINE_UNQUOTED(OPAL_SIZEOF_BOOL, $ac_cv_sizeof_bool,
[Do not use outside of mpi.h. The size of a `bool', as computed by sizeof.]) dnl `
AC_DEFINE_UNQUOTED(OMPI_SIZEOF_INT, $ac_cv_sizeof_int,
AC_DEFINE_UNQUOTED(OPAL_SIZEOF_INT, $ac_cv_sizeof_int,
[Do not use outside of mpi.h. The size of a `int', as computed by sizeof.]) dnl `
############################################################################

8
contrib/dist/macosx-pkg/buildpackage.sh поставляемый
Просмотреть файл

@ -35,7 +35,7 @@ OMPI_OSX_README="ReadMe.rtf"
# note - if want XGrid support, make sure that a cocoa-supported
# architecture appears first on the list. Otherwise, we won't
# lipo that component and it will be dropped
OMPI_ARCH_LIST="ppc ppc64 i386 x86_64"
OPAL_ARCH_LIST="ppc ppc64 i386 x86_64"
OMPI_SDK="/Developer/SDKs/MacOSX10.4u.sdk"
#
@ -52,7 +52,7 @@ echo "--> Configuration options:"
echo " Package Name: $OMPI_PACKAGE"
echo " Prefix: $OMPI_PREFIX"
echo " Config Options: $OMPI_OPTIONS"
echo " Architectures: $OMPI_ARCH_LIST"
echo " Architectures: $OPAL_ARCH_LIST"
echo " Target SDK: $OMPI_SDK"
echo ""
@ -160,7 +160,7 @@ fi
build_arch=`uname -p`"-apple-darwin"`uname -r`
real_install=1
for arch in $OMPI_ARCH_LIST ; do
for arch in $OPAL_ARCH_LIST ; do
builddir="$BUILD_TMP/build-$arch"
mkdir "$builddir"
@ -279,7 +279,7 @@ print_arch_if() {
# Set arch to the first arch in the list. Go through the for loop,
# although we'll break out at the end of the first time through. Look
# at the other arches that were built by using ls.
for arch in $OMPI_ARCH_LIST ; do
for arch in $OPAL_ARCH_LIST ; do
cd $BUILD_TMP
other_archs=`ls -d dist-*`
fulldistdir="$BUILD_TMP/dist"

2
contrib/dist/make_dist_tarball поставляемый
Просмотреть файл

@ -120,7 +120,7 @@ check_gnu_version libtool $LT_TARGET_VERSION
# Verify that we're in a top Open MPI dir
#
echo "*** Checking to ensure in top-level Open MPI directory..."
if test -f VERSION -a -f configure.ac -a -f config/ompi_setup_cc.m4; then
if test -f VERSION -a -f configure.ac -a -f config/opal_setup_cc.m4; then
happy=1
else
echo "Do not appear to be in an Open MPI top directory. Abort!"

2
contrib/dist/make_tarball поставляемый
Просмотреть файл

@ -120,7 +120,7 @@ check_gnu_version libtool $LT_TARGET_VERSION
# Verify that we're in a top Open MPI dir
#
echo "*** Checking to ensure in top-level Open MPI directory..."
if test -f VERSION -a -f configure.ac -a -f config/ompi_setup_cc.m4; then
if test -f VERSION -a -f configure.ac -a -f config/opal_setup_cc.m4; then
happy=1
else
echo "Do not appear to be in an Open MPI top directory. Abort!"

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

@ -134,7 +134,7 @@ SET(OMPI_F90_ABSOLUTE "\"none\"")
SET(OMPI_F90_BUILD_SIZE "\"small\"")
# we don't support libtool on Windows.
SET(OMPI_WANT_LIBLTDL 0)
SET(OPAL_WANT_LIBLTDL 0)
# set the im/export decleration here.
# Don't bother with OMPI_IMPORTS
@ -172,40 +172,40 @@ IF(NOT MPI_PARAM_CHECK)
SET (MPI_PARAM_CHECK "ompi_mpi_param_check")
ENDIF(NOT MPI_PARAM_CHECK)
OPTION(OMPI_ENABLE_DEBUG
OPTION(OPAL_ENABLE_DEBUG
"Whether we want developer-level debugging code or not." OFF)
IF(OMPI_ENABLE_DEBUG)
SET(OMPI_ENABLE_DEBUG 1)
ELSE(OMPI_ENABLE_DEBUG)
SET(OMPI_ENABLE_DEBUG 0)
ENDIF(OMPI_ENABLE_DEBUG)
IF(OPAL_ENABLE_DEBUG)
SET(OPAL_ENABLE_DEBUG 1)
ELSE(OPAL_ENABLE_DEBUG)
SET(OPAL_ENABLE_DEBUG 0)
ENDIF(OPAL_ENABLE_DEBUG)
OPTION(OMPI_ENABLE_HETEROGENEOUS_SUPPORT
OPTION(OPAL_ENABLE_HETEROGENEOUS_SUPPORT
"Enable features required for heterogeneous support." OFF)
MARK_AS_ADVANCED(OMPI_ENABLE_HETEROGENEOUS_SUPPORT)
IF(OMPI_ENABLE_HETEROGENEOUS_SUPPORT)
SET(OMPI_ENABLE_HETEROGENEOUS_SUPPORT 1)
ELSE(OMPI_ENABLE_HETEROGENEOUS_SUPPORT)
SET(OMPI_ENABLE_HETEROGENEOUS_SUPPORT 0)
ENDIF(OMPI_ENABLE_HETEROGENEOUS_SUPPORT)
MARK_AS_ADVANCED(OPAL_ENABLE_HETEROGENEOUS_SUPPORT)
IF(OPAL_ENABLE_HETEROGENEOUS_SUPPORT)
SET(OPAL_ENABLE_HETEROGENEOUS_SUPPORT 1)
ELSE(OPAL_ENABLE_HETEROGENEOUS_SUPPORT)
SET(OPAL_ENABLE_HETEROGENEOUS_SUPPORT 0)
ENDIF(OPAL_ENABLE_HETEROGENEOUS_SUPPORT)
OPTION(OMPI_ENABLE_MEM_DEBUG
OPTION(OPAL_ENABLE_MEM_DEBUG
"Whether we want the memory debug or not." OFF)
MARK_AS_ADVANCED(OMPI_ENABLE_MEM_DEBUG)
IF(OMPI_ENABLE_MEM_DEBUG)
SET(OMPI_ENABLE_MEM_DEBUG 1)
ELSE(OMPI_ENABLE_MEM_DEBUG)
SET(OMPI_ENABLE_MEM_DEBUG 0)
ENDIF(OMPI_ENABLE_MEM_DEBUG)
MARK_AS_ADVANCED(OPAL_ENABLE_MEM_DEBUG)
IF(OPAL_ENABLE_MEM_DEBUG)
SET(OPAL_ENABLE_MEM_DEBUG 1)
ELSE(OPAL_ENABLE_MEM_DEBUG)
SET(OPAL_ENABLE_MEM_DEBUG 0)
ENDIF(OPAL_ENABLE_MEM_DEBUG)
OPTION(OMPI_ENABLE_MEM_PROFILE
OPTION(OPAL_ENABLE_MEM_PROFILE
"Whether we want the memory profiling or not." OFF)
MARK_AS_ADVANCED(OMPI_ENABLE_MEM_PROFILE)
IF(OMPI_ENABLE_MEM_PROFILE)
SET(OMPI_ENABLE_MEM_PROFILE 1)
ELSE(OMPI_ENABLE_MEM_PROFILE)
SET(OMPI_ENABLE_MEM_PROFILE 0)
ENDIF(OMPI_ENABLE_MEM_PROFILE)
MARK_AS_ADVANCED(OPAL_ENABLE_MEM_PROFILE)
IF(OPAL_ENABLE_MEM_PROFILE)
SET(OPAL_ENABLE_MEM_PROFILE 1)
ELSE(OPAL_ENABLE_MEM_PROFILE)
SET(OPAL_ENABLE_MEM_PROFILE 0)
ENDIF(OPAL_ENABLE_MEM_PROFILE)
OPTION(OMPI_ENABLE_MPI_PROFILING
"Whether we want MPI profiling or not." ON)
@ -218,32 +218,32 @@ ELSE(OMPI_ENABLE_MPI_PROFILING)
SET(MPIF_H_PMPI_W_FUNCS "")
ENDIF(OMPI_ENABLE_MPI_PROFILING)
OPTION(OMPI_ENABLE_MPI_THREADS
OPTION(OPAL_ENABLE_MPI_THREADS
"Whether we should enable support for multiple user threads." OFF)
MARK_AS_ADVANCED(OMPI_ENABLE_MPI_THREADS)
IF(OMPI_ENABLE_MPI_THREADS)
SET(OMPI_ENABLE_MPI_THREADS 1)
ELSE(OMPI_ENABLE_MPI_THREADS)
SET(OMPI_ENABLE_MPI_THREADS 0)
ENDIF(OMPI_ENABLE_MPI_THREADS)
MARK_AS_ADVANCED(OPAL_ENABLE_MPI_THREADS)
IF(OPAL_ENABLE_MPI_THREADS)
SET(OPAL_ENABLE_MPI_THREADS 1)
ELSE(OPAL_ENABLE_MPI_THREADS)
SET(OPAL_ENABLE_MPI_THREADS 0)
ENDIF(OPAL_ENABLE_MPI_THREADS)
OPTION(OMPI_ENABLE_PROGRESS_THREADS
OPTION(OPAL_ENABLE_PROGRESS_THREADS
"Whether we should use progress threads rather than polling." OFF)
MARK_AS_ADVANCED(OMPI_ENABLE_PROGRESS_THREADS)
IF(OMPI_ENABLE_PROGRESS_THREADS)
SET(OMPI_ENABLE_PROGRESS_THREADS 1)
ELSE(OMPI_ENABLE_PROGRESS_THREADS)
SET(OMPI_ENABLE_PROGRESS_THREADS 0)
ENDIF(OMPI_ENABLE_PROGRESS_THREADS)
MARK_AS_ADVANCED(OPAL_ENABLE_PROGRESS_THREADS)
IF(OPAL_ENABLE_PROGRESS_THREADS)
SET(OPAL_ENABLE_PROGRESS_THREADS 1)
ELSE(OPAL_ENABLE_PROGRESS_THREADS)
SET(OPAL_ENABLE_PROGRESS_THREADS 0)
ENDIF(OPAL_ENABLE_PROGRESS_THREADS)
OPTION(OMPI_ENABLE_PTY_SUPPORT
OPTION(OPAL_ENABLE_PTY_SUPPORT
"Whether we should use progress threads rather than polling." OFF)
MARK_AS_ADVANCED(OMPI_ENABLE_PTY_SUPPORT)
IF(OMPI_ENABLE_PTY_SUPPORT)
SET(OMPI_ENABLE_PTY_SUPPORT 1)
ELSE(OMPI_ENABLE_PTY_SUPPORT)
SET(OMPI_ENABLE_PTY_SUPPORT 0)
ENDIF(OMPI_ENABLE_PTY_SUPPORT)
MARK_AS_ADVANCED(OPAL_ENABLE_PTY_SUPPORT)
IF(OPAL_ENABLE_PTY_SUPPORT)
SET(OPAL_ENABLE_PTY_SUPPORT 1)
ELSE(OPAL_ENABLE_PTY_SUPPORT)
SET(OPAL_ENABLE_PTY_SUPPORT 0)
ENDIF(OPAL_ENABLE_PTY_SUPPORT)
OPTION ( OMPI_GROUP_SPARSE
"Wether we want sparse process groups." OFF)
@ -304,13 +304,13 @@ ELSE(NOT OMPI_WANT_PERUSE)
SET(OMPI_WANT_PERUSE 1)
ENDIF(NOT OMPI_WANT_PERUSE)
OPTION( OMPI_WANT_PRETTY_PRINT_STACKTRACE
OPTION( OPAL_WANT_PRETTY_PRINT_STACKTRACE
"Whether we want pretty-print stack trace feature." ON)
MARK_AS_ADVANCED(OMPI_WANT_PRETTY_PRINT_STACKTRACE)
MARK_AS_ADVANCED(OPAL_WANT_PRETTY_PRINT_STACKTRACE)
OPTION( OMPI_WANT_SMP_LOCKS
OPTION( OPAL_WANT_SMP_LOCKS
"Whether we want to have smp locks in atomic ops or not." ON)
MARK_AS_ADVANCED(OMPI_WANT_SMP_LOCKS)
MARK_AS_ADVANCED(OPAL_WANT_SMP_LOCKS)
OPTION( OPAL_ENABLE_FT
"Enable fault tolerance general components and logic." ON)
@ -587,7 +587,7 @@ CHECK_INCLUDE_FILE (mx_extension.h MX_HAVE_EXTENSIONS_H)
#/* Define to 1 if you have the ANSI C header files. */
CHECK_INCLUDE_FILE(stddef.h STDC_HEADERS)
IF(STDC_HEADERS)
SET(OMPI_STDC_HEADERS 1)
SET(OPAL_STDC_HEADERS 1)
ENDIF(STDC_HEADERS)
###################################################################
@ -1042,9 +1042,9 @@ C_GET_ALIGNMENT (wchar_t c WCHAR_T)
# <stdbool.h>) */
INCLUDE(c_check_bool)
IF (COMPILER_SUPPORT_BOOL)
SET (OMPI_NEED_C_BOOL 0)
SET (OPAL_NEED_C_BOOL 0)
ELSE (COMPILER_SUPPORT_BOOL)
SET (OMPI_NEED_C_BOOL 1)
SET (OPAL_NEED_C_BOOL 1)
ENDIF (COMPILER_SUPPORT_BOOL)
#/* Define to `__inline__' or `__inline' if that's what the C compiler
@ -1078,23 +1078,23 @@ ENDIF(HAVE_INLINE)
#/* #undef OMPI_CXX_XLC_INLINE_ASSEMBLY */
#
#/* Whether C compiler supports DEC style inline assembly */
#/* #undef OMPI_C_DEC_INLINE_ASSEMBLY */
#/* #undef OPAL_C_DEC_INLINE_ASSEMBLY */
#
#/* Whether C compiler supports GCC style inline assembly */
#/* #undef OMPI_C_GCC_INLINE_ASSEMBLY */
#/* #undef OPAL_C_GCC_INLINE_ASSEMBLY */
#
#/* Whether C compiler supports __builtin_expect */
#/* #undef OMPI_C_HAVE_BUILTIN_EXPECT */
#/* #undef OPAL_C_HAVE_BUILTIN_EXPECT */
#
#/* Whether C compiler supports __builtin_prefetch */
#/* #undef OMPI_C_HAVE_BUILTIN_PREFETCH */
#/* #undef OPAL_C_HAVE_BUILTIN_PREFETCH */
#
#/* Whether C compiler supports -fvisibility */
#/* #undef OMPI_C_HAVE_VISIBILITY */
SET(OMPI_C_HAVE_VISIBILITY 1)
#/* #undef OPAL_C_HAVE_VISIBILITY */
SET(OPAL_C_HAVE_VISIBILITY 1)
#
#/* Whether C compiler supports XLC style inline assembly */
#/* #undef OMPI_C_XLC_INLINE_ASSEMBLY */
#/* #undef OPAL_C_XLC_INLINE_ASSEMBLY */
#
SET(OMPI_HAVE_CXX_EXCEPTION_SUPPORT 0)
@ -1339,50 +1339,50 @@ ENDIF(WIN32)
#
#/* OMPI architecture string */
#/* #undef OMPI_ARCH */
#/* #undef OPAL_ARCH */
#
#/* Assembly align directive expects logarithmic value */
#/* #undef OMPI_ASM_ALIGN_LOG */
#/* #undef OPAL_ASM_ALIGN_LOG */
#
#/* Assembly directive for exporting symbols */
#/* #undef OMPI_ASM_GLOBAL */
#/* #undef OPAL_ASM_GLOBAL */
#
#/* Assembly prefix for gsym labels */
#/* #undef OMPI_ASM_GSYM */
#/* #undef OPAL_ASM_GSYM */
#
#/* Assembly suffix for labels */
#/* #undef OMPI_ASM_LABEL_SUFFIX */
#/* #undef OPAL_ASM_LABEL_SUFFIX */
#
#/* Assembly prefix for lsym labels */
#/* #undef OMPI_ASM_LSYM */
#/* #undef OPAL_ASM_LSYM */
#
#/* Do we need to give a .size directive */
#/* #undef OMPI_ASM_SIZE */
#/* #undef OPAL_ASM_SIZE */
#
#/* Whether we can do 64bit assembly operations or not. Should not be used
# outside of the assembly header files */
#/* #undef OMPI_ASM_SUPPORT_64BIT */
#/* #undef OPAL_ASM_SUPPORT_64BIT */
#
#/* Assembly directive for setting text section */
#/* #undef OMPI_ASM_TEXT */
#/* #undef OPAL_ASM_TEXT */
#
#/* How to set function type in .type directive */
#/* #undef OMPI_ASM_TYPE */
#/* #undef OPAL_ASM_TYPE */
#
#/* Architecture type of assembly to use for atomic operations */
#/* #undef OMPI_ASSEMBLY_ARCH */
#/* #undef OPAL_ASSEMBLY_ARCH */
IF(WIN32)
SET (OMPI_ASSEMBLY_ARCH "OMPI_WINDOWS")
SET (OPAL_ASSEMBLY_ARCH "OMPI_WINDOWS")
ENDIF(WIN32)
#
#/* Format of assembly file */
#/* #undef OMPI_ASSEMBLY_FORMAT */
#/* #undef OPAL_ASSEMBLY_FORMAT */
#
#/* OMPI underlying C compiler */
#/* #undef OMPI_CC */
#/* #undef OPAL_CC */
IF (CMAKE_C_COMPILER)
SET (OMPI_CC ${CMAKE_C_COMPILER})
SET (OPAL_CC ${CMAKE_C_COMPILER})
ENDIF (CMAKE_C_COMPILER)
#
@ -1407,74 +1407,74 @@ ENDIF (CMAKE_CXX_COMPILER)
#
#/* Whether there is an atomic assembly file available */
#/* #undef OMPI_HAVE_ASM_FILE */
#/* #undef OPAL_HAVE_ASM_FILE */
#
#/* Whether your compiler has __attribute__ or not */
#/* #undef OMPI_HAVE_ATTRIBUTE */
#/* #undef OPAL_HAVE_ATTRIBUTE */
#
#/* Whether your compiler has __attribute__ aligned or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_ALIGNED */
#/* #undef OPAL_HAVE_ATTRIBUTE_ALIGNED */
#
#/* Whether your compiler has __attribute__ always_inline or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_ALWAYS_INLINE */
#/* #undef OPAL_HAVE_ATTRIBUTE_ALWAYS_INLINE */
#
#/* Whether your compiler has __attribute__ const or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_CONST */
#/* #undef OPAL_HAVE_ATTRIBUTE_CONST */
#
#/* Whether your compiler has __attribute__ deprecated or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_DEPRECATED */
#/* #undef OPAL_HAVE_ATTRIBUTE_DEPRECATED */
#
#/* Whether your compiler has __attribute__ format or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_FORMAT */
#/* #undef OPAL_HAVE_ATTRIBUTE_FORMAT */
#
#/* Whether your compiler has __attribute__ malloc or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_MALLOC */
#/* #undef OPAL_HAVE_ATTRIBUTE_MALLOC */
#
#/* Whether your compiler has __attribute__ may_alias or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_MAY_ALIAS */
#/* #undef OPAL_HAVE_ATTRIBUTE_MAY_ALIAS */
#
#/* Whether your compiler has __attribute__ nonnull or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_NONNULL */
#/* #undef OPAL_HAVE_ATTRIBUTE_NONNULL */
#
#/* Whether your compiler has __attribute__ noreturn or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_NORETURN */
#/* #undef OPAL_HAVE_ATTRIBUTE_NORETURN */
#
#/* Whether your compiler has __attribute__ no_instrument_function or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION */
#/* #undef OPAL_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION */
#
#/* Whether your compiler has __attribute__ packed or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_PACKED */
#/* #undef OPAL_HAVE_ATTRIBUTE_PACKED */
#
#/* Whether your compiler has __attribute__ pure or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_PURE */
#/* #undef OPAL_HAVE_ATTRIBUTE_PURE */
#
#/* Whether your compiler has __attribute__ sentinel or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_SENTINEL */
#/* #undef OPAL_HAVE_ATTRIBUTE_SENTINEL */
#
#/* Whether your compiler has __attribute__ unused or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_UNUSED */
#/* #undef OPAL_HAVE_ATTRIBUTE_UNUSED */
#
#/* Whether your compiler has __attribute__ visibility or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_VISIBILITY */
#/* #undef OPAL_HAVE_ATTRIBUTE_VISIBILITY */
#
#/* Whether your compiler has __attribute__ warn unused result or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT */
#/* #undef OPAL_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT */
#
#/* Whether your compiler has __attribute__ weak alias or not */
#/* #undef OMPI_HAVE_ATTRIBUTE_WEAK_ALIAS */
#/* #undef OPAL_HAVE_ATTRIBUTE_WEAK_ALIAS */
#
#/* whether qsort is broken or not */
#/* #undef OMPI_HAVE_BROKEN_QSORT */
#/* #undef OPAL_HAVE_BROKEN_QSORT */
#
#/* Do we have POSIX threads */
#/* #undef OMPI_HAVE_POSIX_THREADS */
SET(OMPI_HAVE_POSIX_THREADS 0)
#/* #undef OPAL_HAVE_POSIX_THREADS */
SET(OPAL_HAVE_POSIX_THREADS 0)
#
#/* Do not use outside of mpi.h. Define to 1 if the system has the type 'long
# long'. */
IF(HAVE_LONG_LONG)
SET(OMPI_HAVE_LONG_LONG 1)
SET(OPAL_HAVE_LONG_LONG 1)
ENDIF(HAVE_LONG_LONG)
#
@ -1488,23 +1488,23 @@ ENDIF(HAVE_LONG_LONG)
#/* #undef OMPI_HAVE_SA_LEN */
#
#/* Whether we have SA_RESTART in <signal.h> or not */
#/* #undef OMPI_HAVE_SA_RESTART */
#/* #undef OPAL_HAVE_SA_RESTART */
#
#/* Do we have native Solaris threads */
#/* #undef OMPI_HAVE_SOLARIS_THREADS */
SET(OMPI_HAVE_SOLARIS_THREADS 0)
#/* #undef OPAL_HAVE_SOLARIS_THREADS */
SET(OPAL_HAVE_SOLARIS_THREADS 0)
#
#/* Whether we have __va_copy or not */
#/* #undef OMPI_HAVE_UNDERSCORE_VA_COPY */
#/* #undef OPAL_HAVE_UNDERSCORE_VA_COPY */
#
#/* Whether we have va_copy or not */
#/* #undef OMPI_HAVE_VA_COPY */
#/* #undef OPAL_HAVE_VA_COPY */
#
#/* Wehther we have weak symbols or not */
#/* #undef OMPI_HAVE_WEAK_SYMBOLS */
#/* #undef OPAL_HAVE_WEAK_SYMBOLS */
# We don't support weak symbols on windows
SET(OMPI_HAVE_WEAK_SYMBOLS 0)
SET(OPAL_HAVE_WEAK_SYMBOLS 0)
#
#/* Number of arguments to ibv_create_cq */
@ -1560,14 +1560,14 @@ SET (OMPI_MPI_OFFSET_TYPE_STRING "long long")
#/* #undef OMPI_PORTALS_UTCP */
#
#/* Whether r notation is used for ppc registers */
#/* #undef OMPI_POWERPC_R_REGISTERS */
#/* #undef OPAL_POWERPC_R_REGISTERS */
#
#/* type to use for ptrdiff_t */
#/* #undef OMPI_PTRDIFF_TYPE */
#/* #undef OPAL_PTRDIFF_TYPE */
IF(HAVE_PTRDIFF_T)
SET(OMPI_PTRDIFF_TYPE "ptrdiff_t")
SET(OPAL_PTRDIFF_TYPE "ptrdiff_t")
ENDIF(HAVE_PTRDIFF_T)
@ -1580,10 +1580,10 @@ ENDIF(HAVE_PTRDIFF_T)
#
#
#/* Do threads have different pids (pthreads on linux) */
#/* #undef OMPI_THREADS_HAVE_DIFFERENT_PIDS */
#/* #undef OPAL_THREADS_HAVE_DIFFERENT_PIDS */
#
#/* Whether to use <stdbool.h> or not */
#/* #undef OMPI_USE_STDBOOL_H */
#/* #undef OPAL_USE_STDBOOL_H */
#
#/* Complete release number of Open MPI */
#/* #undef OMPI_VERSION */

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

@ -35,22 +35,22 @@
should be good enough */
/* Define to 1 if you have the ANSI C header files. */
#cmakedefine OMPI_STDC_HEADERS 1
#cmakedefine OPAL_STDC_HEADERS 1
/* Define to 1 if you have the <sys/time.h> header file. */
#cmakedefine OMPI_HAVE_SYS_TIME_H 1
#cmakedefine OPAL_HAVE_SYS_TIME_H 1
/* Define to 1 if you have the <sys/synch.h> header file. */
#cmakedefine OMPI_HAVE_SYS_SYNCH_H 1
#cmakedefine OPAL_HAVE_SYS_SYNCH_H 1
/* Define to 1 if the system has the type `long long'. */
#cmakedefine OMPI_HAVE_LONG_LONG 1
#cmakedefine OPAL_HAVE_LONG_LONG 1
/* The size of a `bool', as computed by sizeof. */
#cmakedefine OMPI_SIZEOF_BOOL ${SIZEOF_BOOL}
#cmakedefine OPAL_SIZEOF_BOOL ${SIZEOF_BOOL}
/* The size of a `int', as computed by sizeof. */
#cmakedefine OMPI_SIZEOF_INT ${SIZEOF_INT}
#cmakedefine OPAL_SIZEOF_INT ${SIZEOF_INT}
/* Whether we have FORTRAN LOGICAL*1 or not */
#define OMPI_HAVE_FORTRAN_LOGICAL1 ${OMPI_HAVE_FORTRAN_LOGICAL1}
@ -95,7 +95,7 @@
#cmakedefine OMPI_MPI_OFFSET_TYPE ${OMPI_MPI_OFFSET_TYPE_STRING}
/* type to use for ptrdiff_t, if it does not exist, set to ptrdiff_t if it does exist */
#cmakedefine OMPI_PTRDIFF_TYPE ${OMPI_PTRDIFF_TYPE}
#cmakedefine OPAL_PTRDIFF_TYPE ${OPAL_PTRDIFF_TYPE}
/* Whether we want MPI cxx support or not */
#cmakedefine OMPI_WANT_CXX_BINDINGS ${OMPI_WANT_CXX_BINDINGS}
@ -131,7 +131,7 @@
#cmakedefine ompi_fortran_integer_t ${ompi_fortran_integer_t}
/* Whether C compiler supports -fvisibility */
#cmakedefine OMPI_C_HAVE_VISIBILITY ${OMPI_C_HAVE_VISIBILITY}
#cmakedefine OPAL_C_HAVE_VISIBILITY ${OPAL_C_HAVE_VISIBILITY}
/* Whether OMPI should provide MPI File interface */
#cmakedefine OMPI_PROVIDE_MPI_FILE_INTERFACE ${OMPI_PROVIDE_MPI_FILE_INTERFACE}
@ -147,7 +147,7 @@
# define OMPI_DECLSPEC
# endif /* defined(OMPI_IMPORTS) */
# else
# if OMPI_C_HAVE_VISIBILITY == 1
# if OPAL_C_HAVE_VISIBILITY == 1
# define OMPI_DECLSPEC __attribute__((visibility("default")))
# else
# define OMPI_DECLSPEC
@ -165,7 +165,7 @@
/* @OMPI_END_CONFIGURE_SECTION@ */
/* include for ptrdiff_t */
#ifdef OMPI_STDC_HEADERS
#ifdef OPAL_STDC_HEADERS
#include <stddef.h>
#endif
@ -202,7 +202,7 @@ extern "C" {
* Typedefs
*/
typedef OMPI_PTRDIFF_TYPE MPI_Aint;
typedef OPAL_PTRDIFF_TYPE MPI_Aint;
typedef OMPI_MPI_OFFSET_TYPE MPI_Offset;
typedef struct ompi_communicator_t *MPI_Comm;
typedef struct ompi_datatype_t *MPI_Datatype;
@ -763,11 +763,11 @@ OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUSES_IGNORE;
#define MPI_UB (((MPI_Datatype)&(ompi_mpi_ub)))
#define MPI_LB (((MPI_Datatype)&(ompi_mpi_lb)))
#define MPI_WCHAR (((MPI_Datatype)&(ompi_mpi_wchar)))
#if OMPI_HAVE_LONG_LONG
#if OPAL_HAVE_LONG_LONG
#define MPI_LONG_LONG_INT (((MPI_Datatype)&(ompi_mpi_long_long_int)))
#define MPI_LONG_LONG (((MPI_Datatype)&(ompi_mpi_long_long_int)))
#define MPI_UNSIGNED_LONG_LONG (((MPI_Datatype)&(ompi_mpi_unsigned_long_long)))
#endif /* OMPI_HAVE_LONG_LONG */
#endif /* OPAL_HAVE_LONG_LONG */
#define MPI_2COMPLEX (((MPI_Datatype)&(ompi_mpi_2cplex)))
#define MPI_2DOUBLE_COMPLEX (((MPI_Datatype)&(ompi_mpi_2dblcplex)))

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

@ -43,7 +43,7 @@
#define OMPI_BUILD_LIBS ${OMPI_BUILD_LIBS}
#define OMPI_CC_ABSOLUTE "${OMPI_CC}"
#define OPAL_CC_ABSOLUTE "${OPAL_CC}"
#define OMPI_CXX_ABSOLUTE "${OMPI_CXX}"
@ -634,7 +634,7 @@
#cmakedefine NO_MINUS_C_MINUS_O 1
/* Alignment of type char */
#define OMPI_ALIGNMENT_CHAR ${CHAR_ALIGNMENT}
#define OPAL_ALIGNMENT_CHAR ${CHAR_ALIGNMENT}
/* Alignment of type bool */
#define OMPI_ALIGNMENT_CXX_BOOL ${BOOL_ALIGNMENT}
@ -709,19 +709,19 @@
#define OMPI_ALIGNMENT_FORTRAN_REAL8 ${OMPI_ALIGNMENT_FORTRAN_REAL8}
/* Alignment of type int */
#define OMPI_ALIGNMENT_INT ${INT_ALIGNMENT}
#define OPAL_ALIGNMENT_INT ${INT_ALIGNMENT}
/* Alignment of type long */
#define OMPI_ALIGNMENT_LONG ${LONG_ALIGNMENT}
#define OPAL_ALIGNMENT_LONG ${LONG_ALIGNMENT}
/* Alignment of type long double */
#define OMPI_ALIGNMENT_LONG_DOUBLE ${LONG_DOUBLE_ALIGNMENT}
#define OPAL_ALIGNMENT_LONG_DOUBLE ${LONG_DOUBLE_ALIGNMENT}
/* Alignment of type long long */
#define OMPI_ALIGNMENT_LONG_LONG ${LONG_LONG_ALIGNMENT}
#define OPAL_ALIGNMENT_LONG_LONG ${LONG_LONG_ALIGNMENT}
/* Alignment of type short */
#define OMPI_ALIGNMENT_SHORT ${SHORT_ALIGNMENT}
#define OPAL_ALIGNMENT_SHORT ${SHORT_ALIGNMENT}
/* Alignment of type void * */
#define OMPI_ALIGNMENT_VOID_P ${VOID_P_ALIGNMENT}
@ -730,44 +730,44 @@
#define OMPI_ALIGNMENT_WCHAR ${WCHAR_T_ALIGNMENT}
/* OMPI architecture string */
#define OMPI_ARCH "${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_SYSTEM}"
#define OPAL_ARCH "${CMAKE_SYSTEM_PROCESSOR} ${CMAKE_SYSTEM}"
/* Assembly align directive expects logarithmic value */
#cmakedefine OMPI_ASM_ALIGN_LOG
#cmakedefine OPAL_ASM_ALIGN_LOG
/* Assembly directive for exporting symbols */
#cmakedefine OMPI_ASM_GLOBAL
#cmakedefine OPAL_ASM_GLOBAL
/* Assembly prefix for gsym labels */
#cmakedefine OMPI_ASM_GSYM
#cmakedefine OPAL_ASM_GSYM
/* Assembly suffix for labels */
#cmakedefine OMPI_ASM_LABEL_SUFFIX
#cmakedefine OPAL_ASM_LABEL_SUFFIX
/* Assembly prefix for lsym labels */
#cmakedefine OMPI_ASM_LSYM
#cmakedefine OPAL_ASM_LSYM
/* Do we need to give a .size directive */
#cmakedefine OMPI_ASM_SIZE
#cmakedefine OPAL_ASM_SIZE
/* Whether we can do 64bit assembly operations or not. Should not be used
outside of the assembly header files */
#cmakedefine OMPI_ASM_SUPPORT_64BIT
#cmakedefine OPAL_ASM_SUPPORT_64BIT
/* Assembly directive for setting text section */
#cmakedefine OMPI_ASM_TEXT
#cmakedefine OPAL_ASM_TEXT
/* How to set function type in .type directive */
#cmakedefine OMPI_ASM_TYPE
#cmakedefine OPAL_ASM_TYPE
/* Architecture type of assembly to use for atomic operations */
#cmakedefine OMPI_ASSEMBLY_ARCH ${OMPI_ASSEMBLY_ARCH}
#cmakedefine OPAL_ASSEMBLY_ARCH ${OPAL_ASSEMBLY_ARCH}
/* Format of assembly file */
#cmakedefine OMPI_ASSEMBLY_FORMAT
#cmakedefine OPAL_ASSEMBLY_FORMAT
/* OMPI underlying C compiler */
#cmakedefine OMPI_CC "${OMPI_CC}"
#cmakedefine OPAL_CC "${OPAL_CC}"
/* OMPI underlying C++ compiler */
#cmakedefine OMPI_CXX "${OMPI_CXX}"
@ -791,46 +791,46 @@
#cmakedefine OMPI_CXX_XLC_INLINE_ASSEMBLY
/* Whether C compiler supports DEC style inline assembly */
#cmakedefine OMPI_C_DEC_INLINE_ASSEMBLY
#cmakedefine OPAL_C_DEC_INLINE_ASSEMBLY
/* Whether C compiler supports GCC style inline assembly */
#cmakedefine OMPI_C_GCC_INLINE_ASSEMBLY
#cmakedefine OPAL_C_GCC_INLINE_ASSEMBLY
/* Whether C compiler supports __builtin_expect */
#cmakedefine OMPI_C_HAVE_BUILTIN_EXPECT
#cmakedefine OPAL_C_HAVE_BUILTIN_EXPECT
/* Whether C compiler supports __builtin_prefetch */
#cmakedefine OMPI_C_HAVE_BUILTIN_PREFETCH
#cmakedefine OPAL_C_HAVE_BUILTIN_PREFETCH
/* Whether C compiler supports -fvisibility */
#define OMPI_C_HAVE_VISIBILITY ${OMPI_C_HAVE_VISIBILITY}
#define OPAL_C_HAVE_VISIBILITY ${OPAL_C_HAVE_VISIBILITY}
/* Whether C compiler supports XLC style inline assembly */
#cmakedefine OMPI_C_XLC_INLINE_ASSEMBLY
#cmakedefine OPAL_C_XLC_INLINE_ASSEMBLY
/* Whether we want developer-level debugging code or not */
#define OMPI_ENABLE_DEBUG ${OMPI_ENABLE_DEBUG}
#define OPAL_ENABLE_DEBUG ${OPAL_ENABLE_DEBUG}
/* Enable features required for heterogeneous support */
#define OMPI_ENABLE_HETEROGENEOUS_SUPPORT ${OMPI_ENABLE_HETEROGENEOUS_SUPPORT}
#define OPAL_ENABLE_HETEROGENEOUS_SUPPORT ${OPAL_ENABLE_HETEROGENEOUS_SUPPORT}
/* Whether we want the memory profiling or not */
#define OMPI_ENABLE_MEM_DEBUG ${OMPI_ENABLE_MEM_DEBUG}
#define OPAL_ENABLE_MEM_DEBUG ${OPAL_ENABLE_MEM_DEBUG}
/* Whether we want the memory profiling or not */
#define OMPI_ENABLE_MEM_PROFILE ${OMPI_ENABLE_MEM_PROFILE}
#define OPAL_ENABLE_MEM_PROFILE ${OPAL_ENABLE_MEM_PROFILE}
/* Whether we want MPI profiling or not */
#define OMPI_ENABLE_MPI_PROFILING ${OMPI_ENABLE_MPI_PROFILING}
/* Whether we should enable support for multiple user threads */
#define OMPI_ENABLE_MPI_THREADS ${OMPI_ENABLE_MPI_THREADS}
#define OPAL_ENABLE_MPI_THREADS ${OPAL_ENABLE_MPI_THREADS}
/* Whether we should use progress threads rather than polling */
#define OMPI_ENABLE_PROGRESS_THREADS ${OMPI_ENABLE_PROGRESS_THREADS}
#define OPAL_ENABLE_PROGRESS_THREADS ${OPAL_ENABLE_PROGRESS_THREADS}
/* Whether user wants PTY support or not */
#define OMPI_ENABLE_PTY_SUPPORT ${OMPI_ENABLE_PTY_SUPPORT}
#define OPAL_ENABLE_PTY_SUPPORT ${OPAL_ENABLE_PTY_SUPPORT}
/* OMPI underlying F77 compiler */
#define OMPI_F77 "${CMAKE_Fortran_COMPILER}"
@ -864,64 +864,64 @@
#define OMPI_GROUP_SPARSE ${OMPI_GROUP_SPARSE}
/* Whether there is an atomic assembly file available */
#cmakedefine OMPI_HAVE_ASM_FILE
#cmakedefine OPAL_HAVE_ASM_FILE
/* Whether your compiler has __attribute__ or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE
#cmakedefine OPAL_HAVE_ATTRIBUTE
/* Whether your compiler has __attribute__ aligned or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_ALIGNED
#cmakedefine OPAL_HAVE_ATTRIBUTE_ALIGNED
/* Whether your compiler has __attribute__ always_inline or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_ALWAYS_INLINE
#cmakedefine OPAL_HAVE_ATTRIBUTE_ALWAYS_INLINE
/* Whether your compiler has __attribute__ const or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_CONST
#cmakedefine OPAL_HAVE_ATTRIBUTE_CONST
/* Whether your compiler has __attribute__ deprecated or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_DEPRECATED
#cmakedefine OPAL_HAVE_ATTRIBUTE_DEPRECATED
/* Whether your compiler has __attribute__ format or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_FORMAT
#cmakedefine OPAL_HAVE_ATTRIBUTE_FORMAT
/* Whether your compiler has __attribute__ malloc or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_MALLOC
#cmakedefine OPAL_HAVE_ATTRIBUTE_MALLOC
/* Whether your compiler has __attribute__ may_alias or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_MAY_ALIAS
#cmakedefine OPAL_HAVE_ATTRIBUTE_MAY_ALIAS
/* Whether your compiler has __attribute__ nonnull or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_NONNULL
#cmakedefine OPAL_HAVE_ATTRIBUTE_NONNULL
/* Whether your compiler has __attribute__ noreturn or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_NORETURN
#cmakedefine OPAL_HAVE_ATTRIBUTE_NORETURN
/* Whether your compiler has __attribute__ no_instrument_function or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION
#cmakedefine OPAL_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION
/* Whether your compiler has __attribute__ packed or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_PACKED
#cmakedefine OPAL_HAVE_ATTRIBUTE_PACKED
/* Whether your compiler has __attribute__ pure or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_PURE
#cmakedefine OPAL_HAVE_ATTRIBUTE_PURE
/* Whether your compiler has __attribute__ sentinel or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_SENTINEL
#cmakedefine OPAL_HAVE_ATTRIBUTE_SENTINEL
/* Whether your compiler has __attribute__ unused or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_UNUSED
#cmakedefine OPAL_HAVE_ATTRIBUTE_UNUSED
/* Whether your compiler has __attribute__ visibility or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_VISIBILITY
#cmakedefine OPAL_HAVE_ATTRIBUTE_VISIBILITY
/* Whether your compiler has __attribute__ warn unused result or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT
#cmakedefine OPAL_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT
/* Whether your compiler has __attribute__ weak alias or not */
#cmakedefine OMPI_HAVE_ATTRIBUTE_WEAK_ALIAS
#cmakedefine OPAL_HAVE_ATTRIBUTE_WEAK_ALIAS
/* whether qsort is broken or not */
#cmakedefine OMPI_HAVE_BROKEN_QSORT
#cmakedefine OPAL_HAVE_BROKEN_QSORT
/* Whether or not we have compiled with C++ exceptions support */
#define OMPI_HAVE_CXX_EXCEPTION_SUPPORT ${OMPI_HAVE_CXX_EXCEPTION_SUPPORT}
@ -1047,10 +1047,10 @@
/* Do not use outside of mpi.h. Define to 1 if the system has the type 'long
long'. */
#cmakedefine OMPI_HAVE_LONG_LONG 1
#cmakedefine OPAL_HAVE_LONG_LONG 1
/* Do we have POSIX threads */
#define OMPI_HAVE_POSIX_THREADS ${OMPI_HAVE_POSIX_THREADS}
#define OPAL_HAVE_POSIX_THREADS ${OPAL_HAVE_POSIX_THREADS}
/* If PTHREADS implementation supports PTHREAD_MUTEX_ERRORCHECK */
#cmakedefine OMPI_HAVE_PTHREAD_MUTEX_ERRORCHECK
@ -1062,19 +1062,19 @@
#cmakedefine OMPI_HAVE_SA_LEN
/* Whether we have SA_RESTART in <signal.h> or not */
#cmakedefine OMPI_HAVE_SA_RESTART
#cmakedefine OPAL_HAVE_SA_RESTART
/* Do we have native Solaris threads */
#define OMPI_HAVE_SOLARIS_THREADS ${OMPI_HAVE_SOLARIS_THREADS}
#define OPAL_HAVE_SOLARIS_THREADS ${OPAL_HAVE_SOLARIS_THREADS}
/* Whether we have __va_copy or not */
#cmakedefine OMPI_HAVE_UNDERSCORE_VA_COPY
#cmakedefine OPAL_HAVE_UNDERSCORE_VA_COPY
/* Whether we have va_copy or not */
#cmakedefine OMPI_HAVE_VA_COPY
#cmakedefine OPAL_HAVE_VA_COPY
/* Wehther we have weak symbols or not */
#define OMPI_HAVE_WEAK_SYMBOLS ${OMPI_HAVE_WEAK_SYMBOLS}
#define OPAL_HAVE_WEAK_SYMBOLS ${OPAL_HAVE_WEAK_SYMBOLS}
/* Number of arguments to ibv_create_cq */
#cmakedefine OMPI_IBV_CREATE_CQ_ARGS
@ -1115,7 +1115,7 @@
/* Whether the C compiler supports "bool" without any other help (such as
<stdbool.h>) */
#cmakedefine OMPI_NEED_C_BOOL 1
#cmakedefine OPAL_NEED_C_BOOL 1
/* MPI datatype corresponding to MPI_Offset */
#cmakedefine OMPI_OFFSET_DATATYPE
@ -1130,13 +1130,13 @@
#cmakedefine OMPI_PORTALS_UTCP
/* Whether r notation is used for ppc registers */
#cmakedefine OMPI_POWERPC_R_REGISTERS
#cmakedefine OPAL_POWERPC_R_REGISTERS
/* Whether OMPI should provide MPI File interface */
#define OMPI_PROVIDE_MPI_FILE_INTERFACE ${OMPI_PROVIDE_MPI_FILE_INTERFACE}
/* type to use for ptrdiff_t */
#cmakedefine OMPI_PTRDIFF_TYPE ${OMPI_PTRDIFF_TYPE}
#cmakedefine OPAL_PTRDIFF_TYPE ${OPAL_PTRDIFF_TYPE}
/* Release release number of Open MPI */
#cmakedefine OMPI_RELEASE_VERSION ${OMPI_RELEASE_VERSION_STRING}
@ -1208,10 +1208,10 @@
#define OMPI_SIZEOF_FORTRAN_REAL8 ${OMPI_SIZEOF_FORTRAN_REAL8}
/* Do threads have different pids (pthreads on linux) */
#cmakedefine OMPI_THREADS_HAVE_DIFFERENT_PIDS
#cmakedefine OPAL_THREADS_HAVE_DIFFERENT_PIDS
/* Whether to use <stdbool.h> or not */
#cmakedefine OMPI_USE_STDBOOL_H
#cmakedefine OPAL_USE_STDBOOL_H
/* Complete release number of Open MPI */
#cmakedefine OMPI_VERSION "${OMPI_VERSION_STRING}"
@ -1226,7 +1226,7 @@
#define OMPI_WANT_F90_BINDINGS ${OMPI_WANT_F90_BINDINGS}
/* Whether to include support for libltdl or not */
#define OMPI_WANT_LIBLTDL ${OMPI_WANT_LIBLTDL}
#define OPAL_WANT_LIBLTDL ${OPAL_WANT_LIBLTDL}
/* do we want to try to work around C++ bindings SEEK_* issue? */
#cmakedefine OMPI_WANT_MPI_CXX_SEEK 1
@ -1235,10 +1235,10 @@
#define OMPI_WANT_PERUSE ${OMPI_WANT_PERUSE}
/* if want pretty-print stack trace feature */
#cmakedefine OMPI_WANT_PRETTY_PRINT_STACKTRACE 1
#cmakedefine OPAL_WANT_PRETTY_PRINT_STACKTRACE 1
/* whether we want to have smp locks in atomic ops or not */
#cmakedefine OMPI_WANT_SMP_LOCKS 1
#cmakedefine OPAL_WANT_SMP_LOCKS 1
/* Enable fault tolerance general components and logic */
#define OPAL_ENABLE_FT ${OPAL_ENABLE_FT}

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

@ -61,7 +61,7 @@ static void ompi_free_list_destruct(ompi_free_list_t* fl)
opal_list_item_t *item;
ompi_free_list_memory_t *fl_mem;
#if 0 && OMPI_ENABLE_DEBUG
#if 0 && OPAL_ENABLE_DEBUG
if(opal_list_get_size(&fl->super) != fl->fl_num_allocated) {
opal_output(0, "ompi_free_list: %d allocated %d returned: %s:%d\n",
fl->fl_num_allocated, opal_list_get_size(&fl->super),

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

@ -364,7 +364,7 @@ static int ompi_comm_register_cid (uint32_t cid )
if ( regcom->cid > cid ) {
break;
}
#if OMPI_ENABLE_MPI_THREADS
#if OPAL_ENABLE_MPI_THREADS
if( regcom->cid == cid ) {
/**
* The MPI standard state that is the user responsability to
@ -377,7 +377,7 @@ static int ompi_comm_register_cid (uint32_t cid )
OBJ_RELEASE(newentry);
return OMPI_ERROR;
}
#endif /* OMPI_ENABLE_MPI_THREADS */
#endif /* OPAL_ENABLE_MPI_THREADS */
}
opal_list_insert_pos (&ompi_registered_comms, item,
(opal_list_item_t *)newentry);

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

@ -311,7 +311,7 @@ static inline ompi_communicator_t *ompi_comm_lookup(uint32_t cid)
static inline struct ompi_proc_t* ompi_comm_peer_lookup(ompi_communicator_t* comm, int peer_id)
{
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
if(peer_id >= comm->c_remote_group->grp_proc_count) {
opal_output(0, "ompi_comm_lookup_peer: invalid peer index (%d)", peer_id);
return (struct ompi_proc_t *) NULL;

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

@ -534,7 +534,7 @@ ompi_convertor_prepare_for_recv( ompi_convertor_t* convertor,
OMPI_CONVERTOR_PREPARE( convertor, datatype, count, pUserBuf );
if( convertor->flags & CONVERTOR_WITH_CHECKSUM ) {
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if( !(convertor->flags & CONVERTOR_HOMOGENEOUS) ) {
convertor->fAdvance = ompi_unpack_general_checksum;
} else
@ -545,7 +545,7 @@ ompi_convertor_prepare_for_recv( ompi_convertor_t* convertor,
convertor->fAdvance = ompi_generic_simple_unpack_checksum;
}
} else {
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if( !(convertor->flags & CONVERTOR_HOMOGENEOUS) ) {
convertor->fAdvance = ompi_unpack_general;
} else

2
ompi/datatype/convertor.h
Просмотреть файл

@ -169,7 +169,7 @@ static inline int ompi_convertor_cleanup( ompi_convertor_t* convertor )
static inline int32_t
ompi_convertor_need_buffers( const ompi_convertor_t* pConvertor )
{
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if (OPAL_UNLIKELY(0 == (pConvertor->flags & CONVERTOR_HOMOGENEOUS))) return 1;
#endif
if( pConvertor->flags & DT_FLAG_NO_GAPS ) return 0;

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

@ -14,12 +14,12 @@
#include "ompi/datatype/convertor_internal.h"
#include "ompi/datatype/datatype_internal.h"
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
extern int ompi_pack_debug;
#define DO_DEBUG(INST) if( ompi_pack_debug ) { INST }
#else
#define DO_DEBUG(INST)
#endif /* OMPI_ENABLE_DEBUG */
#endif /* OPAL_ENABLE_DEBUG */
/**
* This function always work in local representation. This means no representation

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

@ -255,7 +255,7 @@ do { \
(PSTACK) = pTempStack; \
} while(0)
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
OMPI_DECLSPEC int ompi_ddt_safeguard_pointer_debug_breakpoint( const void* actual_ptr, int length,
const void* initial_ptr,
const ompi_datatype_t* pData,
@ -278,7 +278,7 @@ OMPI_DECLSPEC int ompi_ddt_safeguard_pointer_debug_breakpoint( const void* actua
#else
#define OMPI_DDT_SAFEGUARD_POINTER( ACTPTR, LENGTH, INITPTR, PDATA, COUNT )
#endif /* OMPI_ENABLE_DEBUG */
#endif /* OPAL_ENABLE_DEBUG */
static inline int GET_FIRST_NON_LOOP( const dt_elem_desc_t* _pElem )
{

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

@ -21,12 +21,12 @@
#include "ompi/datatype/convertor_internal.h"
#include "ompi/datatype/datatype_internal.h"
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
extern int ompi_pack_debug;
#define DO_DEBUG(INST) if( ompi_pack_debug ) { INST }
#else
#define DO_DEBUG(INST)
#endif /* OMPI_ENABLE_DEBUG */
#endif /* OPAL_ENABLE_DEBUG */
#include "ompi/datatype/datatype_checksum.h"
#include "ompi/datatype/datatype_pack.h"

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

@ -26,12 +26,12 @@
#include <stdio.h>
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
extern int ompi_unpack_debug;
#define DO_DEBUG(INST) if( ompi_unpack_debug ) { INST }
#else
#define DO_DEBUG(INST)
#endif /* OMPI_ENABLE_DEBUG */
#endif /* OPAL_ENABLE_DEBUG */
#include "ompi/datatype/datatype_checksum.h"
#include "ompi/datatype/datatype_unpack.h"

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

@ -58,7 +58,7 @@ typedef struct __dt_args {
* alignment (but not long alignment). On those architectures,
* copy the buffer into an aligned buffer first.
*/
#if OMPI_ALIGN_WORD_SIZE_INTEGERS
#if OPAL_ALIGN_WORD_SIZE_INTEGERS
#define OMPI_DDT_ALIGN_INT(VALUE, TYPE) \
(VALUE) = OPAL_ALIGN((VALUE), sizeof(MPI_Aint), TYPE)
#define OMPI_DDT_ALIGN_PTR(PTR, TYPE) \
@ -66,7 +66,7 @@ typedef struct __dt_args {
#else
#define OMPI_DDT_ALIGN_INT(VALUE, TYPE)
#define OMPI_DDT_ALIGN_PTR(PTR, TYPE)
#endif /* OMPI_ALIGN_WORD_SIZE_INTEGERS */
#endif /* OPAL_ALIGN_WORD_SIZE_INTEGERS */
/**
* Some architecture require that 64 bits pointers (to pointers) has to
@ -232,13 +232,13 @@ int32_t ompi_ddt_set_args( ompi_datatype_t* pData,
*/
OBJ_RETAIN( d[pos] );
pArgs->total_pack_size += ((ompi_ddt_args_t*)d[pos]->args)->total_pack_size;
#if OMPI_ALIGN_WORD_SIZE_INTEGERS
#if OPAL_ALIGN_WORD_SIZE_INTEGERS
/* as total_pack_size is always aligned to MPI_Aint size their sum
* will be aligned to ...
*/
assert( pArgs->total_pack_size ==
OPAL_ALIGN(pArgs->total_pack_size, sizeof(MPI_Aint), int) );
#endif /* OMPI_ALIGN_WORD_SIZE_INTEGERS */
#endif /* OPAL_ALIGN_WORD_SIZE_INTEGERS */
}
}
return MPI_SUCCESS;
@ -508,7 +508,7 @@ __ompi_ddt_create_from_packed_description( void** packed_buffer,
int create_type, i;
char* next_buffer;
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
bool need_swap = false;
if( (remote_processor->proc_arch ^ ompi_proc_local()->proc_arch) &
@ -523,7 +523,7 @@ __ompi_ddt_create_from_packed_description( void** packed_buffer,
position = (int*)next_buffer;
create_type = position[0];
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if (need_swap) {
create_type = opal_swap_bytes4(create_type);
}
@ -531,7 +531,7 @@ __ompi_ddt_create_from_packed_description( void** packed_buffer,
if( MPI_COMBINER_DUP == create_type ) {
/* there we have a simple predefined datatype */
data_id = position[1];
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if (need_swap) {
data_id = opal_swap_bytes4(data_id);
}
@ -544,7 +544,7 @@ __ompi_ddt_create_from_packed_description( void** packed_buffer,
number_of_length = position[1];
number_of_disp = position[2];
number_of_datatype = position[3];
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if (need_swap) {
number_of_length = opal_swap_bytes4(number_of_length);
number_of_disp = opal_swap_bytes4(number_of_disp);
@ -566,7 +566,7 @@ __ompi_ddt_create_from_packed_description( void** packed_buffer,
for( i = 0; i < number_of_datatype; i++ ) {
data_id = position[i];
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if (need_swap) {
data_id = opal_swap_bytes4(data_id);
}
@ -589,7 +589,7 @@ __ompi_ddt_create_from_packed_description( void** packed_buffer,
}
}
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if (need_swap) {
for (i = 0 ; i < number_of_length ; ++i) {
array_of_length[i] = opal_swap_bytes4(array_of_length[i]);

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

@ -29,12 +29,12 @@
#endif
#include <stdlib.h>
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
extern int ompi_copy_debug;
#define DO_DEBUG(INST) if( ompi_copy_debug ) { INST }
#else
#define DO_DEBUG(INST)
#endif /* OMPI_ENABLE_DEBUG */
#endif /* OPAL_ENABLE_DEBUG */
size_t ompi_datatype_memcpy_block_size = 128 * 1024;

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

@ -28,13 +28,13 @@
#include "ompi/datatype/convertor_internal.h"
#include <stdio.h>
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
#include "opal/mca/base/mca_base_param.h"
int ompi_unpack_debug = 0;
int ompi_pack_debug = 0;
int ompi_copy_debug = 0;
int ompi_position_debug = 0;
#endif /* OMPI_ENABLE_DEBUG */
#endif /* OPAL_ENABLE_DEBUG */
extern size_t ompi_datatype_memcpy_block_size;
@ -100,20 +100,20 @@ OMPI_DECLSPEC ompi_datatype_t ompi_mpi_loop = INIT_BASIC_TYPE( DT_LOOP, LOOP );
OMPI_DECLSPEC ompi_datatype_t ompi_mpi_end_loop = INIT_BASIC_TYPE( DT_END_LOOP, END_LOOP );
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_ub = { INIT_BASIC_TYPE( DT_UB, UB) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_lb = { INIT_BASIC_TYPE( DT_LB, LB) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_char = { INIT_BASIC_DATA( char, OMPI_ALIGNMENT_CHAR, CHAR, DT_FLAG_DATA_C ) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_character = { INIT_BASIC_DATA( char, OMPI_ALIGNMENT_CHAR, CHARACTER, DT_FLAG_DATA_FORTRAN) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned_char = { INIT_BASIC_DATA( unsigned char, OMPI_ALIGNMENT_CHAR, UNSIGNED_CHAR, DT_FLAG_DATA_C) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_signed_char = { INIT_BASIC_DATA( signed char, OMPI_ALIGNMENT_CHAR, SIGNED_CHAR, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_byte = { INIT_BASIC_DATA( unsigned char, OMPI_ALIGNMENT_CHAR, BYTE, DT_FLAG_DATA_C | DT_FLAG_DATA_INT ) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_short = { INIT_BASIC_DATA( short, OMPI_ALIGNMENT_SHORT, SHORT, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned_short = { INIT_BASIC_DATA( unsigned short, OMPI_ALIGNMENT_SHORT, UNSIGNED_SHORT, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_int = { INIT_BASIC_DATA( int, OMPI_ALIGNMENT_INT, INT, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned = { INIT_BASIC_DATA_WITH_NAME( unsigned int, OMPI_ALIGNMENT_INT, UNSIGNED_INT, UNSIGNED, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_long = { INIT_BASIC_DATA( long, OMPI_ALIGNMENT_LONG, LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned_long = { INIT_BASIC_DATA( unsigned long, OMPI_ALIGNMENT_LONG, UNSIGNED_LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_char = { INIT_BASIC_DATA( char, OPAL_ALIGNMENT_CHAR, CHAR, DT_FLAG_DATA_C ) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_character = { INIT_BASIC_DATA( char, OPAL_ALIGNMENT_CHAR, CHARACTER, DT_FLAG_DATA_FORTRAN) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned_char = { INIT_BASIC_DATA( unsigned char, OPAL_ALIGNMENT_CHAR, UNSIGNED_CHAR, DT_FLAG_DATA_C) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_signed_char = { INIT_BASIC_DATA( signed char, OPAL_ALIGNMENT_CHAR, SIGNED_CHAR, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_byte = { INIT_BASIC_DATA( unsigned char, OPAL_ALIGNMENT_CHAR, BYTE, DT_FLAG_DATA_C | DT_FLAG_DATA_INT ) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_short = { INIT_BASIC_DATA( short, OPAL_ALIGNMENT_SHORT, SHORT, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned_short = { INIT_BASIC_DATA( unsigned short, OPAL_ALIGNMENT_SHORT, UNSIGNED_SHORT, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_int = { INIT_BASIC_DATA( int, OPAL_ALIGNMENT_INT, INT, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned = { INIT_BASIC_DATA_WITH_NAME( unsigned int, OPAL_ALIGNMENT_INT, UNSIGNED_INT, UNSIGNED, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_long = { INIT_BASIC_DATA( long, OPAL_ALIGNMENT_LONG, LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned_long = { INIT_BASIC_DATA( unsigned long, OPAL_ALIGNMENT_LONG, UNSIGNED_LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
#if HAVE_LONG_LONG
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_long_long_int = { INIT_BASIC_DATA_WITH_NAME( long long, OMPI_ALIGNMENT_LONG_LONG, LONG_LONG_INT, LONG_LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned_long_long = { INIT_BASIC_DATA( unsigned long long, OMPI_ALIGNMENT_LONG_LONG, UNSIGNED_LONG_LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_long_long_int = { INIT_BASIC_DATA_WITH_NAME( long long, OPAL_ALIGNMENT_LONG_LONG, LONG_LONG_INT, LONG_LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned_long_long = { INIT_BASIC_DATA( unsigned long long, OPAL_ALIGNMENT_LONG_LONG, UNSIGNED_LONG_LONG, DT_FLAG_DATA_C | DT_FLAG_DATA_INT) };
#else
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) };
@ -121,11 +121,11 @@ OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_unsigned_long_long = { INIT_UN
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_double = { INIT_BASIC_DATA( double, OMPI_ALIGNMENT_DOUBLE, DOUBLE, DT_FLAG_DATA_C | DT_FLAG_DATA_FLOAT) };
#if HAVE_LONG_DOUBLE
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_long_double = { INIT_BASIC_DATA( long double, OMPI_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
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_long_double = { INIT_UNAVAILABLE_DATA( LONG_DOUBLE) };
#endif /* HAVE_LONG_DOUBLE */
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_packed = { INIT_BASIC_DATA( char, OMPI_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
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_wchar = { INIT_BASIC_DATA( wchar_t, OMPI_ALIGNMENT_WCHAR, WCHAR, DT_FLAG_DATA_C) };
#else
@ -139,7 +139,7 @@ OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_real = { INIT_BASIC_FORTRAN_TY
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) };
#if HAVE_LONG_DOUBLE
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_ldblcplex = { INIT_BASIC_DATA( ompi_complex_long_double_t, OMPI_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) };
#else
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_ldblcplex = { INIT_UNAVAILABLE_DATA( COMPLEX_LONG_DOUBLE) };
#endif /* HAVE_LONG_DOUBLE */
@ -164,7 +164,7 @@ OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_2integer = { INIT_BASIC_TYPE(
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_dblcplex = { INIT_BASIC_DATA( ompi_complex_double_t, OMPI_ALIGNMENT_DOUBLE, COMPLEX_DOUBLE, DT_FLAG_DATA_CPP | DT_FLAG_DATA_COMPLEX) };
#if HAVE_LONG_DOUBLE
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_cxx_ldblcplex = { INIT_BASIC_DATA( ompi_complex_long_double_t, OMPI_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
OMPI_DECLSPEC ompi_predefined_datatype_t ompi_mpi_cxx_ldblcplex = { INIT_UNAVAILABLE_DATA( COMPLEX_LONG_DOUBLE) };
#endif /* HAVE_LONG_DOUBLE */
@ -397,7 +397,7 @@ size_t ompi_ddt_local_sizes[DT_MAX_PREDEFINED];
int ompi_ddt_register_params(void)
{
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
mca_base_param_reg_int_name( "mpi", "ddt_unpack_debug",
"Whether to output debugging information in the ddt unpack functions (nonzero = enabled)",
false, false,
@ -414,7 +414,7 @@ int ompi_ddt_register_params(void)
"Whether to output debugging information in the ddt copy functions (nonzero = enabled)",
false, false,
ompi_copy_debug, &ompi_copy_debug );
#endif /* OMPI_ENABLE_DEBUG */
#endif /* OPAL_ENABLE_DEBUG */
return OMPI_SUCCESS;
}
@ -848,7 +848,7 @@ int32_t ompi_ddt_finalize( void )
return OMPI_SUCCESS;
}
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
/*
* Set a breakpoint to this function in your favorite debugger
* to make it stop on all pack and unpack errors.
@ -860,7 +860,7 @@ int ompi_ddt_safeguard_pointer_debug_breakpoint( const void* actual_ptr, int len
{
return 0;
}
#endif /* OMPI_ENABLE_DEBUG */
#endif /* OPAL_ENABLE_DEBUG */
/********************************************************
* Data dumping functions

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

@ -28,12 +28,12 @@
#endif
#include <stdlib.h>
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
extern int ompi_position_debug;
#define DO_DEBUG(INST) if( ompi_position_debug ) { INST }
#else
#define DO_DEBUG(INST)
#endif /* OMPI_ENABLE_DEBUG */
#endif /* OPAL_ENABLE_DEBUG */
/* The pack/unpack functions need a cleanup. I have to create a proper interface to access
* all basic functionalities, hence using them as basic blocks for all conversion functions.

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

@ -150,7 +150,7 @@ opal_condition_t ompi_request_cond;
size_t ompi_request_waiting;
opal_mutex_t ompi_request_lock;
opal_mutex_t opal_event_lock;
#if OMPI_HAVE_THREAD_SUPPORT
#if OPAL_HAVE_THREAD_SUPPORT
volatile
#endif
uint32_t opal_progress_recursion_depth_counter;

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

@ -290,28 +290,28 @@ static void file_destructor(ompi_file_t *file)
if (NULL != file->f_comm) {
OBJ_RELEASE(file->f_comm);
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
file->f_comm = NULL;
#endif
}
if (NULL != file->f_filename) {
free(file->f_filename);
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
file->f_filename = NULL;
#endif
}
if (NULL != file->error_handler) {
OBJ_RELEASE(file->error_handler);
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
file->error_handler = NULL;
#endif
}
if (NULL != file->f_info) {
OBJ_RELEASE(file->f_info);
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
file->f_info = NULL;
#endif
}

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

@ -325,7 +325,7 @@ int ompi_group_minloc (int list[], int length);
*/
static inline struct ompi_proc_t* ompi_group_peer_lookup(ompi_group_t *group, int peer_id)
{
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
if (peer_id >= group->grp_proc_count) {
opal_output(0, "ompi_group_lookup_peer: invalid peer index (%d)", peer_id);
return (struct ompi_proc_t *) NULL;

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

@ -35,22 +35,22 @@
should be good enough */
/* Define to 1 if you have the ANSI C header files. */
#undef OMPI_STDC_HEADERS
#undef OPAL_STDC_HEADERS
/* Define to 1 if you have the <sys/time.h> header file. */
#undef OMPI_HAVE_SYS_TIME_H
#undef OPAL_HAVE_SYS_TIME_H
/* Define to 1 if you have the <sys/synch.h> header file. */
#undef OMPI_HAVE_SYS_SYNCH_H
#undef OPAL_HAVE_SYS_SYNCH_H
/* Define to 1 if the system has the type `long long'. */
#undef OMPI_HAVE_LONG_LONG
#undef OPAL_HAVE_LONG_LONG
/* The size of a `bool', as computed by sizeof. */
#undef OMPI_SIZEOF_BOOL
#undef OPAL_SIZEOF_BOOL
/* The size of a `int', as computed by sizeof. */
#undef OMPI_SIZEOF_INT
#undef OPAL_SIZEOF_INT
/* Whether we have FORTRAN LOGICAL*1 or not */
#undef OMPI_HAVE_FORTRAN_LOGICAL1
@ -95,7 +95,7 @@
#undef OMPI_MPI_OFFSET_TYPE
/* type to use for ptrdiff_t, if it does not exist, set to ptrdiff_t if it does exist */
#undef OMPI_PTRDIFF_TYPE
#undef OPAL_PTRDIFF_TYPE
/* Whether we want MPI cxx support or not */
#undef OMPI_WANT_CXX_BINDINGS
@ -131,7 +131,7 @@
#undef ompi_fortran_integer_t
/* Whether C compiler supports -fvisibility */
#undef OMPI_C_HAVE_VISIBILITY
#undef OPAL_C_HAVE_VISIBILITY
/* Whether OMPI should provide MPI File interface */
#undef OMPI_PROVIDE_MPI_FILE_INTERFACE
@ -144,7 +144,7 @@
# define OMPI_DECLSPEC
# endif /* defined(OMPI_IMPORTS) */
# else
# if OMPI_C_HAVE_VISIBILITY == 1
# if OPAL_C_HAVE_VISIBILITY == 1
# define OMPI_DECLSPEC __attribute__((visibility("default")))
# else
# define OMPI_DECLSPEC
@ -162,7 +162,7 @@
/* @OMPI_END_CONFIGURE_SECTION@ */
/* include for ptrdiff_t */
#ifdef OMPI_STDC_HEADERS
#ifdef OPAL_STDC_HEADERS
#include <stddef.h>
#endif
@ -215,7 +215,7 @@ extern "C" {
* Typedefs
*/
typedef OMPI_PTRDIFF_TYPE MPI_Aint;
typedef OPAL_PTRDIFF_TYPE MPI_Aint;
typedef OMPI_MPI_OFFSET_TYPE MPI_Offset;
typedef struct ompi_communicator_t *MPI_Comm;
typedef struct ompi_datatype_t *MPI_Datatype;
@ -776,11 +776,11 @@ OMPI_DECLSPEC extern MPI_Fint *MPI_F_STATUSES_IGNORE;
#define MPI_UB OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_ub)
#define MPI_LB OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_lb)
#define MPI_WCHAR OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_wchar)
#if OMPI_HAVE_LONG_LONG
#if OPAL_HAVE_LONG_LONG
#define MPI_LONG_LONG_INT OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_long_long_int)
#define MPI_LONG_LONG OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_long_long_int)
#define MPI_UNSIGNED_LONG_LONG OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_unsigned_long_long)
#endif /* OMPI_HAVE_LONG_LONG */
#endif /* OPAL_HAVE_LONG_LONG */
#define MPI_2COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_2cplex)
#define MPI_2DOUBLE_COMPLEX OMPI_PREDEFINED_GLOBAL(MPI_Datatype, ompi_mpi_2dblcplex)

12
ompi/include/ompi/memchecker.h
Просмотреть файл

@ -163,7 +163,7 @@ static inline int memchecker_comm(MPI_Comm comm)
/* c_base */
opal_memchecker_base_isdefined (&comm->c_base.obj_class, sizeof(opal_class_t *));
opal_memchecker_base_isdefined ((void*)&comm->c_base.obj_reference_count, sizeof(volatile int32_t));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
opal_memchecker_base_isdefined (&comm->c_base.obj_magic_id, sizeof(opal_object_t));
opal_memchecker_base_isdefined (&comm->c_base.cls_init_file_name, sizeof(const char *));
opal_memchecker_base_isdefined (&comm->c_base.cls_init_lineno, sizeof(int));
@ -171,12 +171,12 @@ static inline int memchecker_comm(MPI_Comm comm)
/* c_lock */
opal_memchecker_base_isdefined (&comm->c_lock.super.obj_class, sizeof(opal_class_t *));
opal_memchecker_base_isdefined ((void*)&comm->c_lock.super.obj_reference_count, sizeof(volatile int32_t));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
opal_memchecker_base_isdefined (&comm->c_lock.super.obj_magic_id, sizeof(uint64_t));
opal_memchecker_base_isdefined (&comm->c_lock.super.cls_init_file_name, sizeof(const char *));
opal_memchecker_base_isdefined (&comm->c_lock.super.cls_init_lineno, sizeof(int));
#endif
#if OMPI_HAVE_POSIX_THREADS
#if OPAL_HAVE_POSIX_THREADS
/*
opal_memchecker_base_isdefined (&comm->c_lock.m_lock_pthread.__m_reserved, sizeof(int));
opal_memchecker_base_isdefined (&comm->c_lock.m_lock_pthread.__m_count, sizeof(int));
@ -186,7 +186,7 @@ static inline int memchecker_comm(MPI_Comm comm)
opal_memchecker_base_isdefined (&comm->c_lock.m_lock_pthread.__m_lock.__spinlock, sizeof(int));
*/
#endif
#if OMPI_HAVE_SOLARIS_THREADS
#if OPAL_HAVE_SOLARIS_THREADS
opal_memchecker_base_isdefined (&comm->c_lock.m_lock_solaris, sizeof(mutex_t));
#endif
/*
@ -262,7 +262,7 @@ static inline int memchecker_request(MPI_Request *request)
#if 0
opal_memchecker_base_isdefined (&(*request)->super.super.super.obj_class, sizeof(opal_class_t *));
opal_memchecker_base_isdefined ((void*)&(*request)->super.super.super.obj_reference_count, sizeof(volatile int32_t));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
opal_memchecker_base_isdefined (&(*request)->super.super.super.obj_magic_id, sizeof(uint64_t));
opal_memchecker_base_isdefined (&(*request)->super.super.super.cls_init_file_name, sizeof(const char *));
opal_memchecker_base_isdefined (&(*request)->super.super.super.cls_init_lineno, sizeof(int));
@ -270,7 +270,7 @@ static inline int memchecker_request(MPI_Request *request)
opal_memchecker_base_isdefined ((void*)&(*request)->super.super.opal_list_next, sizeof(volatile struct opal_list_item_t *));
opal_memchecker_base_isdefined ((void*)&(*request)->super.super.opal_list_prev, sizeof(volatile struct opal_list_item_t *));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
opal_memchecker_base_isdefined ((void*)&(*request)->super.super.opal_list_item_refcount, sizeof(volatile int32_t));
opal_memchecker_base_isdefined ((void*)&(*request)->super.super.opal_list_item_belong_to, sizeof(volatile struct opal_list_t *));
#endif

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

@ -107,7 +107,7 @@ typedef struct {
#else
# if OMPI_C_HAVE_VISIBILITY
# if OPAL_C_HAVE_VISIBILITY
# ifndef OMPI_DECLSPEC
# define OMPI_DECLSPEC __opal_attribute_visibility__("default")
# endif

2
ompi/mca/bml/base/bml_base_btl.c
Просмотреть файл

@ -67,7 +67,7 @@ int mca_bml_base_btl_array_reserve(mca_bml_base_btl_array_t* array, size_t size)
}
#if OMPI_ENABLE_DEBUG_RELIABILITY
#if OPAL_ENABLE_DEBUG_RELIABILITY
extern double mca_bml_base_error_rate_floor;
extern double mca_bml_base_error_rate_ceiling;

4
ompi/mca/bml/base/bml_base_open.c
Просмотреть файл

@ -31,7 +31,7 @@
int mca_bml_base_already_opened = 0;
opal_list_t mca_bml_base_components_available;
#if OMPI_ENABLE_DEBUG_RELIABILITY
#if OPAL_ENABLE_DEBUG_RELIABILITY
double mca_bml_base_error_rate_floor;
double mca_bml_base_error_rate_ceiling;
int mca_bml_base_error_count;
@ -51,7 +51,7 @@ int mca_bml_base_open(void)
return OMPI_ERROR;
}
#if OMPI_ENABLE_DEBUG_RELIABILITY
#if OPAL_ENABLE_DEBUG_RELIABILITY
do {
int param, value;

10
ompi/mca/bml/bml.h
Просмотреть файл

@ -38,7 +38,7 @@
#include "opal/mca/crs/base/base.h"
#include "ompi/constants.h"
#define OMPI_ENABLE_DEBUG_RELIABILITY 0
#define OPAL_ENABLE_DEBUG_RELIABILITY 0
/*
* BML types
@ -111,7 +111,7 @@ static inline void mca_bml_base_btl_array_set_size(mca_bml_base_btl_array_t* arr
*/
static inline mca_bml_base_btl_t* mca_bml_base_btl_array_insert(mca_bml_base_btl_array_t* array)
{
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
if(array->arr_size >= array->arr_reserve) {
opal_output(0, "mca_bml_base_btl_array_insert: invalid array index %lu >= %lu",
(unsigned long)array->arr_size, (unsigned long)array->arr_reserve);
@ -157,7 +157,7 @@ static inline bool mca_bml_base_btl_array_remove( mca_bml_base_btl_array_t* arra
*/
static inline mca_bml_base_btl_t* mca_bml_base_btl_array_get_index(mca_bml_base_btl_array_t* array, size_t item_index)
{
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
if(item_index >= array->arr_size) {
opal_output(0, "mca_bml_base_btl_array_get_index: invalid array index %lu >= %lu",
(unsigned long)item_index, (unsigned long)array->arr_size);
@ -176,7 +176,7 @@ static inline mca_bml_base_btl_t* mca_bml_base_btl_array_get_index(mca_bml_base_
*/
static inline mca_bml_base_btl_t* mca_bml_base_btl_array_get_next(mca_bml_base_btl_array_t* array)
{
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
if(array->arr_size == 0) {
opal_output(0, "mca_bml_base_btl_array_get_next: invalid array size");
return 0;
@ -253,7 +253,7 @@ static inline void mca_bml_base_free( mca_bml_base_btl_t* bml_btl,
*/
}
#if OMPI_ENABLE_DEBUG_RELIABILITY
#if OPAL_ENABLE_DEBUG_RELIABILITY
int mca_bml_base_send( mca_bml_base_btl_t* bml_btl,
mca_btl_base_descriptor_t* des,

8
ompi/mca/bml/r2/bml_r2_ft.c
Просмотреть файл

@ -174,8 +174,8 @@ int mca_bml_r2_ft_event(int state)
* This will cause the BTL components to discover the available
* network options on this machine, and post proper modex informaiton.
*/
if( OMPI_SUCCESS != (ret = mca_btl_base_select(OMPI_ENABLE_PROGRESS_THREADS,
OMPI_ENABLE_MPI_THREADS) ) ) {
if( OMPI_SUCCESS != (ret = mca_btl_base_select(OPAL_ENABLE_PROGRESS_THREADS,
OPAL_ENABLE_MPI_THREADS) ) ) {
opal_output(0, "bml:r2: ft_event(Restart): Failed to select in BTL framework\n");
return ret;
}
@ -274,8 +274,8 @@ int mca_bml_r2_ft_event(int state)
* This will cause the BTL components to discover the available
* network options on this machine, and post proper modex informaiton.
*/
if( OMPI_SUCCESS != (ret = mca_btl_base_select(OMPI_ENABLE_PROGRESS_THREADS,
OMPI_ENABLE_MPI_THREADS) ) ) {
if( OMPI_SUCCESS != (ret = mca_btl_base_select(OPAL_ENABLE_PROGRESS_THREADS,
OPAL_ENABLE_MPI_THREADS) ) ) {
opal_output(0, "bml:r2: ft_event(Restart): Failed to select in BTL framework\n");
return ret;
}

2
ompi/mca/btl/base/btl_base_error.h
Просмотреть файл

@ -70,7 +70,7 @@ do { \
} while(0);
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
#define BTL_VERBOSE(args) \
do { \
if(mca_btl_base_verbose > 0) { \

2
ompi/mca/btl/btl.h
Просмотреть файл

@ -225,7 +225,7 @@ struct mca_btl_base_segment_t {
ompi_ptr_t seg_addr;
/** Length in bytes */
uint32_t seg_len;
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
/** Heterogeneous padding */
uint8_t seg_padding[4];
#endif

6
ompi/mca/btl/gm/btl_gm.c
Просмотреть файл

@ -75,7 +75,7 @@ mca_btl_gm_module_t mca_btl_gm_module = {
mca_btl_gm_free,
mca_btl_gm_prepare_src,
mca_btl_gm_prepare_dst,
#if OMPI_ENABLE_MPI_THREADS || OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_MPI_THREADS || OPAL_ENABLE_PROGRESS_THREADS
mca_btl_gm_send,
NULL, /* send immediate */
mca_btl_gm_put,
@ -939,14 +939,14 @@ int mca_btl_gm_get(
* Cleanup/release module resources.
*/
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
static void mca_btl_gm_alarm(void* arg) {}
#endif
int mca_btl_gm_finalize(struct mca_btl_base_module_t* btl)
{
mca_btl_gm_module_t* gm_btl = (mca_btl_gm_module_t*) btl;
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
gm_alarm_t alarm;
OPAL_THREAD_LOCK(&mca_btl_gm_component.gm_lock);
gm_btl->gm_progress = false;

2
ompi/mca/btl/gm/btl_gm.h
Просмотреть файл

@ -99,7 +99,7 @@ struct mca_btl_gm_module_t {
opal_list_t gm_pending; /**< list of pending send descriptors */
opal_list_t gm_repost; /**< list of pending fragments */
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
opal_thread_t gm_thread;
bool gm_progress;
#endif

8
ompi/mca/btl/gm/btl_gm_component.c
Просмотреть файл

@ -43,7 +43,7 @@
#include "ompi/runtime/mpiruntime.h"
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
static void* mca_btl_gm_progress_thread( opal_object_t* arg );
#endif
static int gm_reg_mr(void *reg_data, void *base, size_t size,
@ -234,7 +234,7 @@ mca_btl_gm_module_init (mca_btl_gm_module_t * btl)
OBJ_CONSTRUCT(&btl->gm_frag_user, ompi_free_list_t);
OBJ_CONSTRUCT(&btl->gm_pending, opal_list_t);
OBJ_CONSTRUCT(&btl->gm_repost, opal_list_t);
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
OBJ_CONSTRUCT(&btl->gm_thread, opal_thread_t);
#endif
@ -341,7 +341,7 @@ mca_btl_gm_module_init (mca_btl_gm_module_t * btl)
return OMPI_ERROR;
}
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
/* start progress thread */
btl->gm_progress = true;
btl->gm_thread.t_run = mca_btl_gm_progress_thread;
@ -649,7 +649,7 @@ int mca_btl_gm_component_progress()
}
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
static void* mca_btl_gm_progress_thread( opal_object_t* arg )
{
opal_thread_t* thread = (opal_thread_t*)arg;

2
ompi/mca/btl/mx/btl_mx_component.c
Просмотреть файл

@ -522,7 +522,7 @@ mca_btl_base_module_t** mca_btl_mx_component_init(int *num_btl_modules,
}
mx_addrs[count].unique_network_id = mx_btl->mx_unique_network_id;
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
BTL_MX_ADDR_HTON(mx_addrs[count]);
#endif
mca_btl_mx_component.mx_btls[count] = mx_btl;

2
ompi/mca/btl/mx/btl_mx_proc.c
Просмотреть файл

@ -144,7 +144,7 @@ mca_btl_mx_proc_t* mca_btl_mx_proc_create(ompi_proc_t* ompi_proc)
for( i = 0; i < mx_peers_count; i++ ) {
mca_btl_mx_module_t* mx_btl;
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
BTL_MX_ADDR_NTOH(mx_peers[rc]);
#endif
for( j = 0; j < mca_btl_mx_component.mx_num_btls; j++ ) {

2
ompi/mca/btl/ofud/btl_ofud.h
Просмотреть файл

@ -97,7 +97,7 @@ typedef mca_btl_base_recv_reg_t mca_btl_ud_recv_reg_t;
* Profiling variables
*/
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
#define MCA_BTL_UD_ENABLE_PROFILE 0
#else
#define MCA_BTL_UD_ENABLE_PROFILE 0

2
ompi/mca/btl/ofud/btl_ofud_endpoint.c
Просмотреть файл

@ -119,7 +119,7 @@ OBJ_CLASS_INSTANCE(mca_btl_ud_endpoint_t,
static void mca_btl_ud_endpoint_construct(mca_btl_base_endpoint_t* endpoint)
{
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
memset(&endpoint->rem_addr, 0, sizeof(struct mca_btl_ud_addr_t));
#endif
}

8
ompi/mca/btl/openib/btl_openib.c
Просмотреть файл

@ -158,7 +158,7 @@ static int adjust_cq(mca_btl_openib_device_t *device, const int cq)
if(NULL == device->ib_cq[cq]) {
device->ib_cq[cq] = ibv_create_cq_compat(device->ib_dev_context, cq_size,
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
device, device->ib_channel,
#else
NULL, NULL,
@ -171,7 +171,7 @@ static int adjust_cq(mca_btl_openib_device_t *device, const int cq)
return OMPI_ERROR;
}
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
if(ibv_req_notify_cq(device->ib_cq[cq], 0)) {
show_init_error(__FILE__, __LINE__, "ibv_req_notify_cq",
ibv_get_device_name(device->ib_dev));
@ -1292,7 +1292,7 @@ int mca_btl_openib_put( mca_btl_base_module_t* btl,
return OMPI_SUCCESS;
}
/* post descriptor */
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if((ep->endpoint_proc->proc_ompi->proc_arch & OPAL_ARCH_ISBIGENDIAN)
!= (ompi_proc_local()->proc_arch & OPAL_ARCH_ISBIGENDIAN)) {
rem_addr = opal_swap_bytes8(rem_addr);
@ -1373,7 +1373,7 @@ int mca_btl_openib_get(mca_btl_base_module_t* btl,
return OMPI_SUCCESS;
}
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if((ep->endpoint_proc->proc_ompi->proc_arch & OPAL_ARCH_ISBIGENDIAN)
!= (ompi_proc_local()->proc_arch & OPAL_ARCH_ISBIGENDIAN)) {
rem_addr = opal_swap_bytes8(rem_addr);

10
ompi/mca/btl/openib/btl_openib.h
Просмотреть файл

@ -58,7 +58,7 @@ BEGIN_C_DECLS
/*--------------------------------------------------------------------*/
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
#define ATTACH() do { \
int i = 0; \
opal_output(0, "WAITING TO DEBUG ATTACH"); \
@ -198,7 +198,7 @@ struct mca_btl_openib_component_t {
int32_t apm_lmc;
int32_t apm_ports;
uint32_t buffer_alignment; /**< Preferred communication buffer alignment in Bytes (must be power of two) */
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
int32_t fatal_counter; /**< Counts number on fatal events that we got on all devices */
int async_pipe[2]; /**< Pipe for comunication with async event thread */
int async_comp_pipe[2]; /**< Pipe for async thread comunication with main thread */
@ -297,7 +297,7 @@ struct mca_btl_base_endpoint_t;
typedef struct mca_btl_openib_device_t {
opal_object_t super;
struct ibv_device *ib_dev; /* the ib device */
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
struct ibv_comp_channel *ib_channel; /* Channel event for the device */
opal_thread_t thread; /* Progress thread */
volatile bool progress; /* Progress status */
@ -319,7 +319,7 @@ typedef struct mca_btl_openib_device_t {
uint16_t hp_cq_polls;
uint16_t eager_rdma_polls;
bool pollme;
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
volatile bool got_fatal_event;
#endif
#if HAVE_XRC
@ -404,7 +404,7 @@ struct mca_btl_openib_reg_t {
};
typedef struct mca_btl_openib_reg_t mca_btl_openib_reg_t;
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
extern void* mca_btl_openib_progress_thread(opal_object_t*);
#endif

2
ompi/mca/btl/openib/btl_openib_async.c
Просмотреть файл

@ -12,7 +12,7 @@
#include "ompi_config.h"
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
#include <infiniband/verbs.h>
#include <fcntl.h>
#include <sys/poll.h>

42
ompi/mca/btl/openib/btl_openib_component.c
Просмотреть файл

@ -83,7 +83,7 @@ const char *ibv_get_sysfs_path(void);
#include "btl_openib_mca.h"
#include "btl_openib_xrc.h"
#include "btl_openib_fd.h"
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
#include "btl_openib_async.h"
#endif
#include "connect/base.h"
@ -166,7 +166,7 @@ static int btl_openib_component_close(void)
{
int rc = OMPI_SUCCESS;
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
/* Tell the async thread to shutdown */
if (mca_btl_openib_component.use_async_event_thread &&
0 != mca_btl_openib_component.async_thread) {
@ -312,7 +312,7 @@ static int btl_openib_modex_send(void)
mca_btl_openib_component.openib_btls[i]->port_info.lid,
(int) size);
#if !defined(WORDS_BIGENDIAN) && OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if !defined(WORDS_BIGENDIAN) && OPAL_ENABLE_HETEROGENEOUS_SUPPORT
MCA_BTL_OPENIB_MODEX_MSG_HTON(*(mca_btl_openib_modex_message_t *)offset);
#endif
offset += size;
@ -518,7 +518,7 @@ static inline int param_register_int(const char* param_name, int default_value)
return param_value;
}
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
static int start_async_event_thread(void)
{
/* Set the fatal counter to zero */
@ -602,7 +602,7 @@ static int init_one_port(opal_list_t *btl_list, mca_btl_openib_device_t *device,
lmc = mca_btl_openib_component.max_lmc;
}
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
/* APM support -- only meaningful if async event support is
enabled. If async events are not enabled, then there's nothing
to listen for the APM event to load the new path, so it's not
@ -768,7 +768,7 @@ static void device_construct(mca_btl_openib_device_t *device)
device->ib_dev_context = NULL;
device->ib_pd = NULL;
device->mpool = NULL;
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
device->ib_channel = NULL;
#endif
device->btls = 0;
@ -786,7 +786,7 @@ static void device_construct(mca_btl_openib_device_t *device)
device->xrc_fd = -1;
#endif
device->qps = NULL;
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
mca_btl_openib_component.async_pipe[0] =
mca_btl_openib_component.async_pipe[1] = -1;
mca_btl_openib_component.async_comp_pipe[0] =
@ -801,8 +801,8 @@ static void device_destruct(mca_btl_openib_device_t *device)
{
int i;
#if OMPI_HAVE_THREADS
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_HAVE_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
if(device->progress) {
device->progress = false;
if (pthread_cancel(device->thread.t_handle)) {
@ -910,7 +910,7 @@ static int prepare_device_for_use(mca_btl_openib_device_t *device)
mca_btl_openib_frag_init_data_t *init_data;
int qp, length;
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
if(mca_btl_openib_component.use_async_event_thread) {
if(0 == mca_btl_openib_component.async_thread) {
/* async thread is not yet started, so start it here */
@ -929,7 +929,7 @@ static int prepare_device_for_use(mca_btl_openib_device_t *device)
return OMPI_ERROR;
}
}
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
/* Prepare data for thread, but not starting it */
OBJ_CONSTRUCT(&device->thread, opal_thread_t);
device->thread.t_run = mca_btl_openib_progress_thread;
@ -1682,7 +1682,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
device->use_eager_rdma = values.use_eager_rdma;
}
/* Eager RDMA is not currently supported with progress threads */
if (device->use_eager_rdma && OMPI_ENABLE_PROGRESS_THREADS) {
if (device->use_eager_rdma && OPAL_ENABLE_PROGRESS_THREADS) {
device->use_eager_rdma = 0;
orte_show_help("help-mpi-btl-openib.txt",
"eager RDMA and progress threads", true);
@ -1725,7 +1725,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
goto error;
}
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
device->ib_channel = ibv_create_comp_channel(device->ib_dev_context);
if (NULL == device->ib_channel) {
BTL_ERROR(("error creating channel for %s errno says %s",
@ -1801,7 +1801,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
}
error:
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
if (device->ib_channel) {
ibv_destroy_comp_channel(device->ib_channel);
}
@ -2082,7 +2082,7 @@ btl_openib_component_init(int *num_btl_modules,
OS's that support OpenFabrics that provide both FREE and MUNMAP
support, so the following test is [currently] good enough... */
value = opal_mem_hooks_support_level();
#if !OMPI_HAVE_THREADS
#if !OPAL_HAVE_THREADS
if ((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) ==
((OPAL_MEMORY_FREE_SUPPORT | OPAL_MEMORY_MUNMAP_SUPPORT) & value)) {
orte_show_help("help-mpi-btl-openib.txt",
@ -2259,7 +2259,7 @@ btl_openib_component_init(int *num_btl_modules,
OBJ_CONSTRUCT(&btl_list, opal_list_t);
OBJ_CONSTRUCT(&mca_btl_openib_component.ib_lock, opal_mutex_t);
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
mca_btl_openib_component.async_thread = 0;
#endif
distance = dev_sorted[0].distance;
@ -2882,7 +2882,7 @@ static void handle_wc(mca_btl_openib_device_t* device, const uint32_t cq,
OPAL_OUTPUT((-1, "Got WC: RDMA_RECV, qp %d, src qp %d, WR ID %p",
wc->qp_num, wc->src_qp, (void*) wc->wr_id));
#if !defined(WORDS_BIGENDIAN) && OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if !defined(WORDS_BIGENDIAN) && OPAL_ENABLE_HETEROGENEOUS_SUPPORT
wc->imm_data = ntohl(wc->imm_data);
#endif
if(wc->wc_flags & IBV_WC_WITH_IMM) {
@ -3032,7 +3032,7 @@ error:
return count;
}
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
void* mca_btl_openib_progress_thread(opal_object_t* arg)
{
opal_thread_t* thread = (opal_thread_t*)arg;
@ -3100,7 +3100,7 @@ static int progress_one_device(mca_btl_openib_device_t *device)
BTL_OPENIB_FOOTER_NTOH(*frag->ftr);
}
size = MCA_BTL_OPENIB_RDMA_FRAG_GET_SIZE(frag->ftr);
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
if (frag->ftr->seq != endpoint->eager_rdma_local.seq)
BTL_ERROR(("Eager RDMA wrong SEQ: received %d expected %d",
frag->ftr->seq,
@ -3145,7 +3145,7 @@ static int btl_openib_component_progress(void)
int i;
int count = 0;
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
if(OPAL_UNLIKELY(mca_btl_openib_component.use_async_event_thread &&
mca_btl_openib_component.fatal_counter)) {
goto error;
@ -3160,7 +3160,7 @@ static int btl_openib_component_progress(void)
return count;
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
error:
/* Set the fatal counter to zero */
mca_btl_openib_component.fatal_counter = 0;

4
ompi/mca/btl/openib/btl_openib_eager_rdma.h
Просмотреть файл

@ -25,7 +25,7 @@ struct mca_btl_openib_eager_rdma_local_t {
uint16_t tail; /**< Needed for credit managment */
int32_t credits; /**< number of RDMA credits */
int32_t rd_win;
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
uint32_t seq;
#endif
opal_mutex_t lock; /**< guard access to RDMA buffer */
@ -38,7 +38,7 @@ struct mca_btl_openib_eager_rdma_remote_t {
uint32_t rkey; /**< RKey for accessing remote buffer */
int32_t head; /**< RDMA buffer to post to */
int32_t tokens; /**< number of rdam tokens */
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
uint32_t seq;
#endif
};

2
ompi/mca/btl/openib/btl_openib_endpoint.c
Просмотреть файл

@ -626,7 +626,7 @@ void mca_btl_openib_endpoint_connected(mca_btl_openib_endpoint_t *endpoint)
}
/* Run over all qps and load alternative path */
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
if (APM_ENABLED) {
int i;
if (MCA_BTL_XRC_ENABLED) {

4
ompi/mca/btl/openib/btl_openib_endpoint.h
Просмотреть файл

@ -493,7 +493,7 @@ static inline int post_send(mca_btl_openib_endpoint_t *ep,
sr_desc->opcode = IBV_WR_RDMA_WRITE;
MCA_BTL_OPENIB_RDMA_FRAG_SET_SIZE(ftr, sg->length);
MCA_BTL_OPENIB_RDMA_MAKE_LOCAL(ftr);
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
ftr->seq = ep->eager_rdma_remote.seq++;
#endif
if(ep->nbo)
@ -513,7 +513,7 @@ static inline int post_send(mca_btl_openib_endpoint_t *ep,
sr_desc->opcode = IBV_WR_SEND;
} else {
sr_desc->opcode = IBV_WR_SEND_WITH_IMM;
#if !defined(WORDS_BIGENDIAN) && OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if !defined(WORDS_BIGENDIAN) && OPAL_ENABLE_HETEROGENEOUS_SUPPORT
sr_desc->imm_data = htonl(ep->rem_info.rem_index);
#else
sr_desc->imm_data = ep->rem_info.rem_index;

14
ompi/mca/btl/openib/btl_openib_fd.c
Просмотреть файл

@ -9,7 +9,7 @@
*/
/**
* Note: this file is a little fast-n-loose with OMPI_HAVE_THREADS --
* Note: this file is a little fast-n-loose with OPAL_HAVE_THREADS --
* it uses this value in run-time "if" conditionals (vs. compile-time
* #if conditionals). We also don't protect including <pthread.h>.
* That's because this component currently only compiles on Linux and
@ -513,7 +513,7 @@ int ompi_btl_openib_fd_init(void)
/* Calculate the real size of the cmd struct */
cmd_size = (int) (&(bogus.end) - ((char*) &bogus));
if (OMPI_HAVE_THREADS) {
if (OPAL_HAVE_THREADS) {
OBJ_CONSTRUCT(&pending_to_main_thread, opal_list_t);
/* Create pipes to communicate between the two threads */
@ -572,7 +572,7 @@ int ompi_btl_openib_fd_monitor(int fd, int flags,
cmd.pc_flags = flags;
cmd.pc_fn.event = callback;
cmd.pc_context = context;
if (OMPI_HAVE_THREADS) {
if (OPAL_HAVE_THREADS) {
/* For the threaded version, write a command down the pipe */
OPAL_OUTPUT((-1, "main thread sending monitor fd %d", fd));
write_fd(pipe_to_service_thread[1], cmd_size, &cmd);
@ -605,7 +605,7 @@ int ompi_btl_openib_fd_unmonitor(int fd,
cmd.pc_flags = 0;
cmd.pc_fn.event = callback;
cmd.pc_context = context;
if (OMPI_HAVE_THREADS) {
if (OPAL_HAVE_THREADS) {
/* For the threaded version, write a command down the pipe */
OPAL_OUTPUT((-1, "main thread sending unmonitor fd %d", fd));
write_fd(pipe_to_service_thread[1], cmd_size, &cmd);
@ -631,7 +631,7 @@ int ompi_btl_openib_fd_run_in_service(ompi_btl_openib_fd_main_callback_fn_t *cal
cmd.pc_flags = 0;
cmd.pc_fn.main = callback;
cmd.pc_context = context;
if (OMPI_HAVE_THREADS) {
if (OPAL_HAVE_THREADS) {
/* For the threaded version, write a command down the pipe */
OPAL_OUTPUT((-1, "main thread sending 'run in service'"));
write_fd(pipe_to_service_thread[1], cmd_size, &cmd);
@ -650,7 +650,7 @@ int ompi_btl_openib_fd_run_in_service(ompi_btl_openib_fd_main_callback_fn_t *cal
int ompi_btl_openib_fd_run_in_main(ompi_btl_openib_fd_main_callback_fn_t *callback,
void *context)
{
if (OMPI_HAVE_THREADS) {
if (OPAL_HAVE_THREADS) {
cmd_t cmd;
OPAL_OUTPUT((-1, "run in main -- sending command"));
@ -677,7 +677,7 @@ int ompi_btl_openib_fd_run_in_main(ompi_btl_openib_fd_main_callback_fn_t *callba
int ompi_btl_openib_fd_finalize(void)
{
if (initialized) {
if (OMPI_HAVE_THREADS) {
if (OPAL_HAVE_THREADS) {
/* For the threaded version, send a command down the pipe */
cmd_t cmd;
OPAL_OUTPUT((-1, "shutting down openib fd"));

4
ompi/mca/btl/openib/btl_openib_frag.h
Просмотреть файл

@ -73,7 +73,7 @@ typedef struct mca_btl_openib_header_coalesced_t {
} while(0)
struct mca_btl_openib_footer_t {
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
uint32_t seq;
#endif
union {
@ -94,7 +94,7 @@ typedef struct mca_btl_openib_footer_t mca_btl_openib_footer_t;
} while (0)
#endif
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
#define BTL_OPENIB_FOOTER_SEQ_HTON(h) ((h).seq = htonl((h).seq))
#define BTL_OPENIB_FOOTER_SEQ_NTOH(h) ((h).seq = ntohl((h).seq))
#else

2
ompi/mca/btl/openib/btl_openib_iwarp.c
Просмотреть файл

@ -46,7 +46,7 @@ static OBJ_CLASS_INSTANCE(rdma_addr_list_t, opal_list_item_t,
NULL, NULL);
static opal_list_t *myaddrs = NULL;
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
static char *stringify(uint32_t addr)
{
static char line[64];

2
ompi/mca/btl/openib/btl_openib_mca.c
Просмотреть файл

@ -426,7 +426,7 @@ int btl_openib_register_mca_params(void)
0, &ival, REGINT_GE_ZERO));
mca_btl_openib_component.max_lmc = (uint32_t) ival;
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
CHECK(reg_int("enable_apm_over_lmc", NULL, "Maximum number of alterative paths for each device port "
"(must be >= -1, where 0 = disable apm, -1 = all availible alternative paths )",
0, &ival, REGINT_NEG_ONE_OK|REGINT_GE_ZERO));

2
ompi/mca/btl/openib/btl_openib_proc.c
Просмотреть файл

@ -188,7 +188,7 @@ mca_btl_openib_proc_t* mca_btl_openib_proc_create(ompi_proc_t* ompi_proc)
/* Unpack the modex comment message struct */
size = modex_message_size;
memcpy(&(module_proc->proc_ports[i].pm_port_info), offset, size);
#if !defined(WORDS_BIGENDIAN) && OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if !defined(WORDS_BIGENDIAN) && OPAL_ENABLE_HETEROGENEOUS_SUPPORT
MCA_BTL_OPENIB_MODEX_MSG_NTOH(module_proc->proc_ports[i].pm_port_info);
#endif
offset += size;

8
ompi/mca/btl/openib/connect/btl_openib_connect_base.c
Просмотреть файл

@ -18,10 +18,10 @@
#if HAVE_XRC
#include "connect/btl_openib_connect_xoob.h"
#endif
#if OMPI_HAVE_RDMACM && OMPI_HAVE_THREADS
#if OMPI_HAVE_RDMACM && OPAL_HAVE_THREADS
#include "connect/btl_openib_connect_rdmacm.h"
#endif
#if OMPI_HAVE_IBCM && OMPI_HAVE_THREADS
#if OMPI_HAVE_IBCM && OPAL_HAVE_THREADS
#include "connect/btl_openib_connect_ibcm.h"
#endif
@ -45,7 +45,7 @@ static ompi_btl_openib_connect_base_component_t *all[] = {
/* Always have an entry here so that the CP indexes will always be
the same: if RDMA CM is not available, use the "empty" CPC */
#if OMPI_HAVE_RDMACM && OMPI_HAVE_THREADS
#if OMPI_HAVE_RDMACM && OPAL_HAVE_THREADS
&ompi_btl_openib_connect_rdmacm,
#else
&ompi_btl_openib_connect_empty,
@ -53,7 +53,7 @@ static ompi_btl_openib_connect_base_component_t *all[] = {
/* Always have an entry here so that the CP indexes will always be
the same: if IB CM is not available, use the "empty" CPC */
#if OMPI_HAVE_IBCM && OMPI_HAVE_THREADS
#if OMPI_HAVE_IBCM && OPAL_HAVE_THREADS
&ompi_btl_openib_connect_ibcm,
#else
&ompi_btl_openib_connect_empty,

2
ompi/mca/btl/openib/connect/btl_openib_connect_ibcm.c
Просмотреть файл

@ -541,7 +541,7 @@ ompi_btl_openib_connect_base_component_t ompi_btl_openib_connect_ibcm = {
/*--------------------------------------------------------------------*/
#define ENABLE_TIMERS (OMPI_ENABLE_DEBUG && 0)
#define ENABLE_TIMERS (OPAL_ENABLE_DEBUG && 0)
#if ENABLE_TIMERS
#include MCA_timer_IMPLEMENTATION_HEADER

30
ompi/mca/btl/openib/connect/btl_openib_connect_rdmacm.c
Просмотреть файл

@ -292,13 +292,13 @@ static mca_btl_openib_endpoint_t *rdmacm_find_endpoint(rdmacm_contents_t *conten
opal_pointer_array_t *endpoints = contents->openib_btl->device->endpoints;
struct sockaddr *peeraddr = rdma_get_peer_addr(id);
uint32_t peeripaddr = ((struct sockaddr_in *)peeraddr)->sin_addr.s_addr;
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
char *a;
#endif
OPAL_OUTPUT((-1, "remote peer requesting connection: %s port %d",
a = stringify(peeripaddr), rem_port));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
free(a);
#endif
for (i = 0; i < opal_pointer_array_get_size(endpoints); i++) {
@ -313,7 +313,7 @@ static mca_btl_openib_endpoint_t *rdmacm_find_endpoint(rdmacm_contents_t *conten
message = endpoint->endpoint_remote_cpc_data->cbm_modex_message;
OPAL_OUTPUT((-1, "message ipaddr = %s port %d",
a = stringify(message->ipaddr), message->tcp_port));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
free(a);
#endif
if (message->ipaddr == peeripaddr && message->tcp_port == rem_port) {
@ -453,7 +453,7 @@ out:
static bool i_initiate(uint32_t local_ipaddr, uint16_t local_port,
uint32_t remote_ipaddr, uint16_t remote_port)
{
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
char *a = stringify(local_ipaddr);
char *b = stringify(remote_ipaddr);
#endif
@ -462,7 +462,7 @@ static bool i_initiate(uint32_t local_ipaddr, uint16_t local_port,
(local_ipaddr == remote_ipaddr && local_port < remote_port)) {
OPAL_OUTPUT((-1, "i_initiate (I WIN): local ipaddr %s, remote ipaddr %s",
a, b));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
free(a);
free(b);
#endif
@ -470,7 +470,7 @@ static bool i_initiate(uint32_t local_ipaddr, uint16_t local_port,
} else {
OPAL_OUTPUT((-1, "i_initiate (I lose): local ipaddr %s, remote ipaddr %s",
a, b));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
free(a);
free(b);
#endif
@ -488,7 +488,7 @@ static int rdmacm_client_connect_one(rdmacm_contents_t *contents,
struct sockaddr_in src_in, dest_in;
id_context_t *context;
int rc;
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
char *a, *b;
#endif
@ -536,7 +536,7 @@ static int rdmacm_client_connect_one(rdmacm_contents_t *contents,
contents->tcp_port,
b = stringify(message->ipaddr),
message->tcp_port));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
free(a);
free(b);
#endif
@ -608,7 +608,7 @@ static int rdmacm_module_start_connect(ompi_btl_openib_connect_base_module_t *cp
modex_message_t *message, *local_message;
int rc, qp;
opal_list_item_t *item;
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
char *a, *b;
#endif
@ -624,7 +624,7 @@ static int rdmacm_module_start_connect(ompi_btl_openib_connect_base_module_t *cp
OPAL_OUTPUT((-1, "Connecting from IP %s:%d to remote IP %s:%d ep state = %d",
a = stringify(local_message->ipaddr), local_message->tcp_port,
b = stringify(message->ipaddr), message->tcp_port, endpoint->endpoint_state));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
free(a);
free(b);
#endif
@ -1193,7 +1193,7 @@ static int resolve_route(id_context_t *context)
goto out;
}
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
{
char *a, *b;
OPAL_OUTPUT((-1, "Resolved route ID %p (local addr %s, remote addr %s)",
@ -1370,7 +1370,7 @@ static int finish_connect(id_context_t *context)
msg.rem_index = contents->endpoint->index;
msg.rem_port = contents->tcp_port;
if (contents->endpoint->endpoint_initiator) {
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
char *a;
#endif
OPAL_OUTPUT((-1, "Finish connect (I am initiator): sending from %s:%d, TCP port %d, qp index %d (num %d) to IP %s:%d",
@ -1380,7 +1380,7 @@ static int finish_connect(id_context_t *context)
context->qpnum,
contents->endpoint->qps[context->qpnum].qp->lcl_qp->qp_num,
a = stringify(remoteipaddr), remoteport));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
free(a);
#endif
}
@ -1709,7 +1709,7 @@ static int create_message(rdmacm_contents_t *server,
ompi_btl_openib_connect_base_module_data_t *data)
{
modex_message_t *message;
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
char *a;
#endif
@ -1728,7 +1728,7 @@ static int create_message(rdmacm_contents_t *server,
OPAL_OUTPUT((-1, "Message IP address is %s, port %d",
a = stringify(message->ipaddr), message->tcp_port));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
free(a);
#endif
data->cbm_modex_message = message;

2
ompi/mca/btl/openib/connect/btl_openib_connect_xoob.c
Просмотреть файл

@ -587,7 +587,7 @@ static int xoob_recv_qp_create(mca_btl_openib_endpoint_t *endpoint, mca_btl_open
endpoint->xrc_recv_qp_num, strerror(ret), ret));
return OMPI_ERROR;
}
#if OMPI_HAVE_THREADS
#if OPAL_HAVE_THREADS
if (APM_ENABLED) {
mca_btl_openib_load_apm_xrc_rcv(endpoint->xrc_recv_qp_num, endpoint);
}

10
ompi/mca/btl/portals/btl_portals_component.c
Просмотреть файл

@ -364,7 +364,7 @@ mca_btl_portals_component_progress(void)
"PTL_EVENT_PUT_START for 0x%lx, %d",
(unsigned long) frag, (int) tag));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
if (ev.ni_fail_type != PTL_NI_OK) {
opal_output(mca_btl_portals_component.portals_output,
"Failure to start event\n");
@ -386,7 +386,7 @@ mca_btl_portals_component_progress(void)
"PTL_EVENT_PUT_END for 0x%lx, %d",
(unsigned long) frag, (int) tag));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
if (ev.ni_fail_type != PTL_NI_OK) {
opal_output(mca_btl_portals_component.portals_output,
"Failure to end event\n");
@ -498,7 +498,7 @@ mca_btl_portals_component_progress(void)
case PTL_EVENT_SEND_START:
/* generated on source (origin) when put starts sending */
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PTL_EVENT_SEND_START for 0x%lx, %d",
(unsigned long) frag, (int) ev.hdr_data));
@ -520,7 +520,7 @@ mca_btl_portals_component_progress(void)
case PTL_EVENT_SEND_END:
/* generated on source (origin) when put stops sending */
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
OPAL_OUTPUT_VERBOSE((90, mca_btl_portals_component.portals_output,
"PTL_EVENT_SEND_END for 0x%lx, %d",
(unsigned long) frag, (int) ev.hdr_data));
@ -571,7 +571,7 @@ mca_btl_portals_component_progress(void)
"PTL_EVENT_ACK for 0x%lx",
(unsigned long) frag));
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
if(!mca_btl_portals_component.portals_need_ack) {
opal_output(mca_btl_portals_component.portals_output,
"Received PTL_EVENT_ACK but ACK's are disabled!\n");

4
ompi/mca/btl/portals/btl_portals_send.c
Просмотреть файл

@ -64,7 +64,7 @@ mca_btl_portals_send(struct mca_btl_base_module_t* btl_base,
mca_btl_portals_module.md_send.start = frag->segments[0].seg_addr.pval;
mca_btl_portals_module.md_send.length =
0 == frag->size ? frag->segments[0].seg_len : frag->size;
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
mca_btl_portals_module.md_send.options =
PTL_MD_EVENT_START_DISABLE;
#else
@ -204,7 +204,7 @@ int mca_btl_portals_sendi(struct mca_btl_base_module_t* btl_base,
mca_btl_portals_module.md_send.start = frag->segments[0].seg_addr.pval;
mca_btl_portals_module.md_send.length =
0 == frag->size ? frag->segments[0].seg_len : frag->size;
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
mca_btl_portals_module.md_send.options =
PTL_MD_EVENT_START_DISABLE;
#else

4
ompi/mca/btl/sctp/btl_sctp_component.c
Просмотреть файл

@ -371,7 +371,7 @@ static int mca_btl_sctp_create(int if_index, const char* if_name)
sprintf(param, "latency_%s", if_name);
btl->super.btl_latency = mca_btl_sctp_param_register_int(param, 0);
#if 0 && OMPI_ENABLE_DEBUG
#if 0 && OPAL_ENABLE_DEBUG
BTL_OUTPUT(("interface: %s bandwidth %d latency %d",
if_name, btl->super.btl_bandwidth, btl->super.btl_latency));
#endif
@ -417,7 +417,7 @@ static int mca_btl_sctp_create(int if_index, const char* if_name)
sprintf(param, "latency_%s", if_name);
btl->super.btl_latency = mca_btl_sctp_param_register_int(param, 0);
#if 0 && OMPI_ENABLE_DEBUG
#if 0 && OPAL_ENABLE_DEBUG
BTL_OUTPUT(("interface: %s bandwidth %d latency %d",
if_name, btl->super.btl_bandwidth, btl->super.btl_latency));
#endif

6
ompi/mca/btl/sctp/btl_sctp_endpoint.c
Просмотреть файл

@ -596,7 +596,7 @@ bool mca_btl_sctp_endpoint_accept(mca_btl_base_endpoint_t* btl_endpoint, struct
mca_btl_sctp_endpoint_event_init(btl_endpoint, sd);
opal_event_add(&btl_endpoint->endpoint_recv_event, 0);
mca_btl_sctp_endpoint_connected(btl_endpoint);
#if OMPI_ENABLE_DEBUG && WANT_PEER_DUMP
#if OPAL_ENABLE_DEBUG && WANT_PEER_DUMP
mca_btl_sctp_endpoint_dump(btl_endpoint, "accepted");
#endif
OPAL_THREAD_UNLOCK(&btl_endpoint->endpoint_send_lock);
@ -620,7 +620,7 @@ bool mca_btl_sctp_endpoint_accept(mca_btl_base_endpoint_t* btl_endpoint, struct
/* conflicts can't happen with one-to-many socket */
mca_btl_sctp_endpoint_event_init(btl_endpoint, sd);
opal_event_add(&btl_endpoint->endpoint_recv_event, 0);
#if OMPI_ENABLE_DEBUG && WANT_PEER_DUMP
#if OPAL_ENABLE_DEBUG && WANT_PEER_DUMP
mca_btl_sctp_endpoint_dump(btl_endpoint, "accepted");
#endif
OPAL_THREAD_UNLOCK(&btl_endpoint->endpoint_send_lock);
@ -846,7 +846,7 @@ static int mca_btl_sctp_endpoint_recv_connect_ack(mca_btl_base_endpoint_t* btl_e
/* connected */
mca_btl_sctp_endpoint_connected(btl_endpoint);
#if OMPI_ENABLE_DEBUG && WANT_PEER_DUMP
#if OPAL_ENABLE_DEBUG && WANT_PEER_DUMP
mca_btl_sctp_endpoint_dump(btl_endpoint, "connected");
#endif
return OMPI_SUCCESS;

2
ompi/mca/btl/sctp/btl_sctp_hdr.h
Просмотреть файл

@ -42,7 +42,7 @@ struct mca_btl_sctp_hdr_t {
mca_btl_base_header_t base;
uint8_t type;
uint16_t count;
#if OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if OPAL_ENABLE_HETEROGENEOUS_SUPPORT
/* uint64_t may be required to be 8 byte aligned. */
uint8_t padding[4];
#endif

2
ompi/mca/btl/self/btl_self_endpoint.h
Просмотреть файл

@ -21,7 +21,7 @@
#ifndef MCA_BTL_SELF_ENDPOINT_H
#define MCA_BTL_SELF_ENDPOINT_H
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
#include "opal/event/event.h"
#endif

4
ompi/mca/btl/sm/btl_sm.c
Просмотреть файл

@ -354,7 +354,7 @@ static struct mca_btl_base_endpoint_t *
create_sm_endpoint(int local_proc, struct ompi_proc_t *proc)
{
struct mca_btl_base_endpoint_t *ep;
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
char path[PATH_MAX];
#endif
@ -365,7 +365,7 @@ create_sm_endpoint(int local_proc, struct ompi_proc_t *proc)
ep->peer_smp_rank = local_proc + mca_btl_sm_component.num_smp_procs;
OBJ_CONSTRUCT(&ep->pending_sends, opal_list_t);
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
sprintf(path, "%s"OPAL_PATH_SEP"sm_fifo.%lu",
orte_process_info.job_session_dir,
(unsigned long)proc->proc_name.vpid);

8
ompi/mca/btl/sm/btl_sm.h
Просмотреть файл

@ -105,7 +105,7 @@ typedef struct sm_fifo_t sm_fifo_t;
* Shared Memory resource managment
*/
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
#define DATA (char)0
#define DONE (char)1
#endif
@ -162,7 +162,7 @@ struct mca_btl_sm_component_t {
int mem_node;
int num_mem_nodes;
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
char sm_fifo_path[PATH_MAX]; /**< path to fifo used to signal this process */
int sm_fifo_fd; /**< file descriptor corresponding to opened fifo */
opal_thread_t sm_fifo_thread;
@ -472,11 +472,11 @@ extern int mca_btl_sm_send(
*/
int mca_btl_sm_ft_event(int state);
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
void mca_btl_sm_component_event_thread(opal_object_t*);
#endif
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
#define MCA_BTL_SM_SIGNAL_PEER(peer) \
{ \
unsigned char cmd = DATA; \

8
ompi/mca/btl/sm/btl_sm_component.c
Просмотреть файл

@ -224,7 +224,7 @@ int mca_btl_sm_component_close(void)
OBJ_RELEASE(mca_btl_sm_component.mmap_file);
}
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
/* close/cleanup fifo create for event notification */
if(mca_btl_sm_component.sm_fifo_fd > 0) {
/* write a done message down the pipe */
@ -266,7 +266,7 @@ mca_btl_base_module_t** mca_btl_sm_component_init(
mca_btl_sm_component.sm_mpool = NULL;
mca_btl_sm_component.sm_mpool_base = NULL;
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
/* create a named pipe to receive events */
sprintf( mca_btl_sm_component.sm_fifo_path,
"%s"OPAL_PATH_SEP"sm_fifo.%lu", orte_process_info.job_session_dir,
@ -313,7 +313,7 @@ mca_btl_base_module_t** mca_btl_sm_component_init(
* SM component progress.
*/
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
void mca_btl_sm_component_event_thread(opal_object_t* thread)
{
while(1) {
@ -409,7 +409,7 @@ int mca_btl_sm_component_progress(void)
* memory address, to a true virtual address */
hdr = (mca_btl_sm_hdr_t *) RELATIVE2VIRTUAL(hdr);
peer_smp_rank = hdr->my_smp_rank;
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
if ( FIFO_MAP(peer_smp_rank) != j ) {
opal_output(0, "mca_btl_sm_component_progress: "
"rank %d got %d on FIFO %d, but this sender should send to FIFO %d\n",

4
ompi/mca/btl/sm/btl_sm_endpoint.h
Просмотреть файл

@ -22,7 +22,7 @@
#ifndef MCA_BTL_SM_ENDPOINT_H
#define MCA_BTL_SM_ENDPOINT_H
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
#include "opal/event/event.h"
#endif
@ -37,7 +37,7 @@ struct mca_btl_base_endpoint_t {
* SMP specfic data structures. */
int peer_smp_rank; /**< My peer's SMP process rank. Used for accessing
* SMP specfic data structures. */
#if OMPI_ENABLE_PROGRESS_THREADS == 1
#if OPAL_ENABLE_PROGRESS_THREADS == 1
int fifo_fd; /**< pipe/fifo used to signal endpoint that data is queued */
#endif
opal_list_t pending_sends; /**< pending data to send */

2
ompi/mca/btl/tcp/btl_tcp_component.c
Просмотреть файл

@ -367,7 +367,7 @@ static int mca_btl_tcp_create(int if_kindex, const char* if_name)
/* allow user to override/specify latency ranking */
sprintf(param, "latency_%s:%d", if_name, i);
btl->super.btl_latency = mca_btl_tcp_param_register_int(param, NULL, btl->super.btl_latency);
#if 0 && OMPI_ENABLE_DEBUG
#if 0 && OPAL_ENABLE_DEBUG
BTL_OUTPUT(("interface %s instance %i: bandwidth %d latency %d\n", if_name, i,
btl->super.btl_bandwidth, btl->super.btl_latency));
#endif

4
ompi/mca/btl/tcp/btl_tcp_endpoint.c
Просмотреть файл

@ -367,7 +367,7 @@ bool mca_btl_tcp_endpoint_accept(mca_btl_base_endpoint_t* btl_endpoint,
mca_btl_tcp_endpoint_event_init(btl_endpoint);
opal_event_add(&btl_endpoint->endpoint_recv_event, 0);
mca_btl_tcp_endpoint_connected(btl_endpoint);
#if OMPI_ENABLE_DEBUG && WANT_PEER_DUMP
#if OPAL_ENABLE_DEBUG && WANT_PEER_DUMP
mca_btl_tcp_endpoint_dump(btl_endpoint, "accepted");
#endif
OPAL_THREAD_UNLOCK(&btl_endpoint->endpoint_send_lock);
@ -666,7 +666,7 @@ static void mca_btl_tcp_endpoint_recv_handler(int sd, short flags, void* user)
OPAL_THREAD_LOCK(&btl_endpoint->endpoint_send_lock);
mca_btl_tcp_endpoint_connected(btl_endpoint);
OPAL_THREAD_UNLOCK(&btl_endpoint->endpoint_send_lock);
#if OMPI_ENABLE_DEBUG && WANT_PEER_DUMP
#if OPAL_ENABLE_DEBUG && WANT_PEER_DUMP
mca_btl_tcp_endpoint_dump(btl_endpoint, "connected");
#endif
}

2
ompi/mca/btl/udapl/btl_udapl.h
Просмотреть файл

@ -243,7 +243,7 @@ do { \
* Report a uDAPL error - for debugging
*/
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
extern void mca_btl_udapl_error(DAT_RETURN ret, char* str);
#define MCA_BTL_UDAPL_ERROR(ret, str) \

2
ompi/mca/btl/udapl/btl_udapl_component.c
Просмотреть файл

@ -158,7 +158,7 @@ mca_btl_udapl_dat_event_to_string(DAT_EVENT_NUMBER event_number)
* Report a uDAPL error - for debugging
*/
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
void
mca_btl_udapl_error(DAT_RETURN ret, char* str)
{

4
ompi/mca/btl/udapl/btl_udapl_frag.c
Просмотреть файл

@ -29,7 +29,7 @@ static void mca_btl_udapl_frag_common_constructor(mca_btl_udapl_frag_t* frag)
mca_btl_udapl_reg_t* reg =
(mca_btl_udapl_reg_t*)frag->base.super.registration;
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
frag->base.des_src = NULL;
frag->base.des_src_cnt = 0;
frag->base.des_dst = NULL;
@ -88,7 +88,7 @@ static void mca_btl_udapl_frag_eager_rdma_constructor(mca_btl_udapl_frag_t* frag
static void mca_btl_udapl_frag_common_destructor(mca_btl_udapl_frag_t* frag)
{
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
frag->ftr = NULL;
frag->size = 0;
frag->registration = NULL;

6
ompi/mca/coll/tuned/coll_tuned_component.c
Просмотреть файл

@ -114,7 +114,7 @@ mca_coll_tuned_component_t mca_coll_tuned_component = {
static int tuned_open(void)
{
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
{
int param;
@ -127,7 +127,7 @@ static int tuned_open(void)
}
}
}
#endif /* OMPI_ENABLE_DEBUG */
#endif /* OPAL_ENABLE_DEBUG */
/* Use a low priority, but allow other components to be lower */
mca_base_param_reg_int(&mca_coll_tuned_component.super.collm_version,
@ -226,7 +226,7 @@ mca_coll_tuned_module_destruct(mca_coll_tuned_module_t *module)
data = module->tuned_data;
if (NULL != data) {
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
/* Reset the reqs to NULL/0 -- they'll be freed as part of freeing
the generel c_coll_selected_data */
data->mcct_reqs = NULL;

4
ompi/mca/common/sm/common_sm_mmap.c
Просмотреть файл

@ -82,7 +82,7 @@ static mca_common_sm_mmap_t* create_map(int fd, size_t size, char *file_name,
/* set up the map object */
map = OBJ_NEW(mca_common_sm_mmap_t);
strncpy(map->map_path, file_name, OMPI_PATH_MAX);
strncpy(map->map_path, file_name, OPAL_PATH_MAX);
/* the first entry in the file is the control structure. The first
entry in the control structure is an mca_common_sm_file_header_t
element */
@ -265,7 +265,7 @@ mca_common_sm_mmap_t* mca_common_sm_mmap_init(size_t size, char *file_name,
/* set up the map object */
map = OBJ_NEW(mca_common_sm_mmap_t);
strncpy(map->map_path, file_name, OMPI_PATH_MAX);
strncpy(map->map_path, file_name, OPAL_PATH_MAX);
/* the first entry in the file is the control structure. The first
entry in the control structure is an mca_common_sm_file_header_t
element */

2
ompi/mca/common/sm/common_sm_mmap.h
Просмотреть файл

@ -58,7 +58,7 @@ struct mca_common_sm_mmap_t {
/* base address of data segment */
unsigned char *data_addr;
size_t map_size;
char map_path[OMPI_PATH_MAX];
char map_path[OPAL_PATH_MAX];
#if defined(__WINDOWS__)
HANDLE hMappedObject;
#endif /* defined(__WINDOWS__) */

6
ompi/mca/crcp/bkmrk/crcp_bkmrk_pml.c
Просмотреть файл

@ -555,7 +555,7 @@ char * timer_label[CRCP_TIMER_MAX];
/************************************
* Additional Debuging dumps
************************************/
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
static void traffic_message_dump_peer(ompi_crcp_bkmrk_pml_peer_ref_t *peer_ref, char * msg, bool root_only);
static void traffic_message_dump_msg_list(opal_list_t *msg_list, bool is_drain);
static void traffic_message_dump_msg_indv(ompi_crcp_bkmrk_pml_traffic_message_ref_t * msg_ref, char * msg, bool vshort);
@ -3687,7 +3687,7 @@ static int traffic_message_find(opal_list_t * search_list,
*found_msg_ref = NULL;
#if OMPI_ENABLE_DEBUG == 1
#if OPAL_ENABLE_DEBUG == 1
/*
* Dummy checks:
*/
@ -6314,7 +6314,7 @@ static void display_indv_timer_core(int idx, int proc, int msgs, bool direct) {
}
/**************** Message Dump functionality ********************/
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
static void traffic_message_dump_msg_content_indv(ompi_crcp_bkmrk_pml_message_content_ref_t * content_ref)
{
OPAL_OUTPUT_VERBOSE((10, mca_crcp_bkmrk_component.super.output_handle,

12
ompi/mca/dpm/orte/dpm_orte.c
Просмотреть файл

@ -491,11 +491,11 @@ static int spawn(int count, char **array_of_commands,
int rc, i, j, counter;
int have_wdir=0;
int flag=0;
char cwd[OMPI_PATH_MAX];
char host[OMPI_PATH_MAX]; /*** should define OMPI_HOST_MAX ***/
char prefix[OMPI_PATH_MAX];
char stdin_target[OMPI_PATH_MAX];
char params[OMPI_PATH_MAX];
char cwd[OPAL_PATH_MAX];
char host[OPAL_PATH_MAX]; /*** should define OMPI_HOST_MAX ***/
char prefix[OPAL_PATH_MAX];
char stdin_target[OPAL_PATH_MAX];
char params[OPAL_PATH_MAX];
orte_job_t *jdata;
orte_app_context_t *app;
@ -714,7 +714,7 @@ static int spawn(int count, char **array_of_commands,
if (NULL != app->preload_files_dest_dir) {
app->cwd = strdup(app->preload_files_dest_dir);
} else {
if (OMPI_SUCCESS != (rc = opal_getcwd(cwd, OMPI_PATH_MAX))) {
if (OMPI_SUCCESS != (rc = opal_getcwd(cwd, OPAL_PATH_MAX))) {
ORTE_ERROR_LOG(rc);
OBJ_RELEASE(jdata);
opal_progress_event_users_decrement();

20
ompi/mca/io/base/io_base_request.c
Просмотреть файл

@ -248,7 +248,7 @@ void mca_io_base_request_return(ompi_file_t *file)
OPAL_THREAD_UNLOCK(&file->f_io_requests_lock);
}
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
static volatile bool thread_running = false;
static volatile bool thread_done = false;
static opal_thread_t progress_thread;
@ -275,14 +275,14 @@ request_progress_thread(opal_object_t *arg)
return NULL;
}
#endif /* OMPI_ENABLE_PROGRESS_THREADS */
#endif /* OPAL_ENABLE_PROGRESS_THREADS */
void
mca_io_base_request_progress_init(void)
{
mca_io_base_request_num_pending = 0;
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
thread_running = false;
thread_done = false;
@ -292,14 +292,14 @@ mca_io_base_request_progress_init(void)
progress_thread.t_run = request_progress_thread;
progress_thread.t_arg = NULL;
#endif /* OMPI_ENABLE_PROGRESS_THREADS */
#endif /* OPAL_ENABLE_PROGRESS_THREADS */
}
OMPI_DECLSPEC void
mca_io_base_request_progress_add(void)
{
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
/* if we don't have a progress thread, make us have a progress
thread */
if (! thread_running) {
@ -310,13 +310,13 @@ mca_io_base_request_progress_add(void)
}
OPAL_THREAD_UNLOCK(&progress_mutex);
}
#endif /* OMPI_ENABLE_PROGRESS_THREADS */
#endif /* OPAL_ENABLE_PROGRESS_THREADS */
OPAL_THREAD_ADD32(&mca_io_base_request_num_pending, 1);
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
opal_condition_signal(&progress_cond);
#endif /* OMPI_ENABLE_PROGRESS_THREADS */
#endif /* OPAL_ENABLE_PROGRESS_THREADS */
}
@ -330,7 +330,7 @@ mca_io_base_request_progress_del(void)
void
mca_io_base_request_progress_fini(void)
{
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
void *ret;
/* make the helper thread die */
@ -344,5 +344,5 @@ mca_io_base_request_progress_fini(void)
OBJ_DESTRUCT(&progress_thread);
OBJ_DESTRUCT(&progress_cond);
OBJ_DESTRUCT(&progress_mutex);
#endif /* OMPI_ENABLE_PROGRESS_THREADS */
#endif /* OPAL_ENABLE_PROGRESS_THREADS */
}

2
ompi/mca/mpool/base/mpool_base_lookup.c
Просмотреть файл

@ -19,7 +19,7 @@
* $HEADER$
*/
#define OMPI_DISABLE_ENABLE_MEM_DEBUG 1
#define OPAL_DISABLE_ENABLE_MEM_DEBUG 1
#include "ompi_config.h"
#include <stdio.h>

2
ompi/mca/mpool/base/mpool_base_open.c
Просмотреть файл

@ -17,7 +17,7 @@
* $HEADER$
*/
#define OMPI_DISABLE_ENABLE_MEM_DEBUG 1
#define OPAL_DISABLE_ENABLE_MEM_DEBUG 1
#include "ompi_config.h"
#include <stdio.h>

2
ompi/mca/mpool/fake/mpool_fake_component.c
Просмотреть файл

@ -18,7 +18,7 @@
* $HEADER$
*/
#define OMPI_DISABLE_ENABLE_MEM_DEBUG 1
#define OPAL_DISABLE_ENABLE_MEM_DEBUG 1
#include "ompi_config.h"
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_param.h"

2
ompi/mca/mpool/fake/mpool_fake_module.c
Просмотреть файл

@ -19,7 +19,7 @@
* $HEADER$
*/
#define OMPI_DISABLE_ENABLE_MEM_DEBUG 1
#define OPAL_DISABLE_ENABLE_MEM_DEBUG 1
#include "ompi_config.h"
#include "mpool_fake.h"
#include <errno.h>

2
ompi/mca/mpool/rdma/mpool_rdma_component.c
Просмотреть файл

@ -19,7 +19,7 @@
* $HEADER$
*/
#define OMPI_DISABLE_ENABLE_MEM_DEBUG 1
#define OPAL_DISABLE_ENABLE_MEM_DEBUG 1
#include "ompi_config.h"
#include "opal/mca/base/base.h"
#include "opal/mca/base/mca_base_param.h"

2
ompi/mca/mpool/rdma/mpool_rdma_module.c
Просмотреть файл

@ -21,7 +21,7 @@
* $HEADER$
*/
#define OMPI_DISABLE_ENABLE_MEM_DEBUG 1
#define OPAL_DISABLE_ENABLE_MEM_DEBUG 1
#include "ompi_config.h"
#include "opal/align.h"
#include "orte/util/name_fns.h"

2
ompi/mca/mtl/mx/mtl_mx.c
Просмотреть файл

@ -160,7 +160,7 @@ ompi_mtl_mx_add_procs(struct mca_mtl_base_module_t *mtl,
progress MX as often as possible during the stage gate 2. This
would have happened after the stage gate anyway, so we're just
speeding things up a bit. */
#if OMPI_ENABLE_PROGRESS_THREADS == 0
#if OPAL_ENABLE_PROGRESS_THREADS == 0
/* switch from letting us sit in the event library for a bit each
time through opal_progress() to completely non-blocking */
opal_progress_set_event_flag(OPAL_EVLOOP_NONBLOCK);

4
ompi/mca/osc/pt2pt/osc_pt2pt.c
Просмотреть файл

@ -55,7 +55,7 @@ ompi_osc_pt2pt_module_free(ompi_win_t *win)
ret = (ret != OMPI_SUCCESS) ? ret : tmp;
if (0 == opal_hash_table_get_size(&mca_osc_pt2pt_component.p2p_c_modules)) {
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
void *foo;
mca_osc_pt2pt_component.p2p_c_thread_run = false;
@ -94,7 +94,7 @@ ompi_osc_pt2pt_module_free(ompi_win_t *win)
}
if (NULL != module->p2p_comm) ompi_comm_free(&module->p2p_comm);
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
memset(module, 0, sizeof(ompi_osc_base_module_t));
#endif
if (NULL != module) free(module);

2
ompi/mca/osc/pt2pt/osc_pt2pt.h
Просмотреть файл

@ -66,7 +66,7 @@ struct ompi_osc_pt2pt_component_t {
/** list of outstanding requests, of type ompi_osc_pt2pt_mpireq_t */
opal_list_t p2p_c_pending_requests;
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
opal_thread_t p2p_c_thread;
bool p2p_c_thread_run;
#endif

32
ompi/mca/osc/pt2pt/osc_pt2pt_component.c
Просмотреть файл

@ -41,7 +41,7 @@
static int component_open(void);
static void component_fragment_cb(ompi_osc_pt2pt_mpireq_t *mpireq);
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
static void* component_thread_fn(opal_object_t *obj);
#endif
@ -205,7 +205,7 @@ ompi_osc_pt2pt_component_init(bool enable_progress_threads,
OBJ_CONSTRUCT(&mca_osc_pt2pt_component.p2p_c_pending_requests,
opal_list_t);
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
OBJ_CONSTRUCT(&mca_osc_pt2pt_component.p2p_c_thread, opal_thread_t);
mca_osc_pt2pt_component.p2p_c_thread_run = false;
#endif
@ -218,7 +218,7 @@ int
ompi_osc_pt2pt_component_finalize(void)
{
size_t num_modules;
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
void* ret;
#endif
@ -227,7 +227,7 @@ ompi_osc_pt2pt_component_finalize(void)
opal_output(ompi_osc_base_output,
"WARNING: There were %d Windows created but not freed.",
(int) num_modules);
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
mca_osc_pt2pt_component.p2p_c_thread_run = false;
opal_condition_broadcast(&ompi_request_cond);
opal_thread_join(&mca_osc_pt2pt_component.p2p_c_thread, &ret);
@ -367,7 +367,7 @@ ompi_osc_pt2pt_component_select(ompi_win_t *win,
module);
ret = opal_hash_table_get_size(&mca_osc_pt2pt_component.p2p_c_modules);
if (ret == 1) {
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
mca_osc_pt2pt_component.p2p_c_thread_run = true;
mca_osc_pt2pt_component.p2p_c_thread.t_run = component_thread_fn;
mca_osc_pt2pt_component.p2p_c_thread.t_arg = NULL;
@ -444,7 +444,7 @@ ompi_osc_pt2pt_component_select(ompi_win_t *win,
}
if (NULL != module->p2p_comm) ompi_comm_free(&module->p2p_comm);
#if OMPI_ENABLE_DEBUG
#if OPAL_ENABLE_DEBUG
memset(module, 0, sizeof(ompi_osc_base_module_t));
#endif
if (NULL != module) free(module);
@ -475,7 +475,7 @@ component_fragment_cb(ompi_osc_pt2pt_mpireq_t *mpireq)
(ompi_osc_pt2pt_send_header_t*) buffer->payload;
void *payload = (void*) (header + 1);
#if !defined(WORDS_BIGENDIAN) && OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if !defined(WORDS_BIGENDIAN) && OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if (header->hdr_base.hdr_flags & OMPI_OSC_PT2PT_HDR_FLAG_NBO) {
OMPI_OSC_PT2PT_SEND_HDR_NTOH(*header);
}
@ -501,7 +501,7 @@ component_fragment_cb(ompi_osc_pt2pt_mpireq_t *mpireq)
(ompi_osc_pt2pt_send_header_t*) buffer->payload;
void *payload = (void*) (header + 1);
#if !defined(WORDS_BIGENDIAN) && OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if !defined(WORDS_BIGENDIAN) && OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if (header->hdr_base.hdr_flags & OMPI_OSC_PT2PT_HDR_FLAG_NBO) {
OMPI_OSC_PT2PT_SEND_HDR_NTOH(*header);
}
@ -531,7 +531,7 @@ component_fragment_cb(ompi_osc_pt2pt_mpireq_t *mpireq)
ompi_osc_pt2pt_replyreq_t *replyreq;
ompi_proc_t *proc;
#if !defined(WORDS_BIGENDIAN) && OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if !defined(WORDS_BIGENDIAN) && OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if (header->hdr_base.hdr_flags & OMPI_OSC_PT2PT_HDR_FLAG_NBO) {
OMPI_OSC_PT2PT_SEND_HDR_NTOH(*header);
}
@ -580,7 +580,7 @@ component_fragment_cb(ompi_osc_pt2pt_mpireq_t *mpireq)
void *payload = (void*) (header + 1);
ompi_osc_pt2pt_sendreq_t *sendreq;
#if !defined(WORDS_BIGENDIAN) && OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if !defined(WORDS_BIGENDIAN) && OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if (header->hdr_base.hdr_flags & OMPI_OSC_PT2PT_HDR_FLAG_NBO) {
OMPI_OSC_PT2PT_REPLY_HDR_NTOH(*header);
}
@ -611,7 +611,7 @@ component_fragment_cb(ompi_osc_pt2pt_mpireq_t *mpireq)
(ompi_osc_pt2pt_control_header_t*) buffer->payload;
int32_t count;
#if !defined(WORDS_BIGENDIAN) && OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if !defined(WORDS_BIGENDIAN) && OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if (header->hdr_base.hdr_flags & OMPI_OSC_PT2PT_HDR_FLAG_NBO) {
OMPI_OSC_PT2PT_CONTROL_HDR_NTOH(*header);
}
@ -634,7 +634,7 @@ component_fragment_cb(ompi_osc_pt2pt_mpireq_t *mpireq)
(ompi_osc_pt2pt_control_header_t*) buffer->payload;
int32_t count;
#if !defined(WORDS_BIGENDIAN) && OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if !defined(WORDS_BIGENDIAN) && OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if (header->hdr_base.hdr_flags & OMPI_OSC_PT2PT_HDR_FLAG_NBO) {
OMPI_OSC_PT2PT_CONTROL_HDR_NTOH(*header);
}
@ -658,7 +658,7 @@ component_fragment_cb(ompi_osc_pt2pt_mpireq_t *mpireq)
ompi_osc_pt2pt_control_header_t *header =
(ompi_osc_pt2pt_control_header_t*) buffer->payload;
#if !defined(WORDS_BIGENDIAN) && OMPI_ENABLE_HETEROGENEOUS_SUPPORT
#if !defined(WORDS_BIGENDIAN) && OPAL_ENABLE_HETEROGENEOUS_SUPPORT
if (header->hdr_base.hdr_flags & OMPI_OSC_PT2PT_HDR_FLAG_NBO) {
OMPI_OSC_PT2PT_CONTROL_HDR_NTOH(*header);
}
@ -706,7 +706,7 @@ ompi_osc_pt2pt_component_progress(void)
opal_list_item_t *item;
int ret, done = 0;
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
OPAL_THREAD_LOCK(&mca_osc_pt2pt_component.p2p_c_lock);
#else
ret = OPAL_THREAD_TRYLOCK(&mca_osc_pt2pt_component.p2p_c_lock);
@ -720,7 +720,7 @@ ompi_osc_pt2pt_component_progress(void)
(ompi_osc_pt2pt_mpireq_t*) item;
/* BWB - FIX ME */
#if OMPI_ENABLE_PROGRESS_THREADS == 0
#if OPAL_ENABLE_PROGRESS_THREADS == 0
if (buffer->request->req_state == OMPI_REQUEST_INACTIVE ||
buffer->request->req_complete) {
ret = ompi_request_test(&buffer->request,
@ -750,7 +750,7 @@ ompi_osc_pt2pt_component_progress(void)
return done;
}
#if OMPI_ENABLE_PROGRESS_THREADS
#if OPAL_ENABLE_PROGRESS_THREADS
static void*
component_thread_fn(opal_object_t *obj)
{

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше