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

restored Jeffs changes

Просмотр исходного кода 
This commit was SVN r1529.
Этот коммит содержится в:
Tim Woodall 2004-07-01 16:25:44 +00:00
родитель 6eed97c7f9
Коммит 8cfc45bbee
34 изменённых файлов: 397 добавлений и 349 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
autogen.sh
Просмотреть файл

@ -541,8 +541,8 @@ AC_DEFINE_UNQUOTED(MCA_${pd_module_type}_${pd_module_name}_FULL_VERSION,
EOF EOF
cat >> $pd_amc_file <<EOF cat >> $pd_amc_file <<EOF
AM_CONDITIONAL(OMPI_BUILD_${pd_module_type}_${pd_module_name}_LOADABLE_MODULE, AM_CONDITIONAL(OMPI_BUILD_${pd_module_type}_${pd_module_name}_DSO,
test "\$BUILD_${pd_module_type}_${pd_module_name}_LOADABLE_MODULE" = "1") test "\$BUILD_${pd_module_type}_${pd_module_name}_DSO" = "1")
EOF EOF

7
config/mca_configure.ac
Просмотреть файл

@ -117,6 +117,7 @@ AC_MSG_RESULT([$result])
# Check and see if the user wants this module built as a run-time # Check and see if the user wants this module built as a run-time
# loadable module. Acceptable combinations: # loadable module. Acceptable combinations:
# #
# [default -- no option]
# --with-modules # --with-modules
# --with-modules=[.+,]*MODULE_TYPE[.+,]* # --with-modules=[.+,]*MODULE_TYPE[.+,]*
# --with-modules=[.+,]*MODULE_TYPE-MODULE_NAME[.+,]* # --with-modules=[.+,]*MODULE_TYPE-MODULE_NAME[.+,]*
@ -169,8 +170,8 @@ unset msg
# Part one of libtool magic # Part one of libtool magic
# #
AM_ENABLE_STATIC AM_ENABLE_SHARED
AM_DISABLE_SHARED AM_DISABLE_STATIC
# #
@ -231,7 +232,7 @@ AC_SUBST(CPPFLAGS)
ompi_show_subtitle "GNU libtool setup" ompi_show_subtitle "GNU libtool setup"
AM_PROG_LIBTOOL AM_PROG_LIBTOOL
AM_CONDITIONAL(OMPI_BUILD_@MCA_TYPE@_@MCA_MODULE_NAME@_LOADABLE_MODULE, AM_CONDITIONAL(OMPI_BUILD_@MCA_TYPE@_@MCA_MODULE_NAME@_DSO,
test "$BUILD_@MCA_TYPE@_@MCA_MODULE_NAME@_LOADABLE_MODULE" = "1") test "$BUILD_@MCA_TYPE@_@MCA_MODULE_NAME@_LOADABLE_MODULE" = "1")

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

@ -8,42 +8,54 @@ AC_DEFUN([OMPI_MCA],[
# Find which modules should be built as run-time loadable modules # Find which modules should be built as run-time loadable modules
# Acceptable combinations: # Acceptable combinations:
# #
# --with-modules # [default -- no option given]
# --with-modules=[.+,]*MODULE_TYPE[.+,]* # --enable-mca-dso
# --with-modules=[.+,]*MODULE_TYPE-MODULE_NAME[.+,]* # --enable-mca-dso=[.+,]*COMPONENT_TYPE[.+,]*
# --without-modules # --enable-mca-dso=[.+,]*COMPONENT_TYPE-COMPONENT_NAME[.+,]*
# --disable-mca-dso
# #
AC_MSG_CHECKING([which modules should be run-time loadable]) AC_MSG_CHECKING([which modules should be run-time loadable])
AC_ARG_WITH(modules, AC_ARG_ENABLE(mca-dso,
AC_HELP_STRING([--with-modules=LIST], AC_HELP_STRING([--enable-mca-dso=LIST],
[comma-separated list of types and/or type-module pairs of modules that will be built as run-time loadable modules (as opposed to statically linked in OMPI/MPI (if supported on this platform). This directly implies "--enable-shared=LIST and --disable-static=LIST".])) [comma-separated list of types and/or type-component pairs that will be built as run-time loadable modules (as opposed to statically linked in), if supported on this platform. The default is to build all components as DSOs; the --disable-mca-dso[=LIST] form can be used to disable building all or some types/components as DSOs]))
if test "$with_modules" = "" -o "$with_modules" = "no"; then # First, check to see if we're only building static libraries. If so,
LOADABLE_MODULE_all=0 # then override everything and only build components as static
# libraries.
if test "$enable_shared" = "no"; then
DSO_all=0
msg=none msg=none
elif test "$with_modules" = "yes"; then elif test -z "$enable_mca_dso" -o "$enable_mca_dso" = "yes"; then
LOADABLE_MODULE_all=1 DSO_all=1
msg=all msg=all
elif test "$enable_mca_dso" = "no"; then
DSO_all=0
msg=none
else else
LOADABLE_MODULE_all=0 DSO_all=0
ifs_save="$IFS" ifs_save="$IFS"
IFS="${IFS}$PATH_SEPARATOR," IFS="${IFS}$PATH_SEPARATOR,"
msg= msg=
for module in $with_modules; do for item in $enable_mca_dso; do
str="`echo LOADABLE_MODULE_$module=1 | sed s/-/_/g`" str="`echo DSO_$item=1 | sed s/-/_/g`"
eval $str eval $str
msg="$module $msg" msg="$item $msg"
done done
IFS="$ifs_save" IFS="$ifs_save"
fi fi
AC_MSG_RESULT([$msg]) AC_MSG_RESULT([$msg])
unset msg unset msg
if test "$enable_shared" = "no"; then
AC_MSG_WARN([*** Shared libraries have been disabled (--disable-shared])
AC_MSG_WARN([*** Building MCA components as DSOs automatically disabled])
fi
# The list of MCA types (it's fixed) # The list of MCA types (it's fixed)
AC_MSG_CHECKING([for MCA types]) AC_MSG_CHECKING([for MCA types])
found_types="allocator coll common io gpr mpool oob one pcm pml ptl topo" found_types="allocator coll common gpr io mpool ns one oob op pcm pml ptl topo"
AC_MSG_RESULT([$found_types]) AC_MSG_RESULT([$found_types])
# Get the list of all the non-configure MCA modules that were found by # Get the list of all the non-configure MCA modules that were found by
@ -53,15 +65,16 @@ AC_MSG_RESULT([$found_types])
MCA_FIND_NO_CONFIGURE_MODULES MCA_FIND_NO_CONFIGURE_MODULES
# Now determine the configurable modules in each of the types. This # Now determine the configurable modules in each of the types. This
# is a little redundant and could be combined into the loop above, but # is a little redundant and could be combined into
# we separate it out for clarity. The extern statements and array of # MCA_FIND_NO_CONFIGURE_MODULES, but we separate it out for clarity.
# pointers to the module global structs are written to a file for each # The extern statements and array of pointers to the module global
# type that is #include'd in the flue file for each type. # structs are written to a file for each type that is #include'd in
# the file for each type.
for type in $found_types; do for type in $found_types; do
all_modules= all_modules=
static_modules= static_modules=
dynamic_modules= dso_modules=
static_ltlibs= static_ltlibs=
# Ensure that the directory where the #include file is to live # Ensure that the directory where the #include file is to live
@ -80,7 +93,7 @@ for type in $found_types; do
# Also ensure that the dynamic-mca base directory exists # Also ensure that the dynamic-mca base directory exists
total_dir="." total_dir="."
dyndir=src/mca/dynamic/$type dyndir=src/dynamic-mca/$type
for dir_part in `IFS='/\\'; set X $dyndir; shift; echo "$[@]"`; do for dir_part in `IFS='/\\'; set X $dyndir; shift; echo "$[@]"`; do
total_dir=$total_dir/$dir_part total_dir=$total_dir/$dir_part
test -d "$total_dir" || test -d "$total_dir" ||
@ -94,7 +107,7 @@ for type in $found_types; do
rm -f $outfile $outfile.struct $outfile.extern \ rm -f $outfile $outfile.struct $outfile.extern \
$outfile.all $outfile.static $outfile.dyanmic $outfile.all $outfile.static $outfile.dyanmic
touch $outfile.struct $outfile.extern \ touch $outfile.struct $outfile.extern \
$outfile.all $outfile.static $outfile.dynamic $outfile.all $outfile.static $outfile.dso
# Manual conversion of $type to its generic name (e.g., crmpi->cr, # Manual conversion of $type to its generic name (e.g., crmpi->cr,
# crompi->cr). # crompi->cr).
@ -125,7 +138,7 @@ for type in $found_types; do
# Remove any possible sym link in the mca-dynamic tree # Remove any possible sym link in the mca-dynamic tree
rm -f src/mca/dyanmic/$type/$m rm -f src/dynamic-mca/$type/$m
# Now process the module # Now process the module
@ -139,12 +152,12 @@ for type in $found_types; do
# generated the AM_CONDITIONAL directly. Here, we fill in # generated the AM_CONDITIONAL directly. Here, we fill in
# the variable that is used in that AM_CONDITIONAL. # the variable that is used in that AM_CONDITIONAL.
if test "$compile_mode" = "dynamic"; then if test "$compile_mode" = "dso"; then
value=1 value=1
else else
value=0 value=0
fi fi
foo="BUILD_${type}_${m}_LOADABLE_MODULE=$value" foo="BUILD_${type}_${m}_DSO=$value"
eval $foo eval $foo
fi fi
done done
@ -166,7 +179,7 @@ for type in $found_types; do
# Remove any possible sym link in the mca-dynamic tree # Remove any possible sym link in the mca-dynamic tree
rm -f src/mca/dyanmic/$type/$m rm -f src/dyanmic-mca/$type/$m
# Configure the module subdirectory # Configure the module subdirectory
@ -187,9 +200,9 @@ for type in $found_types; do
all_modules="`echo $all_modules`" all_modules="`echo $all_modules`"
static_modules="`sort $outfile.static`" static_modules="`sort $outfile.static`"
static_modules="`echo $static_modules`" static_modules="`echo $static_modules`"
dynamic_modules="`sort $outfile.dynamic`" dso_modules="`sort $outfile.dso`"
dynamic_modules="`echo $dynamic_modules`" dso_modules="`echo $dso_modules`"
rm -f $outfile $outfile.all $outfile.static $outfile.dynamic rm -f $outfile $outfile.all $outfile.static $outfile.dso
# Create the final .h file that will be included in the type's # Create the final .h file that will be included in the type's
# top-level glue. This lists all the static modules. # top-level glue. This lists all the static modules.
@ -216,13 +229,13 @@ EOF
eval "$foo" eval "$foo"
foo="MCA_${type}_STATIC_SUBDIRS"'="$static_modules"' foo="MCA_${type}_STATIC_SUBDIRS"'="$static_modules"'
eval "$foo" eval "$foo"
foo="MCA_${type}_DYNAMIC_SUBDIRS"'="$dynamic_modules"' foo="MCA_${type}_DSO_SUBDIRS"'="$dso_modules"'
eval "$foo" eval "$foo"
foo="MCA_${type}_STATIC_LTLIBS"'="$static_ltlibs"' foo="MCA_${type}_STATIC_LTLIBS"'="$static_ltlibs"'
eval "$foo" eval "$foo"
done done
unset foo type m modules structs outfile outdir total_dir file \ unset foo type m modules structs outfile outdir total_dir file \
all_modules static_modules dynamic_modules static_ltlibs all_modules static_modules dso_modules static_ltlibs
# Grumble. It seems that AC_SUBST and AC_DEFINE don't let you # Grumble. It seems that AC_SUBST and AC_DEFINE don't let you
# substitue on a variable name that contains a variable (e.g., # substitue on a variable name that contains a variable (e.g.,
@ -232,66 +245,66 @@ unset foo type m modules structs outfile outdir total_dir file \
AC_SUBST(MCA_common_ALL_SUBDIRS) AC_SUBST(MCA_common_ALL_SUBDIRS)
AC_SUBST(MCA_common_STATIC_SUBDIRS) AC_SUBST(MCA_common_STATIC_SUBDIRS)
AC_SUBST(MCA_common_DYNAMIC_SUBDIRS) AC_SUBST(MCA_common_DSO_SUBDIRS)
AC_SUBST(MCA_common_STATIC_LTLIBS) AC_SUBST(MCA_common_STATIC_LTLIBS)
# OMPI types # OMPI types
AC_SUBST(MCA_oob_ALL_SUBDIRS) AC_SUBST(MCA_oob_ALL_SUBDIRS)
AC_SUBST(MCA_oob_STATIC_SUBDIRS) AC_SUBST(MCA_oob_STATIC_SUBDIRS)
AC_SUBST(MCA_oob_DYNAMIC_SUBDIRS) AC_SUBST(MCA_oob_DSO_SUBDIRS)
AC_SUBST(MCA_oob_STATIC_LTLIBS) AC_SUBST(MCA_oob_STATIC_LTLIBS)
AC_SUBST(MCA_pcm_ALL_SUBDIRS) AC_SUBST(MCA_pcm_ALL_SUBDIRS)
AC_SUBST(MCA_pcm_STATIC_SUBDIRS) AC_SUBST(MCA_pcm_STATIC_SUBDIRS)
AC_SUBST(MCA_pcm_DYNAMIC_SUBDIRS) AC_SUBST(MCA_pcm_DSO_SUBDIRS)
AC_SUBST(MCA_pcm_STATIC_LTLIBS) AC_SUBST(MCA_pcm_STATIC_LTLIBS)
AC_SUBST(MCA_gpr_ALL_SUBDIRS) AC_SUBST(MCA_gpr_ALL_SUBDIRS)
AC_SUBST(MCA_gpr_STATIC_SUBDIRS) AC_SUBST(MCA_gpr_STATIC_SUBDIRS)
AC_SUBST(MCA_gpr_DYNAMIC_SUBDIRS) AC_SUBST(MCA_gpr_DSO_SUBDIRS)
AC_SUBST(MCA_gpr_STATIC_LTLIBS) AC_SUBST(MCA_gpr_STATIC_LTLIBS)
# MPI types # MPI types
AC_SUBST(MCA_allocator_ALL_SUBDIRS) AC_SUBST(MCA_allocator_ALL_SUBDIRS)
AC_SUBST(MCA_allocator_STATIC_SUBDIRS) AC_SUBST(MCA_allocator_STATIC_SUBDIRS)
AC_SUBST(MCA_allocator_DYNAMIC_SUBDIRS) AC_SUBST(MCA_allocator_DSO_SUBDIRS)
AC_SUBST(MCA_allocator_STATIC_LTLIBS) AC_SUBST(MCA_allocator_STATIC_LTLIBS)
AC_SUBST(MCA_coll_ALL_SUBDIRS) AC_SUBST(MCA_coll_ALL_SUBDIRS)
AC_SUBST(MCA_coll_STATIC_SUBDIRS) AC_SUBST(MCA_coll_STATIC_SUBDIRS)
AC_SUBST(MCA_coll_DYNAMIC_SUBDIRS) AC_SUBST(MCA_coll_DSO_SUBDIRS)
AC_SUBST(MCA_coll_STATIC_LTLIBS) AC_SUBST(MCA_coll_STATIC_LTLIBS)
AC_SUBST(MCA_io_ALL_SUBDIRS) AC_SUBST(MCA_io_ALL_SUBDIRS)
AC_SUBST(MCA_io_STATIC_SUBDIRS) AC_SUBST(MCA_io_STATIC_SUBDIRS)
AC_SUBST(MCA_io_DYNAMIC_SUBDIRS) AC_SUBST(MCA_io_DSO_SUBDIRS)
AC_SUBST(MCA_io_STATIC_LTLIBS) AC_SUBST(MCA_io_STATIC_LTLIBS)
AC_SUBST(MCA_mpool_ALL_SUBDIRS) AC_SUBST(MCA_mpool_ALL_SUBDIRS)
AC_SUBST(MCA_mpool_STATIC_SUBDIRS) AC_SUBST(MCA_mpool_STATIC_SUBDIRS)
AC_SUBST(MCA_mpool_DYNAMIC_SUBDIRS) AC_SUBST(MCA_mpool_DSO_SUBDIRS)
AC_SUBST(MCA_mpool_STATIC_LTLIBS) AC_SUBST(MCA_mpool_STATIC_LTLIBS)
AC_SUBST(MCA_one_ALL_SUBDIRS) AC_SUBST(MCA_one_ALL_SUBDIRS)
AC_SUBST(MCA_one_STATIC_SUBDIRS) AC_SUBST(MCA_one_STATIC_SUBDIRS)
AC_SUBST(MCA_one_DYNAMIC_SUBDIRS) AC_SUBST(MCA_one_DSO_SUBDIRS)
AC_SUBST(MCA_one_STATIC_LTLIBS) AC_SUBST(MCA_one_STATIC_LTLIBS)
AC_SUBST(MCA_pml_ALL_SUBDIRS) AC_SUBST(MCA_pml_ALL_SUBDIRS)
AC_SUBST(MCA_pml_STATIC_SUBDIRS) AC_SUBST(MCA_pml_STATIC_SUBDIRS)
AC_SUBST(MCA_pml_DYNAMIC_SUBDIRS) AC_SUBST(MCA_pml_DSO_SUBDIRS)
AC_SUBST(MCA_pml_STATIC_LTLIBS) AC_SUBST(MCA_pml_STATIC_LTLIBS)
AC_SUBST(MCA_ptl_ALL_SUBDIRS) AC_SUBST(MCA_ptl_ALL_SUBDIRS)
AC_SUBST(MCA_ptl_STATIC_SUBDIRS) AC_SUBST(MCA_ptl_STATIC_SUBDIRS)
AC_SUBST(MCA_ptl_DYNAMIC_SUBDIRS) AC_SUBST(MCA_ptl_DSO_SUBDIRS)
AC_SUBST(MCA_ptl_STATIC_LTLIBS) AC_SUBST(MCA_ptl_STATIC_LTLIBS)
AC_SUBST(MCA_topo_ALL_SUBDIRS) AC_SUBST(MCA_topo_ALL_SUBDIRS)
AC_SUBST(MCA_topo_STATIC_SUBDIRS) AC_SUBST(MCA_topo_STATIC_SUBDIRS)
AC_SUBST(MCA_topo_DYNAMIC_SUBDIRS) AC_SUBST(MCA_topo_DSO_SUBDIRS)
AC_SUBST(MCA_topo_STATIC_LTLIBS) AC_SUBST(MCA_topo_STATIC_LTLIBS)
# Finally, now that we've filled in all the test variables, get all # Finally, now that we've filled in all the test variables, get all
@ -327,24 +340,24 @@ if test "$HAPPY" = "1"; then
# Is this module going to built staic or shared? # Is this module going to built staic or shared?
str="SHARED_TYPE=\$LOADABLE_MODULE_$type" str="SHARED_TYPE=\$DSO_$type"
eval $str eval $str
str="SHARED_GENERIC_TYPE=\$LOADABLE_MODULE_$generic_type" str="SHARED_GENERIC_TYPE=\$DSO_$generic_type"
eval $str eval $str
str="SHARED_MODULE=\$LOADABLE_MODULE_${type}_$m" str="SHARED_MODULE=\$DSO_${type}_$m"
eval $str eval $str
shared_mode_override=static shared_mode_override=static
# Setup for either shared or static # Setup for either shared or static
if test "$shared_mode_override" = "dynamic" -o \ if test "$shared_mode_override" = "dso" -o \
"$SHARED_TYPE" = "1" -o \ "$SHARED_TYPE" = "1" -o \
"$SHARED_GENERIC_TYPE" = "1" -o \ "$SHARED_GENERIC_TYPE" = "1" -o \
"$SHARED_MODULE" = "1" -o \ "$SHARED_MODULE" = "1" -o \
"$LOADABLE_MODULE_all" = "1"; then "$DSO_all" = "1"; then
compile_mode="dynamic" compile_mode="dso"
echo $m >> $outfile.dynamic echo $m >> $outfile.dso
rm -f "src/dynamic-mca/$type/$m" rm -f "src/dynamic-mca/$type/$m"
$LN_S "$OMPI_TOP_BUILDDIR/src/mca/$type/$m" \ $LN_S "$OMPI_TOP_BUILDDIR/src/mca/$type/$m" \
"src/dynamic-mca/$type/$m" "src/dynamic-mca/$type/$m"

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

@ -118,8 +118,8 @@ OMPI_CONFIGURE_OPTIONS
ompi_enable_shared="$enable_shared" ompi_enable_shared="$enable_shared"
ompi_enable_static="$enable_static" ompi_enable_static="$enable_static"
AM_DISABLE_SHARED AM_ENABLE_SHARED
AM_ENABLE_STATIC AM_DISABLE_STATIC
############################################################################ ############################################################################

2
src/dynamic-mca/allocator/Makefile.am
Просмотреть файл

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options include $(top_srcdir)/config/Makefile.options
SUBDIRS = $(MCA_allocator_DYNAMIC_SUBDIRS) SUBDIRS = $(MCA_allocator_DSO_SUBDIRS)
DISTCLEANFILES = $(SUBDIRS) DISTCLEANFILES = $(SUBDIRS)
# Every directory under here is a sym link to something in the main # Every directory under here is a sym link to something in the main

2
src/dynamic-mca/coll/Makefile.am
Просмотреть файл

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options include $(top_srcdir)/config/Makefile.options
SUBDIRS = $(MCA_coll_DYNAMIC_SUBDIRS) SUBDIRS = $(MCA_coll_DSO_SUBDIRS)
DISTCLEANFILES = $(SUBDIRS) DISTCLEANFILES = $(SUBDIRS)
# Every directory under here is a sym link to something in the main # Every directory under here is a sym link to something in the main

2
src/dynamic-mca/common/Makefile.am
Просмотреть файл

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options include $(top_srcdir)/config/Makefile.options
SUBDIRS = $(MCA_common_DYNAMIC_SUBDIRS) SUBDIRS = $(MCA_common_DSO_SUBDIRS)
DISTCLEANFILES = $(SUBDIRS) DISTCLEANFILES = $(SUBDIRS)
# Every directory under here is a sym link to something in the main # Every directory under here is a sym link to something in the main

2
src/dynamic-mca/gpr/Makefile.am
Просмотреть файл

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options include $(top_srcdir)/config/Makefile.options
SUBDIRS = $(MCA_gpr_DYNAMIC_SUBDIRS) SUBDIRS = $(MCA_gpr_DSO_SUBDIRS)
DISTCLEANFILES = $(SUBDIRS) DISTCLEANFILES = $(SUBDIRS)
# Every directory under here is a sym link to something in the main # Every directory under here is a sym link to something in the main

2
src/dynamic-mca/io/Makefile.am
Просмотреть файл

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options include $(top_srcdir)/config/Makefile.options
SUBDIRS = $(MCA_io_DYNAMIC_SUBDIRS) SUBDIRS = $(MCA_io_DSO_SUBDIRS)
DISTCLEANFILES = $(SUBDIRS) DISTCLEANFILES = $(SUBDIRS)
# Every directory under here is a sym link to something in the main # Every directory under here is a sym link to something in the main

2
src/dynamic-mca/mpool/Makefile.am
Просмотреть файл

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options include $(top_srcdir)/config/Makefile.options
SUBDIRS = $(MCA_mpool_DYNAMIC_SUBDIRS) SUBDIRS = $(MCA_mpool_DSO_SUBDIRS)
DISTCLEANFILES = $(SUBDIRS) DISTCLEANFILES = $(SUBDIRS)
# Every directory under here is a sym link to something in the main # Every directory under here is a sym link to something in the main

2
src/dynamic-mca/one/Makefile.am
Просмотреть файл

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options include $(top_srcdir)/config/Makefile.options
SUBDIRS = $(MCA_one_DYNAMIC_SUBDIRS) SUBDIRS = $(MCA_one_DSO_SUBDIRS)
DISTCLEANFILES = $(SUBDIRS) DISTCLEANFILES = $(SUBDIRS)
# Every directory under here is a sym link to something in the main # Every directory under here is a sym link to something in the main

2
src/dynamic-mca/oob/Makefile.am
Просмотреть файл

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options include $(top_srcdir)/config/Makefile.options
SUBDIRS = $(MCA_oob_DYNAMIC_SUBDIRS) SUBDIRS = $(MCA_oob_DSO_SUBDIRS)
DISTCLEANFILES = $(SUBDIRS) DISTCLEANFILES = $(SUBDIRS)
# Every directory under here is a sym link to something in the main # Every directory under here is a sym link to something in the main

2
src/dynamic-mca/pcm/Makefile.am
Просмотреть файл

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options include $(top_srcdir)/config/Makefile.options
SUBDIRS = $(MCA_pcm_DYNAMIC_SUBDIRS) SUBDIRS = $(MCA_pcm_DSO_SUBDIRS)
DISTCLEANFILES = $(SUBDIRS) DISTCLEANFILES = $(SUBDIRS)
# Every directory under here is a sym link to something in the main # Every directory under here is a sym link to something in the main

2
src/dynamic-mca/pml/Makefile.am
Просмотреть файл

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options include $(top_srcdir)/config/Makefile.options
SUBDIRS = $(MCA_pml_DYNAMIC_SUBDIRS) SUBDIRS = $(MCA_pml_DSO_SUBDIRS)
DISTCLEANFILES = $(SUBDIRS) DISTCLEANFILES = $(SUBDIRS)
# Every directory under here is a sym link to something in the main # Every directory under here is a sym link to something in the main

2
src/dynamic-mca/ptl/Makefile.am
Просмотреть файл

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options include $(top_srcdir)/config/Makefile.options
SUBDIRS = $(MCA_ptl_DYNAMIC_SUBDIRS) SUBDIRS = $(MCA_ptl_DSO_SUBDIRS)
DISTCLEANFILES = $(SUBDIRS) DISTCLEANFILES = $(SUBDIRS)
# Every directory under here is a sym link to something in the main # Every directory under here is a sym link to something in the main

2
src/dynamic-mca/topo/Makefile.am
Просмотреть файл

@ -4,7 +4,7 @@
include $(top_srcdir)/config/Makefile.options include $(top_srcdir)/config/Makefile.options
SUBDIRS = $(MCA_topo_DYNAMIC_SUBDIRS) SUBDIRS = $(MCA_topo_DSO_SUBDIRS)
DISTCLEANFILES = $(SUBDIRS) DISTCLEANFILES = $(SUBDIRS)
# Every directory under here is a sym link to something in the main # Every directory under here is a sym link to something in the main

23
src/mca/allocator/bucket/Makefile.am
Просмотреть файл

@ -1,8 +1,9 @@
# -*- makefile -*-
# #
# $HEADER$ # $HEADER$
# #
# Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
sources = \ sources = \
@ -10,21 +11,25 @@ sources = \
allocator_bucket_alloc.c \ allocator_bucket_alloc.c \
allocator_bucket_alloc.h allocator_bucket_alloc.h
if OMPI_BUILD_allocator_bucket_LOADABLE_MODULE # Make the output library in this directory, and name it either
module_noinst = # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
module_install = mca_allocator_bucket.la # (for static builds).
if OMPI_BUILD_allocator_bucket_DSO
component_noinst =
component_install = mca_allocator_bucket.la
else else
module_noinst = libmca_allocator_bucket.la component_noinst = libmca_allocator_bucket.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_allocator_bucket_la_SOURCES = $(sources) mca_allocator_bucket_la_SOURCES = $(sources)
mca_allocator_bucket_la_LIBADD = $(LIBOMPI_LA) mca_allocator_bucket_la_LIBADD = $(LIBOMPI_LA)
mca_allocator_bucket_la_LDFLAGS = -module -avoid-version mca_allocator_bucket_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_allocator_bucket_la_SOURCES = $(sources) libmca_allocator_bucket_la_SOURCES = $(sources)
libmca_allocator_bucket_la_LDFLAGS = -module -avoid-version libmca_allocator_bucket_la_LDFLAGS = -module -avoid-version

29
src/mca/coll/basic/Makefile.am
Просмотреть файл

@ -1,9 +1,8 @@
# -*- makefile -*-
# #
# $HEADER$ # $HEADER$
# #
# Use the top-level OMPI Makefile.options # Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
@ -11,27 +10,25 @@ SUBDIRS = src
EXTRA_DIST = VERSION EXTRA_DIST = VERSION
# According to the MCA spec, we have to make the output library here # Make the output library in this directory, and name it either
# in the top-level directory, and it has to be named # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# libompi_ssi_coll_ompi_basic.la # (for static builds).
if OMPI_BUILD_coll_basic_LOADABLE_MODULE if OMPI_BUILD_coll_basic_DSO
module_noinst = component_noinst =
module_install = mca_coll_basic.la component_install = mca_coll_basic.la
else else
module_noinst = libmca_coll_basic.la component_noinst = libmca_coll_basic.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_coll_basic_la_SOURCES = mca_coll_basic_la_SOURCES =
mca_coll_basic_la_LIBADD = \ mca_coll_basic_la_LIBADD = src/libmca_coll_basic.la $(LIBMPI_LA)
src/libmca_coll_basic.la \
$(LIBMPI_LA)
mca_coll_basic_la_LDFLAGS = -module -avoid-version mca_coll_basic_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_coll_basic_la_SOURCES = libmca_coll_basic_la_SOURCES =
libmca_coll_basic_la_LIBADD = src/libmca_coll_basic.la libmca_coll_basic_la_LIBADD = src/libmca_coll_basic.la
libmca_coll_basic_la_LDFLAGS = -module -avoid-version libmca_coll_basic_la_LDFLAGS = -module -avoid-version

28
src/mca/io/romio/Makefile.am
Просмотреть файл

@ -2,7 +2,7 @@
# $HEADER$ # $HEADER$
# #
# Use the top-level OMPI Makefile.options # Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
@ -10,27 +10,25 @@ SUBDIRS = src
EXTRA_DIST = VERSION EXTRA_DIST = VERSION
# According to the MCA spec, we have to make the output library here # Make the output library in this directory, and name it either
# in the top-level directory, and it has to be named # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# libompi_ssi_coll_ompi_basic.la # (for static builds).
if OMPI_BUILD_io_romio_LOADABLE_MODULE if OMPI_BUILD_io_romio_DSO
module_noinst = component_noinst =
module_install = mca_io_romio.la component_install = mca_io_romio.la
else else
module_noinst = libmca_mpi_io_romio.la component_noinst = libmca_mpi_io_romio.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_io_romio_la_SOURCES = mca_io_romio_la_SOURCES =
mca_io_romio_la_LIBADD = \ mca_io_romio_la_LIBADD = src/libmca_io_romio.la $(LIBOMPI_LA)
src/libmca_io_romio.la \
$(LIBOMPI_LA)
mca_io_romio_la_LDFLAGS = -module -avoid-version mca_io_romio_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_mpi_io_romio_la_SOURCES = libmca_mpi_io_romio_la_SOURCES =
libmca_mpi_io_romio_la_LIBADD = src/libmca_io_romio.la libmca_mpi_io_romio_la_LIBADD = src/libmca_io_romio.la
libmca_mpi_io_romio_la_LDFLAGS = -module -avoid-version libmca_mpi_io_romio_la_LDFLAGS = -module -avoid-version

23
src/mca/mpool/sm/Makefile.am
Просмотреть файл

@ -1,8 +1,9 @@
# -*- makefile -*-
# #
# $HEADER$ # $HEADER$
# #
# Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
sources = \ sources = \
@ -12,20 +13,24 @@ sources = \
mpool_sm_mmap.h \ mpool_sm_mmap.h \
mpool_sm_component.c mpool_sm_component.c
if OMPI_BUILD_mpool_sm_LOADABLE_MODULE # Make the output library in this directory, and name it either
module_noinst = # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
module_install = mca_mpool_sm.la # (for static builds).
if OMPI_BUILD_mpool_sm_DSO
component_noinst =
component_install = mca_mpool_sm.la
else else
module_noinst = libmca_mpool_sm.la component_noinst = libmca_mpool_sm.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_mpool_sm_la_SOURCES = $(sources) mca_mpool_sm_la_SOURCES = $(sources)
mca_mpool_sm_la_LIBADD = $(LIBOMPI_LA) mca_mpool_sm_la_LIBADD = $(LIBOMPI_LA)
mca_mpool_sm_la_LDFLAGS = -module -avoid-version mca_mpool_sm_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_mpool_sm_la_SOURCES = $(sources) libmca_mpool_sm_la_SOURCES = $(sources)
libmca_mpool_sm_la_LDFLAGS = -module -avoid-version libmca_mpool_sm_la_LDFLAGS = -module -avoid-version

6
src/mca/oob/base/Makefile.am
Просмотреть файл

@ -20,12 +20,12 @@ headers = \
libmca_oob_base_la_SOURCES = \ libmca_oob_base_la_SOURCES = \
$(headers) \ $(headers) \
oob_base_close.c \ oob_base_close.c \
oob_base_open.c \
oob_base_init.c \ oob_base_init.c \
oob_base_send.c \ oob_base_open.c \
oob_base_send_nb.c \
oob_base_recv.c \ oob_base_recv.c \
oob_base_recv_nb.c \ oob_base_recv_nb.c \
oob_base_send.c \
oob_base_send_nb.c \
oob_base_pack.c oob_base_pack.c
# Conditionally install the header files # Conditionally install the header files

29
src/mca/oob/cofs/Makefile.am
Просмотреть файл

@ -1,9 +1,8 @@
# -*- makefile -*-
# #
# $HEADER$ # $HEADER$
# #
# Use the top-level OMPI Makefile.options # Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
@ -11,27 +10,25 @@ SUBDIRS = src
EXTRA_DIST = VERSION EXTRA_DIST = VERSION
# According to the MCA spec, we have to make the output library here # Make the output library in this directory, and name it either
# in the top-level directory, and it has to be named # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# libompi_ssi_coll_ompi_basic.la # (for static builds).
if OMPI_BUILD_oob_cofs_LOADABLE_MODULE if OMPI_BUILD_oob_cofs_DSO
module_noinst = component_noinst =
module_install = mca_oob_cofs.la component_install = mca_oob_cofs.la
else else
module_noinst = libmca_oob_cofs.la component_noinst = libmca_oob_cofs.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_oob_cofs_la_SOURCES = mca_oob_cofs_la_SOURCES =
mca_oob_cofs_la_LIBADD = \ mca_oob_cofs_la_LIBADD = src/libmca_oob_cofs.la $(LIBOMPI_LA)
src/libmca_oob_cofs.la \
$(LIBOMPI_LA)
mca_oob_cofs_la_LDFLAGS = -module -avoid-version mca_oob_cofs_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_oob_cofs_la_SOURCES = libmca_oob_cofs_la_SOURCES =
libmca_oob_cofs_la_LIBADD = src/libmca_oob_cofs.la libmca_oob_cofs_la_LIBADD = src/libmca_oob_cofs.la
libmca_oob_cofs_la_LDFLAGS = -module -avoid-version libmca_oob_cofs_la_LDFLAGS = -module -avoid-version

31
src/mca/oob/tcp/Makefile.am
Просмотреть файл

@ -1,31 +0,0 @@
# -*- makefile -*-
#
# $HEADER$
#
include $(top_ompi_srcdir)/config/Makefile.options
sources = \
oob_tcp.c \
oob_tcp_recv.c \
oob_tcp_send.c \
oob_tcp_peer.c
if OMPI_BUILD_allocator_bucket_LOADABLE_MODULE
module_noinst =
module_install = mca_oob_tcp.la
else
module_noinst = libmca_oob_tcp.la
module_install =
endif
mcamoduledir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install)
mca_oob_tcp_la_SOURCES = $(sources)
mca_oob_tcp_la_LIBADD = $(LIBOMPI_LA)
mca_oob_tcp_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst)
libmca_oob_tcp_la_SOURCES = $(sources)
libmca_oob_tcp_la_LDFLAGS = -module -avoid-version

1
src/mca/oob/tcp/configure.params
Просмотреть файл

@ -6,4 +6,5 @@
# Specific to this module # Specific to this module
PARAM_INIT_FILE=oob_tcp.c PARAM_INIT_FILE=oob_tcp.c
PARAM_CONFIG_HEADER_FILE="oob_tcp_config.h"
PARAM_CONFIG_FILES="Makefile" PARAM_CONFIG_FILES="Makefile"

29
src/mca/pcm/cofs/Makefile.am
Просмотреть файл

@ -1,9 +1,8 @@
# -*- makefile -*-
# #
# $HEADER$ # $HEADER$
# #
# Use the top-level OMPI Makefile.options # Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
@ -11,27 +10,25 @@ SUBDIRS = src
EXTRA_DIST = VERSION EXTRA_DIST = VERSION
# According to the MCA spec, we have to make the output library here # Make the output library in this directory, and name it either
# in the top-level directory, and it has to be named # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# libompi_ssi_coll_ompi_basic.la # (for static builds).
if OMPI_BUILD_pcm_cofs_LOADABLE_MODULE if OMPI_BUILD_pcm_cofs_DSO
module_noinst = component_noinst =
module_install = mca_pcm_cofs.la component_install = mca_pcm_cofs.la
else else
module_noinst = libmca_pcm_cofs.la component_noinst = libmca_pcm_cofs.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_pcm_cofs_la_SOURCES = mca_pcm_cofs_la_SOURCES =
mca_pcm_cofs_la_LIBADD = \ mca_pcm_cofs_la_LIBADD = src/libmca_pcm_cofs.la $(LIBOMPI_LA)
src/libmca_pcm_cofs.la \
$(LIBOMPI_LA)
mca_pcm_cofs_la_LDFLAGS = -module -avoid-version mca_pcm_cofs_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_pcm_cofs_la_SOURCES = libmca_pcm_cofs_la_SOURCES =
libmca_pcm_cofs_la_LIBADD = src/libmca_pcm_cofs.la libmca_pcm_cofs_la_LIBADD = src/libmca_pcm_cofs.la
libmca_pcm_cofs_la_LDFLAGS = -module -avoid-version libmca_pcm_cofs_la_LDFLAGS = -module -avoid-version

29
src/mca/pcm/rsh/Makefile.am
Просмотреть файл

@ -1,9 +1,8 @@
# -*- makefile -*-
# #
# $HEADER$ # $HEADER$
# #
# Use the top-level OMPI Makefile.options # Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
@ -11,27 +10,25 @@ SUBDIRS = src
EXTRA_DIST = VERSION EXTRA_DIST = VERSION
# According to the MCA spec, we have to make the output library here # Make the output library in this directory, and name it either
# in the top-level directory, and it has to be named # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# libompi_ssi_coll_ompi_basic.la # (for static builds).
if OMPI_BUILD_pcm_rsh_LOADABLE_MODULE if OMPI_BUILD_pcm_rsh_DSO
module_noinst = component_noinst =
module_install = mca_pcm_rsh.la component_install = mca_pcm_rsh.la
else else
module_noinst = libmca_pcm_rsh.la component_noinst = libmca_pcm_rsh.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_pcm_rsh_la_SOURCES = mca_pcm_rsh_la_SOURCES =
mca_pcm_rsh_la_LIBADD = \ mca_pcm_rsh_la_LIBADD = src/libmca_pcm_rsh.la $(LIBOMPI_LA)
src/libmca_pcm_rsh.la \
$(LIBOMPI_LA)
mca_pcm_rsh_la_LDFLAGS = -module -avoid-version mca_pcm_rsh_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_pcm_rsh_la_SOURCES = libmca_pcm_rsh_la_SOURCES =
libmca_pcm_rsh_la_LIBADD = src/libmca_pcm_rsh.la libmca_pcm_rsh_la_LIBADD = src/libmca_pcm_rsh.la
libmca_pcm_rsh_la_LDFLAGS = -module -avoid-version libmca_pcm_rsh_la_LDFLAGS = -module -avoid-version

28
src/mca/pml/teg/Makefile.am
Просмотреть файл

@ -2,7 +2,7 @@
# $HEADER$ # $HEADER$
# #
# Use the top-level OMPI Makefile.options # Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
@ -10,27 +10,25 @@ SUBDIRS = src
EXTRA_DIST = VERSION EXTRA_DIST = VERSION
# According to the MCA spec, we have to make the output library here # Make the output library in this directory, and name it either
# in the top-level directory, and it has to be named # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# libompi_ssi_coll_ompi_basic.la # (for static builds).
if OMPI_BUILD_pml_teg_LOADABLE_MODULE if OMPI_BUILD_pml_teg_DSO
module_noinst = component_noinst =
module_install = mca_pml_teg.la component_install = mca_pml_teg.la
else else
module_noinst = libmca_pml_teg.la component_noinst = libmca_pml_teg.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_pml_teg_la_SOURCES = mca_pml_teg_la_SOURCES =
mca_pml_teg_la_LIBADD = \ mca_pml_teg_la_LIBADD = src/libmca_pml_teg.la $(LIBOMPI_LA)
src/libmca_pml_teg.la \
$(LIBOMPI_LA)
mca_pml_teg_la_LDFLAGS = -module -avoid-version mca_pml_teg_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_pml_teg_la_SOURCES = libmca_pml_teg_la_SOURCES =
libmca_pml_teg_la_LIBADD = src/libmca_pml_teg.la libmca_pml_teg_la_LIBADD = src/libmca_pml_teg.la
libmca_pml_teg_la_LDFLAGS = -module -avoid-version libmca_pml_teg_la_LDFLAGS = -module -avoid-version

33
src/mca/ptl/elan/Makefile.am
Просмотреть файл

@ -2,13 +2,10 @@
# $HEADER$ # $HEADER$
# #
# Use the top-level OMPI Makefile.options # Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
# JMS:
# CPPFLAGS including -I$(top_ompi_builddir)/src/include, etc
# does not seem to be passed down
AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \ AM_CPPFLAGS = -I$(top_ompi_builddir)/src/include \
-I$(top_ompi_srcdir)/src -I$(top_ompi_srcdir)/src/include \ -I$(top_ompi_srcdir)/src -I$(top_ompi_srcdir)/src/include \
-I/usr/lib/qsnet/elan4/include -I/usr/lib/qsnet/elan4/include
@ -17,29 +14,25 @@ SUBDIRS = src
EXTRA_DIST = VERSION EXTRA_DIST = VERSION
# According to the MCA spec, we have to make the output library here # Make the output library in this directory, and name it either
# in the top-level directory, and it has to be named # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# libompi_ssi_coll_ompi_basic.la # (for static builds).
if OMPI_BUILD_ptl_elan_LOADABLE_MODULE if OMPI_BUILD_ptl_elan_DSO
module_noinst = component_noinst =
module_install = mca_ptl_elan.la component_install = mca_ptl_elan.la
else else
module_noinst = libmca_ptl_elan.la component_noinst = libmca_ptl_elan.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_ptl_elan_la_SOURCES = mca_ptl_elan_la_SOURCES =
mca_ptl_elan_la_LIBADD = \ mca_ptl_elan_la_LIBADD = src/libmca_ptl_elan.la $(LIBOMPI_LA)
src/libmca_ptl_elan.la \
$(LIBOMPI_LA)
mca_ptl_elan_la_LDFLAGS = -module -avoid-version mca_ptl_elan_la_LDFLAGS = -module -avoid-version
#-lelan -lelanctrl -lrms -lrmscall -lelan4
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_ptl_elan_la_SOURCES = libmca_ptl_elan_la_SOURCES =
libmca_ptl_elan_la_LIBADD = src/libmca_ptl_elan.la libmca_ptl_elan_la_LIBADD = src/libmca_ptl_elan.la
libmca_ptl_elan_la_LDFLAGS = -module -avoid-version libmca_ptl_elan_la_LDFLAGS = -module -avoid-version
#-lelan -lelanctrl -lrms -lrmscall -lelan4

28
src/mca/ptl/gm/Makefile.am
Просмотреть файл

@ -2,7 +2,7 @@
# $HEADER$ # $HEADER$
# #
# Use the top-level OpenMPI Makefile.options # Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
@ -10,27 +10,25 @@ SUBDIRS = src
EXTRA_DIST = VERSION EXTRA_DIST = VERSION
# According to the MCA spec, we have to make the output library here # Make the output library in this directory, and name it either
# in the top-level directory, and it has to be named # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# libompi_ssi_coll_ompi_basic.la # (for static builds).
if OMPI_BUILD_ptl_gm_LOADABLE_MODULE if OMPI_BUILD_ptl_gm_DSO
module_noinst = component_noinst =
module_install = mca_ptl_gm.la component_install = mca_ptl_gm.la
else else
module_noinst = libmca_ptl_gm.la component_noinst = libmca_ptl_gm.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_ptl_gm_la_SOURCES = mca_ptl_gm_la_SOURCES =
mca_ptl_gm_la_LIBADD = \ mca_ptl_gm_la_LIBADD = src/libmca_ptl_gm.la $(LIBOMPI_LA)
src/libmca_ptl_gm.la \
$(LIBOMPI_LA)
mca_ptl_gm_la_LDFLAGS = -module -avoid-version mca_ptl_gm_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_ptl_gm_la_SOURCES = libmca_ptl_gm_la_SOURCES =
libmca_ptl_gm_la_LIBADD = src/libmca_ptl_gm.la libmca_ptl_gm_la_LIBADD = src/libmca_ptl_gm.la
libmca_ptl_gm_la_LDFLAGS = -module -avoid-version libmca_ptl_gm_la_LDFLAGS = -module -avoid-version

156
src/mca/ptl/gm/configure.stub
Просмотреть файл

@ -8,40 +8,128 @@
# configure script. # configure script.
# #
AC_DEFUN([MCA_CONFIGURE_STUB],[ AC_DEFUN([MCA_CONFIGURE_STUB],[
#
# gm ptl configure.stub
#
# # Additional --with flags that can be specified
# ...do whatever you need to do here, like look for the Elan4
# libraries and header files. Built-in tests such as AC_CHECK_LIBS
# and AC_CHECK_HEADERS may be useful here. See the Autoconf docs ...
#
echo "Hello from gm configure.stub:MCA-CONFIGURE-STUB!"
# AC_ARG_WITH(ptl-gm,
# done with gm ptl configure.stub AC_HELP_STRING([--with-ptl-gm=DIR],
# [Specify the installation directory of GM]))
])dnl AC_ARG_WITH(ptl-gm-libdir,
AC_HELP_STRING([--with-ptl-gm-libdir=DIR],
[directory where the GM library can be found, if it is not in \$GMDIR/lib or \$GMDIR/binary/lib]))
#
# Since MCA_CONFIGURE_STUB is not invoked when we are configured with # Add to CPPFLAGS if necessary
# --enable dist, we provide this alternate macro is that invoked
# instead. Not all modules will need this -- probably only modules EXTRA_CPPFLAGS=
# thaty use AM_CONDITIONALS will require doing anything here. If you if test -n "$with_ptl_gm"; then
# don't need it, you can remove this whole AC_DEFUN. if test -d "$with_ptl_gm/include"; then
# EXTRA_CPPFLAGS="-I$with_ptl_gm/include"
AC_DEFUN([MCA_CONFIGURE_DIST_STUB],[ else
# AC_MSG_WARN([*** Warning: cannot find $with_ptl_gm/include])
# gm ptl configure-dist.stub AC_MSG_WARN([*** Will still try to configure gm ptl anyway...])
# fi
fi
# ...probably only need this if have AM_CONDITIONALs in the
# MCA_CONFIGURE_STUB. # See if we can find gm.h
echo "Hello from gm configure.stub:MCA-CONFIGURE-DIST-STUB!"
CPPFLAGS="$CPPFLAGS $EXTRA_CPPFLAGS"
# AC_CHECK_HEADERS(gm.h,,
# done with gm ptl configure-dist.stub AC_MSG_ERROR([*** Cannot find working gm.h.]))
#
# Add to LDFLAGS if necessary
EXTRA_LDFLAGS=
if test -n "$with_ptl_gm_libdir"; then
if test -d "$with_ptl_gm_libdir/lib"; then
EXTRA_LDFLAGS="-L$with_ptl_gm_libdir/lib"
elif test -d "$with_ptl_bm_libdir/binary/lib"; then
EXTRA_LDFLAGS="-L$with_ptl_gm_libdir/binary/lib"
else
AC_MSG_WARN([*** Warning: cannot find $with_ptl_gm_libdir/lib])
AC_MSG_WARN([*** or $with_ptl_gm_libdir/binary/lib])
AC_MSG_WARN([*** Will still try to configure gm ptl anyway...])
fi
elif test -n "$with_ptl_gm"; then
if test -d "$with_ptl_gm/lib"; then
EXTRA_LDFLAGS="-L$with_ptl_gm/lib"
elif test -d "$with_ptl_bm/binary/lib"; then
EXTRA_LDFLAGS="-L$with_ptl_gm/binary/lib"
else
AC_MSG_WARN([*** Warning: cannot find $with_ptl_gm/lib])
AC_MSG_WARN([*** or $with_ptl_gm/binary/lib])
AC_MSG_WARN([*** Will still try to configure gm ptl anyway...])
fi
fi
# Try to find libgm
LDFLAGS="$LDFLAGS $EXTRA_LDFLAGS"
AC_CHECK_LIB([gm], [main], [],
AC_MSG_ERROR([*** Cannot find libgm]))
#
# See if we have GM_API_VERSION. If we do, use it. If not, find the
# highest one available. It seems that GM_API_VERSION was introduced
# somewhere after 1.3 but before 1.6. :-\
#
AC_MSG_CHECKING(for GM_API_VERSION)
AC_TRY_COMPILE([#include<gm.h>],
[int foo = GM_API_VERSION;],
have_gm_api_ver_msg=yes gm_api_ver=GM_API_VERSION,
have_gm_api_ver_msg=no gm_api_ver="")
AC_MSG_RESULT([$have_gm_api_ver_msg])
if test "$gm_api_ver" = ""; then
found=0
for val in 5 4 3; do
if test "$found" = "0"; then
var="GM_API_VERSION_1_$val"
AC_MSG_CHECKING(for $var)
AC_TRY_COMPILE([#include<gm.h>],
[int foo = $var;],
msg=yes found=1 gm_api_ver=$var,
msg=no found=0 gm_api_ver="")
AC_MSG_RESULT($msg)
fi
done
fi
if test "$gm_api_ver" = ""; then
AC_MSG_WARN([*** Could not find a supported GM_API_VERSION])
AC_MSG_ERROR([*** Cannot continue])
fi
AC_DEFINE_UNQUOTED(OMPI_MCA_PTL_GM_API_VERSION, $gm_api_ver,
[Version of the GM API to use])
unset gm_api_ver have_gm_api_ver_msg found val msg
#
# Do we have gm_put()?
# gm_put() was introduced in gm 2.0, and is exactly identical to gm
# 1.6's gm_directed_send_with_callback(). The name was simply changed
# for consistency/symmtery with gm_get().
#
AC_MSG_CHECKING([for gm_put()])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include<gm.h>
]],
[[gm_put(0, 0, 0, 0, 0, 0, 0, 0, 0);]])],
[HAVE_RDMA_PUT=1 MSG=yes],
[HAVE_RDMA_PUT=0 MSG="no, use gm_directed_send_with_callback()"])
AC_DEFINE_UNQUOTED(OMPI_MCA_PTL_GM_HAVE_RDMA_PUT, $HAVE_RDMA_PUT,
[Whether we have gm_put() or gm_directed_send_with_callback()])
AC_MSG_RESULT([$MSG])
#
# Do we have gm_get()?
# gm_get() was introduced in gm 2.0.
#
AC_MSG_CHECKING([for gm_get()])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include<gm.h>
]],
[[gm_get(0, 0, 0, 0, 0, 0, 0, 0, 0);]])],
[HAVE_RDMA_GET=1 MSG=yes],
[HAVE_RDMA_GET=0 MSG=no])
AC_DEFINE_UNQUOTED(OMPI_MCA_PTL_GM_HAVE_RDMA_GET, $HAVE_RDMA_GET,
[Whether we have get_get() or not])
AC_MSG_RESULT([$MSG])
])dnl ])dnl

