The bulk of the remaining renaming changes, in one final glorious "blob". Thanks to Jeff for some help chasing down a few spots. Per chat with Jeff, we decided to cleanup a few things that were historical in nature:
top_ompi_srcdir -> OMPI_TOP_SRCDIR top_ompi_builddir -> OMPI_TOP_BUILDDIR We also split the srcdir/builddir flags according to their local tree (e.g., OPAL_TOP_SRCDIR), and tied them all together in configure.ac. Renamed ompi_ignore and ompi_unignore to be opal_<foo> as these are agnostic markers. Only thing left is ompilibdir being treated similar to what we dif for srcdir/builddir. Coming soon. This commit was SVN r31678.
This commit is contained in:
Ralph Castain
parent
05590b6a8c
commit
a8e2d6c3a6
@ -30,7 +30,7 @@ AC_DEFUN([OPAL_CHECK_COMPILER], [
|
||||
AC_CACHE_CHECK([for compiler $lower], opal_cv_compiler_[$1],
|
||||
[
|
||||
CPPFLAGS_orig=$CPPFLAGS
|
||||
CPPFLAGS="-I${top_ompi_srcdir}/opal/include/opal $CPPFLAGS"
|
||||
CPPFLAGS="-I${OPAL_TOP_SRCDIR}/opal/include/opal $CPPFLAGS"
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@ -62,7 +62,7 @@ AC_DEFUN([OPAL_CHECK_COMPILER_STRING], [
|
||||
AC_CACHE_CHECK([for compiler $lower], opal_cv_compiler_[$1],
|
||||
[
|
||||
CPPFLAGS_orig=$CPPFLAGS
|
||||
CPPFLAGS="-I${top_ompi_srcdir}/opal/include/opal $CPPFLAGS"
|
||||
CPPFLAGS="-I${OPAL_TOP_SRCDIR}/opal/include/opal $CPPFLAGS"
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@ -95,7 +95,7 @@ AC_DEFUN([OPAL_CHECK_COMPILER_STRINGIFY], [
|
||||
AC_CACHE_CHECK([for compiler $lower], opal_cv_compiler_[$1],
|
||||
[
|
||||
CPPFLAGS_orig=$CPPFLAGS
|
||||
CPPFLAGS="-I${top_ompi_srcdir}/opal/include/opal $CPPFLAGS"
|
||||
CPPFLAGS="-I${OPAL_TOP_SRCDIR}/opal/include/opal $CPPFLAGS"
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
@ -999,11 +999,11 @@ if test "$opal_cv_asm_arch" != "WINDOWS" -a "$opal_cv_asm_builtin" != "BUILTIN_S
|
||||
# see if we have a pre-built one already
|
||||
AC_MSG_CHECKING([for pre-built assembly file])
|
||||
opal_cv_asm_file=""
|
||||
if $GREP "$opal_cv_asm_arch" "${top_ompi_srcdir}/opal/asm/asm-data.txt" | $FGREP "$opal_cv_asm_format" >conftest.out 2>&1 ; then
|
||||
if $GREP "$opal_cv_asm_arch" "${OPAL_TOP_SRCDIR}/opal/asm/asm-data.txt" | $FGREP "$opal_cv_asm_format" >conftest.out 2>&1 ; then
|
||||
opal_cv_asm_file="`cut -f3 conftest.out`"
|
||||
if test ! "$opal_cv_asm_file" = "" ; then
|
||||
opal_cv_asm_file="atomic-${opal_cv_asm_file}.s"
|
||||
if test -f "${top_ompi_srcdir}/opal/asm/generated/${opal_cv_asm_file}" ; then
|
||||
if test -f "${OPAL_TOP_SRCDIR}/opal/asm/generated/${opal_cv_asm_file}" ; then
|
||||
AC_MSG_RESULT([yes ($opal_cv_asm_file)])
|
||||
else
|
||||
AC_MSG_RESULT([no ($opal_cv_asm_file not found)])
|
||||
@ -1021,7 +1021,7 @@ if test "$opal_cv_asm_arch" != "WINDOWS" -a "$opal_cv_asm_builtin" != "BUILTIN_S
|
||||
AC_MSG_CHECKING([whether possible to generate assembly file])
|
||||
mkdir -p opal/asm/generated
|
||||
opal_cv_asm_file="atomic-local.s"
|
||||
opal_try='$PERL $top_ompi_srcdir/opal/asm/generate-asm.pl $opal_cv_asm_arch "$opal_cv_asm_format" $top_ompi_srcdir/opal/asm/base $top_ompi_builddir/opal/asm/generated/$opal_cv_asm_file >conftest.out 2>&1'
|
||||
opal_try='$PERL $OPAL_TOP_SRCDIR/opal/asm/generate-asm.pl $opal_cv_asm_arch "$opal_cv_asm_format" $OPAL_TOP_SRCDIR/opal/asm/base $OPAL_TOP_BUILDDIR/opal/asm/generated/$opal_cv_asm_file >conftest.out 2>&1'
|
||||
if AC_TRY_EVAL(opal_try) ; then
|
||||
# save the warnings
|
||||
cat conftest.out >&AC_FD_CC
|
||||
|
||||
@ -11,7 +11,7 @@ dnl University of Stuttgart. All rights reserved.
|
||||
dnl Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
dnl All rights reserved.
|
||||
dnl Copyright (c) 2010-2013 Cisco Systems, Inc. All rights reserved.
|
||||
dnl Copyright (c) 2013 Intel, Inc. All rights reserved.
|
||||
dnl Copyright (c) 2013-2014 Intel, Inc. All rights reserved.
|
||||
dnl $COPYRIGHT$
|
||||
dnl
|
||||
dnl Additional copyrights may follow
|
||||
@ -19,24 +19,24 @@ dnl
|
||||
dnl $HEADER$
|
||||
dnl
|
||||
|
||||
# OMPI_EVAL_ARG(arg)
|
||||
# OPAL_EVAL_ARG(arg)
|
||||
# ------------------
|
||||
# evaluates and returns argument
|
||||
AC_DEFUN([OMPI_EVAL_ARG], [$1])
|
||||
AC_DEFUN([OPAL_EVAL_ARG], [$1])
|
||||
|
||||
######################################################################
|
||||
#
|
||||
# OMPI_MCA
|
||||
# OPAL_MCA
|
||||
#
|
||||
# configure the MCA (modular component architecture). Works hand in hand
|
||||
# with Open MPI's autogen.pl, requiring it's specially formatted lists
|
||||
# of frameworks, components, etc.
|
||||
#
|
||||
# USAGE:
|
||||
# OMPI_MCA()
|
||||
# OPAL_MCA()
|
||||
#
|
||||
######################################################################
|
||||
AC_DEFUN([OMPI_MCA],[
|
||||
AC_DEFUN([OPAL_MCA],[
|
||||
dnl for OPAL_CONFIGURE_USER env variable
|
||||
AC_REQUIRE([OPAL_CONFIGURE_SETUP])
|
||||
|
||||
@ -322,7 +322,7 @@ AC_DEFUN([MCA_ORDER_COMPONENT_LIST], [
|
||||
[m4_fatal([MCA_$1_$2_]mca_component[_PRIORITY not found, but required.])])])])
|
||||
m4_define([component_list],
|
||||
[esyscmd([config/opal_mca_priority_sort.pl] m4_foreach([mca_component], [mca_$1_$2_m4_config_component_list],
|
||||
[m4_ifval(mca_component, [mca_component ]OMPI_EVAL_ARG([MCA_]$1[_]$2[_]mca_component[_PRIORITY ]))]))])
|
||||
[m4_ifval(mca_component, [mca_component ]OPAL_EVAL_ARG([MCA_]$1[_]$2[_]mca_component[_PRIORITY ]))]))])
|
||||
])
|
||||
|
||||
AC_DEFUN([MCA_CHECK_IGNORED_PRIORITY], [
|
||||
@ -388,13 +388,13 @@ AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[
|
||||
# If there are components in the no configure list, but we're
|
||||
# doing one of the "special" selection logics, abort with a
|
||||
# reasonable message.
|
||||
m4_if(OMPI_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST],
|
||||
m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST],
|
||||
[m4_ifval(mca_$1_$2_no_config_component_list,
|
||||
[m4_fatal([Framework $2 using STOP_AT_FIRST but at least one component has no configure.m4])])])
|
||||
m4_if(OMPI_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY],
|
||||
m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY],
|
||||
[m4_ifval(mca_$1_$2_no_config_component_list,
|
||||
[m4_fatal([Framework $2 using STOP_AT_FIRST_PRIORITY but at least one component has no configure.m4])])])
|
||||
m4_if(OMPI_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [PRIORITY],
|
||||
m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [PRIORITY],
|
||||
[m4_ifval(mca_$1_$2_no_config_component_list,
|
||||
[m4_fatal([Framework $2 using PRIORITY but at least one component has no configure.m4])])])
|
||||
# run the configure logic for the no-config components
|
||||
@ -409,9 +409,9 @@ AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[
|
||||
|
||||
# configure components that use built-in configuration scripts
|
||||
m4_ifdef([component_list], [m4_undefine([component_list])])
|
||||
m4_if(OMPI_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST], [MCA_ORDER_COMPONENT_LIST($1, $2)],
|
||||
[m4_if(OMPI_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY], [MCA_ORDER_COMPONENT_LIST($1, $2)],
|
||||
[m4_if(OMPI_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [PRIORITY], [MCA_ORDER_COMPONENT_LIST($1, $2)],
|
||||
m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST], [MCA_ORDER_COMPONENT_LIST($1, $2)],
|
||||
[m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY], [MCA_ORDER_COMPONENT_LIST($1, $2)],
|
||||
[m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [PRIORITY], [MCA_ORDER_COMPONENT_LIST($1, $2)],
|
||||
[m4_define([component_list], [mca_$1_$2_m4_config_component_list])])])])
|
||||
|
||||
best_mca_component_priority=0
|
||||
@ -419,7 +419,7 @@ AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[
|
||||
components_last_result=0
|
||||
m4_foreach(mca_component, [component_list],
|
||||
[m4_ifval(mca_component,
|
||||
[m4_if(OMPI_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY],
|
||||
[m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY],
|
||||
[AS_IF([test $best_mca_component_priority -gt MCA_$1_$2_]mca_component[_PRIORITY], [components_looking_for_succeed=0])])
|
||||
MCA_CONFIGURE_M4_CONFIG_COMPONENT($1, $2, mca_component,
|
||||
[all_components],
|
||||
@ -429,18 +429,18 @@ AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[
|
||||
[$components_looking_for_succeed],
|
||||
[components_last_result=1],
|
||||
[components_last_result=0])
|
||||
m4_if(OMPI_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST],
|
||||
m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST],
|
||||
[AS_IF([test $components_last_result -eq 1], [components_looking_for_succeed=0])])
|
||||
m4_if(OMPI_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY],
|
||||
[AS_IF([test $components_last_result -eq 1], [best_mca_component_priority=]OMPI_EVAL_ARG([MCA_$1_$2_]mca_component[_PRIORITY]))])
|
||||
m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY],
|
||||
[AS_IF([test $components_last_result -eq 1], [best_mca_component_priority=]OPAL_EVAL_ARG([MCA_$1_$2_]mca_component[_PRIORITY]))])
|
||||
])])
|
||||
|
||||
# configure components that provide their own configure script.
|
||||
# It would be really hard to run these for "find first that
|
||||
# works", so we don't :)
|
||||
m4_if(OMPI_EVAL_ARG([MCA_$1_]$2[_CONFIGURE_MODE]), [STOP_AT_FIRST], [],
|
||||
[m4_if(OMPI_EVAL_ARG([MCA_$1_]$2[_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY], [],
|
||||
[m4_if(OMPI_EVAL_ARG([MCA_$1_]$2[_CONFIGURE_MODE]), [PRIORITY], [],
|
||||
m4_if(OPAL_EVAL_ARG([MCA_$1_]$2[_CONFIGURE_MODE]), [STOP_AT_FIRST], [],
|
||||
[m4_if(OPAL_EVAL_ARG([MCA_$1_]$2[_CONFIGURE_MODE]), [STOP_AT_FIRST_PRIORITY], [],
|
||||
[m4_if(OPAL_EVAL_ARG([MCA_$1_]$2[_CONFIGURE_MODE]), [PRIORITY], [],
|
||||
[MCA_CHECK_IGNORED_PRIORITY($1, $2)
|
||||
AS_IF([test "$3" != "0"],
|
||||
[MCA_CONFIGURE_ALL_CONFIG_COMPONENTS($1, $2, [all_components],
|
||||
@ -457,9 +457,9 @@ AC_DEFUN([MCA_CONFIGURE_FRAMEWORK],[
|
||||
AC_SUBST(MCA_$1_$2_DSO_COMPONENTS)
|
||||
AC_SUBST(MCA_$1_$2_STATIC_LTLIBS)
|
||||
|
||||
OMPI_MCA_MAKE_DIR_LIST(MCA_$1_$2_ALL_SUBDIRS, $2, [$all_components])
|
||||
OMPI_MCA_MAKE_DIR_LIST(MCA_$1_$2_STATIC_SUBDIRS, $2, [$static_components])
|
||||
OMPI_MCA_MAKE_DIR_LIST(MCA_$1_$2_DSO_SUBDIRS, $2, [$dso_components])
|
||||
OPAL_MCA_MAKE_DIR_LIST(MCA_$1_$2_ALL_SUBDIRS, $2, [$all_components])
|
||||
OPAL_MCA_MAKE_DIR_LIST(MCA_$1_$2_STATIC_SUBDIRS, $2, [$static_components])
|
||||
OPAL_MCA_MAKE_DIR_LIST(MCA_$1_$2_DSO_SUBDIRS, $2, [$dso_components])
|
||||
|
||||
# Create the final .h file that will be included in the type's
|
||||
# top-level glue. This lists all the static components. We don't
|
||||
@ -636,7 +636,7 @@ AC_DEFUN([MCA_CONFIGURE_ALL_CONFIG_COMPONENTS],[
|
||||
|
||||
if test "$should_build" = "1" ; then
|
||||
OPAL_CONFIG_SUBDIR([$1/mca/$2/$component],
|
||||
[$ompi_subdir_args],
|
||||
[$opal_subdir_args],
|
||||
[should_build=1], [should_build=0])
|
||||
fi
|
||||
|
||||
@ -803,7 +803,7 @@ AC_MSG_ERROR([*** $2 component $3 was supposed to be direct-called, but
|
||||
# don't have to implement the else clause in the literal check...
|
||||
AS_LITERAL_IF([$3],
|
||||
[AS_IF([test "$$2_$3_WRAPPER_EXTRA_CPPFLAGS" != ""],
|
||||
[m4_if(OMPI_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST], [stop_at_first=1], [stop_at_first=0])
|
||||
[m4_if(OPAL_EVAL_ARG([MCA_$1_$2_CONFIGURE_MODE]), [STOP_AT_FIRST], [stop_at_first=1], [stop_at_first=0])
|
||||
AS_IF([test "$8" = "static" -a "$stop_at_first" = "1"],
|
||||
[AS_IF([test "$with_devel_headers" = "yes"],
|
||||
[OPAL_FLAGS_APPEND_UNIQ([mca_wrapper_extra_cppflags], [$$2_$3_WRAPPER_EXTRA_CPPFLAGS])])],
|
||||
@ -857,28 +857,28 @@ AC_DEFUN([MCA_COMPONENT_BUILD_CHECK],[
|
||||
|
||||
# build if:
|
||||
# - the component type is direct and we are that component
|
||||
# - there is no ompi_ignore file
|
||||
# - there is an ompi_ignore, but there is an empty ompi_unignore
|
||||
# - there is an ompi_ignore, but username is in ompi_unignore
|
||||
# - there is no opal_ignore file
|
||||
# - there is an opal_ignore, but there is an empty opal_unignore
|
||||
# - there is an opal_ignore, but username is in opal_unignore
|
||||
if test -d $component_path ; then
|
||||
# decide if we want the component to be built or not. This
|
||||
# is spread out because some of the logic is a little complex
|
||||
# and test's syntax isn't exactly the greatest. We want to
|
||||
# build the component by default.
|
||||
want_component=1
|
||||
if test -f $component_path/.ompi_ignore ; then
|
||||
# If there is an ompi_ignore file, don't build
|
||||
if test -f $component_path/.opal_ignore ; then
|
||||
# If there is an opal_ignore file, don't build
|
||||
# the component. Note that this decision can be
|
||||
# overridden by the unignore logic below.
|
||||
want_component=0
|
||||
fi
|
||||
if test -f $component_path/.ompi_unignore ; then
|
||||
# if there is an empty ompi_unignore, that is
|
||||
if test -f $component_path/.opal_unignore ; then
|
||||
# if there is an empty opal_unignore, that is
|
||||
# equivalent to having your userid in the unignore file.
|
||||
# If userid is in the file, unignore the ignore file.
|
||||
if test ! -s $component_path/.ompi_unignore ; then
|
||||
if test ! -s $component_path/.opal_unignore ; then
|
||||
want_component=1
|
||||
elif test ! -z "`$GREP $OPAL_CONFIGURE_USER $component_path/.ompi_unignore`" ; then
|
||||
elif test ! -z "`$GREP $OPAL_CONFIGURE_USER $component_path/.opal_unignore`" ; then
|
||||
want_component=1
|
||||
fi
|
||||
fi
|
||||
@ -929,9 +929,9 @@ AC_DEFUN([MCA_SETUP_DIRECT_CALL],[
|
||||
])
|
||||
|
||||
|
||||
# OMPI_MCA_MAKE_DIR_LIST(subst'ed variable, framework, shell list)
|
||||
# OPAL_MCA_MAKE_DIR_LIST(subst'ed variable, framework, shell list)
|
||||
# -------------------------------------------------------------------------
|
||||
AC_DEFUN([OMPI_MCA_MAKE_DIR_LIST],[
|
||||
AC_DEFUN([OPAL_MCA_MAKE_DIR_LIST],[
|
||||
$1=
|
||||
for item in $3 ; do
|
||||
$1="$$1 mca/$2/$item"
|
||||
|
||||
@ -147,23 +147,23 @@ AC_DEFUN([OPAL_SETUP_LIBLTDL],[
|
||||
AC_DEFUN([_OPAL_SETUP_LIBLTDL_INTERNAL],[
|
||||
OPAL_VAR_SCOPE_PUSH([CFLAGS_save CPPFLAGS_save])
|
||||
|
||||
ompi_subdir_args="$ompi_subdir_args --enable-ltdl-convenience --disable-ltdl-install"
|
||||
opal_subdir_args="$opal_subdir_args --enable-ltdl-convenience --disable-ltdl-install"
|
||||
if test "$enable_shared" = "yes"; then
|
||||
ompi_subdir_args="$ompi_subdir_args --enable-shared"
|
||||
opal_subdir_args="$opal_subdir_args --enable-shared"
|
||||
else
|
||||
ompi_subdir_args="$ompi_subdir_args --disable-shared"
|
||||
opal_subdir_args="$opal_subdir_args --disable-shared"
|
||||
fi
|
||||
if test "$enable_static" = "yes"; then
|
||||
ompi_subdir_args="$ompi_subdir_args --enable-static"
|
||||
opal_subdir_args="$opal_subdir_args --enable-static"
|
||||
else
|
||||
ompi_subdir_args="$ompi_subdir_args --disable-static"
|
||||
opal_subdir_args="$opal_subdir_args --disable-static"
|
||||
fi
|
||||
|
||||
CFLAGS_save="$CFLAGS"
|
||||
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"
|
||||
|
||||
# VPATH support will be included by default in CONFIG_SUBDIR
|
||||
OPAL_CONFIG_SUBDIR(opal/libltdl, [$ompi_subdir_args],
|
||||
OPAL_CONFIG_SUBDIR(opal/libltdl, [$opal_subdir_args],
|
||||
[HAPPY=1], [HAPPY=0])
|
||||
if test "$HAPPY" = "1"; then
|
||||
LIBLTDL_SUBDIR=libltdl
|
||||
|
||||
@ -150,7 +150,7 @@ AC_DEFUN([OPAL_SETUP_RPATH],[
|
||||
# (because if script A sources script B, and B calls "exit", then both
|
||||
# B and A will exit). Instead, we have to send the output to a file
|
||||
# and then source that.
|
||||
$OMPI_TOP_BUILDDIR/libtool --config > $rpath_outfile
|
||||
$OPAL_TOP_BUILDDIR/libtool --config > $rpath_outfile
|
||||
|
||||
chmod +x $rpath_outfile
|
||||
. ./$rpath_outfile
|
||||
|
||||
31
configure.ac
31
configure.ac
@ -135,7 +135,7 @@ m4_ifdef([project_ompi],
|
||||
# It's icky that we have to hard-code the names of the
|
||||
# common components here. :-( This could probably be done
|
||||
# transparently by adding some intelligence in autogen.sh
|
||||
# and/or ompi_mca.m4, but I don't have the cycles to do this
|
||||
# and/or opal_mca.m4, but I don't have the cycles to do this
|
||||
# right now.
|
||||
AC_SUBST(libmca_common_cuda_so_version)
|
||||
AC_SUBST(libmca_common_mx_so_version)
|
||||
@ -214,6 +214,7 @@ AH_TOP([/* -*- c -*-
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2014 Intel, Inc. All rights reserved.
|
||||
* $COPYRIGHT$
|
||||
*
|
||||
* Additional copyrights may follow
|
||||
@ -238,10 +239,22 @@ AH_BOTTOM([
|
||||
|
||||
OPAL_BASIC_SETUP
|
||||
|
||||
top_ompi_srcdir="$OMPI_TOP_SRCDIR"
|
||||
AC_SUBST(top_ompi_srcdir)
|
||||
top_ompi_builddir="$OMPI_TOP_BUILDDIR"
|
||||
AC_SUBST(top_ompi_builddir)
|
||||
OPAL_TOP_SRCDIR="$OMPI_TOP_SRCDIR"
|
||||
OPAL_TOP_BUILDDIR="$OMPI_TOP_BUILDDIR"
|
||||
AC_SUBST(OPAL_TOP_SRCDIR)
|
||||
AC_SUBST(OPAL_TOP_BUILDDIR)
|
||||
|
||||
m4_ifdef([project_orte],
|
||||
[ORTE_TOP_SRCDIR="$OMPI_TOP_SRCDIR"
|
||||
ORTE_TOP_BUILDDIR="$OMPI_TOP_BUILDDIR"
|
||||
AC_SUBST(ORTE_TOP_SRCDIR)
|
||||
AC_SUBST(ORTE_TOP_BUILDDIR)])
|
||||
|
||||
m4_ifdef([project_oshmem],
|
||||
[OSHMEM_TOP_SRCDIR="$OMPI_TOP_SRCDIR"
|
||||
OSHMEM_TOP_BUILDDIR="$OMPI_TOP_BUILDDIR"
|
||||
AC_SUBST(OSHMEM_TOP_SRCDIR)
|
||||
AC_SUBST(OSHMEM_TOP_BUILDDIR)])
|
||||
|
||||
############################################################################
|
||||
# Configuration options
|
||||
@ -1139,10 +1152,10 @@ OPAL_SETUP_FT
|
||||
opal_show_title "Modular Component Architecture (MCA) setup"
|
||||
|
||||
AC_MSG_CHECKING([for subdir args])
|
||||
OPAL_CONFIG_SUBDIR_ARGS([ompi_subdir_args])
|
||||
AC_MSG_RESULT([$ompi_subdir_args])
|
||||
OPAL_CONFIG_SUBDIR_ARGS([opal_subdir_args])
|
||||
AC_MSG_RESULT([$opal_subdir_args])
|
||||
|
||||
OMPI_MCA
|
||||
OPAL_MCA
|
||||
|
||||
m4_ifdef([project_ompi], [OMPI_REQUIRE_ENDPOINT_TAG_FINI])
|
||||
|
||||
@ -1351,7 +1364,7 @@ fi
|
||||
# If that macro is defined, we'll run it here.
|
||||
#
|
||||
# Unfortunately, aclocal is not smart enough to parse something like
|
||||
# the following in ompi_mca.m4 (when we're already m4 looping over the
|
||||
# the following in opal_mca.m4 (when we're already m4 looping over the
|
||||
# project list):
|
||||
#
|
||||
# m4_foreach(mca_project, [mca_project_list],
|
||||
|
||||
@ -145,10 +145,10 @@ libmpi_la_LIBADD = \
|
||||
|
||||
if OMPI_RTE_ORTE
|
||||
libmpi_la_LIBADD += \
|
||||
$(top_ompi_builddir)/orte/libopen-rte.la
|
||||
$(OMPI_TOP_BUILDDIR)/orte/libopen-rte.la
|
||||
endif
|
||||
libmpi_la_LIBADD += \
|
||||
$(top_ompi_builddir)/opal/libopen-pal.la
|
||||
$(OMPI_TOP_BUILDDIR)/opal/libopen-pal.la
|
||||
libmpi_la_DEPENDENCIES = $(libmpi_la_LIBADD)
|
||||
libmpi_la_LDFLAGS = \
|
||||
-version-info $(libmpi_so_version) \
|
||||
|
||||
@ -60,8 +60,8 @@ mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_bcol_iboffload_la_SOURCES = $(sources)
|
||||
mca_bcol_iboffload_la_LDFLAGS = -module -avoid-version $(btl_openib_LDFLAGS) $(bcol_iboffload_LDFLAGS)
|
||||
mca_bcol_iboffload_la_LIBADD = $(btl_openib_LIBS) $(bcol_iboffload_LIBS) \
|
||||
$(top_ompi_builddir)/ompi/mca/common/ofacm/libmca_common_ofacm.la \
|
||||
$(top_ompi_builddir)/ompi/mca/common/verbs/libmca_common_verbs.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/ofacm/libmca_common_ofacm.la \
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/verbs/libmca_common_verbs.la
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
libmca_bcol_iboffload_la_SOURCES =$(sources)
|
||||
|
||||
@ -118,10 +118,10 @@ mcacomponent_LTLIBRARIES = $(component)
|
||||
mca_btl_openib_la_SOURCES = $(component_sources)
|
||||
mca_btl_openib_la_LDFLAGS = -module -avoid-version $(btl_openib_LDFLAGS)
|
||||
mca_btl_openib_la_LIBADD = $(btl_openib_LIBS) \
|
||||
$(top_ompi_builddir)/ompi/mca/common/verbs/libmca_common_verbs.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/verbs/libmca_common_verbs.la
|
||||
if OPAL_cuda_support
|
||||
mca_btl_openib_la_LIBADD += \
|
||||
$(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES = $(lib)
|
||||
|
||||
@ -48,7 +48,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_btl_sm_la_SOURCES = $(libmca_btl_sm_la_sources)
|
||||
mca_btl_sm_la_LDFLAGS = -module -avoid-version
|
||||
mca_btl_sm_la_LIBADD = \
|
||||
$(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/sm/libmca_common_sm.la
|
||||
mca_btl_sm_la_CPPFLAGS = $(btl_sm_CPPFLAGS)
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
|
||||
@ -49,11 +49,11 @@ mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_btl_smcuda_la_SOURCES = $(libmca_btl_smcuda_la_sources)
|
||||
mca_btl_smcuda_la_LDFLAGS = -module -avoid-version
|
||||
mca_btl_smcuda_la_LIBADD = \
|
||||
$(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/sm/libmca_common_sm.la
|
||||
mca_btl_smcuda_la_CPPFLAGS = $(btl_smcuda_CPPFLAGS)
|
||||
if OPAL_cuda_support
|
||||
mca_btl_smcuda_la_LIBADD += \
|
||||
$(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
|
||||
@ -57,7 +57,7 @@ mca_btl_tcp_la_SOURCES = $(component_sources)
|
||||
mca_btl_tcp_la_LDFLAGS = -module -avoid-version
|
||||
if OPAL_cuda_support
|
||||
mca_btl_tcp_la_LIBADD = \
|
||||
$(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES = $(lib)
|
||||
|
||||
@ -103,7 +103,7 @@ mcacomponent_LTLIBRARIES = $(component)
|
||||
mca_btl_usnic_la_SOURCES = $(component_sources)
|
||||
mca_btl_usnic_la_LDFLAGS = -module -avoid-version $(btl_usnic_LDFLAGS)
|
||||
mca_btl_usnic_la_LIBADD = $(btl_usnic_LIBS) \
|
||||
$(top_ompi_builddir)/ompi/mca/common/verbs/libmca_common_verbs.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/verbs/libmca_common_verbs.la
|
||||
|
||||
noinst_LTLIBRARIES = $(lib)
|
||||
libmca_btl_usnic_la_SOURCES = $(lib_sources)
|
||||
|
||||
@ -62,7 +62,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_coll_sm_la_SOURCES = $(sources)
|
||||
mca_coll_sm_la_LDFLAGS = -module -avoid-version
|
||||
mca_coll_sm_la_LIBADD = \
|
||||
$(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/sm/libmca_common_sm.la
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
libmca_coll_sm_la_SOURCES =$(sources)
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
# Note that this file must exist, even though it is empty (there is no
|
||||
# "base" directory for the common framework). autogen.pl and
|
||||
# ompi_mca.m4 assume that every framework has a top-level Makefile.am.
|
||||
# opal_mca.m4 assume that every framework has a top-level Makefile.am.
|
||||
# We *could* adjust the framework glue code to exclude "common" from
|
||||
# this requirement, but it's just a lot easier to have an empty
|
||||
# Makefile.am here.
|
||||
|
||||
@ -19,18 +19,18 @@
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign dist-bzip2
|
||||
|
||||
# $(top_ompi_srcdir) - mca_base_param.h
|
||||
# $(top_ompi_srcdir)/opal/include - opal_config_bottom.h
|
||||
# $(top_ompi_builddir)/opal/include - opal_config.h
|
||||
# $(top_ompi_builddir)/ompi/include - mpi.h
|
||||
# $(OMPI_TOP_SRCDIR) - mca_base_param.h
|
||||
# $(OMPI_TOP_SRCDIR)/opal/include - opal_config_bottom.h
|
||||
# $(OMPI_TOP_BUILDDIR)/opal/include - opal_config.h
|
||||
# $(OMPI_TOP_BUILDDIR)/ompi/include - mpi.h
|
||||
# $(top_srcdir)/include - vpath support
|
||||
# $(top_srcdir)/adio/include - vpath support
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-DOMPI_BUILDING=1 \
|
||||
-I$(top_ompi_srcdir) \
|
||||
-I$(top_ompi_srcdir)/opal/include \
|
||||
-I$(top_ompi_builddir)/opal/include \
|
||||
-I$(top_ompi_builddir)/ompi/include \
|
||||
-I$(OMPI_TOP_SRCDIR) \
|
||||
-I$(OMPI_TOP_SRCDIR)/opal/include \
|
||||
-I$(OMPI_TOP_BUILDDIR)/opal/include \
|
||||
-I$(OMPI_TOP_BUILDDIR)/ompi/include \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/adio/include
|
||||
|
||||
@ -82,12 +82,12 @@ if test -f "$srcdir/../../../../../config/opal_mca.m4"; then
|
||||
# appropriate include directory (don't know why automake
|
||||
# doesn't do this # automatically).
|
||||
|
||||
top_ompi_srcdir='$(top_srcdir)/../../../../..'
|
||||
top_ompi_builddir='$(top_builddir)/../../../../..'
|
||||
with_mpi="$top_ompi_srcdir"
|
||||
OMPI_TOP_SRCDIR='$(top_srcdir)/../../../../..'
|
||||
OMPI_TOP_BUILDDIR='$(top_builddir)/../../../../..'
|
||||
with_mpi="$OMPI_TOP_SRCDIR"
|
||||
AC_MSG_RESULT([in Open MPI source tree -- good])
|
||||
AC_SUBST(top_ompi_srcdir)
|
||||
AC_SUBST(top_ompi_builddir)
|
||||
AC_SUBST(OMPI_TOP_SRCDIR)
|
||||
AC_SUBST(OMPI_TOP_BUILDDIR)
|
||||
else
|
||||
AC_MSG_RESULT([not found])
|
||||
AC_MSG_WARN([*** Could not find Open MPI support files])
|
||||
|
||||
@ -18,22 +18,22 @@
|
||||
#
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_ompi_builddir)/include \
|
||||
-I$(top_ompi_builddir)/opal \
|
||||
-I$(top_ompi_builddir)/opal/include \
|
||||
-I$(top_ompi_srcdir)/opal \
|
||||
-I$(top_ompi_srcdir)/opal/include \
|
||||
-I$(top_ompi_builddir)/orte \
|
||||
-I$(top_ompi_builddir)/orte/include \
|
||||
-I$(top_ompi_srcdir)/orte \
|
||||
-I$(top_ompi_srcdir)/orte/include \
|
||||
-I$(top_ompi_builddir)/ompi \
|
||||
-I$(top_ompi_builddir)/ompi/include \
|
||||
-I$(top_ompi_srcdir)/ompi \
|
||||
-I$(top_ompi_srcdir)/ompi/include \
|
||||
-I$(top_ompi_srcdir)/ompi/mca/io/romio \
|
||||
-I$(top_ompi_srcdir)/ompi/mca/io/romio/romio/include \
|
||||
-I$(top_ompi_srcdir)/ompi/mca/io/romio/romio/adio/include \
|
||||
-I$(OMPI_TOP_BUILDDIR)/include \
|
||||
-I$(OMPI_TOP_BUILDDIR)/opal \
|
||||
-I$(OMPI_TOP_BUILDDIR)/opal/include \
|
||||
-I$(OMPI_TOP_SRCDIR)/opal \
|
||||
-I$(OMPI_TOP_SRCDIR)/opal/include \
|
||||
-I$(OMPI_TOP_BUILDDIR)/orte \
|
||||
-I$(OMPI_TOP_BUILDDIR)/orte/include \
|
||||
-I$(OMPI_TOP_SRCDIR)/orte \
|
||||
-I$(OMPI_TOP_SRCDIR)/orte/include \
|
||||
-I$(OMPI_TOP_BUILDDIR)/ompi \
|
||||
-I$(OMPI_TOP_BUILDDIR)/ompi/include \
|
||||
-I$(OMPI_TOP_SRCDIR)/ompi \
|
||||
-I$(OMPI_TOP_SRCDIR)/ompi/include \
|
||||
-I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio \
|
||||
-I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio/romio/include \
|
||||
-I$(OMPI_TOP_SRCDIR)/ompi/mca/io/romio/romio/adio/include \
|
||||
-I$(top_builddir)
|
||||
|
||||
sources += \
|
||||
|
||||
@ -48,7 +48,7 @@ mca_mpool_gpusm_la_LDFLAGS = -module -avoid-version
|
||||
mca_mpool_gpusm_la_LIBADD = $(mpool_gpusm_LIBS)
|
||||
if OPAL_cuda_support
|
||||
mca_mpool_gpusm_la_LIBADD += \
|
||||
$(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
|
||||
@ -49,7 +49,7 @@ mca_mpool_grdma_la_LDFLAGS = -module -avoid-version
|
||||
mca_mpool_grdma_la_LIBADD = $(mpool_grdma_LIBS)
|
||||
if OPAL_cuda_support
|
||||
mca_mpool_grdma_la_LIBADD += \
|
||||
$(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
|
||||
@ -48,7 +48,7 @@ mca_mpool_rgpusm_la_LDFLAGS = -module -avoid-version
|
||||
mca_mpool_rgpusm_la_LIBADD = $(mpool_rgpusm_LIBS)
|
||||
if OPAL_cuda_support
|
||||
mca_mpool_rgpusm_la_LIBADD += \
|
||||
$(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
|
||||
@ -43,10 +43,10 @@ mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_mpool_sm_la_SOURCES = $(sources)
|
||||
mca_mpool_sm_la_LDFLAGS = -module -avoid-version
|
||||
mca_mpool_sm_la_LIBADD = \
|
||||
$(top_ompi_builddir)/ompi/mca/common/sm/libmca_common_sm.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/sm/libmca_common_sm.la
|
||||
if OPAL_cuda_support
|
||||
mca_mpool_sm_la_LIBADD += \
|
||||
$(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
|
||||
@ -49,7 +49,7 @@ sources = \
|
||||
# MCA_BUILD_ompi_<framework>_<component>_DSO AM_CONDITIONAL to indicate
|
||||
# which way this component should be built.
|
||||
|
||||
if MCA_BUILD_op_example_DSO
|
||||
if MCA_BUILD_ompi_op_example_DSO
|
||||
lib =
|
||||
lib_sources =
|
||||
component = mca_op_example.la
|
||||
|
||||
@ -69,7 +69,7 @@ mca_pml_ob1_la_LDFLAGS = -module -avoid-version
|
||||
|
||||
if OPAL_cuda_support
|
||||
mca_pml_ob1_la_LIBADD = \
|
||||
$(top_ompi_builddir)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/cuda/libmca_common_cuda.la
|
||||
endif
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
|
||||
@ -31,7 +31,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_pubsub_pmi_la_SOURCES = $(local_sources)
|
||||
mca_pubsub_pmi_la_LDFLAGS = -module -avoid-version $(pubsub_pmi_LDFLAGS)
|
||||
mca_pubsub_pmi_la_LIBADD = $(pubsub_pmi_LIBS) \
|
||||
$(top_ompi_builddir)/opal/mca/common/pmi/libmca_common_pmi.la
|
||||
$(OMPI_TOP_BUILDDIR)/opal/mca/common/pmi/libmca_common_pmi.la
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
libmca_pubsub_pmi_la_SOURCES = $(local_sources)
|
||||
|
||||
@ -36,7 +36,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_rte_pmi_la_SOURCES = $(local_sources)
|
||||
mca_rte_pmi_la_LDFLAGS = -module -avoid-version $(rte_pmi_LDFLAGS)
|
||||
mca_rte_pmi_la_LIBADD = $(rte_pmi_LIBS) \
|
||||
$(top_ompi_builddir)/orte/mca/common/pmi/libmca_common_pmi.la
|
||||
$(OMPI_TOP_BUILDDIR)/orte/mca/common/pmi/libmca_common_pmi.la
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
libmca_rte_pmi_la_SOURCES = $(local_sources)
|
||||
|
||||
@ -41,17 +41,17 @@ mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_sbgp_ibnet_la_SOURCES = $(sources)
|
||||
mca_sbgp_ibnet_la_LDFLAGS = -module -avoid-version $(sbgp_ibnet_LDFLAGS) $(btl_openib_LDFLAGS)
|
||||
mca_sbgp_ibnet_la_LIBADD = $(sbgp_ibnet_LIBS) $(btl_openib_LIBS) \
|
||||
$(top_ompi_builddir)/ompi/mca/common/verbs/libmca_common_verbs.la \
|
||||
$(top_ompi_builddir)/ompi/mca/common/ofacm/libmca_common_ofacm.la
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/verbs/libmca_common_verbs.la \
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/ofacm/libmca_common_ofacm.la
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
libmca_sbgp_ibnet_la_SOURCES =$(sources)
|
||||
libmca_sbgp_ibnet_la_LDFLAGS = -module -avoid-version
|
||||
|
||||
$(top_ompi_builddir)/ompi/mca/common/ofacm/libmca_common_ofacm.la: foo.c
|
||||
cd $(top_ompi_builddir)/ompi/mca/common/ofacm && $(MAKE)
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/ofacm/libmca_common_ofacm.la: foo.c
|
||||
cd $(OMPI_TOP_BUILDDIR)/ompi/mca/common/ofacm && $(MAKE)
|
||||
|
||||
$(top_ompi_builddir)/ompi/mca/common/ofautils/libmca_common_ofautils.la: foo.c
|
||||
cd $(top_ompi_builddir)/ompi/mca/common/ofautils && $(MAKE)
|
||||
$(OMPI_TOP_BUILDDIR)/ompi/mca/common/ofautils/libmca_common_ofautils.la: foo.c
|
||||
cd $(OMPI_TOP_BUILDDIR)/ompi/mca/common/ofautils && $(MAKE)
|
||||
|
||||
foo.c:
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
|
||||
# Note that this file must exist, even though it is empty (there is no
|
||||
# "base" directory for the common framework). autogen.pl and
|
||||
# ompi_mca.m4 assume that every framework has a top-level Makefile.am.
|
||||
# opal_mca.m4 assume that every framework has a top-level Makefile.am.
|
||||
# We *could* adjust the framework glue code to exclude "common" from
|
||||
# this requirement, but it's just a lot easier to have an empty
|
||||
# Makefile.am here.
|
||||
|
||||
@ -30,7 +30,7 @@ mca_dstore_pmi_la_SOURCES = $(sources)
|
||||
mca_dstore_pmi_la_CPPFLAGS = $(dstore_pmi_CPPFLAGS)
|
||||
mca_dstore_pmi_la_LDFLAGS = -module -avoid-version $(dstore_pmi_LDFLAGS)
|
||||
mca_dstore_pmi_la_LIBADD = $(dstore_pmi_LIBS) \
|
||||
$(top_ompi_builddir)/opal/mca/common/pmi/libmca_common_pmi.la
|
||||
$(OPAL_TOP_BUILDDIR)/opal/mca/common/pmi/libmca_common_pmi.la
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
libmca_dstore_pmi_la_SOURCES =$(sources)
|
||||
|
||||
@ -72,9 +72,9 @@ EOF
|
||||
# Add some stuff to CPPFLAGS so that the rest of the source
|
||||
# tree can be built
|
||||
libevent_file=$libevent_basedir/libevent
|
||||
CPPFLAGS="$CPPFLAGS -I$OMPI_TOP_SRCDIR/$libevent_file -I$OMPI_TOP_SRCDIR/$libevent_file/include"
|
||||
AS_IF([test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"],
|
||||
[CPPFLAGS="$CPPFLAGS -I$OMPI_TOP_BUILDDIR/$libevent_file/include"])
|
||||
CPPFLAGS="$CPPFLAGS -I$OPAL_TOP_SRCDIR/$libevent_file -I$OPAL_TOP_SRCDIR/$libevent_file/include"
|
||||
AS_IF([test "$OPAL_TOP_BUILDDIR" != "$OPAL_TOP_SRCDIR"],
|
||||
[CPPFLAGS="$CPPFLAGS -I$OPAL_TOP_BUILDDIR/$libevent_file/include"])
|
||||
unset libevent_file
|
||||
])
|
||||
])
|
||||
@ -100,7 +100,7 @@ AC_DEFUN([MCA_opal_event_libevent2021_DO_THE_CONFIG], [
|
||||
CFLAGS_save="$CFLAGS"
|
||||
CFLAGS="$OPAL_CFLAGS_BEFORE_PICKY $OPAL_VISIBILITY_CFLAGS"
|
||||
CPPFLAGS_save="$CPPFLAGS"
|
||||
CPPFLAGS="-I$OMPI_TOP_SRCDIR -I$OMPI_TOP_BUILDDIR -I$OMPI_TOP_SRCDIR/opal/include $CPPFLAGS"
|
||||
CPPFLAGS="-I$OPAL_TOP_SRCDIR -I$OPAL_TOP_BUILDDIR -I$OPAL_TOP_SRCDIR/opal/include $CPPFLAGS"
|
||||
|
||||
AC_MSG_CHECKING([libevent configuration args])
|
||||
event_args="--disable-dns --disable-http --disable-rpc --disable-openssl --enable-thread-support"
|
||||
@ -165,7 +165,7 @@ AC_DEFUN([MCA_opal_event_libevent2021_DO_THE_CONFIG], [
|
||||
AC_MSG_RESULT([$event_args])
|
||||
|
||||
OPAL_CONFIG_SUBDIR([$libevent_basedir/libevent],
|
||||
[$event_args $ompi_subdir_args],
|
||||
[$event_args $opal_subdir_args],
|
||||
[libevent_happy="yes"], [libevent_happy="no"])
|
||||
if test "$libevent_happy" = "no"; then
|
||||
AC_MSG_WARN([Event library failed to configure])
|
||||
|
||||
4
opal/mca/hwloc/external/configure.m4
vendored
4
opal/mca/hwloc/external/configure.m4
vendored
@ -46,8 +46,8 @@ AC_DEFUN([MCA_opal_hwloc_external_POST_CONFIG],[
|
||||
CPPFLAGS="$CPPFLAGS $opal_hwloc_external_CPPFLAGS"
|
||||
LDFLAGS="$LDFLAGS $opal_hwloc_external_LDFLAGS"
|
||||
LIBS="$LIBS $opal_hwloc_external_LIBS"
|
||||
AS_IF([test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"],
|
||||
[CPPFLAGS="$CPPFLAGS -I$OMPI_TOP_BUILDDIR/$file/include"])
|
||||
AS_IF([test "$OPAL_TOP_BUILDDIR" != "$OPAL_TOP_SRCDIR"],
|
||||
[CPPFLAGS="$CPPFLAGS -I$OPAL_TOP_BUILDDIR/$file/include"])
|
||||
unset file
|
||||
|
||||
# We have to do some extra indirection to get the
|
||||
|
||||
@ -47,9 +47,9 @@ AC_DEFUN([MCA_opal_hwloc_hwloc172_POST_CONFIG],[
|
||||
# Add some stuff to CPPFLAGS so that the rest of the source
|
||||
# tree can be built
|
||||
file=$opal_hwloc_hwloc172_basedir/hwloc
|
||||
CPPFLAGS="$CPPFLAGS -I$OMPI_TOP_SRCDIR/$file/include"
|
||||
AS_IF([test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"],
|
||||
[CPPFLAGS="$CPPFLAGS -I$OMPI_TOP_BUILDDIR/$file/include"])
|
||||
CPPFLAGS="$CPPFLAGS -I$OPAL_TOP_SRCDIR/$file/include"
|
||||
AS_IF([test "$OPAL_TOP_BUILDDIR" != "$OPAL_TOP_SRCDIR"],
|
||||
[CPPFLAGS="$CPPFLAGS -I$OPAL_TOP_BUILDDIR/$file/include"])
|
||||
unset file
|
||||
])
|
||||
OPAL_VAR_SCOPE_POP
|
||||
@ -105,7 +105,7 @@ AC_DEFUN([MCA_opal_hwloc_hwloc172_CONFIG],[
|
||||
|
||||
# Build flags for our Makefile.am
|
||||
opal_hwloc_hwloc172_LDFLAGS='$(HWLOC_EMBEDDED_LDFLAGS)'
|
||||
opal_hwloc_hwloc172_LIBS='$(top_ompi_builddir)/'"$opal_hwloc_hwloc172_basedir"'/hwloc/src/libhwloc_embedded.la $(HWLOC_EMBEDDED_LIBS)'
|
||||
opal_hwloc_hwloc172_LIBS='$(OPAL_TOP_BUILDDIR)/'"$opal_hwloc_hwloc172_basedir"'/hwloc/src/libhwloc_embedded.la $(HWLOC_EMBEDDED_LIBS)'
|
||||
opal_hwloc_hwloc172_support=yes
|
||||
|
||||
AC_DEFINE_UNQUOTED([HWLOC_HWLOC172_HWLOC_VERSION],
|
||||
|
||||
@ -28,7 +28,7 @@ AC_DEFUN([MCA_opal_memchecker_CONFIG],[
|
||||
WANT_MEMCHECKER=0
|
||||
|
||||
# Setting this environment variable causes
|
||||
# MCA_COMONENT_BUILD_CHECK (in ompi_mca.m4, invoked by
|
||||
# MCA_COMONENT_BUILD_CHECK (in opal_mca.m4, invoked by
|
||||
# MCA_CONFIGURE_FRAMEWORK, below) to rule that the component
|
||||
# should not be built. It is effectively the same as adding
|
||||
# "memchecker" to the --enable-mca-no-build list.
|
||||
|
||||
@ -32,7 +32,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_memchecker_valgrind_la_SOURCES = $(sources)
|
||||
mca_memchecker_valgrind_la_LDFLAGS = -module -avoid-version
|
||||
mca_memchecker_valgrind_la_LIBADD = \
|
||||
$(top_ompi_builddir)/opal/libopal.la
|
||||
$(OPAL_TOP_BUILDDIR)/opal/libopal.la
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
libmca_memchecker_valgrind_la_SOURCES =$(sources)
|
||||
|
||||
@ -37,7 +37,7 @@ lib_LTLIBRARIES = libopen-rte.la
|
||||
libopen_rte_la_SOURCES =
|
||||
libopen_rte_la_LIBADD = \
|
||||
$(MCA_orte_FRAMEWORK_LIBS) \
|
||||
$(top_ompi_builddir)/opal/libopen-pal.la
|
||||
$(ORTE_TOP_BUILDDIR)/opal/libopen-pal.la
|
||||
libopen_rte_la_DEPENDENCIES = $(libopen_rte_la_LIBADD)
|
||||
libopen_rte_la_LDFLAGS = -version-info $(libopen_rte_so_version)
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_ess_pmi_la_SOURCES = $(sources)
|
||||
mca_ess_pmi_la_LDFLAGS = -module -avoid-version $(ess_pmi_LDFLAGS)
|
||||
mca_ess_pmi_la_LIBADD = $(ess_pmi_LIBS) \
|
||||
$(top_ompi_builddir)/opal/mca/common/pmi/libmca_common_pmi.la
|
||||
$(ORTE_TOP_BUILDDIR)/opal/mca/common/pmi/libmca_common_pmi.la
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
libmca_ess_pmi_la_SOURCES =$(sources)
|
||||
|
||||
@ -38,7 +38,7 @@ mcacomponent_LTLIBRARIES = $(component_install)
|
||||
mca_grpcomm_pmi_la_SOURCES = $(sources)
|
||||
mca_grpcomm_pmi_la_LDFLAGS = -module -avoid-version $(grpcomm_pmi_LDFLAGS)
|
||||
mca_grpcomm_pmi_la_LIBADD = $(grpcomm_pmi_LIBS) \
|
||||
$(top_ompi_builddir)/opal/mca/common/pmi/libmca_common_pmi.la
|
||||
$(ORTE_TOP_BUILDDIR)/opal/mca/common/pmi/libmca_common_pmi.la
|
||||
|
||||
noinst_LTLIBRARIES = $(component_noinst)
|
||||
libmca_grpcomm_pmi_la_SOURCES =$(sources)
|
||||
|
||||
@ -64,7 +64,7 @@ liboshmem_la_LIBADD = \
|
||||
$(fortran_oshmem_lib) \
|
||||
$(fortran_pshmem_lib) \
|
||||
$(MCA_oshmem_FRAMEWORK_LIBS) \
|
||||
$(top_ompi_builddir)/ompi/libmpi.la
|
||||
$(OSHMEM_TOP_BUILDDIR)/ompi/libmpi.la
|
||||
liboshmem_la_DEPENDENCIES = $(liboshmem_la_LIBADD)
|
||||
liboshmem_la_LDFLAGS = \
|
||||
-version-info $(liboshmem_so_version) \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user