[mpich] MPICH primary repository branch, master, updated. v3.1-131-gdaa5a15
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via daa5a15154e77a132fecbb56be1c6ba4ff5c16e6 (commit) via 6f421a8b916e9c2833ea82e98c72ead4d79f3a44 (commit) via adf6ddf6965f0fb8947ea437ae12b72603fc0c24 (commit) via 0a0303c32de8e0514dbb89493805dba38082a535 (commit) via 4adb320768ad605f849620b8cc1580c24df7ac89 (commit) via da256e24020048ad3e604ee95c847e9324c6afbb (commit) via 9c3379146002804a854880dc4835b939e85a0351 (commit) via be23b0d823f7fd3e17ce02e1b966b78c48983c92 (commit) via 880838007641211afb858e36d765784086572e29 (commit) via 42fe2ccf418d364ce552e1d4d9aab08c6e028860 (commit) via 0ab70e769fab5ad7b813a99961d80ea9c4c23418 (commit) from c892a037b69292f9883ae6bf4557288340f4d5e9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/daa5a15154e77a132fecbb56be1c6ba4ff... commit daa5a15154e77a132fecbb56be1c6ba4ff5c16e6 Author: Pavan Balaji <[email protected]> Date: Tue Apr 1 14:25:37 2014 -0500 Add backward compatibility symlinks. Create symlinks for libmpich and friends, for applications that might still be relying on those names. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/Makefile.am b/Makefile.am index d358da4..acf89f2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -232,7 +232,15 @@ install-exec-hook: fi ; \ done ; \ if test -e ${DESTDIR}${bindir}/@MPICXX_NAME@ ; then \ - cd ${DESTDIR}${bindir} && ln -f -s @MPICXX_NAME@ @MPICPP_NAME@ ; fi + cd ${DESTDIR}${bindir} && ln -f -s @MPICXX_NAME@ @MPICPP_NAME@ ; fi ; \ + if test -e ${DESTDIR}${libdir}/lib@MPILIBNAME@@SHLIB_EXT@ ; then \ + cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libmpich@SHLIB_EXT@ ; fi ; \ + if test -e ${DESTDIR}${libdir}/lib@MPIFCLIBNAME@@SHLIB_EXT@ ; then \ + cd ${DESTDIR}${libdir} && ln -f -s lib@MPIFCLIBNAME@@SHLIB_EXT@ libfmpich@SHLIB_EXT@ ; \ + cd ${DESTDIR}${libdir} && ln -f -s lib@MPIFCLIBNAME@@SHLIB_EXT@ libmpichf90@SHLIB_EXT@ ; \ + fi ; \ + if test -e ${DESTDIR}${libdir}/lib@MPICXXLIBNAME@@SHLIB_EXT@ ; then \ + cd ${DESTDIR}${libdir} && ln -f -s lib@MPICXXLIBNAME@@SHLIB_EXT@ libmpichcxx@SHLIB_EXT@ ; fi # the configure step checks for the 'lib' dir to decide whether a source # directory has been previously used for an in-path build before allowing a diff --git a/configure.ac b/configure.ac index f5c363e..94bdb3a 100644 --- a/configure.ac +++ b/configure.ac @@ -2496,6 +2496,13 @@ if test "$NEEDSPLIB" = yes -a "$PMPILIBNAME" = "$MPILIBNAME" ; then NEEDSPLIB=no fi +# We are cheating a bit here and reaching inside of the libtool macros to +# extract the correct shared library extension. It would be nice if this +# were publicly available in at least the same way that $libext is. +eval SHLIB_EXT='"'$shrext_cmds'"' +export SHLIB_EXT +AC_SUBST(SHLIB_EXT) + # ---------------------------------------------------------------------------- # # Add the steps for debugger support @@ -2545,11 +2552,6 @@ on all link lines (consider adding it to LDFLAGS)]) ## most Unix versions, libtvmpich.dylib for Mac OSX). ##ENVVAR END: - # We are cheating a bit here and reaching inside of the libtool macros to - # extract the correct shared library extension. It would be nice if this - # were publicly available in at least the same way that $libext is. - eval SHLIB_EXT='"'$shrext_cmds'"' - if test -z "$MPICH_DEBUGLIBNAME" ; then DEBUGLIBNAME=libtvmpich$SHLIB_EXT else http://git.mpich.org/mpich.git/commitdiff/6f421a8b916e9c2833ea82e98c72ead4d7... commit 6f421a8b916e9c2833ea82e98c72ead4d79f3a44 Author: Pavan Balaji <[email protected]> Date: Tue Apr 1 01:08:29 2014 -0500 Merge libmpif77 and libmpifort. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/Makefile.am b/Makefile.am index 6203dd1..d358da4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -91,6 +91,20 @@ lib_lib@PMPILIBNAME@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(lib_lib@PMPILIBNAME@_la_LDFLAGS) $(LDFLAGS) -o $@ endif !BUILD_F77_BINDING +if BUILD_F77_BINDING +if BUILD_FC_BINDING +lib_lib@MPIFCLIBNAME@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=FC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(FCLD) \ + $(AM_FCFLAGS) $(FCFLAGS) $(lib_lib@MPIFCLIBNAME@_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +else !BUILD_FC_BINDING +lib_lib@MPIFCLIBNAME@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(F77LD) \ + $(AM_FFLAGS) $(FFLAGS) $(lib_lib@MPIFCLIBNAME@_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +endif !BUILD_FC_BINDING +endif BUILD_F77_BINDING + ## Create lists of files for different libraries ## ## mpi_sources: When compiled with -DMPICH_MPI_FROM_PMPI, these files @@ -103,7 +117,7 @@ endif !BUILD_F77_BINDING ## ## mpi_f77_sources: When compiled with -DMPICH_MPI_FROM_PMPI, these ## files provide the "mpi_" public functions for the F77 bindings and -## end up in lib@MPIFLIBNAME@. +## end up in lib@MPIFCLIBNAME@. ## ## mpi_fc_sources: When compiled with -DMPICH_MPI_FROM_PMPI, these ## files provide the "mpi_" public functions for the F90+ bindings and @@ -130,12 +144,8 @@ endif BUILD_PROFILING_LIB lib_lib@MPILIBNAME@_la_LIBADD = if BUILD_F77_BINDING -lib_lib@MPIFLIBNAME@_la_LIBADD = -endif BUILD_F77_BINDING - -if BUILD_FC_BINDING lib_lib@MPIFCLIBNAME@_la_LIBADD = -endif BUILD_FC_BINDING +endif BUILD_F77_BINDING if BUILD_CXX_BINDING lib_lib@MPICXXLIBNAME@_la_LIBADD = @@ -164,23 +174,18 @@ lib_lib@MPILIBNAME@_la_SOURCES += $(mpi_core_sources) endif !BUILD_PROFILING_LIB if BUILD_F77_BINDING -lib_LTLIBRARIES += lib/lib@[email protected] -lib_lib@MPIFLIBNAME@_la_CPPFLAGS = $(AM_CPPFLAGS) +lib_LTLIBRARIES += lib/lib@[email protected] +lib_lib@MPIFCLIBNAME@_la_CPPFLAGS = $(AM_CPPFLAGS) if BUILD_PROFILING_LIB -lib_lib@MPIFLIBNAME@_la_CPPFLAGS += -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES +lib_lib@MPIFCLIBNAME@_la_CPPFLAGS += -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES endif BUILD_PROFILING_LIB -lib_lib@MPIFLIBNAME@_la_SOURCES = $(mpi_f77_sources) -lib_lib@MPIFLIBNAME@_la_LDFLAGS = $(ABIVERSIONFLAGS) -lib_lib@MPIFLIBNAME@_la_LIBADD += lib/lib@[email protected] -endif BUILD_F77_BINDING - +lib_lib@MPIFCLIBNAME@_la_SOURCES = $(mpi_f77_sources) if BUILD_FC_BINDING -lib_LTLIBRARIES += lib/lib@[email protected] -lib_lib@MPIFCLIBNAME@_la_CPPFLAGS = $(AM_CPPFLAGS) -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES -lib_lib@MPIFCLIBNAME@_la_SOURCES = $(mpi_fc_sources) -lib_lib@MPIFCLIBNAME@_la_LDFLAGS = $(ABIVERSIONFLAGS) -lib_lib@MPIFCLIBNAME@_la_LIBADD += lib/lib@[email protected] +lib_lib@MPIFCLIBNAME@_la_SOURCES += $(mpi_fc_sources) endif BUILD_FC_BINDING +lib_lib@MPIFCLIBNAME@_la_LDFLAGS = $(ABIVERSIONFLAGS) +lib_lib@MPIFCLIBNAME@_la_LIBADD += lib/lib@[email protected] +endif BUILD_F77_BINDING if BUILD_CXX_BINDING lib_LTLIBRARIES += lib/lib@[email protected] diff --git a/configure.ac b/configure.ac index 82514e4..f5c363e 100644 --- a/configure.ac +++ b/configure.ac @@ -810,13 +810,10 @@ PMPILIBNAME=${PMPILIBNAME:-"p$MPILIBNAME"} # We use a different library for the C++ wrappers to avoid problems when # creating shared libraries if test -z "$MPICXXLIBNAME" ; then MPICXXLIBNAME="${MPILIBNAME}cxx" ; fi -if test -z "$MPIFLIBNAME" ; then MPIFLIBNAME="${MPILIBNAME}f77" ; fi if test -z "$MPIFCLIBNAME" ; then MPIFCLIBNAME="${MPILIBNAME}fort" ; fi export MPICXXLIBNAME -export MPIFLIBNAME export MPIFCLIBNAME AC_SUBST(MPICXXLIBNAME) -AC_SUBST(MPIFLIBNAME) AC_SUBST(MPIFCLIBNAME) # We'll set FORTRAN_BINDING to 1 if we support Fortran diff --git a/src/env/mpif77.bash.in b/src/env/mpif77.bash.in index 8d692f7..b9d0430 100644 --- a/src/env/mpif77.bash.in +++ b/src/env/mpif77.bash.in @@ -248,8 +248,8 @@ fi # default, environment, configuration file (if any) and command-line # options (if any) f77libs= -if [ "@MPIFLIBNAME@" != "@MPILIBNAME@" ] ; then - f77libs="-l@MPIFLIBNAME@" +if [ "@MPIFCLIBNAME@" != "@MPILIBNAME@" ] ; then + f77libs="-l@MPIFCLIBNAME@" fi PROFILE_FOO= diff --git a/src/env/mpif77.sh.in b/src/env/mpif77.sh.in index 338d4ce..8d815e4 100644 --- a/src/env/mpif77.sh.in +++ b/src/env/mpif77.sh.in @@ -270,8 +270,8 @@ fi # default, environment, configuration file (if any) and command-line # options (if any) f77libs= -if [ "@MPIFLIBNAME@" != "@MPILIBNAME@" ] ; then - f77libs="-l@MPIFLIBNAME@" +if [ "@MPIFCLIBNAME@" != "@MPILIBNAME@" ] ; then + f77libs="-l@MPIFCLIBNAME@" fi PROFILE_FOO= diff --git a/src/env/mpif90.bash.in b/src/env/mpif90.bash.in index 9726764..c14283b 100644 --- a/src/env/mpif90.bash.in +++ b/src/env/mpif90.bash.in @@ -339,7 +339,7 @@ if [ "$linking" = yes ] ; then $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" rc=$? else - $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ -l@MPIFLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ $extra_libs $PROFILE_POSTLIB @WRAPPER_LIBS@ @FC_OTHER_LIBS@ + $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ $extra_libs $PROFILE_POSTLIB @WRAPPER_LIBS@ @FC_OTHER_LIBS@ rc=$? fi else diff --git a/src/env/mpif90.sh.in b/src/env/mpif90.sh.in index 6d7d2e3..d27e2a6 100644 --- a/src/env/mpif90.sh.in +++ b/src/env/mpif90.sh.in @@ -355,7 +355,7 @@ if [ "$linking" = yes ] ; then $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ $allargs rc=$? else - $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ $allargs $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ -l@MPIFLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ $extra_libs $PROFILE_POSTLIB @WRAPPER_LIBS@ @FC_OTHER_LIBS@ + $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ $allargs $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ $extra_libs $PROFILE_POSTLIB @WRAPPER_LIBS@ @FC_OTHER_LIBS@ rc=$? fi else http://git.mpich.org/mpich.git/commitdiff/adf6ddf6965f0fb8947ea437ae12b72603... commit adf6ddf6965f0fb8947ea437ae12b72603fc0c24 Author: Pavan Balaji <[email protected]> Date: Fri Mar 28 09:25:08 2014 -0500 Updated the CHANGES file with library management changes. No reviewer. diff --git a/CHANGES b/CHANGES index 1c3f31b..c57a1e6 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,12 @@ Changes in 3.1.1 =============================================================================== + # Significant rework of MPICH library management and which symbols go + into which libraries. Also updated MPICH library names to make + them consistent with Intel MPI, Cray MPI and IBM PE MPI. Backward + compatibility links are provided for older mpich-based build + systems. + # Fixed the prototype of the Reduce_local C++ binding. The previous prototype was completely incorrect. Thanks to Jeff Squyres for reporting the issue. http://git.mpich.org/mpich.git/commitdiff/0a0303c32de8e0514dbb89493805dba380... commit 0a0303c32de8e0514dbb89493805dba38082a535 Author: Pavan Balaji <[email protected]> Date: Mon Mar 31 19:21:16 2014 -0500 Update pkg-config with inter-library dependency changes. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/src/packaging/pkgconfig/mpich.pc.in b/src/packaging/pkgconfig/mpich.pc.in index 3ba6962..6091e19 100644 --- a/src/packaging/pkgconfig/mpich.pc.in +++ b/src/packaging/pkgconfig/mpich.pc.in @@ -9,7 +9,7 @@ Description: High Performance and portable MPI Version: @MPICH_VERSION@ URL: http://www.mcs.anl.gov/research/projects/mpich Requires: -Libs: @WRAPPER_RPATH_LDFLAGS@ @WRAPPER_LDFLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ @WRAPPER_LIBS@ +Libs: @WRAPPER_RPATH_LDFLAGS@ @WRAPPER_LDFLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ @WRAPPER_EXTRA_LIBS@ @WRAPPER_LIBS@ Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir} # pkg-config does not understand Cxxflags, etc. So we allow users to http://git.mpich.org/mpich.git/commitdiff/4adb320768ad605f849620b8cc1580c24d... commit 4adb320768ad605f849620b8cc1580c24df7ac89 Author: Pavan Balaji <[email protected]> Date: Tue Apr 1 01:07:28 2014 -0500 Use library dependencies. When the conditions are right, we use libtool's interlibrary dependencies to only link the application with the minimum set of libraries required. Those libraries will pull in the other required libraries on demand. That way, the application library dependencies would be minimal, allowing us to add/remove extra libraries in the future. The "conditions are not right" when one of the following is true: 1. MPICH shared library builds are disabled. 2. libtool doesn't support interlibrary dependencies on this platform. 3. The user passed -static or -mpich-alllibs to the command line. 4. Interlibrary dependency tracking is explicitly disabled at configure time. Fixes #2040. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/confdb/aclocal_util.m4 b/confdb/aclocal_util.m4 index 7c96378..575a144 100644 --- a/confdb/aclocal_util.m4 +++ b/confdb/aclocal_util.m4 @@ -55,6 +55,7 @@ AC_DEFUN([PAC_PREFIX_ALL_FLAGS],[ PAC_PREFIX_FLAG($1, FCFLAGS) PAC_PREFIX_FLAG($1, LDFLAGS) PAC_PREFIX_FLAG($1, LIBS) + PAC_PREFIX_FLAG($1, EXTRA_LIBS) ]) dnl Usage: PAC_APPEND_FLAG([-02], [CFLAGS]) diff --git a/configure.ac b/configure.ac index 059f746..82514e4 100644 --- a/configure.ac +++ b/configure.ac @@ -284,6 +284,7 @@ WRAPPER_FFLAGS="$FFLAGS $MPICH_MPIF77_FLAGS" WRAPPER_FCFLAGS="$FCFLAGS $MPICH_MPIFC_FLAGS" WRAPPER_LDFLAGS="$MPICH_LDFLAGS" WRAPPER_LIBS="$MPICH_LIBS" +WRAPPER_EXTRA_LIBS="" # Add MPICHLIB_* to the appropriate flags AC_ARG_VAR(MPICHLIB_CFLAGS, @@ -401,6 +402,9 @@ AC_ARG_ENABLE(fast, none - None of above options, i.e. --disable-fast ],,enable_fast=O2) +AC_ARG_ENABLE(interlib-deps, + [AC_HELP_STRING([--interlib-deps - Enable interlibrary dependencies])],,enable_interlib_deps=yes) + AC_ARG_ENABLE(check-compiler-flags, AC_HELP_STRING([--enable-check-compiler-flags], [enable the checks for all compiler options, xxxFLAGS, MPICH_xxxFLAGS. Default is on.]),, @@ -632,6 +636,15 @@ if test "X$enable_shared" = "Xno" ; then enable_wrapper_rpath=no fi +INTERLIB_DEPS=yes +# We conservatively disable interlibrary dependencies if the libtool +# support model is anything different from "pass_all" +if test "X$enable_shared" = "Xno" -o "$deplibs_check_method" != "pass_all" -o "$enable_interlib_deps" = "no" ; then + INTERLIB_DEPS=no +fi +export INTERLIB_DEPS +AC_SUBST(INTERLIB_DEPS) + dnl AC_PROG_{CXX,F77,FC} must come early in configure.ac in order to avoid some dnl esoteric autoconf macro expansion errors dnl @@ -1109,7 +1122,7 @@ mpllibdir="" AC_SUBST([mpllibdir]) if test "$with_mpl_prefix" = "embedded" ; then PAC_CONFIG_SUBDIR(src/mpl,,AC_MSG_ERROR(MPL configure failed)) - PAC_PREPEND_FLAG([-l${MPLLIBNAME}], [WRAPPER_LIBS]) + PAC_PREPEND_FLAG([-l${MPLLIBNAME}], [WRAPPER_EXTRA_LIBS]) PAC_APPEND_FLAG([-I${master_top_builddir}/src/mpl/include], [CPPFLAGS]) PAC_APPEND_FLAG([-I${use_top_srcdir}/src/mpl/include], [CPPFLAGS]) @@ -1121,7 +1134,7 @@ else AS_IF([test -s "${with_mpl_prefix}/include/mplconfig.h"], [:],[AC_MSG_ERROR([the MPL installation in "${with_mpl_prefix}" appears broken])]) PAC_APPEND_FLAG([-I${with_mpl_prefix}/include],[CPPFLAGS]) - PAC_PREPEND_FLAG([-l${MPLLIBNAME}],[WRAPPER_LIBS]) + PAC_PREPEND_FLAG([-l${MPLLIBNAME}],[WRAPPER_EXTRA_LIBS]) PAC_APPEND_FLAG([-L${with_mpl_prefix}/lib],[WRAPPER_LDFLAGS]) mpllibdir="${with_mpl_prefix}/lib" fi @@ -1178,12 +1191,12 @@ if test "$with_openpa_prefix" = "embedded" ; then opa_subdir_args="--with-atomic-primitives=auto_allow_emulation" fi PAC_CONFIG_SUBDIR_ARGS([src/openpa],[$opa_subdir_args],[],[AC_MSG_ERROR([OpenPA configure failed])]) - PAC_PREPEND_FLAG([-l${OPALIBNAME}],[WRAPPER_LIBS]) + PAC_PREPEND_FLAG([-l${OPALIBNAME}],[WRAPPER_EXTRA_LIBS]) else AC_MSG_WARN([Attempted to use the embedded OpenPA source tree in "src/openpa", but it is missing. Configuration or compilation may fail later.]) fi elif test "$with_openpa_prefix" = "system" ; then - PAC_PREPEND_FLAG([-l${OPALIBNAME}],[WRAPPER_LIBS]) + PAC_PREPEND_FLAG([-l${OPALIBNAME}],[WRAPPER_EXTRA_LIBS]) elif test "$with_openpa_prefix" = "no" ; then # The user doesn't want to use OPA. This may or may not cause MPICH to # fail to configure/build, depending on many other factors. @@ -1194,7 +1207,7 @@ else AS_IF([test -s "${with_openpa_prefix}/include/opa_primitives.h" -a -s "${with_openpa_prefix}/include/opa_config.h"], [:],[AC_MSG_ERROR([the OpenPA installation in "${with_openpa_prefix}" appears broken])]) PAC_APPEND_FLAG([-I${with_openpa_prefix}/include],[CPPFLAGS]) - PAC_PREPEND_FLAG([-l${OPALIBNAME}],[WRAPPER_LIBS]) + PAC_PREPEND_FLAG([-l${OPALIBNAME}],[WRAPPER_EXTRA_LIBS]) if test -d ${with_openpa_prefix}/lib64 ; then PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib64],[WRAPPER_LDFLAGS]) opalibdir="${with_openpa_prefix}/lib64" diff --git a/src/env/mpicc.bash.in b/src/env/mpicc.bash.in index 54757cc..3b786c7 100644 --- a/src/env/mpicc.bash.in +++ b/src/env/mpicc.bash.in @@ -86,6 +86,7 @@ fi linking=yes allargs=("$@") argno=0 +static_libs=no for arg in "$@" ; do # Set addarg to no if this arg should be ignored by the C compiler addarg=yes @@ -111,6 +112,13 @@ for arg in "$@" ; do addarg=no Show=echo ;; + -static) + static_libs=yes + ;; + -mpich-alllibs) + addarg=no + static_libs=yes + ;; -config=*) addarg=no CCname=`echo A$arg | sed -e 's/A-config=//g'` @@ -204,6 +212,10 @@ if [ -n "$profConf" ] ; then fi fi +if test "@INTERLIB_DEPS@" = "no" -o "$static_libs" = "yes" ; then + extra_libs="@LPMPILIBNAME@ @WRAPPER_EXTRA_LIBS@" +fi + # ----------------------------------------------------------------------- # # A temporary statement to invoke the compiler @@ -232,7 +244,7 @@ if [ "$linking" = yes ] ; then $Show $CC @WRAPPER_CPPFLAGS@ $PROFILE_INCPATHS @WRAPPER_CFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir rc=$? else - $Show $CC @WRAPPER_CPPFLAGS@ $PROFILE_INCPATHS @WRAPPER_CFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ + $Show $CC @WRAPPER_CPPFLAGS@ $PROFILE_INCPATHS @WRAPPER_CFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ $extra_libs $PROFILE_POSTLIB @WRAPPER_LIBS@ rc=$? fi else diff --git a/src/env/mpicc.sh.in b/src/env/mpicc.sh.in index f97532e..16b56d3 100644 --- a/src/env/mpicc.sh.in +++ b/src/env/mpicc.sh.in @@ -85,6 +85,7 @@ fi linking=yes allargs="" +static_libs=no for arg in "$@" ; do # Set addarg to no if this arg should be ignored by the C compiler addarg=yes @@ -111,6 +112,13 @@ for arg in "$@" ; do addarg=no Show=echo ;; + -static) + static_libs=yes + ;; + -mpich-alllibs) + addarg=no + static_libs=yes + ;; -config=*) addarg=no CCname=`echo A$arg | sed -e 's/A-config=//g'` @@ -213,6 +221,10 @@ if [ -n "$profConf" ] ; then fi fi +if test "@INTERLIB_DEPS@" = "no" -o "$static_libs" = "yes" ; then + extra_libs="@LPMPILIBNAME@ @WRAPPER_EXTRA_LIBS@" +fi + # ----------------------------------------------------------------------- # # A temporary statement to invoke the compiler @@ -241,7 +253,7 @@ if [ "$linking" = yes ] ; then $Show $CC @WRAPPER_CPPFLAGS@ $PROFILE_INCPATHS @WRAPPER_CFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir rc=$? else - $Show $CC @WRAPPER_CPPFLAGS@ $PROFILE_INCPATHS @WRAPPER_CFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ + $Show $CC @WRAPPER_CPPFLAGS@ $PROFILE_INCPATHS @WRAPPER_CFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ $extra_libs $PROFILE_POSTLIB @WRAPPER_LIBS@ rc=$? fi else diff --git a/src/env/mpicxx.bash.in b/src/env/mpicxx.bash.in index 31229f6..8d6e0d9 100644 --- a/src/env/mpicxx.bash.in +++ b/src/env/mpicxx.bash.in @@ -83,6 +83,7 @@ fi linking=yes allargs=("$@") argno=0 +static_libs=no for arg in "$@" ; do # Set addarg to no if this arg should be ignored by the C compiler addarg=yes @@ -113,6 +114,13 @@ for arg in "$@" ; do addarg=no Show=echo ;; + -static) + static_libs=yes + ;; + -mpich-alllibs) + addarg=no + static_libs=yes + ;; -config=*) addarg=no CXXname=`echo A$arg | sed -e 's/A-config=//g'` @@ -209,6 +217,11 @@ if [ -n "$profConf" ] ; then . $profConffile fi fi + +if test "@INTERLIB_DEPS@" = "no" -o "$static_libs" = "yes" ; then + extra_libs="@LPMPILIBNAME@ @WRAPPER_EXTRA_LIBS@" +fi + # A temporary statement to invoke the compiler # Place the -L before any args incase there are any mpi libraries in there. # Eventually, we'll want to move this after any non-MPI implementation @@ -229,7 +242,7 @@ if [ "$linking" = yes ] ; then $Show $CXX $PROFILE_INCPATHS @WRAPPER_CXXFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir rc=$? else - $Show $CXX $PROFILE_INCPATHS @WRAPPER_CXXFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ + $Show $CXX $PROFILE_INCPATHS @WRAPPER_CXXFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ $extra_libs $PROFILE_POSTLIB @WRAPPER_LIBS@ rc=$? fi else diff --git a/src/env/mpicxx.sh.in b/src/env/mpicxx.sh.in index 8343ebd..a121386 100644 --- a/src/env/mpicxx.sh.in +++ b/src/env/mpicxx.sh.in @@ -82,6 +82,7 @@ fi linking=yes allargs="" +static_libs=no for arg in "$@" ; do # Set addarg to no if this arg should be ignored by the C compiler addarg=yes @@ -113,6 +114,13 @@ for arg in "$@" ; do addarg=no Show=echo ;; + -static) + static_libs=yes + ;; + -mpich-alllibs) + addarg=no + static_libs=yes + ;; -config=*) addarg=no CXXname=`echo A$arg | sed -e 's/A-config=//g'` @@ -218,6 +226,11 @@ if [ -n "$profConf" ] ; then . $profConffile fi fi + +if test "@INTERLIB_DEPS@" = "no" -o "$static_libs" = "yes" ; then + extra_libs="@LPMPILIBNAME@ @WRAPPER_EXTRA_LIBS@" +fi + # A temporary statement to invoke the compiler # Place the -L before any args incase there are any mpi libraries in there. # Eventually, we'll want to move this after any non-MPI implementation @@ -238,7 +251,7 @@ if [ "$linking" = yes ] ; then $Show $CXX $PROFILE_INCPATHS @WRAPPER_CXXFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir rc=$? else - $Show $CXX $PROFILE_INCPATHS @WRAPPER_CXXFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ + $Show $CXX $PROFILE_INCPATHS @WRAPPER_CXXFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ $extra_libs $PROFILE_POSTLIB @WRAPPER_LIBS@ rc=$? fi else diff --git a/src/env/mpif77.bash.in b/src/env/mpif77.bash.in index 9d4117b..8d692f7 100644 --- a/src/env/mpif77.bash.in +++ b/src/env/mpif77.bash.in @@ -90,6 +90,7 @@ linking=yes allargs=("$@") argno=0 cppflags=() +static_libs=no for arg in "$@" ; do # Set addarg to no if this arg should be ignored by the C compiler addarg=yes @@ -121,6 +122,13 @@ for arg in "$@" ; do addarg=no Show=echo ;; + -static) + static_libs=yes + ;; + -mpich-alllibs) + addarg=no + static_libs=yes + ;; -config=*) addarg=no F77name=`echo A$arg | sed -e 's/A-config=//g'` @@ -261,7 +269,11 @@ if [ -n "$profConf" ] ; then . $profConffile fi fi -# + +if test "@INTERLIB_DEPS@" = "no" -o "$static_libs" = "yes" ; then + extra_libs="@LPMPILIBNAME@ @WRAPPER_EXTRA_LIBS@" +fi + # A temporary statement to invoke the compiler # Place the -L before any args incase there are any mpi libraries in there. # Eventually, we'll want to move this after any non-MPI implementation @@ -283,7 +295,7 @@ if [ "$linking" = yes ] ; then $Show $F77 $PROFILE_INCPATHS @WRAPPER_FFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir rc=$? else - $Show $F77 $PROFILE_INCPATHS @WRAPPER_FFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ @F77_OTHER_LIBS@ + $Show $F77 $PROFILE_INCPATHS @WRAPPER_FFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ $extra_libs $PROFILE_POSTLIB @WRAPPER_LIBS@ @F77_OTHER_LIBS@ rc=$? fi else diff --git a/src/env/mpif77.sh.in b/src/env/mpif77.sh.in index 380a4f4..338d4ce 100644 --- a/src/env/mpif77.sh.in +++ b/src/env/mpif77.sh.in @@ -88,6 +88,7 @@ fi linking=yes allargs="" +static_libs=no for arg in "$@" ; do # Set addarg to no if this arg should be ignored by the C compiler addarg=yes @@ -120,6 +121,13 @@ for arg in "$@" ; do addarg=no Show=echo ;; + -static) + static_libs=yes + ;; + -mpich-alllibs) + addarg=no + static_libs=yes + ;; -config=*) addarg=no F77name=`echo A$arg | sed -e 's/A-config=//g'` @@ -283,7 +291,11 @@ if [ -n "$profConf" ] ; then . $profConffile fi fi -# + +if test "@INTERLIB_DEPS@" = "no" -o "$static_libs" = "yes" ; then + extra_libs="@LPMPILIBNAME@ @WRAPPER_EXTRA_LIBS@" +fi + # A temporary statement to invoke the compiler # Place the -L before any args incase there are any mpi libraries in there. # Eventually, we'll want to move this after any non-MPI implementation @@ -305,7 +317,7 @@ if [ "$linking" = yes ] ; then $Show $F77 $PROFILE_INCPATHS @WRAPPER_FFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir rc=$? else - $Show $F77 $PROFILE_INCPATHS @WRAPPER_FFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ @F77_OTHER_LIBS@ + $Show $F77 $PROFILE_INCPATHS @WRAPPER_FFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ $extra_libs $PROFILE_POSTLIB @WRAPPER_LIBS@ @F77_OTHER_LIBS@ rc=$? fi else diff --git a/src/env/mpif90.bash.in b/src/env/mpif90.bash.in index f88d3f0..9726764 100644 --- a/src/env/mpif90.bash.in +++ b/src/env/mpif90.bash.in @@ -103,6 +103,7 @@ linking=yes allargs=("$@") argno=0 cppflags=() +static_libs=no for arg in "$@" ; do # Set addarg to no if this arg should be ignored by the C compiler addarg=yes @@ -132,6 +133,13 @@ for arg in "$@" ; do addarg=no Show=echo ;; + -static) + static_libs=yes + ;; + -mpich-alllibs) + addarg=no + static_libs=yes + ;; -config=*) addarg=no FCname=`echo A$arg | sed -e 's/A-config=//g'` @@ -305,7 +313,10 @@ elif [ -n "$FCMODINC" ] ; then FCMODDIRS="${FCMODINC}$modincdir" fi -# +if test "@INTERLIB_DEPS@" = "no" -o "$static_libs" = "yes" ; then + extra_libs="@LPMPILIBNAME@ @WRAPPER_EXTRA_LIBS@" +fi + # A temporary statement to invoke the compiler # Place the -L before any args incase there are any mpi libraries in there. # Eventually, we'll want to move this after any non-MPI implementation @@ -328,7 +339,7 @@ if [ "$linking" = yes ] ; then $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" rc=$? else - $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ -l@MPIFLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ @FC_OTHER_LIBS@ + $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ -l@MPIFLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ $extra_libs $PROFILE_POSTLIB @WRAPPER_LIBS@ @FC_OTHER_LIBS@ rc=$? fi else diff --git a/src/env/mpif90.sh.in b/src/env/mpif90.sh.in index fa141f9..6d7d2e3 100644 --- a/src/env/mpif90.sh.in +++ b/src/env/mpif90.sh.in @@ -101,6 +101,7 @@ fi # linking=yes allargs="" +static_libs=no for arg in "$@" ; do # Set addarg to no if this arg should be ignored by the C compiler addarg=yes @@ -131,6 +132,13 @@ for arg in "$@" ; do addarg=no Show=echo ;; + -static) + static_libs=yes + ;; + -mpich-alllibs) + addarg=no + static_libs=yes + ;; -config=*) addarg=no FCname=`echo A$arg | sed -e 's/A-config=//g'` @@ -322,7 +330,10 @@ elif [ -n "$FCMODINC" ] ; then FCMODDIRS="${FCMODINC}$modincdir" fi -# +if test "@INTERLIB_DEPS@" = "no" -o "$static_libs" = "yes" ; then + extra_libs="@LPMPILIBNAME@ @WRAPPER_EXTRA_LIBS@" +fi + # A temporary statement to invoke the compiler # Place the -L before any args incase there are any mpi libraries in there. # Eventually, we'll want to move this after any non-MPI implementation @@ -344,7 +355,7 @@ if [ "$linking" = yes ] ; then $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ $allargs rc=$? else - $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ $allargs $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ -l@MPIFLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ @FC_OTHER_LIBS@ + $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ $allargs $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ -l@MPIFLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ $extra_libs $PROFILE_POSTLIB @WRAPPER_LIBS@ @FC_OTHER_LIBS@ rc=$? fi else http://git.mpich.org/mpich.git/commitdiff/da256e24020048ad3e604ee95c847e9324... commit da256e24020048ad3e604ee95c847e9324c6afbb Author: Pavan Balaji <[email protected]> Date: Mon Mar 31 19:19:08 2014 -0500 Reorder library names in pkg-config. We moved the symbols around in libmpi and libpmpi. pkg-config should match this. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/src/packaging/pkgconfig/mpich.pc.in b/src/packaging/pkgconfig/mpich.pc.in index 48657fa..3ba6962 100644 --- a/src/packaging/pkgconfig/mpich.pc.in +++ b/src/packaging/pkgconfig/mpich.pc.in @@ -9,7 +9,7 @@ Description: High Performance and portable MPI Version: @MPICH_VERSION@ URL: http://www.mcs.anl.gov/research/projects/mpich Requires: -Libs: @WRAPPER_RPATH_LDFLAGS@ @WRAPPER_LDFLAGS@ -L${libdir} @LPMPILIBNAME@ -l@MPILIBNAME@ @WRAPPER_LIBS@ +Libs: @WRAPPER_RPATH_LDFLAGS@ @WRAPPER_LDFLAGS@ -L${libdir} -l@MPILIBNAME@ @LPMPILIBNAME@ @WRAPPER_LIBS@ Cflags: @WRAPPER_CPPFLAGS@ @WRAPPER_CFLAGS@ -I${includedir} # pkg-config does not understand Cxxflags, etc. So we allow users to http://git.mpich.org/mpich.git/commitdiff/9c3379146002804a854880dc4835b939e8... commit 9c3379146002804a854880dc4835b939e85a0351 Author: Pavan Balaji <[email protected]> Date: Mon Mar 31 01:51:48 2014 -0500 Move symbols to correct libraries. Maintain a list of files that go into each library. If a particular binding is not enabled, the list variable still exists, but will just be empty. This simplifies the management of which files/symbols go into which library. Move all MPI_ symbols to the libmpi library and all other symbols to the libpmpi library. All Fortran 77 symbols go into libmpif77.so, while C symbols go into libmpi.so. There are some exceptions, such as status_f2c, which are handled by the Fortran code but used in C. Our Fortran 90 build only creates a few symbols and uses the f77 symbols for everything else. These few symbols go into libmpifort.so. Also update compiler wrappers to link to correct libraries. mpif77 should now link with libmpif77. mpif90 links with both libmpifort and libmpif77, since our F90 build still keeps the core Fortran library symbols in libf77. We completely ignored the F77 library earlier. This was OK because all of the Fortran symbols were ending up in libmpi. Now that we have separated out the symbols to the right library, we now need to link to libmpif77 as well. Also added inter-library dependencies. libmpi has a dependency on several internal libraries: libmpl, libopa. libmpicxx did not have a dependency on libmpi, added. libmpif77 did not have a dependency on libmpi, added. libmpifort did not have a dependency on libmpi, added. This dependency model is sufficient for C and F77, but not for C++ and F90. The C and F77 libraries contain all the symbols the application relies on, but the F90 and C++ libraries don't. In the case of F90, symbols such as mpi_bcast are missing and are borrowed from the F77 library. In the case of C++, mpicxx.h contains calls directly to C functions (such as MPI_Reduce_local), which get embedded into the application. Fixes #2023. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/Makefile.am b/Makefile.am index f9f68ee..6203dd1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -48,7 +48,6 @@ pkgconfigdir = @pkgconfigdir@ errnames_txt_files = external_subdirs = @mplsrcdir@ @opasrcdir@ -# FIXME how/where does external_libs/ldflags get used? external_ldflags = -L@mpllibdir@ -L@opalibdir@ external_libs = -l@MPLLIBNAME@ -l@OPALIBNAME@ @@ -63,23 +62,6 @@ external_libs = -l@MPLLIBNAME@ -l@OPALIBNAME@ DIST_SUBDIRS = ${external_subdirs} SUBDIRS = ${external_subdirs} - -# lib/lib@[email protected] always contains the "PMPI_" functions and all of the -# functions and symbols that actually make up the MPICH implementation. If -# weak symbols are fully supported (such as on Linux), then this library also -# contains weak symbols for "MPI_" aliasing the "PMPI_" symbols. This lib also -# always contains the F77 bindings, but not the F90 or C++ bindings. -# -# if weak symbols are not supported (such as on Darwin), then -# lib/lib@[email protected] contains duplicate builds of all of the "PMPI_" routines -# as "MPI_" routines, but none of the implementation routines under the hood -# (such as MPIR_Bcast_impl). -lib_LTLIBRARIES = lib/lib@[email protected] -lib_lib@MPILIBNAME@_la_SOURCES = -nodist_lib_lib@MPILIBNAME@_la_SOURCES = -lib_lib@MPILIBNAME@_la_LIBADD = $(external_libs) -lib_lib@MPILIBNAME@_la_LDFLAGS = $(external_ldflags) $(ABIVERSIONFLAGS) - ## Automake attempts to guess the correct linker among the various compilers ## for each language (see "How the Linker is Chosen" in the AM manual). ## However, this process is static and doesn't assume that you will "disable" @@ -93,36 +75,119 @@ lib_lib@MPILIBNAME@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(F77LD) \ $(AM_FFLAGS) $(FFLAGS) $(lib_lib@MPILIBNAME@_la_LDFLAGS) \ $(LDFLAGS) -o $@ +lib_lib@PMPILIBNAME@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=F77 \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(F77LD) \ + $(AM_FFLAGS) $(FFLAGS) $(lib_lib@PMPILIBNAME@_la_LDFLAGS) \ + $(LDFLAGS) -o $@ else !BUILD_F77_BINDING # link with libtool+CCLD lib_lib@MPILIBNAME@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(lib_lib@MPILIBNAME@_la_CFLAGS) $(CFLAGS) \ $(lib_lib@MPILIBNAME@_la_LDFLAGS) $(LDFLAGS) -o $@ +lib_lib@PMPILIBNAME@_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(lib_lib@PMPILIBNAME@_la_CFLAGS) $(CFLAGS) \ + $(lib_lib@PMPILIBNAME@_la_LDFLAGS) $(LDFLAGS) -o $@ endif !BUILD_F77_BINDING +## Create lists of files for different libraries +## +## mpi_sources: When compiled with -DMPICH_MPI_FROM_PMPI, these files +## provide "MPI_" public functions for the C bindings and end up in +## lib@MPILIBNAME@. When compiled without this macro, these files +## provide "PMPI_" public functions for the C bindings as well as a +## few other internal MPICH functions, all of which end up in +## lib@PMPILIBNAME@ (which is the same as lib@MPILIBNAME@ on systems +## that support weak symbols). +## +## mpi_f77_sources: When compiled with -DMPICH_MPI_FROM_PMPI, these +## files provide the "mpi_" public functions for the F77 bindings and +## end up in lib@MPIFLIBNAME@. +## +## mpi_fc_sources: When compiled with -DMPICH_MPI_FROM_PMPI, these +## files provide the "mpi_" public functions for the F90+ bindings and +## end up in lib@MPIFCLIBNAME@. +## +## mpi_cxx_sources: When compiled with -DMPICH_MPI_FROM_PMPI, these +## files provide the "MPI" public functions for the C++ bindings and +## end up in lib@MPICXXLIBNAME@. +## +## mpi_core_sources: These files are internal non-public functions +## that are used by all bindings. +mpi_sources = +mpi_f77_sources = +mpi_fc_sources = +mpi_cxx_sources = +mpi_core_sources = + +lib_LTLIBRARIES = + if BUILD_PROFILING_LIB -lib_LTLIBRARIES += lib/lib@[email protected] -## FIXME XXX DJG is this "-DMPICH..." flag is in CFLAGS now, should it really be in CPPFLAGS? -lib_lib@PMPILIBNAME@_la_CFLAGS = $(AM_CFLAGS) -DMPICH_MPI_FROM_PMPI -lib_lib@PMPILIBNAME@_la_SOURCES = -lib_lib@PMPILIBNAME@_la_LIBADD = lib/lib@[email protected] $(lib_lib@MPILIBNAME@_la_LIBADD) -lib_lib@PMPILIBNAME@_la_LDFLAGS = $(ABIVERSIONFLAGS) +lib_lib@PMPILIBNAME@_la_LIBADD = endif BUILD_PROFILING_LIB -# these are files that provide "MPI_" functions with "PMPI_" profiling versions -# (for the C language bindings only, fortran & C++ are handled separately) -mpi_sources = +lib_lib@MPILIBNAME@_la_LIBADD = + +if BUILD_F77_BINDING +lib_lib@MPIFLIBNAME@_la_LIBADD = +endif BUILD_F77_BINDING + +if BUILD_FC_BINDING +lib_lib@MPIFCLIBNAME@_la_LIBADD = +endif BUILD_FC_BINDING + +if BUILD_CXX_BINDING +lib_lib@MPICXXLIBNAME@_la_LIBADD = +endif BUILD_CXX_BINDING # include our subdir automake fragments include maint/Makefile.mk include src/Makefile.mk -lib_lib@MPILIBNAME@_la_SOURCES += $(mpi_sources) +lib_LTLIBRARIES += lib/lib@[email protected] +lib_lib@MPILIBNAME@_la_SOURCES = $(mpi_sources) +lib_lib@MPILIBNAME@_la_LDFLAGS = $(external_ldflags) $(ABIVERSIONFLAGS) +lib_lib@MPILIBNAME@_la_LIBADD += $(external_libs) +lib_lib@MPILIBNAME@_la_CPPFLAGS = $(AM_CPPFLAGS) + +if BUILD_PROFILING_LIB +lib_LTLIBRARIES += lib/lib@[email protected] +# dropping mpi_fc_sources and mpi_cxx_sources from the below PMPI list +# since they don't contribute any PMPI symbols. +lib_lib@PMPILIBNAME@_la_SOURCES = $(mpi_sources) $(mpi_f77_sources) $(mpi_core_sources) +lib_lib@PMPILIBNAME@_la_LDFLAGS = $(ABIVERSIONFLAGS) +lib_lib@MPILIBNAME@_la_CPPFLAGS += -DMPICH_MPI_FROM_PMPI +lib_lib@MPILIBNAME@_la_LIBADD += lib/lib@[email protected] +else !BUILD_PROFILING_LIB +lib_lib@MPILIBNAME@_la_SOURCES += $(mpi_core_sources) +endif !BUILD_PROFILING_LIB +if BUILD_F77_BINDING +lib_LTLIBRARIES += lib/lib@[email protected] +lib_lib@MPIFLIBNAME@_la_CPPFLAGS = $(AM_CPPFLAGS) if BUILD_PROFILING_LIB -lib_lib@PMPILIBNAME@_la_SOURCES += $(mpi_sources) +lib_lib@MPIFLIBNAME@_la_CPPFLAGS += -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES endif BUILD_PROFILING_LIB +lib_lib@MPIFLIBNAME@_la_SOURCES = $(mpi_f77_sources) +lib_lib@MPIFLIBNAME@_la_LDFLAGS = $(ABIVERSIONFLAGS) +lib_lib@MPIFLIBNAME@_la_LIBADD += lib/lib@[email protected] +endif BUILD_F77_BINDING + +if BUILD_FC_BINDING +lib_LTLIBRARIES += lib/lib@[email protected] +lib_lib@MPIFCLIBNAME@_la_CPPFLAGS = $(AM_CPPFLAGS) -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES +lib_lib@MPIFCLIBNAME@_la_SOURCES = $(mpi_fc_sources) +lib_lib@MPIFCLIBNAME@_la_LDFLAGS = $(ABIVERSIONFLAGS) +lib_lib@MPIFCLIBNAME@_la_LIBADD += lib/lib@[email protected] +endif BUILD_FC_BINDING + +if BUILD_CXX_BINDING +lib_LTLIBRARIES += lib/lib@[email protected] +lib_lib@MPICXXLIBNAME@_la_SOURCES = $(mpi_cxx_sources) +lib_lib@MPICXXLIBNAME@_la_LDFLAGS = $(ABIVERSIONFLAGS) +lib_lib@MPICXXLIBNAME@_la_LIBADD += lib/lib@[email protected] +endif BUILD_CXX_BINDING # build the current directory and then the examples directory after everything else SUBDIRS += . examples diff --git a/src/binding/cxx/Makefile.mk b/src/binding/cxx/Makefile.mk index da1db96..1fe1b19 100644 --- a/src/binding/cxx/Makefile.mk +++ b/src/binding/cxx/Makefile.mk @@ -10,12 +10,7 @@ EXTRA_DIST += src/binding/cxx/buildiface if BUILD_CXX_BINDING -# No profile library for C++. All routines call the MPI, not PMPI, routines. -lib_LTLIBRARIES += lib/lib@[email protected] - -lib_lib@MPICXXLIBNAME@_la_SOURCES = \ - src/binding/cxx/initcxx.cxx -lib_lib@MPICXXLIBNAME@_la_LDFLAGS = $(ABIVERSIONFLAGS) +mpi_cxx_sources += src/binding/cxx/initcxx.cxx # Update output files if the buildiface script or mpi.h.in is updated. Use the # buildiface-stamp to deal with the &ReplaceIfDifferent logic diff --git a/src/binding/fortran/mpif_h/buildiface b/src/binding/fortran/mpif_h/buildiface index 8f30461..43fb3e6 100755 --- a/src/binding/fortran/mpif_h/buildiface +++ b/src/binding/fortran/mpif_h/buildiface @@ -1009,7 +1009,6 @@ src/binding/fortran/mpif_h/buildiface-stamp: \$(top_srcdir)/src/binding/fortran/ ( cd \$(top_srcdir)/src/binding/fortran/mpif_h && ./buildiface ) endif MAINTAINER_MODE -mpi_f77_sources = if BUILD_F77_BINDING EOT &print_line( MAKEFD, "mpi_f77_sources += ", 80, "\\\n\t", 8 ); @@ -1020,18 +1019,11 @@ EOT &print_endline( MAKEFD ); # The definitions for the Fortran wrappers are special - &AddFwrapDefs; print MAKEFD <<EOT; -# FIXME tension here: MPIFLIBNAME is always "mpich", so we don't want to -# clobber flags set by other parts of MPICH, and we don't want to re-add that -# lib to the lib_LTLIBRARIES list -#lib_LTLIBRARIES += lib/lib\@MPIFLIBNAME\@.la -#lib_lib\@MPIFLIBNAME\@_la_SOURCES = \$(mpi_f77_sources) src/binding/fortran/mpif_h/setbot.c src/binding/fortran/mpif_h/setbotf.f src/binding/fortran/mpif_h/fdebug.c -#lib_lib\@MPIFLIBNAME\@_la_CPPFLAGS = -I\${master_top_srcdir}/src/binding/fortran/mpif_h -lib_lib\@MPILIBNAME\@_la_SOURCES += \$(mpi_f77_sources) src/binding/fortran/mpif_h/fdebug.c - -# these files are created by config.status from ".in" files -nodist_lib_lib\@MPILIBNAME\@_la_SOURCES += src/binding/fortran/mpif_h/setbot.c src/binding/fortran/mpif_h/setbotf.f +mpi_core_sources += src/binding/fortran/mpif_h/fdebug.c \\ + src/binding/fortran/mpif_h/setbot.c \\ + src/binding/fortran/mpif_h/setbotf.f +mpi_sources += src/binding/fortran/mpif_h/statusf2c.c # FIXME does AM_CPPFLAGS need to be included elsewhere somehow in the # target-specific variable? @@ -1040,17 +1032,6 @@ AM_CPPFLAGS += -I\${master_top_srcdir}/src/binding/fortran/mpif_h noinst_HEADERS += src/binding/fortran/mpif_h/fproto.h src/binding/fortran/mpif_h/mpi_fortimpl.h -if BUILD_PROFILING_LIB -# FIXME tension here: PMPIFLIBNAME is always "pmpich", so we don't want to -# clobber flags set by other parts of MPICH, and we don't want to re-add that -# lib to the lib_LTLIBRARIES list -#lib_LTLIBRARIES += lib/lib\@PMPIFLIBNAME\@.la -#lib_lib\@PMPIFLIBNAME\@_la_SOURCES += \$(mpi_f77_sources) -#lib_lib\@PMPIFLIBNAME\@_la_CPPFLAGS += -I\${master_top_srcdir}/src/binding/fortran/mpif_h -lib_lib\@PMPILIBNAME\@_la_SOURCES += \$(mpi_f77_sources) -#lib_lib\@PMPILIBNAME\@_la_CPPFLAGS += -I\${master_top_srcdir}/src/binding/fortran/mpif_h -endif BUILD_PROFILING_LIB - # config.status copies src/binding/fortran/mpif_h/mpif.h to src/include (see the relevant # AC_OUTPUT_COMMANDS in configure.ac), so we need to delete it at distclean time # too. More work is needed in this Makefile.mk to keep src/include/mpif.h up to @@ -4526,7 +4507,6 @@ MPIR_Comm_delete_attr_f77_proxy( $OUTFD = "STATUSF2C"; $filename = "statusf2c.c"; open ($OUTFD, ">$filename.new" ) || die "Cannot open $filename.new\n"; - $files[$#files+1] = $filename; # Status_f2c and c2f will need to have const added before the input # argument for MPI 2.2 print $OUTFD " @@ -5534,29 +5514,6 @@ MPIR_Win_delete_attr_f90_proxy( return (int)ierr; }\n"; } -# -# FWRAPLIB is a special case. We want to compile all of the same files, -# but with MPICH_MPI_FROM_PMPI defined, even (or especially) if weak symbols -# are defined. -# -sub AddFwrapDefs { - ## XXX DJG delete this eventually, I think - ##&print_line( MAKEFD, "wrap_objs = ", 80, "\\\n\t", 8 ); - ##for ($i=0; $i<=$#files; $i++) { - ## $name = $files[$i]; - ## # files contains only the "mpi" files, which is what - ## # we want - ## my $basename = $name; - ## $basename =~ s/\.c//; - ## &print_line( MAKEFD, "_w$basename.o ", 80, "\\\n\t", 8 ); - ##} - ##&print_endline( MAKEFD ); - print MAKEFD "\n"; - print MAKEFD "lib_LTLIBRARIES += lib/lib\@MPIFLIBNAME\@.la\n"; - print MAKEFD "lib_lib\@MPIFLIBNAME\@_la_CPPFLAGS = \$(AM_CPPFLAGS) -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES\n"; - print MAKEFD "lib_lib\@MPIFLIBNAME\@_la_SOURCES = \$(mpi_f77_sources)\n"; - print MAKEFD "lib_lib\@MPIFLIBNAME\@_la_LDFLAGS = \$(ABIVERSIONFLAGS)\n\n"; -} # Allow multiple underscore versions of names # but without the PMPI versions (needed for the wrapper library) diff --git a/src/binding/fortran/use_mpi/buildiface b/src/binding/fortran/use_mpi/buildiface index 4f54e4a..83cefba 100755 --- a/src/binding/fortran/use_mpi/buildiface +++ b/src/binding/fortran/use_mpi/buildiface @@ -924,8 +924,6 @@ if BUILD_FC_BINDING # in a VPATH build) AM_FCFLAGS += \@FCINCFLAG\@src/binding/fortran/use_mpi -lib_LTLIBRARIES += lib/lib\@MPIFCLIBNAME\@.la - EOT print MAKEFD <<EOT; @@ -933,18 +931,13 @@ print MAKEFD <<EOT; # creation routines. These go into libmpi.la and will be built a second time # for inclusion in libpmpi.la on platforms that do not support weak symbols. # If shared libraries are enabled then the compilation space doubles again. -mpi_f90_c_sources = \\ +mpi_sources += \\ src/binding/fortran/use_mpi/create_f90_int.c \\ src/binding/fortran/use_mpi/create_f90_real.c \\ - src/binding/fortran/use_mpi/create_f90_complex.c \\ - src/binding/fortran/use_mpi/typef90cmplxf.c \\ - src/binding/fortran/use_mpi/typef90realf.c \\ - src/binding/fortran/use_mpi/typef90intf.c - -mpi_sources += \$(mpi_f90_c_sources) + src/binding/fortran/use_mpi/create_f90_complex.c # utility code that has no PMPI equivalent -lib_lib\@MPILIBNAME\@_la_SOURCES += src/binding/fortran/use_mpi/create_f90_util.c +mpi_core_sources += src/binding/fortran/use_mpi/create_f90_util.c AM_CPPFLAGS += -Isrc/binding/fortran/use_mpi noinst_HEADERS += \\ src/binding/fortran/use_mpi/create_f90_util.h \\ @@ -955,29 +948,16 @@ noinst_HEADERS += \\ nodist_noinst_HEADERS += \\ src/binding/fortran/use_mpi/mpif90model.h -# actual f90 code that also gets compiled into modules -lib_lib\@MPIFCLIBNAME\@_la_LDFLAGS = \$(ABIVERSIONFLAGS) - # cause any .\$(MOD) files to be output in the f90 bindings directory instead of # the current directory AM_FCFLAGS += \$(FCMODOUTFLAG)src/binding/fortran/use_mpi -lib_lib\@MPIFCLIBNAME\@_la_CPPFLAGS = \$(AM_CPPFLAGS) -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES -# we "manually" build the f90 sources and add them with LIBADD -lib_lib\@MPIFCLIBNAME\@_la_SOURCES = -lib_lib\@MPIFCLIBNAME\@_la_LIBADD = \\ - src/binding/fortran/use_mpi/mpi.lo \\ - src/binding/fortran/use_mpi/mpi_constants.lo \\ - src/binding/fortran/use_mpi/mpi_sizeofs.lo \\ - src/binding/fortran/use_mpi/${outfile_prefix}_base.lo - -# now force libtool FC rules/variables to be generated and cause FC linking to -# be selected for lib/lib\@MPIFCLIBNAME\@.la -EXTRA_lib_lib\@MPIFCLIBNAME\@_la_SOURCES = \\ +mpi_fc_sources += \\ + src/binding/fortran/use_mpi/typef90cmplxf.c \\ + src/binding/fortran/use_mpi/typef90realf.c \\ + src/binding/fortran/use_mpi/typef90intf.c \\ src/binding/fortran/use_mpi/mpi.f90 \\ - src/binding/fortran/use_mpi/mpi_constants.f90 - -nodist_EXTRA_lib_lib\@MPIFCLIBNAME\@_la_SOURCES = \\ + src/binding/fortran/use_mpi/mpi_constants.f90 \\ src/binding/fortran/use_mpi/mpi_sizeofs.f90 \\ src/binding/fortran/use_mpi/${outfile_prefix}_base.f90 diff --git a/src/env/mpicc.bash.in b/src/env/mpicc.bash.in index 85f6c88..54757cc 100644 --- a/src/env/mpicc.bash.in +++ b/src/env/mpicc.bash.in @@ -232,7 +232,7 @@ if [ "$linking" = yes ] ; then $Show $CC @WRAPPER_CPPFLAGS@ $PROFILE_INCPATHS @WRAPPER_CFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir rc=$? else - $Show $CC @WRAPPER_CPPFLAGS@ $PROFILE_INCPATHS @WRAPPER_CFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO $rpath_flags @LPMPILIBNAME@ -l@MPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ + $Show $CC @WRAPPER_CPPFLAGS@ $PROFILE_INCPATHS @WRAPPER_CFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ rc=$? fi else diff --git a/src/env/mpicc.sh.in b/src/env/mpicc.sh.in index 119a884..f97532e 100644 --- a/src/env/mpicc.sh.in +++ b/src/env/mpicc.sh.in @@ -241,7 +241,7 @@ if [ "$linking" = yes ] ; then $Show $CC @WRAPPER_CPPFLAGS@ $PROFILE_INCPATHS @WRAPPER_CFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir rc=$? else - $Show $CC @WRAPPER_CPPFLAGS@ $PROFILE_INCPATHS @WRAPPER_CFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO $rpath_flags @LPMPILIBNAME@ -l@MPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ + $Show $CC @WRAPPER_CPPFLAGS@ $PROFILE_INCPATHS @WRAPPER_CFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ rc=$? fi else diff --git a/src/env/mpicxx.bash.in b/src/env/mpicxx.bash.in index 3974ff9..31229f6 100644 --- a/src/env/mpicxx.bash.in +++ b/src/env/mpicxx.bash.in @@ -229,7 +229,7 @@ if [ "$linking" = yes ] ; then $Show $CXX $PROFILE_INCPATHS @WRAPPER_CXXFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir rc=$? else - $Show $CXX $PROFILE_INCPATHS @WRAPPER_CXXFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags @LPMPILIBNAME@ -l@MPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ + $Show $CXX $PROFILE_INCPATHS @WRAPPER_CXXFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ rc=$? fi else diff --git a/src/env/mpicxx.sh.in b/src/env/mpicxx.sh.in index 48195a1..8343ebd 100644 --- a/src/env/mpicxx.sh.in +++ b/src/env/mpicxx.sh.in @@ -238,7 +238,7 @@ if [ "$linking" = yes ] ; then $Show $CXX $PROFILE_INCPATHS @WRAPPER_CXXFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir rc=$? else - $Show $CXX $PROFILE_INCPATHS @WRAPPER_CXXFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags @LPMPILIBNAME@ -l@MPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ + $Show $CXX $PROFILE_INCPATHS @WRAPPER_CXXFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir -L$libdir $cxxlibs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ rc=$? fi else diff --git a/src/env/mpif77.bash.in b/src/env/mpif77.bash.in index a3567c2..9d4117b 100644 --- a/src/env/mpif77.bash.in +++ b/src/env/mpif77.bash.in @@ -239,6 +239,10 @@ fi # Derived variables. These are assembled from variables set from the # default, environment, configuration file (if any) and command-line # options (if any) +f77libs= +if [ "@MPIFLIBNAME@" != "@MPILIBNAME@" ] ; then + f77libs="-l@MPIFLIBNAME@" +fi PROFILE_FOO= # Handle the case of a profile switch @@ -279,7 +283,7 @@ if [ "$linking" = yes ] ; then $Show $F77 $PROFILE_INCPATHS @WRAPPER_FFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir rc=$? else - $Show $F77 $PROFILE_INCPATHS @WRAPPER_FFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO $rpath_flags @LPMPILIBNAME@ -l@MPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ @F77_OTHER_LIBS@ + $Show $F77 $PROFILE_INCPATHS @WRAPPER_FFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ @F77_OTHER_LIBS@ rc=$? fi else diff --git a/src/env/mpif77.sh.in b/src/env/mpif77.sh.in index 0366d77..380a4f4 100644 --- a/src/env/mpif77.sh.in +++ b/src/env/mpif77.sh.in @@ -261,6 +261,10 @@ fi # Derived variables. These are assembled from variables set from the # default, environment, configuration file (if any) and command-line # options (if any) +f77libs= +if [ "@MPIFLIBNAME@" != "@MPILIBNAME@" ] ; then + f77libs="-l@MPIFLIBNAME@" +fi PROFILE_FOO= # Handle the case of a profile switch @@ -301,7 +305,7 @@ if [ "$linking" = yes ] ; then $Show $F77 $PROFILE_INCPATHS @WRAPPER_FFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir rc=$? else - $Show $F77 $PROFILE_INCPATHS @WRAPPER_FFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir -L$libdir $PROFILE_PRELIB $PROFILE_FOO $rpath_flags @LPMPILIBNAME@ -l@MPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ @F77_OTHER_LIBS@ + $Show $F77 $PROFILE_INCPATHS @WRAPPER_FFLAGS@ @WRAPPER_LDFLAGS@ $allargs -I$includedir -L$libdir $f77libs $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ @F77_OTHER_LIBS@ rc=$? fi else diff --git a/src/env/mpif90.bash.in b/src/env/mpif90.bash.in index 7c6ef5d..f88d3f0 100644 --- a/src/env/mpif90.bash.in +++ b/src/env/mpif90.bash.in @@ -297,15 +297,12 @@ else fi # Handle the specification of the directory containing the modules -modulelib="@MPIFCLIBNAME@" if [ -n "$FCMODINCSPEC" ] ; then newarg=`echo A"$FCMODINCSPEC" | \ sed -e 's/^A//' -e 's%<dir>%'"$includedir%g" -e 's/<file>/mpi/g'` FCMODDIRS="$newarg" - FCMODLIBS="-l$modulelib" elif [ -n "$FCMODINC" ] ; then FCMODDIRS="${FCMODINC}$modincdir" - FCMODLIBS="-l$modulelib" fi # @@ -331,7 +328,7 @@ if [ "$linking" = yes ] ; then $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" rc=$? else - $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" $FCINCDIRS $FCMODDIRS -L$libdir $FCMODLIBS $PROFILE_PRELIB $PROFILE_FOO $rpath_flags @LPMPILIBNAME@ -l@MPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ @FC_OTHER_LIBS@ + $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ "${allargs[@]}" $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ -l@MPIFLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ @FC_OTHER_LIBS@ rc=$? fi else diff --git a/src/env/mpif90.sh.in b/src/env/mpif90.sh.in index 6f537c3..fa141f9 100644 --- a/src/env/mpif90.sh.in +++ b/src/env/mpif90.sh.in @@ -314,15 +314,12 @@ else fi # Handle the specification of the directory containing the modules -modulelib="@MPIFCLIBNAME@" if [ -n "$FCMODINCSPEC" ] ; then newarg=`echo A"$FCMODINCSPEC" | \ sed -e 's/^A//' -e 's%<dir>%'"$includedir%g" -e 's/<file>/mpi/g'` FCMODDIRS="$newarg" - FCMODLIBS="-l$modulelib" elif [ -n "$FCMODINC" ] ; then FCMODDIRS="${FCMODINC}$modincdir" - FCMODLIBS="-l$modulelib" fi # @@ -347,7 +344,7 @@ if [ "$linking" = yes ] ; then $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ $allargs rc=$? else - $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ $allargs $FCINCDIRS $FCMODDIRS -L$libdir $FCMODLIBS $PROFILE_PRELIB $PROFILE_FOO $rpath_flags @LPMPILIBNAME@ -l@MPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ @FC_OTHER_LIBS@ + $Show $FC $PROFILE_INCPATHS @WRAPPER_FCFLAGS@ @WRAPPER_LDFLAGS@ $allargs $FCINCDIRS $FCMODDIRS -L$libdir -l@MPIFCLIBNAME@ -l@MPIFLIBNAME@ $PROFILE_PRELIB $PROFILE_FOO $rpath_flags -l@MPILIBNAME@ @LPMPILIBNAME@ $PROFILE_POSTLIB @WRAPPER_LIBS@ @FC_OTHER_LIBS@ rc=$? fi else diff --git a/src/glue/romio/Makefile.mk b/src/glue/romio/Makefile.mk index ef90124..7afc8a0 100644 --- a/src/glue/romio/Makefile.mk +++ b/src/glue/romio/Makefile.mk @@ -5,5 +5,5 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += src/glue/romio/glue_romio.c +mpi_core_sources += src/glue/romio/glue_romio.c diff --git a/src/mpi/attr/Makefile.mk b/src/mpi/attr/Makefile.mk index 64b4292..1a03b64 100644 --- a/src/mpi/attr/Makefile.mk +++ b/src/mpi/attr/Makefile.mk @@ -29,6 +29,6 @@ mpi_sources += \ noinst_HEADERS += src/mpi/attr/attr.h -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpi/attr/attrutil.c \ src/mpi/attr/dup_fn.c diff --git a/src/mpi/coll/Makefile.mk b/src/mpi/coll/Makefile.mk index 4b1b791..20541d7 100644 --- a/src/mpi/coll/Makefile.mk +++ b/src/mpi/coll/Makefile.mk @@ -48,7 +48,7 @@ mpi_sources += \ src/mpi/coll/iscatter.c \ src/mpi/coll/iscatterv.c -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpi/coll/allred_group.c \ src/mpi/coll/barrier_group.c \ src/mpi/coll/helper_fns.c \ diff --git a/src/mpi/comm/Makefile.mk b/src/mpi/comm/Makefile.mk index 98a4a38..7c40af5 100644 --- a/src/mpi/comm/Makefile.mk +++ b/src/mpi/comm/Makefile.mk @@ -31,7 +31,7 @@ mpi_sources += \ src/mpi/comm/comm_reenable_anysource.c \ src/mpi/comm/comm_remote_group_failed.c -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpi/comm/commutil.c noinst_HEADERS += src/mpi/comm/mpicomm.h diff --git a/src/mpi/datatype/Makefile.mk b/src/mpi/datatype/Makefile.mk index 751890c..6d7daf6 100644 --- a/src/mpi/datatype/Makefile.mk +++ b/src/mpi/datatype/Makefile.mk @@ -59,6 +59,6 @@ mpi_sources += \ noinst_HEADERS += src/mpi/datatype/datatype.h -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpi/datatype/typeutil.c diff --git a/src/mpi/errhan/Makefile.mk b/src/mpi/errhan/Makefile.mk index 4116e11..a08c9f3 100644 --- a/src/mpi/errhan/Makefile.mk +++ b/src/mpi/errhan/Makefile.mk @@ -28,7 +28,7 @@ mpi_sources += \ src/mpi/errhan/win_get_errhandler.c \ src/mpi/errhan/win_set_errhandler.c -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpi/errhan/errutil.c \ src/mpi/errhan/dynerrutil.c diff --git a/src/mpi/group/Makefile.mk b/src/mpi/group/Makefile.mk index f3a3319..2cd3975 100644 --- a/src/mpi/group/Makefile.mk +++ b/src/mpi/group/Makefile.mk @@ -19,7 +19,7 @@ mpi_sources += \ src/mpi/group/group_translate_ranks.c \ src/mpi/group/group_union.c -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpi/group/grouputil.c noinst_HEADERS += src/mpi/group/group.h diff --git a/src/mpi/info/Makefile.mk b/src/mpi/info/Makefile.mk index 78eb1f8..93ed470 100644 --- a/src/mpi/info/Makefile.mk +++ b/src/mpi/info/Makefile.mk @@ -5,7 +5,7 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpi/info/infoutil.c mpi_sources += \ diff --git a/src/mpi/init/Makefile.mk b/src/mpi/init/Makefile.mk index 16203e9..6460117 100644 --- a/src/mpi/init/Makefile.mk +++ b/src/mpi/init/Makefile.mk @@ -15,7 +15,7 @@ mpi_sources += \ src/mpi/init/finalized.c \ src/mpi/init/querythread.c -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpi/init/initinfo.c \ src/mpi/init/async.c diff --git a/src/mpi/io/Makefile.mk b/src/mpi/io/Makefile.mk index 4247b4c..9fa99b8 100644 --- a/src/mpi/io/Makefile.mk +++ b/src/mpi/io/Makefile.mk @@ -5,6 +5,6 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpi/io/fileutil.c diff --git a/src/mpi/pt2pt/Makefile.mk b/src/mpi/pt2pt/Makefile.mk index da058e5..0d0b536 100644 --- a/src/mpi/pt2pt/Makefile.mk +++ b/src/mpi/pt2pt/Makefile.mk @@ -49,7 +49,7 @@ mpi_sources += \ src/mpi/pt2pt/waitany.c \ src/mpi/pt2pt/waitsome.c -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpi/pt2pt/bsendutil.c \ src/mpi/pt2pt/mpir_request.c diff --git a/src/mpi/rma/Makefile.mk b/src/mpi/rma/Makefile.mk index 42d8406..0762314 100644 --- a/src/mpi/rma/Makefile.mk +++ b/src/mpi/rma/Makefile.mk @@ -47,7 +47,7 @@ mpi_sources += \ src/mpi/rma/win_unlock_all.c \ src/mpi/rma/win_wait.c -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpi/rma/winutil.c \ src/mpi/rma/rmatypeutil.c diff --git a/src/mpi/timer/Makefile.mk b/src/mpi/timer/Makefile.mk index d1730ad..58fc82f 100644 --- a/src/mpi/timer/Makefile.mk +++ b/src/mpi/timer/Makefile.mk @@ -8,6 +8,6 @@ mpi_sources += \ src/mpi/timer/wtime.c \ src/mpi/timer/wtick.c -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpi/timer/mpidtime.c diff --git a/src/mpi/topo/Makefile.mk b/src/mpi/topo/Makefile.mk index 8bd3dd1..2400d9d 100644 --- a/src/mpi/topo/Makefile.mk +++ b/src/mpi/topo/Makefile.mk @@ -36,7 +36,7 @@ mpi_sources += \ src/mpi/topo/nhb_alltoallv.c \ src/mpi/topo/nhb_alltoallw.c -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpi/topo/topoutil.c noinst_HEADERS += src/mpi/topo/topo.h diff --git a/src/mpi_t/Makefile.mk b/src/mpi_t/Makefile.mk index 37e69da..dd1a0e0 100644 --- a/src/mpi_t/Makefile.mk +++ b/src/mpi_t/Makefile.mk @@ -36,5 +36,5 @@ mpi_sources += \ src/mpi_t/pvar_write.c -lib_lib@MPILIBNAME@_la_SOURCES += src/mpi_t/mpit.c +mpi_core_sources += src/mpi_t/mpit.c diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/Makefile.mk b/src/mpid/ch3/channels/nemesis/netmod/ib/Makefile.mk index e63376d..a357dd1 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ib/Makefile.mk +++ b/src/mpid/ch3/channels/nemesis/netmod/ib/Makefile.mk @@ -7,7 +7,7 @@ if BUILD_NEMESIS_NETMOD_IB -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/channels/nemesis/netmod/ib/ib_finalize.c \ src/mpid/ch3/channels/nemesis/netmod/ib/ib_init.c \ src/mpid/ch3/channels/nemesis/netmod/ib/ib_lmt.c \ diff --git a/src/mpid/ch3/channels/nemesis/netmod/mx/Makefile.mk b/src/mpid/ch3/channels/nemesis/netmod/mx/Makefile.mk index e08a991..edcc31a 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mx/Makefile.mk +++ b/src/mpid/ch3/channels/nemesis/netmod/mx/Makefile.mk @@ -7,7 +7,7 @@ if BUILD_NEMESIS_NETMOD_MX -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/channels/nemesis/netmod/mx/mx_alloc.c \ src/mpid/ch3/channels/nemesis/netmod/mx/mx_cancel.c \ src/mpid/ch3/channels/nemesis/netmod/mx/mx_finalize.c \ diff --git a/src/mpid/ch3/channels/nemesis/netmod/newmad/Makefile.mk b/src/mpid/ch3/channels/nemesis/netmod/newmad/Makefile.mk index 5eb6d4a..097b26f 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/newmad/Makefile.mk +++ b/src/mpid/ch3/channels/nemesis/netmod/newmad/Makefile.mk @@ -7,7 +7,7 @@ if BUILD_NEMESIS_NETMOD_NEWMAD -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/channels/nemesis/netmod/newmad/newmad_finalize.c \ src/mpid/ch3/channels/nemesis/netmod/newmad/newmad_init.c \ src/mpid/ch3/channels/nemesis/netmod/newmad/newmad_poll.c \ diff --git a/src/mpid/ch3/channels/nemesis/netmod/none/Makefile.mk b/src/mpid/ch3/channels/nemesis/netmod/none/Makefile.mk index 6744854..83a98ea 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/none/Makefile.mk +++ b/src/mpid/ch3/channels/nemesis/netmod/none/Makefile.mk @@ -5,6 +5,6 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/channels/nemesis/netmod/none/none.c diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/Makefile.mk b/src/mpid/ch3/channels/nemesis/netmod/portals4/Makefile.mk index aae165e..40b1539 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/portals4/Makefile.mk +++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/Makefile.mk @@ -7,7 +7,7 @@ if BUILD_NEMESIS_NETMOD_PORTALS4 -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_init.c \ src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_pack_byte.c \ src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_poll.c \ diff --git a/src/mpid/ch3/channels/nemesis/netmod/scif/Makefile.mk b/src/mpid/ch3/channels/nemesis/netmod/scif/Makefile.mk index 17ad2e0..67c10c5 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/scif/Makefile.mk +++ b/src/mpid/ch3/channels/nemesis/netmod/scif/Makefile.mk @@ -7,7 +7,7 @@ if BUILD_NEMESIS_NETMOD_SCIF -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/channels/nemesis/netmod/scif/scif_finalize.c \ src/mpid/ch3/channels/nemesis/netmod/scif/scif_init.c \ src/mpid/ch3/channels/nemesis/netmod/scif/scif_send.c \ diff --git a/src/mpid/ch3/channels/nemesis/netmod/tcp/Makefile.mk b/src/mpid/ch3/channels/nemesis/netmod/tcp/Makefile.mk index 5d7ac7b..2183e8c 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/tcp/Makefile.mk +++ b/src/mpid/ch3/channels/nemesis/netmod/tcp/Makefile.mk @@ -7,7 +7,7 @@ if BUILD_NEMESIS_NETMOD_TCP -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_finalize.c \ src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_init.c \ src/mpid/ch3/channels/nemesis/netmod/tcp/tcp_send.c \ diff --git a/src/mpid/ch3/channels/nemesis/src/Makefile.mk b/src/mpid/ch3/channels/nemesis/src/Makefile.mk index 924bbe5..21857f5 100644 --- a/src/mpid/ch3/channels/nemesis/src/Makefile.mk +++ b/src/mpid/ch3/channels/nemesis/src/Makefile.mk @@ -5,7 +5,7 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/channels/nemesis/src/ch3_finalize.c \ src/mpid/ch3/channels/nemesis/src/ch3_init.c \ src/mpid/ch3/channels/nemesis/src/ch3_isend.c \ diff --git a/src/mpid/ch3/channels/nemesis/utils/monitor/Makefile.mk b/src/mpid/ch3/channels/nemesis/utils/monitor/Makefile.mk index 2e0d2a8..640b5cd 100644 --- a/src/mpid/ch3/channels/nemesis/utils/monitor/Makefile.mk +++ b/src/mpid/ch3/channels/nemesis/utils/monitor/Makefile.mk @@ -5,7 +5,7 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/channels/nemesis/utils/monitor/papi_defs.c AM_CPPFLAGS += -I$(top_srcdir)/src/mpid/ch3/channels/nemesis/utils/monitor diff --git a/src/mpid/ch3/channels/nemesis/utils/replacements/Makefile.mk b/src/mpid/ch3/channels/nemesis/utils/replacements/Makefile.mk index c37f02d..c9ad004 100644 --- a/src/mpid/ch3/channels/nemesis/utils/replacements/Makefile.mk +++ b/src/mpid/ch3/channels/nemesis/utils/replacements/Makefile.mk @@ -5,6 +5,6 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/channels/nemesis/utils/replacements/mkstemp.c diff --git a/src/mpid/ch3/channels/sock/src/Makefile.mk b/src/mpid/ch3/channels/sock/src/Makefile.mk index 534c5df..8885bbb 100644 --- a/src/mpid/ch3/channels/sock/src/Makefile.mk +++ b/src/mpid/ch3/channels/sock/src/Makefile.mk @@ -11,7 +11,7 @@ errnames_txt_files += src/mpid/ch3/channels/sock/src/errnames.txt if BUILD_CH3_SOCK -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/channels/sock/src/ch3_finalize.c \ src/mpid/ch3/channels/sock/src/ch3_init.c \ src/mpid/ch3/channels/sock/src/ch3_isend.c \ diff --git a/src/mpid/ch3/src/Makefile.mk b/src/mpid/ch3/src/Makefile.mk index 567e46b..64b075e 100644 --- a/src/mpid/ch3/src/Makefile.mk +++ b/src/mpid/ch3/src/Makefile.mk @@ -5,7 +5,7 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/src/ch3u_buffer.c \ src/mpid/ch3/src/ch3u_comm.c \ src/mpid/ch3/src/ch3u_comm_spawn_multiple.c \ diff --git a/src/mpid/ch3/util/ftb/Makefile.mk b/src/mpid/ch3/util/ftb/Makefile.mk index 9a36274..02222b3 100644 --- a/src/mpid/ch3/util/ftb/Makefile.mk +++ b/src/mpid/ch3/util/ftb/Makefile.mk @@ -9,7 +9,7 @@ errnames_txt_files += src/mpid/ch3/util/ftb/errnames.txt if BUILD_CH3_UTIL_FTB -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/util/ftb/ftb.c endif BUILD_CH3_UTIL_FTB diff --git a/src/mpid/ch3/util/sock/Makefile.mk b/src/mpid/ch3/util/sock/Makefile.mk index b37482b..044a868 100644 --- a/src/mpid/ch3/util/sock/Makefile.mk +++ b/src/mpid/ch3/util/sock/Makefile.mk @@ -9,7 +9,7 @@ errnames_txt_files += src/mpid/ch3/util/sock/errnames.txt if BUILD_CH3_UTIL_SOCK -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/ch3/util/sock/ch3u_init_sock.c \ src/mpid/ch3/util/sock/ch3u_connect_sock.c \ src/mpid/ch3/util/sock/ch3u_getinterfaces.c diff --git a/src/mpid/common/datatype/Makefile.mk b/src/mpid/common/datatype/Makefile.mk index 31a8c64..fd61cc1 100644 --- a/src/mpid/common/datatype/Makefile.mk +++ b/src/mpid/common/datatype/Makefile.mk @@ -9,7 +9,7 @@ if BUILD_MPID_COMMON_DATATYPE include $(top_srcdir)/src/mpid/common/datatype/dataloop/Makefile.mk -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/common/datatype/mpid_contents_support.c \ src/mpid/common/datatype/mpid_datatype_contents.c \ src/mpid/common/datatype/mpid_datatype_free.c \ diff --git a/src/mpid/common/datatype/dataloop/Makefile.mk b/src/mpid/common/datatype/dataloop/Makefile.mk index ec67180..8bf212a 100644 --- a/src/mpid/common/datatype/dataloop/Makefile.mk +++ b/src/mpid/common/datatype/dataloop/Makefile.mk @@ -7,7 +7,7 @@ ## this file is already guarded by an "if BUILD_MPID_COMMON_DATATYPE" -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/common/datatype/dataloop/darray_support.c \ src/mpid/common/datatype/dataloop/dataloop.c \ src/mpid/common/datatype/dataloop/dataloop_create.c \ diff --git a/src/mpid/common/sched/Makefile.mk b/src/mpid/common/sched/Makefile.mk index c716227..3dbfe06 100644 --- a/src/mpid/common/sched/Makefile.mk +++ b/src/mpid/common/sched/Makefile.mk @@ -7,7 +7,7 @@ if BUILD_MPID_COMMON_SCHED -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/common/sched/mpid_sched.c # so that the the device (e.g., ch3) can successfully include mpid_sched_pre.h diff --git a/src/mpid/common/sock/poll/Makefile.mk b/src/mpid/common/sock/poll/Makefile.mk index 6da9f78..9d05f86 100644 --- a/src/mpid/common/sock/poll/Makefile.mk +++ b/src/mpid/common/sock/poll/Makefile.mk @@ -10,7 +10,7 @@ errnames_txt_files += src/mpid/common/sock/poll/errnames.txt ## this whole file is also already guarded by "if BUILD_MPID_COMMON_SOCK" if BUILD_MPID_COMMON_SOCK_POLL -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/common/sock/poll/sock.c # FIXME these ".i" files are awful and should be fixed somehow. They are diff --git a/src/mpid/common/thread/Makefile.mk b/src/mpid/common/thread/Makefile.mk index 6597003..283994c 100644 --- a/src/mpid/common/thread/Makefile.mk +++ b/src/mpid/common/thread/Makefile.mk @@ -12,7 +12,7 @@ if THREAD_SERIALIZED_OR_MULTIPLE AM_CPPFLAGS += -I$(top_srcdir)/src/mpid/common/thread noinst_HEADERS += src/mpid/common/thread/mpid_thread.h -lib_lib@MPILIBNAME@_la_SOURCES += src/mpid/common/thread/mpid_thread.c +mpi_core_sources += src/mpid/common/thread/mpid_thread.c endif THREAD_SERIALIZED_OR_MULTIPLE endif BUILD_MPID_COMMON_THREAD diff --git a/src/mpid/pamid/src/Makefile.mk b/src/mpid/pamid/src/Makefile.mk index 8f03768..9ccd933 100644 --- a/src/mpid/pamid/src/Makefile.mk +++ b/src/mpid/pamid/src/Makefile.mk @@ -39,7 +39,7 @@ include $(top_srcdir)/src/mpid/pamid/src/pt2pt/Makefile.mk include $(top_srcdir)/src/mpid/pamid/src/dyntask/Makefile.mk -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/mpid_buffer.c \ src/mpid/pamid/src/mpidi_bufmm.c \ src/mpid/pamid/src/mpid_finalize.c \ diff --git a/src/mpid/pamid/src/coll/Makefile.mk b/src/mpid/pamid/src/coll/Makefile.mk index a11e6a1..33f40aa 100644 --- a/src/mpid/pamid/src/coll/Makefile.mk +++ b/src/mpid/pamid/src/coll/Makefile.mk @@ -38,7 +38,7 @@ include $(top_srcdir)/src/mpid/pamid/src/coll/exscan/Makefile.mk include $(top_srcdir)/src/mpid/pamid/src/coll/ired_scat_block/Makefile.mk include $(top_srcdir)/src/mpid/pamid/src/coll/ired_scat/Makefile.mk -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/coll_utils.c diff --git a/src/mpid/pamid/src/coll/allgather/Makefile.mk b/src/mpid/pamid/src/coll/allgather/Makefile.mk index dc8864e..db3c098 100644 --- a/src/mpid/pamid/src/coll/allgather/Makefile.mk +++ b/src/mpid/pamid/src/coll/allgather/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/allgather/mpido_allgather.c \ src/mpid/pamid/src/coll/allgather/mpido_iallgather.c diff --git a/src/mpid/pamid/src/coll/allgatherv/Makefile.mk b/src/mpid/pamid/src/coll/allgatherv/Makefile.mk index f0ba398..c8895ca 100644 --- a/src/mpid/pamid/src/coll/allgatherv/Makefile.mk +++ b/src/mpid/pamid/src/coll/allgatherv/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c \ src/mpid/pamid/src/coll/allgatherv/mpido_iallgatherv.c diff --git a/src/mpid/pamid/src/coll/allreduce/Makefile.mk b/src/mpid/pamid/src/coll/allreduce/Makefile.mk index 2be9e61..875e2d9 100644 --- a/src/mpid/pamid/src/coll/allreduce/Makefile.mk +++ b/src/mpid/pamid/src/coll/allreduce/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/allreduce/mpido_allreduce.c \ src/mpid/pamid/src/coll/allreduce/mpido_iallreduce.c diff --git a/src/mpid/pamid/src/coll/alltoall/Makefile.mk b/src/mpid/pamid/src/coll/alltoall/Makefile.mk index 1f40331..f82f25e 100644 --- a/src/mpid/pamid/src/coll/alltoall/Makefile.mk +++ b/src/mpid/pamid/src/coll/alltoall/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c \ src/mpid/pamid/src/coll/alltoall/mpido_ialltoall.c diff --git a/src/mpid/pamid/src/coll/alltoallv/Makefile.mk b/src/mpid/pamid/src/coll/alltoallv/Makefile.mk index 15ab517..4e95a3c 100644 --- a/src/mpid/pamid/src/coll/alltoallv/Makefile.mk +++ b/src/mpid/pamid/src/coll/alltoallv/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c \ src/mpid/pamid/src/coll/alltoallv/mpido_ialltoallv.c diff --git a/src/mpid/pamid/src/coll/alltoallw/Makefile.mk b/src/mpid/pamid/src/coll/alltoallw/Makefile.mk index 33a90cc..4393952 100644 --- a/src/mpid/pamid/src/coll/alltoallw/Makefile.mk +++ b/src/mpid/pamid/src/coll/alltoallw/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/alltoallw/mpido_ialltoallw.c diff --git a/src/mpid/pamid/src/coll/barrier/Makefile.mk b/src/mpid/pamid/src/coll/barrier/Makefile.mk index 5f17631..3d49921 100644 --- a/src/mpid/pamid/src/coll/barrier/Makefile.mk +++ b/src/mpid/pamid/src/coll/barrier/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/barrier/mpido_barrier.c \ src/mpid/pamid/src/coll/barrier/mpido_ibarrier.c diff --git a/src/mpid/pamid/src/coll/bcast/Makefile.mk b/src/mpid/pamid/src/coll/bcast/Makefile.mk index 2b0c9fe..3988631 100644 --- a/src/mpid/pamid/src/coll/bcast/Makefile.mk +++ b/src/mpid/pamid/src/coll/bcast/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/bcast/mpido_bcast.c \ src/mpid/pamid/src/coll/bcast/mpido_ibcast.c diff --git a/src/mpid/pamid/src/coll/exscan/Makefile.mk b/src/mpid/pamid/src/coll/exscan/Makefile.mk index bd79293..511bc9d 100644 --- a/src/mpid/pamid/src/coll/exscan/Makefile.mk +++ b/src/mpid/pamid/src/coll/exscan/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/exscan/mpido_iexscan.c diff --git a/src/mpid/pamid/src/coll/gather/Makefile.mk b/src/mpid/pamid/src/coll/gather/Makefile.mk index 3a999c8..7b95dee 100644 --- a/src/mpid/pamid/src/coll/gather/Makefile.mk +++ b/src/mpid/pamid/src/coll/gather/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/gather/mpido_gather.c \ src/mpid/pamid/src/coll/gather/mpido_igather.c diff --git a/src/mpid/pamid/src/coll/gatherv/Makefile.mk b/src/mpid/pamid/src/coll/gatherv/Makefile.mk index efb4ac0..ee401df 100644 --- a/src/mpid/pamid/src/coll/gatherv/Makefile.mk +++ b/src/mpid/pamid/src/coll/gatherv/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c \ src/mpid/pamid/src/coll/gatherv/mpido_igatherv.c diff --git a/src/mpid/pamid/src/coll/ired_scat/Makefile.mk b/src/mpid/pamid/src/coll/ired_scat/Makefile.mk index da23390..b975ffd 100644 --- a/src/mpid/pamid/src/coll/ired_scat/Makefile.mk +++ b/src/mpid/pamid/src/coll/ired_scat/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/ired_scat/mpido_ired_scat.c diff --git a/src/mpid/pamid/src/coll/ired_scat_block/Makefile.mk b/src/mpid/pamid/src/coll/ired_scat_block/Makefile.mk index abacf7a..562c719 100644 --- a/src/mpid/pamid/src/coll/ired_scat_block/Makefile.mk +++ b/src/mpid/pamid/src/coll/ired_scat_block/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/ired_scat_block/mpido_ired_scat_block.c diff --git a/src/mpid/pamid/src/coll/reduce/Makefile.mk b/src/mpid/pamid/src/coll/reduce/Makefile.mk index b7421dc..c962c91 100644 --- a/src/mpid/pamid/src/coll/reduce/Makefile.mk +++ b/src/mpid/pamid/src/coll/reduce/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/reduce/mpido_reduce.c \ src/mpid/pamid/src/coll/reduce/mpido_ireduce.c diff --git a/src/mpid/pamid/src/coll/scan/Makefile.mk b/src/mpid/pamid/src/coll/scan/Makefile.mk index 076fe58..88a44e0 100644 --- a/src/mpid/pamid/src/coll/scan/Makefile.mk +++ b/src/mpid/pamid/src/coll/scan/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/scan/mpido_scan.c diff --git a/src/mpid/pamid/src/coll/scatter/Makefile.mk b/src/mpid/pamid/src/coll/scatter/Makefile.mk index b64f873..9cf6067 100644 --- a/src/mpid/pamid/src/coll/scatter/Makefile.mk +++ b/src/mpid/pamid/src/coll/scatter/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/scatter/mpido_scatter.c \ src/mpid/pamid/src/coll/scatter/mpido_iscatter.c diff --git a/src/mpid/pamid/src/coll/scatterv/Makefile.mk b/src/mpid/pamid/src/coll/scatterv/Makefile.mk index d0f9e51..7e00f99 100644 --- a/src/mpid/pamid/src/coll/scatterv/Makefile.mk +++ b/src/mpid/pamid/src/coll/scatterv/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c \ src/mpid/pamid/src/coll/scatterv/mpido_iscatterv.c diff --git a/src/mpid/pamid/src/comm/Makefile.mk b/src/mpid/pamid/src/comm/Makefile.mk index 12800aa..de786c7 100644 --- a/src/mpid/pamid/src/comm/Makefile.mk +++ b/src/mpid/pamid/src/comm/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/comm/mpid_comm.c \ src/mpid/pamid/src/comm/mpid_selectcolls.c \ src/mpid/pamid/src/comm/mpid_optcolls.c diff --git a/src/mpid/pamid/src/dyntask/Makefile.mk b/src/mpid/pamid/src/dyntask/Makefile.mk index 64402d8..508de5d 100644 --- a/src/mpid/pamid/src/dyntask/Makefile.mk +++ b/src/mpid/pamid/src/dyntask/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/dyntask/mpid_comm_spawn_multiple.c \ src/mpid/pamid/src/dyntask/mpid_comm_disconnect.c \ src/mpid/pamid/src/dyntask/mpid_port.c \ diff --git a/src/mpid/pamid/src/misc/Makefile.mk b/src/mpid/pamid/src/misc/Makefile.mk index 4a35883..10f6587 100644 --- a/src/mpid/pamid/src/misc/Makefile.mk +++ b/src/mpid/pamid/src/misc/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/misc/mpid_abort.c \ src/mpid/pamid/src/misc/mpid_get_universe_size.c \ src/mpid/pamid/src/misc/mpid_getpname.c \ diff --git a/src/mpid/pamid/src/mpix/Makefile.mk b/src/mpid/pamid/src/mpix/Makefile.mk index 49ab221..8f4b990 100644 --- a/src/mpid/pamid/src/mpix/Makefile.mk +++ b/src/mpid/pamid/src/mpix/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/mpix/mpix.c diff --git a/src/mpid/pamid/src/onesided/Makefile.mk b/src/mpid/pamid/src/onesided/Makefile.mk index 9a6cd37..c58ca32 100644 --- a/src/mpid/pamid/src/onesided/Makefile.mk +++ b/src/mpid/pamid/src/onesided/Makefile.mk @@ -25,7 +25,7 @@ noinst_HEADERS += \ src/mpid/pamid/src/onesided/mpidi_onesided.h -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/onesided/mpid_1s.c \ src/mpid/pamid/src/onesided/mpid_win_accumulate.c \ src/mpid/pamid/src/onesided/mpid_win_create.c \ diff --git a/src/mpid/pamid/src/pamix/Makefile.mk b/src/mpid/pamid/src/pamix/Makefile.mk index 63c1a5a..0ab3a81 100644 --- a/src/mpid/pamid/src/pamix/Makefile.mk +++ b/src/mpid/pamid/src/pamix/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/pamix/pamix.c diff --git a/src/mpid/pamid/src/pt2pt/Makefile.mk b/src/mpid/pamid/src/pt2pt/Makefile.mk index 873e19c..c8dc0e4 100644 --- a/src/mpid/pamid/src/pt2pt/Makefile.mk +++ b/src/mpid/pamid/src/pt2pt/Makefile.mk @@ -30,7 +30,7 @@ noinst_HEADERS += \ include $(top_srcdir)/src/mpid/pamid/src/pt2pt/persistent/Makefile.mk -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/pt2pt/mpid_cancel.c \ src/mpid/pamid/src/pt2pt/mpid_issend.c \ src/mpid/pamid/src/pt2pt/mpid_recv.c \ diff --git a/src/mpid/pamid/src/pt2pt/persistent/Makefile.mk b/src/mpid/pamid/src/pt2pt/persistent/Makefile.mk index 7f365a8..e2894a6 100644 --- a/src/mpid/pamid/src/pt2pt/persistent/Makefile.mk +++ b/src/mpid/pamid/src/pt2pt/persistent/Makefile.mk @@ -21,7 +21,7 @@ if BUILD_PAMID -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/mpid/pamid/src/pt2pt/persistent/mpid_recv_init.c \ src/mpid/pamid/src/pt2pt/persistent/mpid_send_init.c \ src/mpid/pamid/src/pt2pt/persistent/mpid_startall.c diff --git a/src/nameserv/file/Makefile.mk b/src/nameserv/file/Makefile.mk index ee4c2fa..f3b455e 100644 --- a/src/nameserv/file/Makefile.mk +++ b/src/nameserv/file/Makefile.mk @@ -7,7 +7,7 @@ if BUILD_NAMEPUB_FILE -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/nameserv/file/file_nameserv.c endif BUILD_NAMEPUB_FILE diff --git a/src/nameserv/mpd/Makefile.mk b/src/nameserv/mpd/Makefile.mk index 22fb208..18a3ade 100644 --- a/src/nameserv/mpd/Makefile.mk +++ b/src/nameserv/mpd/Makefile.mk @@ -7,7 +7,7 @@ if BUILD_NAMEPUB_MPD -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/nameserv/mpd/mpd_nameserv.c endif BUILD_NAMEPUB_MPD diff --git a/src/nameserv/pmi/Makefile.mk b/src/nameserv/pmi/Makefile.mk index a955f74..fee93ce 100644 --- a/src/nameserv/pmi/Makefile.mk +++ b/src/nameserv/pmi/Makefile.mk @@ -7,7 +7,7 @@ if BUILD_NAMEPUB_PMI -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/nameserv/pmi/pmi_nameserv.c endif BUILD_NAMEPUB_PMI diff --git a/src/pmi/pmi2/poe/Makefile.mk b/src/pmi/pmi2/poe/Makefile.mk index a10fb21..26707a9 100644 --- a/src/pmi/pmi2/poe/Makefile.mk +++ b/src/pmi/pmi2/poe/Makefile.mk @@ -7,7 +7,7 @@ if BUILD_PMI_PMI2_POE -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/pmi/pmi2/poe/poe2pmi.c AM_CPPFLAGS += -I$(top_srcdir)/src/pmi/pmi2/poe diff --git a/src/pmi/pmi2/simple/Makefile.mk b/src/pmi/pmi2/simple/Makefile.mk index 6b90099..bd48a66 100644 --- a/src/pmi/pmi2/simple/Makefile.mk +++ b/src/pmi/pmi2/simple/Makefile.mk @@ -7,7 +7,7 @@ if BUILD_PMI_PMI2_SIMPLE -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/pmi/pmi2/simple/simple2pmi.c \ src/pmi/pmi2/simple/simple_pmiutil.c diff --git a/src/pmi/simple/Makefile.mk b/src/pmi/simple/Makefile.mk index ac94677..ef0eec8 100644 --- a/src/pmi/simple/Makefile.mk +++ b/src/pmi/simple/Makefile.mk @@ -7,7 +7,7 @@ if BUILD_PMI_SIMPLE -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/pmi/simple/simple_pmiutil.c \ src/pmi/simple/simple_pmi.c diff --git a/src/util/cvar/Makefile.mk b/src/util/cvar/Makefile.mk index fa1543f..12764ca 100644 --- a/src/util/cvar/Makefile.mk +++ b/src/util/cvar/Makefile.mk @@ -5,7 +5,7 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/util/cvar/mpich_cvars.c if MAINTAINER_MODE diff --git a/src/util/dbg/Makefile.mk b/src/util/dbg/Makefile.mk index 92bedb8..0c4be0f 100644 --- a/src/util/dbg/Makefile.mk +++ b/src/util/dbg/Makefile.mk @@ -5,7 +5,7 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/util/dbg/dbg_printf.c \ src/util/dbg/timelimit.c \ src/util/dbg/exit.c diff --git a/src/util/instrm/Makefile.mk b/src/util/instrm/Makefile.mk index df7707c..cca66a4 100644 --- a/src/util/instrm/Makefile.mk +++ b/src/util/instrm/Makefile.mk @@ -5,7 +5,7 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/util/instrm/states.c \ src/util/instrm/instr.c diff --git a/src/util/logging/common/Makefile.mk b/src/util/logging/common/Makefile.mk index afc08e4..1efddcc 100644 --- a/src/util/logging/common/Makefile.mk +++ b/src/util/logging/common/Makefile.mk @@ -7,7 +7,7 @@ ## this code is commented out in the old Makefile.sm, so we leave it here but ## similarly disabled -##lib_lib@MPILIBNAME@_la_SOURCES += \ +##mpi_core_sources += \ ## describe_states.c AM_CPPFLAGS += -Isrc/util/logging/common diff --git a/src/util/mem/Makefile.mk b/src/util/mem/Makefile.mk index 8bf8a5b..7d4400a 100644 --- a/src/util/mem/Makefile.mk +++ b/src/util/mem/Makefile.mk @@ -5,7 +5,7 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/util/mem/trmem.c \ src/util/mem/handlemem.c \ src/util/mem/safestr.c \ diff --git a/src/util/msgs/Makefile.mk b/src/util/msgs/Makefile.mk index c676bb4..ab7b3f6 100644 --- a/src/util/msgs/Makefile.mk +++ b/src/util/msgs/Makefile.mk @@ -5,6 +5,6 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/util/msgs/msgprint.c diff --git a/src/util/other/Makefile.mk b/src/util/other/Makefile.mk index 421a024..25204c0 100644 --- a/src/util/other/Makefile.mk +++ b/src/util/other/Makefile.mk @@ -5,7 +5,7 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/util/other/outliers.c \ src/util/other/assert.c diff --git a/src/util/procmap/Makefile.mk b/src/util/procmap/Makefile.mk index 8982f28..58b43fa 100644 --- a/src/util/procmap/Makefile.mk +++ b/src/util/procmap/Makefile.mk @@ -5,6 +5,6 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/util/procmap/local_proc.c diff --git a/src/util/thread/Makefile.mk b/src/util/thread/Makefile.mk index 3ad4893..3d68e2d 100644 --- a/src/util/thread/Makefile.mk +++ b/src/util/thread/Makefile.mk @@ -5,6 +5,6 @@ ## See COPYRIGHT in top-level directory. ## -lib_lib@MPILIBNAME@_la_SOURCES += \ +mpi_core_sources += \ src/util/thread/mpiu_thread.c http://git.mpich.org/mpich.git/commitdiff/be23b0d823f7fd3e17ce02e1b966b78c48... commit be23b0d823f7fd3e17ce02e1b966b78c48983c92 Author: Pavan Balaji <[email protected]> Date: Sat Mar 29 15:59:59 2014 -0500 Make binding automake conditional names consistent. Rename BUILD_CXX_LIB to BUILD_CXX_BINDING. Rename BUILD_F90_LIB to BUILD_FC_BINDING. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/configure.ac b/configure.ac index 9596fdc..059f746 100644 --- a/configure.ac +++ b/configure.ac @@ -5824,10 +5824,10 @@ MPICH_ENABLE_FC=$enable_fc export MPICH_ENABLE_CXX export MPICH_ENABLE_F77 export MPICH_ENABLE_FC -AM_CONDITIONAL([BUILD_CXX_LIB],[test "$enable_cxx" = "yes"]) +AM_CONDITIONAL([BUILD_CXX_BINDING],[test "$enable_cxx" = "yes"]) AM_CONDITIONAL([BUILD_F77_BINDING],[test "$enable_f77" = "yes"]) dnl FIXME DJG this has been moved to the f90 bindings subconfigure.m4 for now -dnl AM_CONDITIONAL([BUILD_F90_LIB],[test "$enable_fc" = "yes"]) +dnl AM_CONDITIONAL([BUILD_FC_BINDING],[test "$enable_fc" = "yes"]) # MPI_SRCDIR gives the test/mpi configure the location of the source # files for an MPI implementation if test -n "$ac_abs_srcdir" ; then diff --git a/src/binding/cxx/Makefile.mk b/src/binding/cxx/Makefile.mk index bfc4424..da1db96 100644 --- a/src/binding/cxx/Makefile.mk +++ b/src/binding/cxx/Makefile.mk @@ -8,7 +8,7 @@ # ensure that the buildiface script ends up in the release tarball EXTRA_DIST += src/binding/cxx/buildiface -if BUILD_CXX_LIB +if BUILD_CXX_BINDING # No profile library for C++. All routines call the MPI, not PMPI, routines. lib_LTLIBRARIES += lib/lib@[email protected] @@ -49,5 +49,5 @@ mpicovsimple.o: mpicovsimple.cxx mpicovsimple.h $(CXXCOMPILE) -c -DCOVERAGE_DIR='"@builddir@"' ${srcdir}/mpicovsimple.cxx endif BUILD_COVERAGE -endif BUILD_CXX_LIB +endif BUILD_CXX_BINDING diff --git a/src/binding/fortran/use_mpi/buildiface b/src/binding/fortran/use_mpi/buildiface index 3251c4b..4f54e4a 100755 --- a/src/binding/fortran/use_mpi/buildiface +++ b/src/binding/fortran/use_mpi/buildiface @@ -917,7 +917,7 @@ mod_verbose = \$(mod_verbose_\$(V)) mod_verbose_ = \$(mod_verbose_\$(AM_DEFAULT_VERBOSITY)) mod_verbose_0 = \@echo " MOD " \$\@; -if BUILD_F90_LIB +if BUILD_FC_BINDING # We need to tell some compilers (e.g., Solaris f90) to look for modules in the # current directory when the source file is not in the working directory (i.e., @@ -1089,7 +1089,7 @@ print MAKEFD "\n"; # ---------------------------------------------------------------------------- print MAKEFD "\n"; -print MAKEFD "endif BUILD_F90_LIB\n"; +print MAKEFD "endif BUILD_FC_BINDING\n"; close( MAKEFD ); &ReplaceIfDifferent( "Makefile.mk", "Makefile.mk.new" ); diff --git a/src/binding/fortran/use_mpi/subconfigure.m4 b/src/binding/fortran/use_mpi/subconfigure.m4 index 65a776d..285b38b 100644 --- a/src/binding/fortran/use_mpi/subconfigure.m4 +++ b/src/binding/fortran/use_mpi/subconfigure.m4 @@ -3,12 +3,12 @@ dnl This configure is used ONLY to determine the Fortran 90 features dnl that are needed to implement the create_type_xxx routines. AC_DEFUN([PAC_SUBCFG_PREREQ_]PAC_SUBCFG_AUTO_SUFFIX,[ -AM_CONDITIONAL([BUILD_F90_LIB],[test "X$enable_fc" = "Xyes"]) +AM_CONDITIONAL([BUILD_FC_BINDING],[test "X$enable_fc" = "Xyes"]) ]) AC_DEFUN([PAC_SUBCFG_BODY_]PAC_SUBCFG_AUTO_SUFFIX,[ -AM_COND_IF([BUILD_F90_LIB],[ +AM_COND_IF([BUILD_FC_BINDING],[ # FIXME XXX DJG this code came from a sub-configure in src/binding/fortran/use_mpi. Why # isn't this just all up in the top-level configure? Alternatively, why doesn't # most/all of the f90 configure code from the top level configure.ac live here @@ -60,7 +60,7 @@ AC_SUBST(FC_INTEGER_MODEL_MAP) AC_CONFIG_FILES([src/binding/fortran/use_mpi/mpif90model.h]) -])dnl end AM_COND_IF(BUILD_F90_LIB,...) +])dnl end AM_COND_IF(BUILD_FC_BINDING,...) ])dnl end _BODY [#] end of __file__ diff --git a/src/env/Makefile.mk b/src/env/Makefile.mk index 9304622..53cc117 100644 --- a/src/env/Makefile.mk +++ b/src/env/Makefile.mk @@ -31,13 +31,13 @@ if BUILD_F77_BINDING bin_SCRIPTS += src/env/mpif77 endif BUILD_F77_BINDING -if BUILD_F90_LIB +if BUILD_FC_BINDING bin_SCRIPTS += src/env/mpif90 -endif BUILD_F90_LIB +endif BUILD_FC_BINDING -if BUILD_CXX_LIB +if BUILD_CXX_BINDING bin_SCRIPTS += src/env/mpicxx -endif BUILD_CXX_LIB +endif BUILD_CXX_BINDING # create a local copy of the compiler wrapper that will actually be installed if BUILD_BASH_SCRIPTS http://git.mpich.org/mpich.git/commitdiff/880838007641211afb858e36d765784086... commit 880838007641211afb858e36d765784086572e29 Author: Pavan Balaji <[email protected]> Date: Mon Mar 31 01:38:10 2014 -0500 Use CPPFLAGS for preprocessor macros. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/src/binding/fortran/mpif_h/buildiface b/src/binding/fortran/mpif_h/buildiface index 8a7648b..8f30461 100755 --- a/src/binding/fortran/mpif_h/buildiface +++ b/src/binding/fortran/mpif_h/buildiface @@ -5553,8 +5553,7 @@ sub AddFwrapDefs { ##&print_endline( MAKEFD ); print MAKEFD "\n"; print MAKEFD "lib_LTLIBRARIES += lib/lib\@MPIFLIBNAME\@.la\n"; - ## FIXME should these be CPPFLAGS instead? - print MAKEFD "lib_lib\@MPIFLIBNAME\@_la_CFLAGS = \$(AM_CFLAGS) -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES\n"; + print MAKEFD "lib_lib\@MPIFLIBNAME\@_la_CPPFLAGS = \$(AM_CPPFLAGS) -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES\n"; print MAKEFD "lib_lib\@MPIFLIBNAME\@_la_SOURCES = \$(mpi_f77_sources)\n"; print MAKEFD "lib_lib\@MPIFLIBNAME\@_la_LDFLAGS = \$(ABIVERSIONFLAGS)\n\n"; } diff --git a/src/binding/fortran/use_mpi/buildiface b/src/binding/fortran/use_mpi/buildiface index 87ee5a5..3251c4b 100755 --- a/src/binding/fortran/use_mpi/buildiface +++ b/src/binding/fortran/use_mpi/buildiface @@ -962,6 +962,7 @@ lib_lib\@MPIFCLIBNAME\@_la_LDFLAGS = \$(ABIVERSIONFLAGS) # the current directory AM_FCFLAGS += \$(FCMODOUTFLAG)src/binding/fortran/use_mpi +lib_lib\@MPIFCLIBNAME\@_la_CPPFLAGS = \$(AM_CPPFLAGS) -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES # we "manually" build the f90 sources and add them with LIBADD lib_lib\@MPIFCLIBNAME\@_la_SOURCES = lib_lib\@MPIFCLIBNAME\@_la_LIBADD = \\ http://git.mpich.org/mpich.git/commitdiff/42fe2ccf418d364ce552e1d4d9aab08c6e... commit 42fe2ccf418d364ce552e1d4d9aab08c6e028860 Author: Pavan Balaji <[email protected]> Date: Sun Mar 23 20:31:59 2014 -0500 Rename mpich libraries. The following library names are used to make the naming consistent across the ABI compatibility group: C libraries: libmpi.* and libpmpi.* C++ library: libmpicxx.* F77 libraries: libmpif77.* F90+ library: libmpifort.* This patch also gets rid of the FWRAPNAME variable, which is a duplicate of MPIFLIBNAME. Similarly, FCWRAPNAME is removed and a new variable MPIFCLIBNAME is added, so it's consistent with the other names. PMPIFLIBNAME, which was unused, is no longer present. Fixes #2039. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/Makefile.am b/Makefile.am index 7547f0d..f9f68ee 100644 --- a/Makefile.am +++ b/Makefile.am @@ -206,7 +206,7 @@ gcov_sources = $(lib_lib@MPILIBNAME@_la_SOURCES) # # Gcov has no good way to deal with source files that have been compiled twice # into two different object files, such as -# bcast.c --> {bcast.o,lib_libpmpich_la-bcast.o} +# bcast.c --> {bcast.o,lib_libpmpi_la-bcast.o} # It still generates a bcast.c.gcov output for each object file. Long file # names and preserved paths do not help with this problem. # What we can do in this case is to move the second files to a separate diff --git a/README.vin b/README.vin index cf23510..9e6902b 100644 --- a/README.vin +++ b/README.vin @@ -821,19 +821,19 @@ To run an MPICH-built program with Intel: For applications built with the default Intel MPI configuration: - ln -s /path/to/intel/lib/libmpi.so libmpich.so.12 - ln -s /path/to/intel/lib/libmpigc4.so libmpichcxx.so.12 - ln -s /path/to/intel/lib/libmpigf.so libfmpich.so.12 - ln -s /path/to/intel/lib/libmpigf.so libmpichf90.so.12 + ln -s /path/to/intel/lib/libmpi.so libmpi.so.12 + ln -s /path/to/intel/lib/libmpigc4.so libmpicxx.so.12 + ln -s /path/to/intel/lib/libmpigf.so libmpif77.so.12 + ln -s /path/to/intel/lib/libmpigf.so libmpifort.so.12 ln -s /path/to/intel/lib/libmpi.so libmpl.so.1 ln -s /path/to/intel/lib/libmpi.so libopa.so.1 For applications built with the debug configuration of Intel MPI: - ln -s /path/to/intel/lib/libmpi_dbg.so libmpich.so.12 - ln -s /path/to/intel/lib/libmpigc4.so libmpichcxx.so.12 - ln -s /path/to/intel/lib/libmpigf.so libfmpich.so.12 - ln -s /path/to/intel/lib/libmpigf.so libmpichf90.so.12 + ln -s /path/to/intel/lib/libmpi_dbg.so libmpi.so.12 + ln -s /path/to/intel/lib/libmpigc4.so libmpicxx.so.12 + ln -s /path/to/intel/lib/libmpigf.so libmpif77.so.12 + ln -s /path/to/intel/lib/libmpigf.so libmpifort.so.12 ln -s /path/to/intel/lib/libmpi_dbg.so libmpl.so.1 ln -s /path/to/intel/lib/libmpi_dbg.so libopa.so.1 @@ -854,10 +854,10 @@ To run an Intel-built program with MPICH: 1. Create symlinks - ln -s /path/to/mpich/lib/libmpich.so libmpi.so.5 - ln -s /path/to/mpich/lib/libmpich.so libmpi_dbg.so.5 - ln -s /path/to/mpich/lib/libmpichcxx.so libmpigc4.so.5 - ln -s /path/to/mpich/lib/libmpichf90.so libmpigf.so.5 + ln -s /path/to/mpich/lib/libmpi.so libmpi.so.5 + ln -s /path/to/mpich/lib/libmpi.so libmpi_dbg.so.5 + ln -s /path/to/mpich/lib/libmpicxx.so libmpigc4.so.5 + ln -s /path/to/mpich/lib/libmpifort.so libmpigf.so.5 2. Modify LD_LIBRARY_PATH diff --git a/configure.ac b/configure.ac index e086df1..9596fdc 100644 --- a/configure.ac +++ b/configure.ac @@ -131,8 +131,8 @@ MPICH_VERSION=MPICH_VERSION_m4 AC_SUBST([MPICH_VERSION]) MPICH_RELEASE_DATE="MPICH_RELEASE_DATE_m4" AC_SUBST([MPICH_RELEASE_DATE]) -libmpich_so_version="libmpich_so_version_m4" -AC_SUBST([libmpich_so_version]) +libmpi_so_version="libmpi_so_version_m4" +AC_SUBST([libmpi_so_version]) if test -z "$MPICH_VERSION" ; then @@ -185,10 +185,10 @@ MPICH_NUMVERSION=`expr $V1$V2$V3$V4$V5 + 0` AC_SUBST(MPICH_NUMVERSION) # ABIVERSION is the name used by simplemake, so we reassign the -# libmpich_so_version number to it -ABIVERSION=${libmpich_so_version} +# libmpi_so_version number to it +ABIVERSION=${libmpi_so_version} export ABIVERSION -export libmpich_so_version +export libmpi_so_version AC_SUBST(ABIVERSION) # Print out the configure options @@ -593,23 +593,6 @@ AC_ARG_WITH(name-publisher, [], with_namepublisher=$with_name_publisher,) -AC_SUBST(MPIFLIBNAME) -AC_SUBST(PMPIFLIBNAME) - -dnl The default is a special wrapper library -AC_ARG_WITH(fwrapname, - AC_HELP_STRING([--with-fwrapname=name], - [Specify name of library containing Fortran interface routines]), - [FWRAPNAME=$withval;set_FWRAPNAME="yes"],FWRAPNAME=fmpich) -AC_SUBST(FWRAPNAME) - -dnl The default is a special wrapper library -AC_ARG_WITH(fcwrapname, - AC_HELP_STRING([--with-fcwrapname=name], - [Specify name of library containing Fortran 90 interface routines]), - [FCWRAPNAME=$withval;set_FCWRAPNAME="yes"],FCWRAPNAME=mpichf90) -AC_SUBST(FCWRAPNAME) - # Find a C compiler. # We also need to do this before the F77 and FC test to ensure that we # find the C preprocessor reliably. @@ -799,10 +782,10 @@ m4_map([PAC_SUBCFG_DO_PREREQ], [PAC_SUBCFG_MODULE_LIST]) # ---------------------------------------------------------------------------- # Set default library names if names haven't already been provided -AC_ARG_VAR([MPILIBNAME],[can be used to override the name of the MPI library (default: "mpich")]) +AC_ARG_VAR([MPILIBNAME],[can be used to override the name of the MPI library (default: "mpi")]) AC_ARG_VAR([PMPILIBNAME],[can be used to override the name of the MPI profiling library (default: "p$MPILIBNAME")]) AC_ARG_VAR([MPICXXLIBNAME],[can be used to override the name of the MPI C++ library (default: "${MPILIBNAME}cxx")]) -MPILIBNAME=${MPILIBNAME:-"mpich"} +MPILIBNAME=${MPILIBNAME:-"mpi"} PMPILIBNAME_set=no if test -n "$PMPILIBNAME" ; then PMPILIBNAME_set=yes @@ -814,10 +797,14 @@ PMPILIBNAME=${PMPILIBNAME:-"p$MPILIBNAME"} # We use a different library for the C++ wrappers to avoid problems when # creating shared libraries if test -z "$MPICXXLIBNAME" ; then MPICXXLIBNAME="${MPILIBNAME}cxx" ; fi -export MPIFLIBNAME -export PMPIFLIBNAME +if test -z "$MPIFLIBNAME" ; then MPIFLIBNAME="${MPILIBNAME}f77" ; fi +if test -z "$MPIFCLIBNAME" ; then MPIFCLIBNAME="${MPILIBNAME}fort" ; fi export MPICXXLIBNAME +export MPIFLIBNAME +export MPIFCLIBNAME AC_SUBST(MPICXXLIBNAME) +AC_SUBST(MPIFLIBNAME) +AC_SUBST(MPIFCLIBNAME) # We'll set FORTRAN_BINDING to 1 if we support Fortran FORTRAN_BINDING=0 @@ -2498,13 +2485,6 @@ AM_CONDITIONAL([BUILD_BASH_SCRIPTS], [test "x$bashWorks" = xyes]) if test "$NEEDSPLIB" = yes -a "$PMPILIBNAME" = "$MPILIBNAME" ; then NEEDSPLIB=no fi -# Set the defaults for the Fortran libraries to be the same as the C libraries -if test -z "$MPIFLIBNAME" ; then - MPIFLIBNAME=$MPILIBNAME -fi -if test -z "$PMPIFLIBNAME" ; then - PMPIFLIBNAME=$PMPILIBNAME -fi # ---------------------------------------------------------------------------- # diff --git a/examples/Makefile.am b/examples/Makefile.am index b38a6a7..72d593a 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -33,7 +33,7 @@ cpi_DEPENDENCIES = # to get rebuilt whenever MPICH's core libraries are rebuilt, but perhaps there # is a better system? -# the make-time instances of libpmpich.la and libmpich.la live here +# the make-time instances of libpmpi.la and libmpi.la live here AM_LDFLAGS += -L../lib # the make-time instances of libmpl.la and libopa.la live here AM_LDFLAGS += -L@mpllibdir@ -L@opalibdir@ diff --git a/maint/checkbuilds.in b/maint/checkbuilds.in index 9994df3..b1d1402 100644 --- a/maint/checkbuilds.in +++ b/maint/checkbuilds.in @@ -285,14 +285,14 @@ sub RunTest { # but we should only do that if explicitly requested (we could # *require* an empty directory for the tests instead) if (-d "$instdir/lib") { - system "rm -f $instdir/lib/libmpich*.* $instdir/lib/libfmpich*.*"; + system "rm -f $instdir/lib/libmpi*.* $instdir/lib/libmpif77*.*"; system "rm -f $instdir/lib/libmpe*.a"; } if (-d "$instdir/bin") { system "rm -f $instdir/bin/mpi* $instdir/bin/mpd*"; } if (-d "$builddir/lib") { - system "rm -f $builddir/lib/libmpich*.* $builddir/lib/libfmpich*.*"; + system "rm -f $builddir/lib/libmpi*.* $builddir/lib/libmpif77*.*"; system "rm -f $builddir/lib/libmpe*.a"; } # diff --git a/maint/samplebuilds b/maint/samplebuilds index 283aa91..8f1b363 100755 --- a/maint/samplebuilds +++ b/maint/samplebuilds @@ -78,8 +78,8 @@ if $srcdir/configure --prefix=$instdir $config_args ; then echo "</CONFIG>" echo "<MAKE>" # Remove any lingering libraries - rm -f lib/libmpich*.a lib/libpmpich*.a lib/libfmpich*.a - rm -f lib/libmpich*.so lib/libpmpich*.so lib/libfmpich*.so + rm -f lib/libmpi*.a lib/libpmpi*.a lib/libmpif77*.a + rm -f lib/libmpi*.so lib/libpmpi*.so lib/libmpif77*.so if make ; then echo "</MAKE>" echo "<MAKEINST>" diff --git a/maint/version.m4 b/maint/version.m4 index eaf0221..3d8c0da 100644 --- a/maint/version.m4 +++ b/maint/version.m4 @@ -32,9 +32,9 @@ m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # 4. If any interfaces have been removed since the last public # release, then set age to 0. -# libmpich so version only includes functionality defined in the MPI +# libmpi so version only includes functionality defined in the MPI # standard, and does not include MPIX_ functions and C++ bindings. -m4_define([libmpich_so_version_m4],[12:0:0])dnl +m4_define([libmpi_so_version_m4],[12:0:0])dnl [#] end of __file__ diff --git a/src/binding/fortran/mpif_h/buildiface b/src/binding/fortran/mpif_h/buildiface index 024baca..8a7648b 100755 --- a/src/binding/fortran/mpif_h/buildiface +++ b/src/binding/fortran/mpif_h/buildiface @@ -5551,14 +5551,12 @@ sub AddFwrapDefs { ## &print_line( MAKEFD, "_w$basename.o ", 80, "\\\n\t", 8 ); ##} ##&print_endline( MAKEFD ); - # FWRAPNAME is the name of a library that contains ONLY the - # Fortran wrappers print MAKEFD "\n"; - print MAKEFD "lib_LTLIBRARIES += lib/lib\@FWRAPNAME\@.la\n"; + print MAKEFD "lib_LTLIBRARIES += lib/lib\@MPIFLIBNAME\@.la\n"; ## FIXME should these be CPPFLAGS instead? - print MAKEFD "lib_lib\@FWRAPNAME\@_la_CFLAGS = \$(AM_CFLAGS) -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES\n"; - print MAKEFD "lib_lib\@FWRAPNAME\@_la_SOURCES = \$(mpi_f77_sources)\n"; - print MAKEFD "lib_lib\@FWRAPNAME\@_la_LDFLAGS = \$(ABIVERSIONFLAGS)\n\n"; + print MAKEFD "lib_lib\@MPIFLIBNAME\@_la_CFLAGS = \$(AM_CFLAGS) -DMPICH_MPI_FROM_PMPI -DUSE_ONLY_MPI_NAMES\n"; + print MAKEFD "lib_lib\@MPIFLIBNAME\@_la_SOURCES = \$(mpi_f77_sources)\n"; + print MAKEFD "lib_lib\@MPIFLIBNAME\@_la_LDFLAGS = \$(ABIVERSIONFLAGS)\n\n"; } # Allow multiple underscore versions of names diff --git a/src/binding/fortran/use_mpi/buildiface b/src/binding/fortran/use_mpi/buildiface index bfa3e78..87ee5a5 100755 --- a/src/binding/fortran/use_mpi/buildiface +++ b/src/binding/fortran/use_mpi/buildiface @@ -924,14 +924,14 @@ if BUILD_F90_LIB # in a VPATH build) AM_FCFLAGS += \@FCINCFLAG\@src/binding/fortran/use_mpi -lib_LTLIBRARIES += lib/lib\@FCWRAPNAME\@.la +lib_LTLIBRARIES += lib/lib\@MPIFCLIBNAME\@.la EOT print MAKEFD <<EOT; # C source that implements both the C and the Fortran bindings for the type -# creation routines. These go into libmpich.la and will be built a second time -# for inclusion in libpmpich.la on platforms that do not support weak symbols. +# creation routines. These go into libmpi.la and will be built a second time +# for inclusion in libpmpi.la on platforms that do not support weak symbols. # If shared libraries are enabled then the compilation space doubles again. mpi_f90_c_sources = \\ src/binding/fortran/use_mpi/create_f90_int.c \\ @@ -956,27 +956,27 @@ nodist_noinst_HEADERS += \\ src/binding/fortran/use_mpi/mpif90model.h # actual f90 code that also gets compiled into modules -lib_lib\@FCWRAPNAME\@_la_LDFLAGS = \$(ABIVERSIONFLAGS) +lib_lib\@MPIFCLIBNAME\@_la_LDFLAGS = \$(ABIVERSIONFLAGS) # cause any .\$(MOD) files to be output in the f90 bindings directory instead of # the current directory AM_FCFLAGS += \$(FCMODOUTFLAG)src/binding/fortran/use_mpi # we "manually" build the f90 sources and add them with LIBADD -lib_lib\@FCWRAPNAME\@_la_SOURCES = -lib_lib\@FCWRAPNAME\@_la_LIBADD = \\ +lib_lib\@MPIFCLIBNAME\@_la_SOURCES = +lib_lib\@MPIFCLIBNAME\@_la_LIBADD = \\ src/binding/fortran/use_mpi/mpi.lo \\ src/binding/fortran/use_mpi/mpi_constants.lo \\ src/binding/fortran/use_mpi/mpi_sizeofs.lo \\ src/binding/fortran/use_mpi/${outfile_prefix}_base.lo # now force libtool FC rules/variables to be generated and cause FC linking to -# be selected for lib/lib\@FCWRAPNAME\@.la -EXTRA_lib_lib\@FCWRAPNAME\@_la_SOURCES = \\ +# be selected for lib/lib\@MPIFCLIBNAME\@.la +EXTRA_lib_lib\@MPIFCLIBNAME\@_la_SOURCES = \\ src/binding/fortran/use_mpi/mpi.f90 \\ src/binding/fortran/use_mpi/mpi_constants.f90 -nodist_EXTRA_lib_lib\@FCWRAPNAME\@_la_SOURCES = \\ +nodist_EXTRA_lib_lib\@MPIFCLIBNAME\@_la_SOURCES = \\ src/binding/fortran/use_mpi/mpi_sizeofs.f90 \\ src/binding/fortran/use_mpi/${outfile_prefix}_base.f90 diff --git a/src/env/mpichversion.c b/src/env/mpichversion.c index fbcf187..38f3c6b 100644 --- a/src/env/mpichversion.c +++ b/src/env/mpichversion.c @@ -43,7 +43,7 @@ typedef enum { Version_number=0, Date=1, - -device - Show the device for which MPICH was configured Using this program: - To use this program, link it against 'libmpich.a' (use 'mpicc' or + To use this program, link it against 'libmpi.a' (use 'mpicc' or the whichever compiler command is used to create MPICH programs) D*/ diff --git a/src/env/mpif90.bash.in b/src/env/mpif90.bash.in index 5596dd6..7c6ef5d 100644 --- a/src/env/mpif90.bash.in +++ b/src/env/mpif90.bash.in @@ -297,7 +297,7 @@ else fi # Handle the specification of the directory containing the modules -modulelib="@FCWRAPNAME@" +modulelib="@MPIFCLIBNAME@" if [ -n "$FCMODINCSPEC" ] ; then newarg=`echo A"$FCMODINCSPEC" | \ sed -e 's/^A//' -e 's%<dir>%'"$includedir%g" -e 's/<file>/mpi/g'` diff --git a/src/env/mpif90.sh.in b/src/env/mpif90.sh.in index f33bf6e..6f537c3 100644 --- a/src/env/mpif90.sh.in +++ b/src/env/mpif90.sh.in @@ -314,7 +314,7 @@ else fi # Handle the specification of the directory containing the modules -modulelib="@FCWRAPNAME@" +modulelib="@MPIFCLIBNAME@" if [ -n "$FCMODINCSPEC" ] ; then newarg=`echo A"$FCMODINCSPEC" | \ sed -e 's/^A//' -e 's%<dir>%'"$includedir%g" -e 's/<file>/mpi/g'` diff --git a/src/mpi/Makefile.mk b/src/mpi/Makefile.mk index 9b74134..4bf0ebc 100644 --- a/src/mpi/Makefile.mk +++ b/src/mpi/Makefile.mk @@ -29,8 +29,8 @@ HTMLDOC_SUBDIRS += src/mpi/romio # FIXME is this the right place to put this? external_libs += src/mpi/romio/libromio.la -# libpromio contains the PMPI symbols (unlike libpmpich, which contains MPI -# symbols) and should be added to libmpich as well +# libpromio contains the PMPI symbols (unlike libpmpi, which contains MPI +# symbols) and should be added to libmpi as well if BUILD_PROFILING_LIB external_libs += src/mpi/romio/libpromio.la endif BUILD_PROFILING_LIB diff --git a/src/mpi/romio/Makefile.am b/src/mpi/romio/Makefile.am index e27323f..7468dd3 100644 --- a/src/mpi/romio/Makefile.am +++ b/src/mpi/romio/Makefile.am @@ -68,17 +68,17 @@ libromio_la_SOURCES = $(romio_mpi_sources) $(romio_other_sources) $(glue_sources ## NOTE: ROMIO's old build system builds a bunch of _foo.o objects that contain ## PMPI_ implementations as well as calls to only other PMPI routines. In -## MPICH, these are the objects that need to go into libmpich, while the foo.o -## objects should go into libpmpich. Furthermore, the -D option for ROMIO's +## MPICH, these are the objects that need to go into libmpi, while the foo.o +## objects should go into libpmpi. Furthermore, the -D option for ROMIO's ## source files is different and inverted (in the boolean sense) compared with ## MPICH's defintion. And ROMIO was dumping all of the symbols into the main -## libmpich library, regardless of the separate profiling library's existence. +## libmpi library, regardless of the separate profiling library's existence. ## ## Annoying, right? if BUILD_PROFILING_LIB # The current best strategy for now is to build the PMPI symbols as a separate # convenience lib to permit adding the special "-D..." argument for all objects. -# MPICH will then link in both convenience library into libmpich, since it +# MPICH will then link in both convenience library into libmpi, since it # won't work very well the other way around. noinst_LTLIBRARIES += libpromio.la libpromio_la_SOURCES = $(romio_mpi_sources) diff --git a/src/mpid/ch3/channels/sock/subconfigure.m4 b/src/mpid/ch3/channels/sock/subconfigure.m4 index 6bd5ddb..79b2250 100644 --- a/src/mpid/ch3/channels/sock/subconfigure.m4 +++ b/src/mpid/ch3/channels/sock/subconfigure.m4 @@ -67,8 +67,8 @@ AC_MSG_NOTICE([RUNNING CONFIGURE FOR ch3:sock]) # # ABIVERSION is needed when a separate sock dll library is built if test "X$ABIVERSION" = "X" ; then - if test "X$libmpich_so_version" != X ; then - ABIVERSION="$libmpich_so_version" + if test "X$libmpi_so_version" != X ; then + ABIVERSION="$libmpi_so_version" else # Note that an install of a sock-dll will fail if the ABI version is not # available http://git.mpich.org/mpich.git/commitdiff/0ab70e769fab5ad7b813a99961d80ea9c4... commit 0ab70e769fab5ad7b813a99961d80ea9c4c23418 Author: Pavan Balaji <[email protected]> Date: Fri Mar 28 14:25:35 2014 -0500 Incorrect placement of the MPIR_Comm_split_type_impl symbol. This symbol should go into libmpich, not libpmpich. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/src/mpi/comm/comm_split_type.c b/src/mpi/comm/comm_split_type.c index 47ca3fc..928b698 100644 --- a/src/mpi/comm/comm_split_type.c +++ b/src/mpi/comm/comm_split_type.c @@ -23,7 +23,6 @@ #ifndef MPICH_MPI_FROM_PMPI #undef MPI_Comm_split_type #define MPI_Comm_split_type PMPI_Comm_split_type -#endif #undef FUNCNAME #define FUNCNAME MPIR_Comm_split_type_impl @@ -58,6 +57,7 @@ int MPIR_Comm_split_type_impl(MPID_Comm * comm_ptr, int split_type, int key, goto fn_exit; } +#endif /* MPICH_MPI_FROM_PMPI */ #undef FUNCNAME #define FUNCNAME MPI_Comm_split_type ----------------------------------------------------------------------- Summary of changes: CHANGES | 6 + Makefile.am | 140 +++++++++++++++----- README.vin | 24 ++-- confdb/aclocal_util.m4 | 1 + configure.ac | 82 +++++------- examples/Makefile.am | 2 +- maint/checkbuilds.in | 4 +- maint/samplebuilds | 4 +- maint/version.m4 | 4 +- src/binding/cxx/Makefile.mk | 11 +- src/binding/fortran/mpif_h/buildiface | 54 +------- src/binding/fortran/use_mpi/buildiface | 43 ++----- src/binding/fortran/use_mpi/subconfigure.m4 | 6 +- src/env/Makefile.mk | 8 +- src/env/mpicc.bash.in | 14 ++- src/env/mpicc.sh.in | 14 ++- src/env/mpichversion.c | 2 +- src/env/mpicxx.bash.in | 15 ++- src/env/mpicxx.sh.in | 15 ++- src/env/mpif77.bash.in | 20 +++- src/env/mpif77.sh.in | 20 +++- src/env/mpif90.bash.in | 18 ++- src/env/mpif90.sh.in | 18 ++- src/glue/romio/Makefile.mk | 2 +- src/mpi/Makefile.mk | 4 +- src/mpi/attr/Makefile.mk | 2 +- src/mpi/coll/Makefile.mk | 2 +- src/mpi/comm/Makefile.mk | 2 +- src/mpi/comm/comm_split_type.c | 2 +- src/mpi/datatype/Makefile.mk | 2 +- src/mpi/errhan/Makefile.mk | 2 +- src/mpi/group/Makefile.mk | 2 +- src/mpi/info/Makefile.mk | 2 +- src/mpi/init/Makefile.mk | 2 +- src/mpi/io/Makefile.mk | 2 +- src/mpi/pt2pt/Makefile.mk | 2 +- src/mpi/rma/Makefile.mk | 2 +- src/mpi/romio/Makefile.am | 8 +- src/mpi/timer/Makefile.mk | 2 +- src/mpi/topo/Makefile.mk | 2 +- src/mpi_t/Makefile.mk | 2 +- .../ch3/channels/nemesis/netmod/ib/Makefile.mk | 2 +- .../ch3/channels/nemesis/netmod/mx/Makefile.mk | 2 +- .../ch3/channels/nemesis/netmod/newmad/Makefile.mk | 2 +- .../ch3/channels/nemesis/netmod/none/Makefile.mk | 2 +- .../channels/nemesis/netmod/portals4/Makefile.mk | 2 +- .../ch3/channels/nemesis/netmod/scif/Makefile.mk | 2 +- .../ch3/channels/nemesis/netmod/tcp/Makefile.mk | 2 +- src/mpid/ch3/channels/nemesis/src/Makefile.mk | 2 +- .../ch3/channels/nemesis/utils/monitor/Makefile.mk | 2 +- .../nemesis/utils/replacements/Makefile.mk | 2 +- src/mpid/ch3/channels/sock/src/Makefile.mk | 2 +- src/mpid/ch3/channels/sock/subconfigure.m4 | 4 +- src/mpid/ch3/src/Makefile.mk | 2 +- src/mpid/ch3/util/ftb/Makefile.mk | 2 +- src/mpid/ch3/util/sock/Makefile.mk | 2 +- src/mpid/common/datatype/Makefile.mk | 2 +- src/mpid/common/datatype/dataloop/Makefile.mk | 2 +- src/mpid/common/sched/Makefile.mk | 2 +- src/mpid/common/sock/poll/Makefile.mk | 2 +- src/mpid/common/thread/Makefile.mk | 2 +- src/mpid/pamid/src/Makefile.mk | 2 +- src/mpid/pamid/src/coll/Makefile.mk | 2 +- src/mpid/pamid/src/coll/allgather/Makefile.mk | 2 +- src/mpid/pamid/src/coll/allgatherv/Makefile.mk | 2 +- src/mpid/pamid/src/coll/allreduce/Makefile.mk | 2 +- src/mpid/pamid/src/coll/alltoall/Makefile.mk | 2 +- src/mpid/pamid/src/coll/alltoallv/Makefile.mk | 2 +- src/mpid/pamid/src/coll/alltoallw/Makefile.mk | 2 +- src/mpid/pamid/src/coll/barrier/Makefile.mk | 2 +- src/mpid/pamid/src/coll/bcast/Makefile.mk | 2 +- src/mpid/pamid/src/coll/exscan/Makefile.mk | 2 +- src/mpid/pamid/src/coll/gather/Makefile.mk | 2 +- src/mpid/pamid/src/coll/gatherv/Makefile.mk | 2 +- src/mpid/pamid/src/coll/ired_scat/Makefile.mk | 2 +- .../pamid/src/coll/ired_scat_block/Makefile.mk | 2 +- src/mpid/pamid/src/coll/reduce/Makefile.mk | 2 +- src/mpid/pamid/src/coll/scan/Makefile.mk | 2 +- src/mpid/pamid/src/coll/scatter/Makefile.mk | 2 +- src/mpid/pamid/src/coll/scatterv/Makefile.mk | 2 +- src/mpid/pamid/src/comm/Makefile.mk | 2 +- src/mpid/pamid/src/dyntask/Makefile.mk | 2 +- src/mpid/pamid/src/misc/Makefile.mk | 2 +- src/mpid/pamid/src/mpix/Makefile.mk | 2 +- src/mpid/pamid/src/onesided/Makefile.mk | 2 +- src/mpid/pamid/src/pamix/Makefile.mk | 2 +- src/mpid/pamid/src/pt2pt/Makefile.mk | 2 +- src/mpid/pamid/src/pt2pt/persistent/Makefile.mk | 2 +- src/nameserv/file/Makefile.mk | 2 +- src/nameserv/mpd/Makefile.mk | 2 +- src/nameserv/pmi/Makefile.mk | 2 +- src/packaging/pkgconfig/mpich.pc.in | 2 +- src/pmi/pmi2/poe/Makefile.mk | 2 +- src/pmi/pmi2/simple/Makefile.mk | 2 +- src/pmi/simple/Makefile.mk | 2 +- src/util/cvar/Makefile.mk | 2 +- src/util/dbg/Makefile.mk | 2 +- src/util/instrm/Makefile.mk | 2 +- src/util/logging/common/Makefile.mk | 2 +- src/util/mem/Makefile.mk | 2 +- src/util/msgs/Makefile.mk | 2 +- src/util/other/Makefile.mk | 2 +- src/util/procmap/Makefile.mk | 2 +- src/util/thread/Makefile.mk | 2 +- 104 files changed, 401 insertions(+), 296 deletions(-) hooks/post-receive -- MPICH primary repository
participants (1)
-
noreply＠mpich.org