28
src/mca/ptl/self/Makefile.am
Просмотреть файл

@ -2,7 +2,7 @@
# $HEADER$ # $HEADER$
# #
# Use the top-level OpenMPI Makefile.options # Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
@ -10,27 +10,25 @@ SUBDIRS = src
EXTRA_DIST = VERSION EXTRA_DIST = VERSION
# According to the MCA spec, we have to make the output library here # Make the output library in this directory, and name it either
# in the top-level directory, and it has to be named # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# libompi_ssi_coll_ompi_basic.la # (for static builds).
if OMPI_BUILD_ptl_self_LOADABLE_MODULE if OMPI_BUILD_ptl_self_DSO
module_noinst = component_noinst =
module_install = mca_ptl_self.la component_install = mca_ptl_self.la
else else
module_noinst = libmca_ptl_self.la component_noinst = libmca_ptl_self.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_ptl_self_la_SOURCES = mca_ptl_self_la_SOURCES =
mca_ptl_self_la_LIBADD = \ mca_ptl_self_la_LIBADD = src/libmca_ptl_self.la $(LIBOMPI_LA)
src/libmca_ptl_self.la \
$(LIBOMPI_LA)
mca_ptl_self_la_LDFLAGS = -module -avoid-version mca_ptl_self_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_ptl_self_la_SOURCES = libmca_ptl_self_la_SOURCES =
libmca_ptl_self_la_LIBADD = src/libmca_ptl_self.la libmca_ptl_self_la_LIBADD = src/libmca_ptl_self.la
libmca_ptl_self_la_LDFLAGS = -module -avoid-version libmca_ptl_self_la_LDFLAGS = -module -avoid-version

