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

Per http://www.open-mpi.org/community/lists/devel/2010/11/8671.php,

Просмотр исходного кода 
change a bunch of OMPI_<foo> names to OPAL_<foo>.

This commit was SVN r24046.
Этот коммит содержится в:
Jeff Squyres 2010-11-12 23:22:11 +00:00
родитель 1f4eae2046
Коммит e4744b4ed5
55 изменённых файлов: 234 добавлений и 234 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -114,12 +114,12 @@ Step 3: Add the following to ompi/tools/ompi_info/ompi_info.h and
change the relevant information inside (i.e., replace
everything between @'s).
#define OMPI_CONFIGURE_USER "@USER_NAME@"
#define OMPI_CONFIGURE_HOST "@HOST_NAME@"
#define OMPI_CONFIGURE_DATE "@TODAY_DATE@"
#define OMPI_BUILD_USER OMPI_CONFIGURE_USER
#define OMPI_BUILD_HOST OMPI_CONFIGURE_HOST
#define OMPI_BUILD_DATE OMPI_CONFIGURE_DATE
#define OPAL_CONFIGURE_USER "@USER_NAME@"
#define OPAL_CONFIGURE_HOST "@HOST_NAME@"
#define OPAL_CONFIGURE_DATE "@TODAY_DATE@"
#define OMPI_BUILD_USER OPAL_CONFIGURE_USER
#define OMPI_BUILD_HOST OPAL_CONFIGURE_HOST
#define OMPI_BUILD_DATE OPAL_CONFIGURE_DATE
#define OMPI_BUILD_CFLAGS "/Od /Gm /EHsc /RTC1 /MDd"
#define OMPI_BUILD_CPPFLAGS "-I${HOME}/ompi-trunk -I${HOME}/opal/include -I${HOME}/ompi-trunk/orte/include -I${HOME}/ompi-trunk/ompi/include"
#define OMPI_BUILD_CXXFLAGS "/Od /Gm /EHsc /RTC1 /MDd"

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

@ -41,9 +41,9 @@ int main() { return fake(3); }
EOF
# Try the compile
OMPI_LOG_COMMAND(
OPAL_LOG_COMMAND(
[$CC $CFLAGS -c conftest_weak.c],
OMPI_LOG_COMMAND(
OPAL_LOG_COMMAND(
[$CC $CFLAGS conftest.c conftest_weak.o -o conftest $LDFLAGS $LIBS],
[ompi_c_weak_symbols_happy=1],
[ompi_c_weak_symbols_happy=0]),

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

@ -91,9 +91,9 @@ void $ompi_ac_thread_fn()
EOF
# Try the compile
OMPI_LOG_COMMAND(
OPAL_LOG_COMMAND(
[$CC $CFLAGS -I. -c conftest.c],
OMPI_LOG_COMMAND(
OPAL_LOG_COMMAND(
[$F77 $FFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS],
[HAPPY=1],
[HAPPY=0]),
@ -102,14 +102,14 @@ OMPI_LOG_COMMAND(
if test "$HAPPY" = "1"; then
$1
else
OMPI_LOG_MSG([here is the C program:], 1)
OMPI_LOG_FILE([conftest.c])
OPAL_LOG_MSG([here is the C program:], 1)
OPAL_LOG_FILE([conftest.c])
if test -f conftest.h; then
OMPI_LOG_MSG([here is contest.h:], 1)
OMPI_LOG_FILE([conftest.h])
OPAL_LOG_MSG([here is contest.h:], 1)
OPAL_LOG_FILE([conftest.h])
fi
OMPI_LOG_MSG([here is the fortran program:], 1)
OMPI_LOG_FILE([conftestf.f])
OPAL_LOG_MSG([here is the fortran program:], 1)
OPAL_LOG_FILE([conftestf.f])
$2
fi

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

@ -79,9 +79,9 @@ void ompi_pthread()
EOF
# Try the compile
OMPI_LOG_COMMAND(
OPAL_LOG_COMMAND(
[$CC $CFLAGS -I. -c conftest.c],
OMPI_LOG_COMMAND(
OPAL_LOG_COMMAND(
[$F77 $FFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS],
[HAPPY=1],
[HAPPY=0]),
@ -90,14 +90,14 @@ OMPI_LOG_COMMAND(
if test "$HAPPY" = "1"; then
$1
else
OMPI_LOG_MSG([here is the C program:], 1)
OMPI_LOG_FILE([conftest.c])
OPAL_LOG_MSG([here is the C program:], 1)
OPAL_LOG_FILE([conftest.c])
if test -f conftest.h; then
OMPI_LOG_MSG([here is contest.h:], 1)
OMPI_LOG_FILE([conftest.h])
OPAL_LOG_MSG([here is contest.h:], 1)
OPAL_LOG_FILE([conftest.h])
fi
OMPI_LOG_MSG([here is the fortran program:], 1)
OMPI_LOG_FILE([conftestf.f])
OPAL_LOG_MSG([here is the fortran program:], 1)
OPAL_LOG_FILE([conftestf.f])
$2
fi

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

@ -32,8 +32,8 @@ dnl
#
######################################################################
AC_DEFUN([OMPI_CONTRIB],[
dnl for OMPI_CONFIGURE_USER env variable
AC_REQUIRE([OMPI_CONFIGURE_SETUP])
dnl for OPAL_CONFIGURE_USER env variable
AC_REQUIRE([OPAL_CONFIGURE_SETUP])
# Option to not build some of the contributed software packages
AC_ARG_ENABLE([contrib-no-build],

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

@ -24,8 +24,8 @@ dnl
#
######################################################################
AC_DEFUN([OMPI_EXT],[
dnl for OMPI_CONFIGURE_USER env variable
AC_REQUIRE([OMPI_CONFIGURE_SETUP])
dnl for OPAL_CONFIGURE_USER env variable
AC_REQUIRE([OPAL_CONFIGURE_SETUP])
# Note that we do not build DSO's here -- we *only* build convenience
# libraries that get slurped into higher-level libraries
@ -90,7 +90,7 @@ AC_DEFUN([OMPI_EXT],[
#
######################################################################
AC_DEFUN([EXT_CONFIGURE],[
OMPI_VAR_SCOPE_PUSH([all_components outfile outfile_real])
OPAL_VAR_SCOPE_PUSH([all_components outfile outfile_real])
all_components=
static_components=
@ -203,7 +203,7 @@ EOF
OMPI_MPIEXT_LIBS="${static_ltlibs}"
AC_SUBST(OMPI_MPIEXT_LIBS)
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])
@ -391,7 +391,7 @@ AC_DEFUN([EXT_COMPONENT_BUILD_CHECK],[
# If userid is in the file, unignore the ignore file.
if test ! -s $component_path/.ompi_unignore ; then
want_component=1
elif test ! -z "`$GREP $OMPI_CONFIGURE_USER $component_path/.ompi_unignore`" ; then
elif test ! -z "`$GREP $OPAL_CONFIGURE_USER $component_path/.ompi_unignore`" ; then
want_component=1
fi
fi

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

@ -47,13 +47,13 @@ int foo(void) { return 0; }
EOF
ompi_check_linker_flags_work() {
OMPI_LOG_MSG([$cmd], [yes])
OPAL_LOG_MSG([$cmd], [yes])
eval $cmd >&5 2>&5
if test -n "[$]1"; then
output=`eval $cmd 2>/dev/null | head -n 1 | sed -e 's,^libtool: *,,' -e 's,^link: *,,'`
fi
status="$?"
OMPI_LOG_MSG([\$? = $status], [yes])
OPAL_LOG_MSG([\$? = $status], [yes])
if test "$status" != "0"; then
AC_MSG_RESULT([libtool error!])
AC_MSG_ERROR([Cannot continue])

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

@ -38,7 +38,7 @@ int $testfunc_name(int a) { return a; }
EOF
# Now compile both parts
OMPI_LOG_COMMAND([$CC -c $CFLAGS $CPPFLAGS conftest_c.$ac_ext],
OPAL_LOG_COMMAND([$CC -c $CFLAGS $CPPFLAGS conftest_c.$ac_ext],
[AC_LANG_PUSH($1)
ompi_lang_link_with_c_libs="$LIBS"
LIBS="conftest_c.o $LIBS"

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

@ -48,8 +48,8 @@ AC_DEFUN([OMPI_LOAD_PLATFORM], [
fi
# eval into environment
OMPI_LOG_MSG([Loading environment file $with_platform, with contents below])
OMPI_LOG_FILE([$with_platform])
OPAL_LOG_MSG([Loading environment file $with_platform, with contents below])
OPAL_LOG_FILE([$with_platform])
. "$with_platform"
# see if they left us a name
@ -59,7 +59,7 @@ AC_DEFUN([OMPI_LOAD_PLATFORM], [
platform_loaded="$with_platform"
fi
echo "Loaded platform arguments for $platform_loaded"
OMPI_LOG_MSG([Loaded platform arguments for $platform_loaded])
OPAL_LOG_MSG([Loaded platform arguments for $platform_loaded])
# look for default mca param file

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

@ -36,8 +36,8 @@ AC_DEFUN([OMPI_EVAL_ARG], [$1])
#
######################################################################
AC_DEFUN([OMPI_MCA],[
dnl for OMPI_CONFIGURE_USER env variable
AC_REQUIRE([OMPI_CONFIGURE_SETUP])
dnl for OPAL_CONFIGURE_USER env variable
AC_REQUIRE([OPAL_CONFIGURE_SETUP])
# Find which components should be built as run-time loadable components
# Acceptable combinations:
@ -889,7 +889,7 @@ AC_DEFUN([MCA_COMPONENT_BUILD_CHECK],[
# If userid is in the file, unignore the ignore file.
if test ! -s $component_path/.ompi_unignore ; then
want_component=1
elif test ! -z "`$GREP $OMPI_CONFIGURE_USER $component_path/.ompi_unignore`" ; then
elif test ! -z "`$GREP $OPAL_CONFIGURE_USER $component_path/.ompi_unignore`" ; then
want_component=1
fi
fi

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

@ -52,7 +52,7 @@ AC_CONFIG_MACRO_DIR(config)
# Start it up
#
OMPI_CONFIGURE_SETUP
OPAL_CONFIGURE_SETUP
ompi_show_title "Configuring project_name_long"
#
@ -215,7 +215,7 @@ AH_BOTTOM([
# Other basic setup stuff (shared with components)
OMPI_BASIC_SETUP
OPAL_BASIC_SETUP
top_ompi_srcdir="$OMPI_TOP_SRCDIR"
AC_SUBST(top_ompi_srcdir)

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

@ -78,9 +78,9 @@ OMPI_DEF(OPAL_PACKAGE_STRING "Open MPI $ENV{USERNAME}@$ENV{COMPUTERNAME} Distrib
OMPI_DEF(PACKAGE_BUGREPORT "http://www.open-mpi.org/community/help/" "Define to the address where bug reports for this package should be sent." 1 1)
OMPI_DEF(OMPI_CONFIGURE_HOST $ENV{COMPUTERNAME} "Host on which configuration has been done." 1 1)
OMPI_DEF(OPAL_CONFIGURE_HOST $ENV{COMPUTERNAME} "Host on which configuration has been done." 1 1)
OMPI_DEF(OMPI_CONFIGURE_USER $ENV{USERNAME} "User who has done the configuration." 1 1)
OMPI_DEF(OPAL_CONFIGURE_USER $ENV{USERNAME} "User who has done the configuration." 1 1)
OMPI_DEF(OMPI_BUILD_USER $ENV{USERNAME} "User who has built the package." 1 1)
@ -112,10 +112,10 @@ EXECUTE_PROCESS(COMMAND cmd /C date /t
STRING (REPLACE "\n" "" CURRENT_TIME ${CURRENT_TIME})
STRING (REPLACE "\n" "" CURRENT_DATE ${CURRENT_DATE})
STRING (REGEX MATCH [.-/\0-9]+ CURRENT_DATE ${CURRENT_DATE})
SET (OMPI_CONFIGURE_DATE "${CURRENT_TIME} ${CURRENT_DATE}" CACHE INTERNAL "OMPI_CONFIGURE_DATE")
SET (OPAL_CONFIGURE_DATE "${CURRENT_TIME} ${CURRENT_DATE}" CACHE INTERNAL "OPAL_CONFIGURE_DATE")
SET (OMPI_BUILD_DATE "${CURRENT_TIME} ${CURRENT_DATE}" CACHE INTERNAL "OMPI_BUILD_DATE")
OMPI_DEF(OMPI_CONFIGURE_DATE "${CURRENT_TIME} ${CURRENT_DATE}" "Configuration date." 1 1)
OMPI_DEF(OPAL_CONFIGURE_DATE "${CURRENT_TIME} ${CURRENT_DATE}" "Configuration date." 1 1)
OMPI_DEF(OMPI_BUILD_DATE "${CURRENT_TIME} ${CURRENT_DATE}" "Build date." 1 1)
OMPI_DEF(OMPI_BUILD_CFLAGS "/Od /Gm /EHsc /RTC1 /MDd" "C flags" 1 1)

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

@ -30,7 +30,7 @@ dnl
#
# types to search is a comma-seperated list of values
AC_DEFUN([OMPI_F77_CHECK], [
OMPI_VAR_SCOPE_PUSH([ofc_have_type ofc_type_size ofc_type_alignment ofc_c_type ofc_expected_size])
OPAL_VAR_SCOPE_PUSH([ofc_have_type ofc_type_size ofc_type_alignment ofc_c_type ofc_expected_size])
ofc_expected_size=$4
ofc_have_type=0
@ -110,5 +110,5 @@ AC_DEFUN([OMPI_F77_CHECK], [
[OMPI_ALIGNMENT_FORTRAN_]m4_bpatsubst(m4_bpatsubst([$1], [*], []), [[^a-zA-Z0-9_]], [_])[=$ofc_type_alignment]
# Clean up
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])dnl

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

@ -72,8 +72,8 @@ EOF
# Try the compilation and run. Can't use AC_TRY_RUN
# because it's two module files.
OMPI_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
[OMPI_LOG_COMMAND([$F77 $FFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS],
OPAL_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
[OPAL_LOG_COMMAND([$F77 $FFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS],
[happy=1], [happy=0])],
[happy=0])
if test "$happy" = "0" ; then
@ -83,7 +83,7 @@ EOF
AS_IF([test "$cross_compiling" = "yes"],
[ # assume we're ok
ompi_cv_f77_logical_array_correct=yes],
[OMPI_LOG_COMMAND([./conftest],
[OPAL_LOG_COMMAND([./conftest],
[if test "`cat conftestval`" = "1" ; then
ompi_cv_f77_logical_array_correct=yes
else

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

@ -23,7 +23,7 @@ dnl
AC_DEFUN([OMPI_F77_CHECK_REAL16_C_EQUIV],[
unset happy
unset CFLAGS_save
OMPI_VAR_SCOPE_PUSH([happy define_value msg CFLAGS_save])
OPAL_VAR_SCOPE_PUSH([happy define_value msg CFLAGS_save])
AS_VAR_PUSHDEF([real16_matches_c_var], [ompi_cv_real16_c_equiv])
# We have to do this as a cache check for cross-compilation platforms
@ -45,7 +45,7 @@ AC_DEFUN([OMPI_F77_CHECK_REAL16_C_EQUIV],[
[AC_MSG_CHECKING([if intel compiler _Quad == REAL*16])
CFLAGS_save="$CFLAGS"
CFLAGS="$CFLAGS -Qoption,cpp,--extended_float_types"
OMPI_UNIQ([CFLAGS])
OPAL_UNIQ([CFLAGS])
OMPI_F77_CHECK_REAL16_EQUIV_TYPE([_Quad], [q])
AS_IF([test "$happy" = "yes"],
[OMPI_FORTRAN_REAL16_C_TYPE="_Quad"
@ -76,7 +76,7 @@ AC_DEFUN([OMPI_F77_CHECK_REAL16_C_EQUIV],[
AC_MSG_WARN([MPI_REAL16 and MPI_COMPLEX32 support have been disabled])])
AC_DEFINE_UNQUOTED([OMPI_REAL16_MATCHES_C], [$define_value],
[Whether Fortran REAL*16 matches the bit format of the equivalent C type])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])
@ -119,8 +119,8 @@ EOF
EOF
rm -f conftestval
# Compile and link
OMPI_LOG_COMMAND([$CC $CFLAGS -I. -c conftest_c.c],
[OMPI_LOG_COMMAND([$F77 $FFLAGS conftest_f.f conftest_c.o -o conftest $LDFLAGS $LIBS],
OPAL_LOG_COMMAND([$CC $CFLAGS -I. -c conftest_c.c],
[OPAL_LOG_COMMAND([$F77 $FFLAGS conftest_f.f conftest_c.o -o conftest $LDFLAGS $LIBS],
[happy="yes"], [happy="no"])], [happy="no"])
AS_IF([test "$happy" = "no"],
[AC_MSG_RESULT([Error!])
@ -130,7 +130,7 @@ EOF
AS_IF([test "$cross_compiling" = "yes"],
[AC_MSG_RESULT([Error!])
AC_MSG_ERROR([Can not determine if REAL*16 bit-matches C if cross compiling])],
[OMPI_LOG_COMMAND([./conftest],
[OPAL_LOG_COMMAND([./conftest],
[happy=`cat conftestval`],
[AC_MSG_RESULT([Error!])
AC_MSG_ERROR([Could not determine if REAL*16 bit-matches C type])

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

@ -23,7 +23,7 @@ dnl
AC_DEFUN([OMPI_F77_FIND_EXT_SYMBOL_CONVENTION], [
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_PROG_GREP])
OMPI_VAR_SCOPE_PUSH([FFLAGS_NEW LDFLAGS_NEW FLAG])
OPAL_VAR_SCOPE_PUSH([FFLAGS_NEW LDFLAGS_NEW FLAG])
# invalidate cache if result came from a run where F77 was disabled
if test "$ompi_cv_f77_external_symbol" = "skipped" ; then
@ -63,7 +63,7 @@ EOF
*) LDFLAGS_NEW="$LDFLAGS_NEW $FLAG" ;;
esac
done
OMPI_LOG_MSG([Try with new FFLAGS: $FFLAGS_NEW and new LDFLAGS:$LDFLAGS_NEW])
OPAL_LOG_MSG([Try with new FFLAGS: $FFLAGS_NEW and new LDFLAGS:$LDFLAGS_NEW])
;;
*)
FFLAGS_NEW="$FFLAGS"
@ -72,7 +72,7 @@ EOF
esac
happy=1
OMPI_LOG_COMMAND([$F77 $FFLAGS_NEW -c conftest.f $LDFLAGS_NEW $LIBS],
OPAL_LOG_COMMAND([$F77 $FFLAGS_NEW -c conftest.f $LDFLAGS_NEW $LIBS],
[if $NM conftest.o | $GREP foo_bar__ >/dev/null 2>&1 ; then
ompi_cv_f77_external_symbol="double underscore"
elif $NM conftest.o | $GREP foo_bar_ >/dev/null 2>&1 ; then
@ -85,8 +85,8 @@ EOF
ompi_cv_f77_external_symbol="upper case"
else
$NM conftest.o >conftest.out 2>&1
OMPI_LOG_MSG([Could not determine Fortran naming convention. Output from $NM:])
OMPI_LOG_FILE([conftest.out])
OPAL_LOG_MSG([Could not determine Fortran naming convention. Output from $NM:])
OPAL_LOG_FILE([conftest.out])
happy=0
fi],
[AC_MSG_ERROR([Fortran compiler did not produce object file])])
@ -124,7 +124,7 @@ EOF
[$ompi_fortran_plain],
[Whether fortran symbols have no trailing underscore or not])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
rm -rf conftest.*
])dnl

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

@ -22,7 +22,7 @@ dnl
# ----------------------------------------------------
AC_DEFUN([OMPI_F77_GET_ALIGNMENT],[
unset happy
OMPI_VAR_SCOPE_PUSH([happy ompi_conftest_h])
OPAL_VAR_SCOPE_PUSH([happy ompi_conftest_h])
# Use of m4_translit suggested by Eric Blake:
# http://lists.gnu.org/archive/html/bug-autoconf/2010-10/msg00016.html
AS_VAR_PUSHDEF([type_var],
@ -76,8 +76,8 @@ void $ompi_ac_align_fn(char *w, char *x, char *y, char *z)
#endif
EOF
OMPI_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
[OMPI_LOG_COMMAND([$F77 $FFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS],
OPAL_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
[OPAL_LOG_COMMAND([$F77 $FFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS],
[happy="yes"], [happy="no"])], [happy="no"])
if test "$happy" = "no" ; then
@ -88,7 +88,7 @@ EOF
AS_IF([test "$cross_compiling" = "yes"],
[AC_MSG_RESULT([Error!])
AC_MSG_ERROR([Can not determine alignment of $1 when cross-compiling])],
[OMPI_LOG_COMMAND([./conftest],
[OPAL_LOG_COMMAND([./conftest],
[AS_VAR_SET(type_var, [`cat conftestval`])],
[AC_MSG_RESULT([Error!])
AC_MSG_ERROR([Could not determine alignment of $1])])])
@ -96,5 +96,5 @@ EOF
AS_VAR_COPY([$2], [type_var])
AS_VAR_POPDEF([type_var])dnl
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])

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

@ -64,8 +64,8 @@ void $ompi_ac_size_fn(char *a, char *b)
#endif
EOF
OMPI_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
[OMPI_LOG_COMMAND([$F77 $FFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS],
OPAL_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
[OPAL_LOG_COMMAND([$F77 $FFLAGS conftestf.f conftest.o -o conftest $LDFLAGS $LIBS],
[happy="yes"], [happy="no"])], [happy="no"])
if test "$happy" = "no" ; then
@ -74,10 +74,10 @@ EOF
AS_IF([test "$cross_compiling" = "yes"],
[AC_MSG_ERROR([Can not determine size of $1 when cross-compiling])],
[OMPI_LOG_COMMAND([./conftest],
[OPAL_LOG_COMMAND([./conftest],
[AS_IF([test -f conftestval],
[AS_VAR_SET(type_var, [`cat conftestval`])],
[OMPI_LOG_MSG([conftestval not found.], 1)
[OPAL_LOG_MSG([conftestval not found.], 1)
AC_MSG_ERROR([Could not determine size of $1])])],
[AC_MSG_ERROR([Could not determine size of $1])])])

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

@ -89,8 +89,8 @@ EOF
#
# Try the compilation and run.
#
OMPI_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
[OMPI_LOG_COMMAND([$F77 $FFLAGS -o conftest conftest.o conftestf.f $LDFLAGS $LIBS],
OPAL_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
[OPAL_LOG_COMMAND([$F77 $FFLAGS -o conftest conftest.o conftestf.f $LDFLAGS $LIBS],
[happy=1], [happy=0])],
[happy=0])
@ -100,7 +100,7 @@ EOF
AS_IF([test "$cross_compiling" = "yes"],
[AC_MSG_ERROR([Can not determine value of .TRUE. when cross-compiling])],
[OMPI_LOG_COMMAND([./conftest],
[OPAL_LOG_COMMAND([./conftest],
[ompi_cv_f77_true_value=`sed 's/ *//' conftestval`],
[AC_MSG_ERROR([Could not determine value of Fotran .TRUE.. Aborting.])])])
fi])

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

@ -41,7 +41,7 @@ module OMPI_MOD_FLAG
end module OMPI_MOD_FLAG
EOF
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -c conftest-module.f90 $LDFLAGS $LIBS], ,
OPAL_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -c conftest-module.f90 $LDFLAGS $LIBS], ,
[cd ..
rm -rf conftest.$$
AC_MSG_RESULT([Whoops!])
@ -63,7 +63,7 @@ EOF
ofi_module_flag=
for flag in $ofi_possible_flags; do
if test "$ofi_module_flag" = ""; then
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 conftest.f90 ${flag}subdir $LDFLAGS $LIBS],
OPAL_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 conftest.f90 ${flag}subdir $LDFLAGS $LIBS],
[AS_VAR_SET(f90_inc_var, [$flag])
ofi_module_flag="$flag"])
fi

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

@ -35,12 +35,12 @@ end program
EOF
# Try to compile
OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -o conftest conftestf.f90 $LDFLAGS $LIBS],
OPAL_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 -o conftest conftestf.f90 $LDFLAGS $LIBS],
[happy="yes"], [happy="no"])
if test "$happy" = "no"; then
OMPI_LOG_MSG([here is the fortran 90 program:], 1)
OMPI_LOG_FILE([conftestf.f90])
OPAL_LOG_MSG([here is the fortran 90 program:], 1)
OPAL_LOG_FILE([conftestf.f90])
AC_MSG_WARN([Could not kind of selected_int_kind($1)])
AC_MSG_WARN([See config.log for details])
AC_MSG_ERROR([Cannot continue])
@ -48,7 +48,7 @@ EOF
AS_IF([test "$cross_compiling" = "yes"],
[AC_MSG_ERROR([Can not determine kind of selected_int_kind($1) when cross-compiling])],
[OMPI_LOG_COMMAND([./conftest],
[OPAL_LOG_COMMAND([./conftest],
[AS_VAR_SET(type_var, [`sed 's/ *//' conftestval`])],
[AC_MSG_ERROR([Could not determine kind of selected_int_kind($1)])])])

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

@ -63,13 +63,13 @@ void $ompi_ac_size_fn(char *a, char *b)
#endif
EOF
OMPI_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
[OMPI_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS],
OPAL_LOG_COMMAND([$CC $CFLAGS -I. -c conftest.c],
[OPAL_LOG_COMMAND([$FC $FCFLAGS $FCFLAGS_f90 conftestf.f90 conftest.o -o conftest $LDFLAGS $LIBS],
[happy="yes"], [happy="no"])], [happy="no"])
if test "$happy" = "no" ; then
OMPI_LOG_MSG([here is the fortran 90 program:], 1)
OMPI_LOG_FILE([conftestf.f90])
OPAL_LOG_MSG([here is the fortran 90 program:], 1)
OPAL_LOG_FILE([conftestf.f90])
AC_MSG_WARN([Could not determine size of $1])
AC_MSG_WARN([See config.log for details])
AC_MSG_ERROR([Cannot continue])
@ -77,7 +77,7 @@ EOF
AS_IF([test "$cross_compiling" = "yes"],
[AC_MSG_ERROR([Can not determine size of $1 when cross-compiling])],
[OMPI_LOG_COMMAND([./conftest],
[OPAL_LOG_COMMAND([./conftest],
[AS_VAR_SET(type_var, [`cat conftestval`])],
[AC_MSG_ERROR([Could not determine size of $1])])])

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

@ -32,9 +32,9 @@ AC_DEFUN([OMPI_CHECK_FCA],[
LIBS_save=$LIBS
CPPFLAGS="$CPPFLAGS -I$ompi_check_fca_dir/include/fca -I$ompi_check_fca_dir/include/fca_core"
OMPI_LOG_MSG([$1_CPPFLAGS : $$1_CPPFLAGS], 1)
OMPI_LOG_MSG([$1_LDFLAGS : $$1_LDFLAGS], 1)
OMPI_LOG_MSG([$1_LIBS : $$1_LIBS], 1)
OPAL_LOG_MSG([$1_CPPFLAGS : $$1_CPPFLAGS], 1)
OPAL_LOG_MSG([$1_LDFLAGS : $$1_LDFLAGS], 1)
OPAL_LOG_MSG([$1_LIBS : $$1_LIBS], 1)
OMPI_CHECK_PACKAGE([$1],
[fca_api.h],

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

@ -29,7 +29,7 @@
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
# support, otherwise executes action-if-not-found
AC_DEFUN([OMPI_CHECK_OPENIB],[
OMPI_VAR_SCOPE_PUSH([$1_msg])
OPAL_VAR_SCOPE_PUSH([$1_msg])
#
# Openfabrics support
@ -294,6 +294,6 @@ dnl fi
AC_MSG_ERROR([Aborting.])])
$3])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])

24
ompi/config/ompi_setup_cxx.m4
Просмотреть файл

@ -29,12 +29,12 @@ AC_DEFUN([OMPI_SETUP_CXX_BANNER],[
# This macro is necessary because PROG_CXX* is REQUIREd by multiple
# places in SETUP_CXX.
AC_DEFUN([OMPI_PROG_CXX],[
OMPI_VAR_SCOPE_PUSH([ompi_cxxflags_save])
OPAL_VAR_SCOPE_PUSH([ompi_cxxflags_save])
ompi_cxxflags_save="$CXXFLAGS"
AC_PROG_CXX
AC_PROG_CXXCPP
CXXFLAGS="$ompi_cxxflags_save"
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])
# OMPI_SETUP_CXX()
@ -66,7 +66,7 @@ AC_DEFUN([OMPI_SETUP_CXX],[
# --------------------------
# Setup the CXX compiler
AC_DEFUN([_OMPI_SETUP_CXX_COMPILER],[
OMPI_VAR_SCOPE_PUSH(ompi_cxx_compiler_works)
OPAL_VAR_SCOPE_PUSH(ompi_cxx_compiler_works)
# There's a few cases here:
#
@ -89,7 +89,7 @@ AC_DEFUN([_OMPI_SETUP_CXX_COMPILER],[
AS_IF([test "x$CXX" = "x"], [CXX=none])
set dummy $CXX
ompi_cxx_argv0=[$]2
OMPI_WHICH([$ompi_cxx_argv0], [OMPI_CXX_ABSOLUTE])
OPAL_WHICH([$ompi_cxx_argv0], [OMPI_CXX_ABSOLUTE])
AS_IF([test "x$OMPI_CXX_ABSOLUTE" = "x"], [OMPI_CXX_ABSOLUTE=none])
AC_DEFINE_UNQUOTED(OMPI_CXX, "$CXX", [OMPI underlying C++ compiler])
@ -137,7 +137,7 @@ AC_DEFUN([_OMPI_SETUP_CXX_COMPILER],[
AS_IF([test "$WANT_MPI_CXX_SUPPORT" = "1"],
[OMPI_CXX_COMPILER_VENDOR([ompi_cxx_vendor])])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])
# _OMPI_SETUP_CXX_COMPILER_BACKEND()
@ -160,7 +160,7 @@ AC_DEFUN([_OMPI_SETUP_CXX_COMPILER_BACKEND],[
# Do we want debugging?
if test "$WANT_DEBUG" = "1" -a "$enable_debug_symbols" != "no" ; then
CXXFLAGS="$CXXFLAGS -g"
OMPI_UNIQ(CXXFLAGS)
OPAL_UNIQ(CXXFLAGS)
AC_MSG_WARN([-g has been added to CXXFLAGS (--enable-debug)])
fi
@ -202,7 +202,7 @@ AC_DEFUN([_OMPI_SETUP_CXX_COMPILER_BACKEND],[
fi
CXXFLAGS="$CXXFLAGS $add"
OMPI_UNIQ(CXXFLAGS)
OPAL_UNIQ(CXXFLAGS)
if test "$add" != "" ; then
AC_MSG_WARN([$add has been added to CXXFLAGS (--enable-picky)])
fi
@ -223,7 +223,7 @@ AC_DEFUN([_OMPI_SETUP_CXX_COMPILER_BACKEND],[
add=" -finline-functions"
fi
CXXFLAGS="$CXXFLAGS_orig$add"
OMPI_UNIQ(CXXFLAGS)
OPAL_UNIQ(CXXFLAGS)
if test "$add" != "" ; then
AC_MSG_WARN([$add has been added to CXXFLAGS])
fi
@ -356,7 +356,7 @@ AC_DEFUN([_OMPI_CXX_CHECK_EXCEPTIONS_BACKEND],[
# -----------------------
# Check for __builtin_* stuff
AC_DEFUN([_OMPI_CXX_CHECK_BUILTIN],[
OMPI_VAR_SCOPE_PUSH([have_cxx_builtin_expect have_cxx_builtin_prefetch])
OPAL_VAR_SCOPE_PUSH([have_cxx_builtin_expect have_cxx_builtin_prefetch])
have_cxx_builtin_expect=0
have_cxx_builtin_prefetch=0
@ -370,7 +370,7 @@ AC_DEFUN([_OMPI_CXX_CHECK_BUILTIN],[
[$have_cxx_builtin_prefetch],
[Whether C++ compiler supports __builtin_prefetch])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])
# _OMPI_CXX_CHECK_BUILTIN_BACKEND
@ -412,7 +412,7 @@ AC_DEFUN([_OMPI_CXX_CHECK_BUILTIN_BACKEND],[
# -----------------------------
# Check for compiler support of 2D const casts
AC_DEFUN([_OMPI_CXX_CHECK_2D_CONST_CAST],[
OMPI_VAR_SCOPE_PUSH([use_2d_const_cast])
OPAL_VAR_SCOPE_PUSH([use_2d_const_cast])
use_2d_const_cast=0
AS_IF([test "$WANT_MPI_CXX_SUPPORT" = "1"],
@ -422,7 +422,7 @@ AC_DEFUN([_OMPI_CXX_CHECK_2D_CONST_CAST],[
[$use_2d_const_cast],
[Whether a const_cast on a 2-d array will work with the C++ compiler])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])
# _OMPI_CXX_CHECK_2D_CONST_CAST_BACKEND

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

@ -41,11 +41,11 @@ AC_DEFUN([OMPI_SETUP_F77_BANNER],[
# This macro is necessary because PROG_FC is REQUIREd by multiple
# places in SETUP_F90.
AC_DEFUN([OMPI_PROG_F77],[
OMPI_VAR_SCOPE_PUSH([ompi_fflags_save])
OPAL_VAR_SCOPE_PUSH([ompi_fflags_save])
ompi_fflags_save="$FFLAGS"
AC_PROG_F77([gfortran g77 f77 xlf frt ifort pgf77 fort77 fl32 af77])
FFLAGS="$ompi_fflags_save"
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])
AC_DEFUN([OMPI_SETUP_F77],[
@ -78,7 +78,7 @@ else
set dummy $OMPI_F77
OMPI_F77_ARGV0=[$]2
BASEF77="`basename $OMPI_F77_ARGV0`"
OMPI_WHICH([$OMPI_F77_ARGV0], [OMPI_F77_ABSOLUTE])
OPAL_WHICH([$OMPI_F77_ARGV0], [OMPI_F77_ABSOLUTE])
if test "$OMPI_WANT_F77_BINDINGS" = "0" ; then
AC_MSG_WARN([*** Fortran 77 bindings disabled by user])

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

@ -43,11 +43,11 @@ AC_DEFUN([OMPI_SETUP_F90_BANNER],[
# This macro is necessary because PROG_FC is REQUIREd by multiple
# places in SETUP_F90.
AC_DEFUN([OMPI_PROG_FC],[
OMPI_VAR_SCOPE_PUSH([ompi_fcflags_save])
OPAL_VAR_SCOPE_PUSH([ompi_fcflags_save])
ompi_fcflags_save="$FCFLAGS"
AC_PROG_FC([gfortran f95 fort xlf95 ifort ifc efc pgf95 lf95 f90 xlf90 pgf90 epcf90])
FCFLAGS="$ompi_fcflags_save"
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])dnl
AC_DEFUN([OMPI_SETUP_F90],[
@ -107,7 +107,7 @@ else
set dummy $OMPI_F90
OMPI_F90_ARGV0=[$]2
BASEF90="`basename $OMPI_F90_ARGV0`"
OMPI_WHICH([$OMPI_F90_ARGV0], [OMPI_F90_ABSOLUTE])
OPAL_WHICH([$OMPI_F90_ARGV0], [OMPI_F90_ABSOLUTE])
fi
fi
# make sure the compiler actually works, if not cross-compiling
@ -232,11 +232,11 @@ cat > conftestf90.f <<EOF
EOF
# Try the compile
OMPI_LOG_COMMAND(
OPAL_LOG_COMMAND(
[$OMPI_F90 $FCFLAGS $FCFLAGS_f -c conftestf90.f],
OMPI_LOG_COMMAND(
OPAL_LOG_COMMAND(
[$OMPI_F77 $FFLAGS -c conftestf77.f],
OMPI_LOG_COMMAND(
OPAL_LOG_COMMAND(
[$OMPI_F90 $FCFLAGS -o conftest conftestf90.o conftestf77.o $LDFLAGS $LIBS],
[HAPPY=1],
[HAPPY=0]),
@ -246,10 +246,10 @@ OMPI_LOG_COMMAND(
if test "$HAPPY" = "1"; then
$1
else
OMPI_LOG_MSG([here is the F77 program:], 1)
OMPI_LOG_FILE([conftestf77.f])
OMPI_LOG_MSG([here is the F90 program:], 1)
OMPI_LOG_FILE([conftestf90.f])
OPAL_LOG_MSG([here is the F77 program:], 1)
OPAL_LOG_FILE([conftestf77.f])
OPAL_LOG_MSG([here is the F90 program:], 1)
OPAL_LOG_FILE([conftestf90.f])
$2
fi

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

@ -26,7 +26,7 @@ dnl
# before the bulk of the tests that can affect the wrapper compilers
#
# Note that we keep the user-specified flags seperately because we
# don't want them to go through OMPI_UNIQ because that has resulted in
# don't want them to go through OPAL_UNIQ because that has resulted in
# unexpected behavior for the user in the past.
AC_DEFUN([OMPI_SETUP_WRAPPER_INIT],[
WRAPPER_EXTRA_FFLAGS=
@ -201,13 +201,13 @@ AC_DEFUN([_OMPI_SETUP_OPAL_WRAPPERS],[
])
AC_DEFUN([OMPI_SETUP_WRAPPER_FINAL],[
OMPI_UNIQ([WRAPPER_EXTRA_FFLAGS])
OMPI_UNIQ([WRAPPER_EXTRA_FFLAGS_PREFIX])
OMPI_UNIQ([WRAPPER_EXTRA_FCFLAGS])
OMPI_UNIQ([WRAPPER_EXTRA_FCFLAGS_PREFIX])
OPAL_UNIQ([WRAPPER_EXTRA_FFLAGS])
OPAL_UNIQ([WRAPPER_EXTRA_FFLAGS_PREFIX])
OPAL_UNIQ([WRAPPER_EXTRA_FCFLAGS])
OPAL_UNIQ([WRAPPER_EXTRA_FCFLAGS_PREFIX])
OMPI_UNIQ([ompi_WRAPPER_EXTRA_LDFLAGS])
OMPI_UNIQ([ompi_WRAPPER_EXTRA_LIBS])
OPAL_UNIQ([ompi_WRAPPER_EXTRA_LDFLAGS])
OPAL_UNIQ([ompi_WRAPPER_EXTRA_LIBS])
m4_ifdef([project_orte], [_OMPI_SETUP_ORTE_WRAPPERS], [_OMPI_SETUP_OPAL_WRAPPERS])

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

@ -34,7 +34,7 @@ AC_DEFUN([MCA_ompi_btl_openib_POST_CONFIG], [
AC_DEFUN([MCA_ompi_btl_openib_CONFIG],[
AC_CONFIG_FILES([ompi/mca/btl/openib/Makefile])
OMPI_VAR_SCOPE_PUSH([cpcs have_threads])
OPAL_VAR_SCOPE_PUSH([cpcs have_threads])
cpcs="oob"
OMPI_CHECK_OPENIB([btl_openib],
@ -84,5 +84,5 @@ AC_DEFUN([MCA_ompi_btl_openib_CONFIG],[
AC_SUBST([btl_openib_LDFLAGS])
AC_SUBST([btl_openib_LIBS])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])dnl

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

@ -17,7 +17,7 @@
# LDFLAGS, LIBS} as needed and runs action-if-found if there is
# support, otherwise executes action-if-not-found
AC_DEFUN([OMPI_CHECK_KNEM],[
OMPI_VAR_SCOPE_PUSH([ompi_check_knem_happy ompi_check_knem_$1_save_CPPFLAGS ompi_check_knem_dir])
OPAL_VAR_SCOPE_PUSH([ompi_check_knem_happy ompi_check_knem_$1_save_CPPFLAGS ompi_check_knem_dir])
AC_ARG_WITH([knem],
[AC_HELP_STRING([--with-knem(=DIR)],
[Build knem Linux kernel module support, searching for headers in DIR])])
@ -60,7 +60,7 @@ AC_DEFUN([OMPI_CHECK_KNEM],[
[AS_IF([test ! -z "$with_knem" -a "$with_knem" != "no"],
[AC_MSG_ERROR([KNEM support requested but not found. Aborting])])
$3])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])dnl
# MCA_btl_sm_CONFIG([action-if-can-compile],
@ -69,7 +69,7 @@ AC_DEFUN([OMPI_CHECK_KNEM],[
AC_DEFUN([MCA_ompi_btl_sm_CONFIG],[
AC_CONFIG_FILES([ompi/mca/btl/sm/Makefile])
OMPI_VAR_SCOPE_PUSH([btl_sm_knem_happy])
OPAL_VAR_SCOPE_PUSH([btl_sm_knem_happy])
OMPI_CHECK_KNEM([btl_sm],
[btl_sm_knem_happy=1],
[btl_sm_knem_happy=0])
@ -80,5 +80,5 @@ AC_DEFUN([MCA_ompi_btl_sm_CONFIG],[
[$1]
# substitute in the things needed to build KNEM
AC_SUBST([btl_sm_CPPFLAGS])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])dnl

4
ompi/mca/io/romio/configure.m4
Просмотреть файл

@ -31,7 +31,7 @@ AC_DEFUN([MCA_ompi_io_romio_POST_CONFIG], [
AC_DEFUN([MCA_ompi_io_romio_CONFIG],[
AC_CONFIG_FILES([ompi/mca/io/romio/Makefile])
OMPI_VAR_SCOPE_PUSH([io_romio_flags io_romio_flags_define io_romio_happy io_romio_save_LIBS])
OPAL_VAR_SCOPE_PUSH([io_romio_flags io_romio_flags_define io_romio_happy io_romio_save_LIBS])
AC_ARG_ENABLE([io-romio],
[AC_HELP_STRING([--disable-io-romio],
[Disable the ROMIO MPI-IO component])])
@ -106,5 +106,5 @@ AC_DEFUN([MCA_ompi_io_romio_CONFIG],[
[AC_MSG_ERROR([ROMIO distribution did not configure successfully])],
[AC_MSG_WARN([ROMIO distribution did not configure successfully])])
$2])])])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])

6
ompi/tools/ompi_info/Makefile.am
Просмотреть файл

@ -19,9 +19,9 @@
#
AM_CFLAGS = \
-DOMPI_CONFIGURE_USER="\"@OMPI_CONFIGURE_USER@\"" \
-DOMPI_CONFIGURE_HOST="\"@OMPI_CONFIGURE_HOST@\"" \
-DOMPI_CONFIGURE_DATE="\"@OMPI_CONFIGURE_DATE@\"" \
-DOPAL_CONFIGURE_USER="\"@OPAL_CONFIGURE_USER@\"" \
-DOPAL_CONFIGURE_HOST="\"@OPAL_CONFIGURE_HOST@\"" \
-DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \
-DOMPI_BUILD_USER="\"$$USER\"" \
-DOMPI_BUILD_HOST="\"`hostname`\"" \
-DOMPI_BUILD_DATE="\"`date`\"" \

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

@ -474,7 +474,7 @@ void ompi_info_do_arch()
void ompi_info_do_hostname()
{
ompi_info_out("Configure host", "config:host", OMPI_CONFIGURE_HOST);
ompi_info_out("Configure host", "config:host", OPAL_CONFIGURE_HOST);
}
@ -588,9 +588,9 @@ void ompi_info_do_config(bool want_all)
OPAL_ENABLE_CRDEBUG ? "yes" : "no");
/* output values */
ompi_info_out("Configured by", "config:user", OMPI_CONFIGURE_USER);
ompi_info_out("Configured on", "config:timestamp", OMPI_CONFIGURE_DATE);
ompi_info_out("Configure host", "config:host", OMPI_CONFIGURE_HOST);
ompi_info_out("Configured by", "config:user", OPAL_CONFIGURE_USER);
ompi_info_out("Configured on", "config:timestamp", OPAL_CONFIGURE_DATE);
ompi_info_out("Configure host", "config:host", OPAL_CONFIGURE_HOST);
ompi_info_out("Built by", "build:user", OMPI_BUILD_USER);
ompi_info_out("Built on", "build:timestamp", OMPI_BUILD_DATE);

6
ompi/tools/win_makefile
Просмотреть файл

@ -84,9 +84,9 @@ ADD_INCL = \
/DOMPI_BUILD_HOST="\"not implemented\"" \
/DOMPI_WANT_SVN="\"not implemented\"" \
/DOMPI_SVN_R="\"not implemented\"" \
/DOMPI_CONFIGURE_USER="\"not implemented\"" \
/DOMPI_CONFIGURE_DATE="\"not implemented\"" \
/DOMPI_CONFIGURE_HOST="\"not implemented\"" \
/DOPAL_CONFIGURE_USER="\"not implemented\"" \
/DOPAL_CONFIGURE_DATE="\"not implemented\"" \
/DOPAL_CONFIGURE_HOST="\"not implemented\"" \
/DOMPI_BUILD_CFLAGS="\"not implemented\"" \
/DOMPI_BUILD_CXXFLAGS="\"not implemented\"" \
/DOMPI_BUILD_FFLAGS="\"not implemented\"" \

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

@ -79,7 +79,7 @@ EOF
# resulting object file. If the ident is found in "strings" or
# the grep succeeds, rule that we have this flavor of ident.
OMPI_LOG_COMMAND([$ompi_compiler $ompi_flags -c conftest.$3 -o conftest.${OBJEXT}],
OPAL_LOG_COMMAND([$ompi_compiler $ompi_flags -c conftest.$3 -o conftest.${OBJEXT}],
[AS_IF([test -f conftest.${OBJEXT}],
[ompi_output="`strings -a conftest.${OBJEXT} | grep $ompi_ident`"
grep $ompi_ident conftest.${OBJEXT} 2>&1 1>/dev/null
@ -87,8 +87,8 @@ EOF
AS_IF([test "$ompi_output" != "" -o "$ompi_status" = "0"],
[$6],
[$7])],
[OMPI_LOG_MSG([the failed program was:])
OMPI_LOG_FILE([conftest.$3])
[OPAL_LOG_MSG([the failed program was:])
OPAL_LOG_FILE([conftest.$3])
$7]
[$7])])

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

@ -18,7 +18,7 @@
# and should be fixed in subsequent releases (e.g., 9.0-2?).
AC_DEFUN([OPAL_CHECK_OFFSETOF],[
OMPI_VAR_SCOPE_PUSH([have_offsetof_msg])
OPAL_VAR_SCOPE_PUSH([have_offsetof_msg])
AC_MSG_CHECKING(for functional offsetof macro)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include<stddef.h>]],
@ -38,6 +38,6 @@ AC_DEFUN([OPAL_CHECK_OFFSETOF],[
fi
AC_MSG_RESULT([$have_offsetof_msg])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])dnl

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

@ -430,10 +430,10 @@ AC_DEFUN([OMPI_CHECK_ASM_GNU_STACKEXEC], [
cat >conftest.c <<EOF
int testfunc() {return 0; }
EOF
OMPI_LOG_COMMAND([$CC $CFLAGS -c conftest.c -o conftest.$OBJEXT],
OPAL_LOG_COMMAND([$CC $CFLAGS -c conftest.c -o conftest.$OBJEXT],
[$OBJDUMP -x conftest.$OBJEXT | $GREP '\.note\.GNU-stack' > /dev/null && ompi_cv_asm_gnu_stack_result=yes],
[OMPI_LOG_MSG([the failed program was:], 1)
OMPI_LOG_FILE([conftest.c])
[OPAL_LOG_MSG([the failed program was:], 1)
OPAL_LOG_FILE([conftest.c])
ompi_cv_asm_gnu_stack_result=no])
if test "$ompi_cv_asm_gnu_stack_result" != "yes" ; then
ompi_cv_asm_gnu_stack_result="no"
@ -808,7 +808,7 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
# OS X Leopard ld bus errors if you have "-g" or "-gX" in the link line
# with our assembly (!). So remove it from CCASFLAGS if it's
# there (and we're on Leopard).
OMPI_VAR_SCOPE_PUSH([ompi_config_asm_flags_new ompi_config_asm_flag])
OPAL_VAR_SCOPE_PUSH([ompi_config_asm_flags_new ompi_config_asm_flag])
AC_MSG_CHECKING([if need to remove -g from CCASFLAGS])
case "$host" in
*-apple-darwin9.*)
@ -831,7 +831,7 @@ AC_DEFUN([OPAL_CONFIG_ASM],[
AC_MSG_RESULT([no])
;;
esac
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
AC_MSG_CHECKING([whether to enable smp locks])
AC_ARG_ENABLE([smp-locks],

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

@ -336,8 +336,8 @@ elif test "$with_cross" != "" ; then
fi
# eval into environment
OMPI_LOG_MSG([Loading cross-compile file $with_cross, with contents below])
OMPI_LOG_FILE([$with_cross])
OPAL_LOG_MSG([Loading cross-compile file $with_cross, with contents below])
OPAL_LOG_FILE([$with_cross])
. "$with_cross"
fi
@ -471,7 +471,7 @@ AC_ARG_WITH([package-string],
[AC_HELP_STRING([--with-package-string=STRING],
[Use a branding string throughout Open MPI])])
if test "$with_package_string" = "" -o "$with_package_string" = "no"; then
with_package_string="Open MPI $OMPI_CONFIGURE_USER@$OMPI_CONFIGURE_HOST Distribution"
with_package_string="Open MPI $OPAL_CONFIGURE_USER@$OPAL_CONFIGURE_HOST Distribution"
fi
AC_DEFINE_UNQUOTED([OPAL_PACKAGE_STRING], ["$with_package_string"],
[package/branding string for Open MPI])

50
opal/config/opal_functions.m4
Просмотреть файл

@ -36,7 +36,7 @@ dnl ON AN "AS IS" BASIS, AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATION TO
dnl PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
dnl
AC_DEFUN([OMPI_CONFIGURE_SETUP],[
AC_DEFUN([OPAL_CONFIGURE_SETUP],[
# Some helper script functions. Unfortunately, we cannot use $1 kinds
# of arugments here because of the m4 substitution. So we have to set
@ -78,29 +78,29 @@ EOF
# Save some stats about this build
#
OMPI_CONFIGURE_USER="`whoami`"
OMPI_CONFIGURE_HOST="`hostname | head -n 1`"
OMPI_CONFIGURE_DATE="`date`"
OPAL_CONFIGURE_USER="`whoami`"
OPAL_CONFIGURE_HOST="`hostname | head -n 1`"
OPAL_CONFIGURE_DATE="`date`"
#
# Save these details so that they can be used in ompi_info later
#
AC_SUBST(OMPI_CONFIGURE_USER)
AC_SUBST(OMPI_CONFIGURE_HOST)
AC_SUBST(OMPI_CONFIGURE_DATE)])dnl
AC_SUBST(OPAL_CONFIGURE_USER)
AC_SUBST(OPAL_CONFIGURE_HOST)
AC_SUBST(OPAL_CONFIGURE_DATE)])dnl
dnl #######################################################################
dnl #######################################################################
dnl #######################################################################
AC_DEFUN([OMPI_BASIC_SETUP],[
AC_DEFUN([OPAL_BASIC_SETUP],[
#
# Save some stats about this build
#
OMPI_CONFIGURE_USER="`whoami`"
OMPI_CONFIGURE_HOST="`hostname | head -n 1`"
OMPI_CONFIGURE_DATE="`date`"
OPAL_CONFIGURE_USER="`whoami`"
OPAL_CONFIGURE_HOST="`hostname | head -n 1`"
OPAL_CONFIGURE_DATE="`date`"
#
# Make automake clean emacs ~ files for "make clean"
@ -152,9 +152,9 @@ esac
AC_ARG_ENABLE(dist,
AC_HELP_STRING([--enable-dist],
[guarantee that that the "dist" make target will be functional, although may not guarantee that any other make target will be functional.]),
OMPI_WANT_DIST=yes, OMPI_WANT_DIST=no)
OPAL_WANT_DIST=yes, OPAL_WANT_DIST=no)
if test "$OMPI_WANT_DIST" = "yes"; then
if test "$OPAL_WANT_DIST" = "yes"; then
AC_MSG_WARN([Configuring in 'make dist' mode])
AC_MSG_WARN([Most make targets may be non-functional!])
fi
@ -196,7 +196,7 @@ dnl #######################################################################
dnl #######################################################################
dnl #######################################################################
AC_DEFUN([OMPI_LOG_MSG],[
AC_DEFUN([OPAL_LOG_MSG],[
# 1 is the message
# 2 is whether to put a prefix or not
if test -n "$2"; then
@ -209,7 +209,7 @@ dnl #######################################################################
dnl #######################################################################
dnl #######################################################################
AC_DEFUN([OMPI_LOG_FILE],[
AC_DEFUN([OPAL_LOG_FILE],[
# 1 is the filename
if test -n "$1" -a -f "$1"; then
cat $1 >&5
@ -219,14 +219,14 @@ dnl #######################################################################
dnl #######################################################################
dnl #######################################################################
AC_DEFUN([OMPI_LOG_COMMAND],[
AC_DEFUN([OPAL_LOG_COMMAND],[
# 1 is the command
# 2 is actions to do if success
# 3 is actions to do if fail
echo "configure:__oline__: $1" >&5
$1 1>&5 2>&1
ompi_status=$?
OMPI_LOG_MSG([\$? = $ompi_status], 1)
OPAL_LOG_MSG([\$? = $ompi_status], 1)
if test "$ompi_status" = "0"; then
unset ompi_status
$2
@ -239,7 +239,7 @@ dnl #######################################################################
dnl #######################################################################
dnl #######################################################################
AC_DEFUN([OMPI_UNIQ],[
AC_DEFUN([OPAL_UNIQ],[
# 1 is the variable name to be uniq-ized
ompi_name=$1
@ -319,11 +319,11 @@ dnl #######################################################################
# ~/.whatever file (and we do not want the error messages to be part
# of the assignment in foo=`which <prog>`). This macro ensures that we
# get a sane executable value.
AC_DEFUN([OMPI_WHICH],[
AC_DEFUN([OPAL_WHICH],[
# 1 is the variable name to do "which" on
# 2 is the variable name to assign the return value to
OMPI_VAR_SCOPE_PUSH([ompi_prog ompi_file ompi_dir ompi_sentinel])
OPAL_VAR_SCOPE_PUSH([ompi_prog ompi_file ompi_dir ompi_sentinel])
ompi_prog=$1
@ -337,7 +337,7 @@ for ompi_dir in $PATH; do
done
IFS=$IFS_SAVE
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])dnl
dnl #######################################################################
@ -346,7 +346,7 @@ dnl #######################################################################
# Declare some variables; use OMPI_VAR_SCOPE_END to ensure that they
# are cleaned up / undefined.
AC_DEFUN([OMPI_VAR_SCOPE_PUSH],[
AC_DEFUN([OPAL_VAR_SCOPE_PUSH],[
# Is the private index set? If not, set it.
if test "x$ompi_scope_index" = "x"; then
@ -363,7 +363,7 @@ AC_DEFUN([OMPI_VAR_SCOPE_PUSH],[
if test "x$ompi_str" != "x"; then
AC_MSG_WARN([Found configure shell variable clash!])
AC_MSG_WARN([[OMPI_VAR_SCOPE_PUSH] called on "$ompi_var",])
AC_MSG_WARN([[OPAL_VAR_SCOPE_PUSH] called on "$ompi_var",])
AC_MSG_WARN([but it is already defined with value "$ompi_str"])
AC_MSG_WARN([This usually indicates an error in configure.])
AC_MSG_ERROR([Cannot continue])
@ -381,12 +381,12 @@ AC_DEFUN([OMPI_VAR_SCOPE_PUSH],[
])dnl
# Unset a bunch of variables that were previously set
AC_DEFUN([OMPI_VAR_SCOPE_POP],[
AC_DEFUN([OPAL_VAR_SCOPE_POP],[
# Unwind the index
ompi_scope_index=`expr $ompi_scope_index - 1`
ompi_scope_test=`expr $ompi_scope_index \> 0`
if test "$ompi_scope_test" = "0"; then
AC_MSG_WARN([[OMPI_VAR_SCOPE_POP] popped too many OMPI configure scopes.])
AC_MSG_WARN([[OPAL_VAR_SCOPE_POP] popped too many OMPI configure scopes.])
AC_MSG_WARN([This usually indicates an error in configure.])
AC_MSG_ERROR([Cannot continue])
fi

18
opal/config/opal_setup_cc.m4
Просмотреть файл

@ -87,10 +87,10 @@ AC_DEFUN([OPAL_SETUP_CC],[
WRAPPER_EXTRA_CFLAGS="${WRAPPER_EXTRA_CFLAGS} $OMPI_COVERAGE_FLAGS"
WRAPPER_EXTRA_LDFLAGS="${WRAPPER_EXTRA_LDFLAGS} $OMPI_COVERAGE_FLAGS"
OMPI_UNIQ(CFLAGS)
OMPI_UNIQ(LDFLAGS)
OMPI_UNIQ(WRAPPER_EXTRA_CFLAGS)
OMPI_UNIQ(WRAPPER_EXTRA_LDFLAGS)
OPAL_UNIQ(CFLAGS)
OPAL_UNIQ(LDFLAGS)
OPAL_UNIQ(WRAPPER_EXTRA_CFLAGS)
OPAL_UNIQ(WRAPPER_EXTRA_LDFLAGS)
AC_MSG_WARN([$OMPI_COVERAGE_FLAGS has been added to CFLAGS (--enable-coverage)])
WANT_DEBUG=1
@ -108,7 +108,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
CFLAGS="$CFLAGS -g"
fi
OMPI_UNIQ(CFLAGS)
OPAL_UNIQ(CFLAGS)
AC_MSG_WARN([-g has been added to CFLAGS (--enable-debug)])
fi
@ -161,7 +161,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
add="$add -Werror-implicit-function-declaration "
CFLAGS="$CFLAGS $add"
OMPI_UNIQ(CFLAGS)
OPAL_UNIQ(CFLAGS)
AC_MSG_WARN([$add has been added to CFLAGS (--enable-picky)])
unset add
fi
@ -196,7 +196,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
fi
CFLAGS="$CFLAGS_orig$add"
OMPI_UNIQ(CFLAGS)
OPAL_UNIQ(CFLAGS)
AC_MSG_WARN([$add has been added to CFLAGS])
unset add
fi
@ -225,7 +225,7 @@ AC_DEFUN([OPAL_SETUP_CC],[
fi
CFLAGS="${CFLAGS_orig}${add}"
OMPI_UNIQ([CFLAGS])
OPAL_UNIQ([CFLAGS])
if test "$add" != "" ; then
AC_MSG_WARN([$add has been added to CFLAGS])
fi
@ -312,6 +312,6 @@ AC_DEFUN([_OMPI_PROG_CC],[
AC_DEFINE_UNQUOTED(OPAL_CC, "$CC", [OMPI underlying C compiler])
set dummy $CC
ompi_cc_argv0=[$]2
OMPI_WHICH([$ompi_cc_argv0], [OPAL_CC_ABSOLUTE])
OPAL_WHICH([$ompi_cc_argv0], [OPAL_CC_ABSOLUTE])
AC_SUBST(OPAL_CC_ABSOLUTE)
])

16
opal/config/opal_setup_cxx.m4
Просмотреть файл

@ -29,12 +29,12 @@ AC_DEFUN([OPAL_SETUP_CXX_BANNER],[
# This macro is necessary because PROG_CXX* is REQUIREd by multiple
# places in SETUP_CXX.
AC_DEFUN([OPAL_PROG_CXX],[
OMPI_VAR_SCOPE_PUSH([opal_cxxflags_save])
OPAL_VAR_SCOPE_PUSH([opal_cxxflags_save])
opal_cxxflags_save="$CXXFLAGS"
AC_PROG_CXX
AC_PROG_CXXCPP
CXXFLAGS="$opal_cxxflags_save"
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])
# OPAL_SETUP_CXX()
@ -55,7 +55,7 @@ AC_DEFUN([OPAL_SETUP_CXX],[
# --------------------------
# Setup the CXX compiler
AC_DEFUN([_OPAL_SETUP_CXX_COMPILER],[
OMPI_VAR_SCOPE_PUSH(opal_cxx_compiler_works)
OPAL_VAR_SCOPE_PUSH(opal_cxx_compiler_works)
# Must REQUIRE the PROG_CXX macro and not call it directly here for
# reasons well-described in the AC2.64 (and beyond) docs.
@ -65,13 +65,13 @@ AC_DEFUN([_OPAL_SETUP_CXX_COMPILER],[
AS_IF([test "x$CXX" = "x"], [CXX=none])
set dummy $CXX
opal_cxx_argv0=[$]2
OMPI_WHICH([$opal_cxx_argv0], [OPAL_CXX_ABSOLUTE])
OPAL_WHICH([$opal_cxx_argv0], [OPAL_CXX_ABSOLUTE])
AS_IF([test "x$OPAL_CXX_ABSOLUTE" = "x"], [OPAL_CXX_ABSOLUTE=none])
AC_DEFINE_UNQUOTED(OPAL_CXX, "$CXX", [OPAL underlying C++ compiler])
AC_SUBST(OPAL_CXX_ABSOLUTE)
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])
# _OPAL_SETUP_CXX_COMPILER_BACKEND()
@ -94,7 +94,7 @@ AC_DEFUN([_OPAL_SETUP_CXX_COMPILER_BACKEND],[
# Do we want debugging?
if test "$WANT_DEBUG" = "1" -a "$enable_debug_symbols" != "no" ; then
CXXFLAGS="$CXXFLAGS -g"
OMPI_UNIQ(CXXFLAGS)
OPAL_UNIQ(CXXFLAGS)
AC_MSG_WARN([-g has been added to CXXFLAGS (--enable-debug)])
fi
@ -136,7 +136,7 @@ AC_DEFUN([_OPAL_SETUP_CXX_COMPILER_BACKEND],[
fi
CXXFLAGS="$CXXFLAGS $add"
OMPI_UNIQ(CXXFLAGS)
OPAL_UNIQ(CXXFLAGS)
if test "$add" != "" ; then
AC_MSG_WARN([$add has been added to CXXFLAGS (--enable-picky)])
fi
@ -157,7 +157,7 @@ AC_DEFUN([_OPAL_SETUP_CXX_COMPILER_BACKEND],[
add=" -finline-functions"
fi
CXXFLAGS="$CXXFLAGS_orig$add"
OMPI_UNIQ(CXXFLAGS)
OPAL_UNIQ(CXXFLAGS)
if test "$add" != "" ; then
AC_MSG_WARN([$add has been added to CXXFLAGS])
fi

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

@ -22,7 +22,7 @@ dnl $HEADER$
dnl
AC_DEFUN([OPAL_SETUP_LIBLTDL],[
OMPI_VAR_SCOPE_PUSH([HAPPY])
OPAL_VAR_SCOPE_PUSH([HAPPY])
ompi_show_subtitle "GNU libltdl setup"
@ -136,7 +136,7 @@ AC_DEFUN([OPAL_SETUP_LIBLTDL],[
AM_CONDITIONAL(OPAL_HAVE_DLOPEN,
[test "$OPAL_ENABLE_DLOPEN_SUPPORT" = "1"])
OMPI_VAR_SCOPE_POP([HAPPY])
OPAL_VAR_SCOPE_POP([HAPPY])
])dnl

18
opal/config/opal_setup_wrappers.m4
Просмотреть файл

@ -26,7 +26,7 @@ dnl
# before the bulk of the tests that can affect the wrapper compilers
#
# Note that we keep the user-specified flags seperately because we
# don't want them to go through OMPI_UNIQ because that has resulted in
# don't want them to go through OPAL_UNIQ because that has resulted in
# unexpected behavior for the user in the past.
AC_DEFUN([OPAL_SETUP_WRAPPER_INIT],[
WRAPPER_EXTRA_CPPFLAGS=
@ -101,15 +101,15 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_INIT],[
AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
OMPI_UNIQ([WRAPPER_EXTRA_CPPFLAGS])
OMPI_UNIQ([WRAPPER_EXTRA_CFLAGS])
OMPI_UNIQ([WRAPPER_EXTRA_CFLAGS_PREFIX])
OMPI_UNIQ([WRAPPER_EXTRA_CXXFLAGS])
OMPI_UNIQ([WRAPPER_EXTRA_CXXFLAGS_PREFIX])
OMPI_UNIQ([WRAPPER_EXTRA_LDFLAGS])
OPAL_UNIQ([WRAPPER_EXTRA_CPPFLAGS])
OPAL_UNIQ([WRAPPER_EXTRA_CFLAGS])
OPAL_UNIQ([WRAPPER_EXTRA_CFLAGS_PREFIX])
OPAL_UNIQ([WRAPPER_EXTRA_CXXFLAGS])
OPAL_UNIQ([WRAPPER_EXTRA_CXXFLAGS_PREFIX])
OPAL_UNIQ([WRAPPER_EXTRA_LDFLAGS])
OMPI_UNIQ([opal_WRAPPER_EXTRA_LDFLAGS])
OMPI_UNIQ([opal_WRAPPER_EXTRA_LIBS])
OPAL_UNIQ([opal_WRAPPER_EXTRA_LDFLAGS])
OPAL_UNIQ([opal_WRAPPER_EXTRA_LIBS])
AC_MSG_CHECKING([for OPAL CPPFLAGS])
OPAL_WRAPPER_EXTRA_CPPFLAGS="$WRAPPER_EXTRA_CPPFLAGS $USER_WRAPPER_EXTRA_CPPFLAGS"

4
opal/mca/memchecker/valgrind/configure.m4
Просмотреть файл

@ -24,7 +24,7 @@ AC_DEFUN([MCA_opal_memchecker_valgrind_COMPILE_MODE], [
AC_DEFUN([MCA_opal_memchecker_valgrind_CONFIG],[
AC_CONFIG_FILES([opal/mca/memchecker/valgrind/Makefile])
OMPI_VAR_SCOPE_PUSH([opal_memchecker_valgrind_save_CPPFLAGS opal_memchecker_valgrind_happy opal_memchecker_valgrind_CPPFLAGS])
OPAL_VAR_SCOPE_PUSH([opal_memchecker_valgrind_save_CPPFLAGS opal_memchecker_valgrind_happy opal_memchecker_valgrind_CPPFLAGS])
AC_ARG_WITH([valgrind],
[AC_HELP_STRING([--with-valgrind(=DIR)],
@ -68,5 +68,5 @@ AC_DEFUN([MCA_opal_memchecker_valgrind_CONFIG],[
AC_SUBST([opal_memchecker_valgrind_CPPFLAGS])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])dnl

4
opal/mca/memory/linux/configure.m4
Просмотреть файл

@ -32,7 +32,7 @@ AC_DEFUN([MCA_opal_memory_linux_COMPILE_MODE], [
AC_DEFUN([MCA_opal_memory_linux_CONFIG],[
AC_CONFIG_FILES([opal/mca/memory/linux/Makefile])
OMPI_VAR_SCOPE_PUSH([memory_linux_ptmalloc2_happy memory_linux_ummu_happy memory_linux_requested icc_major_ver icc_minor_ver memory_linux_mmap memory_linux_munmap memory_linux_LIBS_SAVE])
OPAL_VAR_SCOPE_PUSH([memory_linux_ptmalloc2_happy memory_linux_ummu_happy memory_linux_requested icc_major_ver icc_minor_ver memory_linux_mmap memory_linux_munmap memory_linux_LIBS_SAVE])
# Only allow this component to build on Linux-based systems
@ -195,5 +195,5 @@ AC_DEFUN([MCA_opal_memory_linux_CONFIG],[
memory_base_include=
$2])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])

4
opal/mca/memory/malloc_solaris/configure.m4
Просмотреть файл

@ -32,7 +32,7 @@ AC_DEFUN([MCA_opal_memory_malloc_solaris_COMPILE_MODE], [
AC_DEFUN([MCA_opal_memory_malloc_solaris_CONFIG],[
AC_CONFIG_FILES([opal/mca/memory/malloc_solaris/Makefile])
OMPI_VAR_SCOPE_PUSH([memory_malloc_solaris_happy],
OPAL_VAR_SCOPE_PUSH([memory_malloc_solaris_happy],
[memory_malloc_solaris_should_use],
[memory_malloc_solaris_munmap])
@ -100,5 +100,5 @@ AC_DEFUN([MCA_opal_memory_malloc_solaris_CONFIG],[
[memory_base_found=1
$1], [$2])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])

4
opal/mca/paffinity/hwloc/configure.m4
Просмотреть файл

@ -40,7 +40,7 @@ AC_DEFUN([MCA_opal_paffinity_hwloc_POST_CONFIG],[
AC_DEFUN([MCA_opal_paffinity_hwloc_CONFIG],[
AC_CONFIG_FILES([opal/mca/paffinity/hwloc/Makefile])
OMPI_VAR_SCOPE_PUSH([HWLOC_VERSION opal_check_hwloc_happy opal_check_hwloc_save_CPPFLAGS opal_check_hwloc_save_LDFLAGS opal_check_hwloc_save_LIBS])
OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_check_hwloc_happy opal_check_hwloc_save_CPPFLAGS opal_check_hwloc_save_LDFLAGS opal_check_hwloc_save_LIBS])
# Allowing building using either the internal copy of
# hwloc, or an external version.
@ -139,5 +139,5 @@ AC_DEFUN([MCA_opal_paffinity_hwloc_CONFIG],[
[AC_MSG_WARN([hwloc support requested (via --with-hwloc) but not found.])
AC_MSG_ERROR([Cannot continue.])])
$2])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])dnl

4
opal/mca/pstat/darwin/configure.m4
Просмотреть файл

@ -25,12 +25,12 @@ AC_DEFUN([MCA_opal_pstat_darwin_PRIORITY], [50])
AC_DEFUN([MCA_opal_pstat_darwin_CONFIG],[
AC_CONFIG_FILES([opal/mca/pstat/darwin/Makefile])
OMPI_VAR_SCOPE_PUSH([paff_darwin_happy])
OPAL_VAR_SCOPE_PUSH([paff_darwin_happy])
# check to see if we have <mach/mach_host.h>
# as this is a Darwin-specific thing
AC_CHECK_HEADER([mach/mach_host.h], [paff_darwin_happy=yes], [paff_darwin_happy=no])
AS_IF([test "$paff_darwin_happy" = "yes"], [$1], [$2])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])dnl

4
opal/mca/sysinfo/darwin/configure.m4
Просмотреть файл

@ -14,12 +14,12 @@ AC_DEFUN([MCA_opal_sysinfo_darwin_PRIORITY], [50])
AC_DEFUN([MCA_opal_sysinfo_darwin_CONFIG],[
AC_CONFIG_FILES([opal/mca/sysinfo/darwin/Makefile])
OMPI_VAR_SCOPE_PUSH([sysinfo_darwin_happy])
OPAL_VAR_SCOPE_PUSH([sysinfo_darwin_happy])
# check to see if we have <mach/mach_host.h>
# as this is a Darwin-specific thing
AC_CHECK_HEADER([mach/mach_host.h], [sysinfo_darwin_happy=yes], [sysinfo_darwin_happy=no])
AS_IF([test "$sysinfo_darwin_happy" = "yes"], [$1], [$2])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])dnl

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

@ -37,7 +37,7 @@ AC_DEFUN([ORTE_CHECK_SLURM],[
;;
*)
AC_MSG_CHECKING([for SLURM srun in PATH])
OMPI_WHICH([srun], [ORTE_CHECK_SLURM_SRUN])
OPAL_WHICH([srun], [ORTE_CHECK_SLURM_SRUN])
if test "$ORTE_CHECK_SLURM_SRUN" = ""; then
orte_check_slurm_happy="no"
else

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

@ -66,13 +66,13 @@ AC_DEFUN([ORTE_CHECK_TM],[
AS_IF([test "$orte_check_tm_happy" = "yes" -a "$orte_check_tm_pbs_config" != "not found"],
[$1_CPPFLAGS=`$orte_check_tm_pbs_config --cflags`
OMPI_LOG_MSG([$1_CPPFLAGS from pbs-config: $$1_CPPFLAGS], 1)
OPAL_LOG_MSG([$1_CPPFLAGS from pbs-config: $$1_CPPFLAGS], 1)
ORTE_CHECK_TM_LIBS_FLAGS([$1], [LDFLAGS])
OMPI_LOG_MSG([$1_LDFLAGS from pbs-config: $$1_LDFLAGS], 1)
OPAL_LOG_MSG([$1_LDFLAGS from pbs-config: $$1_LDFLAGS], 1)
ORTE_CHECK_TM_LIBS_FLAGS([$1], [LIBS])
OMPI_LOG_MSG([$1_LIBS from pbs-config: $$1_LIBS], 1)
OPAL_LOG_MSG([$1_LIBS from pbs-config: $$1_LIBS], 1)
# Now that we supposedly have the right flags, try them out.

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

@ -21,8 +21,8 @@ dnl
AC_DEFUN([ORTE_SETUP_WRAPPER_FINAL],[
OMPI_UNIQ([orte_WRAPPER_EXTRA_LDFLAGS])
OMPI_UNIQ([orte_WRAPPER_EXTRA_LIBS])
OPAL_UNIQ([orte_WRAPPER_EXTRA_LDFLAGS])
OPAL_UNIQ([orte_WRAPPER_EXTRA_LIBS])
AC_MSG_CHECKING([for ORTE CPPFLAGS])
ORTE_WRAPPER_EXTRA_CPPFLAGS="$WRAPPER_EXTRA_CPPFLAGS"

4
orte/mca/notifier/command/configure.m4
Просмотреть файл

@ -14,7 +14,7 @@
AC_DEFUN([MCA_orte_notifier_command_CONFIG], [
AC_CONFIG_FILES([orte/mca/notifier/command/Makefile])
OMPI_VAR_SCOPE_PUSH(notifier_happy)
OPAL_VAR_SCOPE_PUSH(notifier_happy)
notifier_happy=no
@ -30,5 +30,5 @@ AC_DEFUN([MCA_orte_notifier_command_CONFIG], [
[notifier_happy=yes])])
AS_IF([test "$notifier_happy" = "yes"], [$1], [$2])
OMPI_VAR_SCOPE_POP
OPAL_VAR_SCOPE_POP
])

6
orte/tools/orte-info/Makefile.am
Просмотреть файл

@ -19,9 +19,9 @@
#
AM_CFLAGS = \
-DOMPI_CONFIGURE_USER="\"@OMPI_CONFIGURE_USER@\"" \
-DOMPI_CONFIGURE_HOST="\"@OMPI_CONFIGURE_HOST@\"" \
-DOMPI_CONFIGURE_DATE="\"@OMPI_CONFIGURE_DATE@\"" \
-DOPAL_CONFIGURE_USER="\"@OPAL_CONFIGURE_USER@\"" \
-DOPAL_CONFIGURE_HOST="\"@OPAL_CONFIGURE_HOST@\"" \
-DOPAL_CONFIGURE_DATE="\"@OPAL_CONFIGURE_DATE@\"" \
-DOMPI_BUILD_USER="\"$$USER\"" \
-DOMPI_BUILD_HOST="\"`hostname`\"" \
-DOMPI_BUILD_DATE="\"`date`\"" \

8
orte/tools/orte-info/param.c
Просмотреть файл

@ -474,7 +474,7 @@ void orte_info_do_arch()
void orte_info_do_hostname()
{
orte_info_out("Configure host", "config:host", OMPI_CONFIGURE_HOST);
orte_info_out("Configure host", "config:host", OPAL_CONFIGURE_HOST);
}
@ -527,9 +527,9 @@ void orte_info_do_config(bool want_all)
OPAL_ENABLE_FT ? "yes" : "no", OPAL_ENABLE_FT_THREAD ? "yes" : "no");;
/* output values */
orte_info_out("Configured by", "config:user", OMPI_CONFIGURE_USER);
orte_info_out("Configured on", "config:timestamp", OMPI_CONFIGURE_DATE);
orte_info_out("Configure host", "config:host", OMPI_CONFIGURE_HOST);
orte_info_out("Configured by", "config:user", OPAL_CONFIGURE_USER);
orte_info_out("Configured on", "config:timestamp", OPAL_CONFIGURE_DATE);
orte_info_out("Configure host", "config:host", OPAL_CONFIGURE_HOST);
orte_info_out("Built by", "build:user", OMPI_BUILD_USER);
orte_info_out("Built on", "build:timestamp", OMPI_BUILD_DATE);