28
src/mca/ptl/sm/Makefile.am
Просмотреть файл

@ -2,7 +2,7 @@
# $HEADER$ # $HEADER$
# #
# Use the top-level OMPI Makefile.options # Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
@ -10,27 +10,25 @@ SUBDIRS = src
EXTRA_DIST = VERSION EXTRA_DIST = VERSION
# According to the MCA spec, we have to make the output library here # Make the output library in this directory, and name it either
# in the top-level directory, and it has to be named # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# libompi_ssi_coll_ompi_basic.la # (for static builds).
if OMPI_BUILD_ptl_sm_LOADABLE_MODULE if OMPI_BUILD_ptl_sm_DSO
module_noinst = component_noinst =
module_install = mca_ptl_sm.la component_install = mca_ptl_sm.la
else else
module_noinst = libmca_ptl_sm.la component_noinst = libmca_ptl_sm.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_ptl_sm_la_SOURCES = mca_ptl_sm_la_SOURCES =
mca_ptl_sm_la_LIBADD = \ mca_ptl_sm_la_LIBADD = src/libmca_ptl_sm.la $(LIBOMPI_LA)
src/libmca_ptl_sm.la \
$(LIBOMPI_LA)
mca_ptl_sm_la_LDFLAGS = -module -avoid-version mca_ptl_sm_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_ptl_sm_la_SOURCES = libmca_ptl_sm_la_SOURCES =
libmca_ptl_sm_la_LIBADD = src/libmca_ptl_sm.la libmca_ptl_sm_la_LIBADD = src/libmca_ptl_sm.la
libmca_ptl_sm_la_LDFLAGS = -module -avoid-version libmca_ptl_sm_la_LDFLAGS = -module -avoid-version

28
src/mca/ptl/tcp/Makefile.am
Просмотреть файл

@ -2,7 +2,7 @@
# $HEADER$ # $HEADER$
# #
# Use the top-level OMPI Makefile.options # Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
@ -10,27 +10,25 @@ SUBDIRS = src
EXTRA_DIST = VERSION EXTRA_DIST = VERSION
# According to the MCA spec, we have to make the output library here # Make the output library in this directory, and name it either
# in the top-level directory, and it has to be named # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# libompi_ssi_coll_ompi_basic.la # (for static builds).
if OMPI_BUILD_ptl_tcp_LOADABLE_MODULE if OMPI_BUILD_ptl_tcp_DSO
module_noinst = component_noinst =
module_install = mca_ptl_tcp.la component_install = mca_ptl_tcp.la
else else
module_noinst = libmca_ptl_tcp.la component_noinst = libmca_ptl_tcp.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_ptl_tcp_la_SOURCES = mca_ptl_tcp_la_SOURCES =
mca_ptl_tcp_la_LIBADD = \ mca_ptl_tcp_la_LIBADD = src/libmca_ptl_tcp.la $(LIBOMPI_LA)
src/libmca_ptl_tcp.la \
$(LIBOMPI_LA)
mca_ptl_tcp_la_LDFLAGS = -module -avoid-version mca_ptl_tcp_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_ptl_tcp_la_SOURCES = libmca_ptl_tcp_la_SOURCES =
libmca_ptl_tcp_la_LIBADD = src/libmca_ptl_tcp.la libmca_ptl_tcp_la_LIBADD = src/libmca_ptl_tcp.la
libmca_ptl_tcp_la_LDFLAGS = -module -avoid-version libmca_ptl_tcp_la_LDFLAGS = -module -avoid-version

29
src/mca/topo/unity/Makefile.am
Просмотреть файл

@ -1,9 +1,8 @@
# -*- makefile -*-
# #
# $HEADER$ # $HEADER$
# #
# Use the top-level OMPI Makefile.options # Use the top-level Makefile.options
include $(top_ompi_srcdir)/config/Makefile.options include $(top_ompi_srcdir)/config/Makefile.options
@ -11,27 +10,25 @@ SUBDIRS = src
EXTRA_DIST = VERSION EXTRA_DIST = VERSION
# According to the MCA spec, we have to make the output library here # Make the output library in this directory, and name it either
# in the top-level directory, and it has to be named # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
# libompi_ssi_topo_ompi_unity.la # (for static builds).
if OMPI_BUILD_topo_unity_LOADABLE_MODULE if OMPI_BUILD_topo_unity_DSO
module_noinst = component_noinst =
module_install = mca_topo_unity.la component_install = mca_topo_unity.la
else else
module_noinst = libmca_topo_unity.la component_noinst = libmca_topo_unity.la
module_install = component_install =
endif endif
mcamoduledir = $(libdir)/openmpi mcacomponentdir = $(libdir)/openmpi
mcamodule_LTLIBRARIES = $(module_install) mcacomponent_LTLIBRARIES = $(component_install)
mca_topo_unity_la_SOURCES = mca_topo_unity_la_SOURCES =
mca_topo_unity_la_LIBADD = \ mca_topo_unity_la_LIBADD = src/libmca_topo_unity.la $(LIBMPI_LA)
src/libmca_topo_unity.la \
$(LIBMPI_LA)
mca_topo_unity_la_LDFLAGS = -module -avoid-version mca_topo_unity_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(module_noinst) noinst_LTLIBRARIES = $(component_noinst)
libmca_topo_unity_la_SOURCES = libmca_topo_unity_la_SOURCES =
libmca_topo_unity_la_LIBADD = src/libmca_topo_unity.la libmca_topo_unity_la_LIBADD = src/libmca_topo_unity.la
libmca_topo_unity_la_LDFLAGS = -module -avoid-version libmca_topo_unity_la_LDFLAGS = -module -avoid-version