[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.2-145-g2d2ff83
Service Account
noreply at mpich.org
Wed Sep 3 13:09:05 CDT 2014
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 2d2ff83d6be5c168e908a4cd426beea238a86885 (commit)
via a455e2ce55514d9e1e7eea093528086374bde53d (commit)
from 5c373c2a0947290333fb350b5f4718b946230d08 (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/2d2ff83d6be5c168e908a4cd426beea238a86885
commit 2d2ff83d6be5c168e908a4cd426beea238a86885
Author: Pavan Balaji <balaji at anl.gov>
Date: Wed Sep 3 12:47:27 2014 -0500
Update configure comment based on EXTERNAL_LIBS changes.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/configure.ac b/configure.ac
index 7337da4..2ce0acf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -269,13 +269,10 @@ PAC_PREFIX_ALL_FLAGS(USER)
# as include paths).
#
# All libraries that are detected by MPICH as needed for some of its
-# functionality (such as -lpthread) should be added to LIBS so
-# autoconf link tests can use them. Libraries that are built by MPICH
-# at make time (and hence are not available for autoconf link tests to
-# use), such as OPA and MPL, should be added to WRAPPER_LIBS for
-# static builds. All libraries in LIBS are added to WRAPPER_LIBS
-# (similarly LDFLAGS are added to WRAPPER_LDFLAGS) as well, at the end
-# of configure.
+# functionality (such as -lpthread) should be added to EXTERNAL_LIBS
+# so executables built within MPICH use them. If inter-library
+# dependencies are not supported on the platform, these libraries are
+# added to the MPICH wrappers (mpicc and friends) as well.
PAC_PREFIX_ALL_FLAGS(WRAPPER)
WRAPPER_CFLAGS="$CFLAGS $MPICH_MPICC_FLAGS"
WRAPPER_CPPFLAGS="$CPPFLAGS $MPICH_MPICPP_FLAGS"
http://git.mpich.org/mpich.git/commitdiff/a455e2ce55514d9e1e7eea093528086374bde53d
commit a455e2ce55514d9e1e7eea093528086374bde53d
Author: Pavan Balaji <balaji at anl.gov>
Date: Wed Sep 3 10:04:51 2014 -0500
Move netmod-specific configure options to netmod subconfigures.
We had some settings in the nemesis subconfigure, which seems
misplaced.
Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>
diff --git a/src/mpid/ch3/channels/nemesis/netmod/ib/subconfigure.m4 b/src/mpid/ch3/channels/nemesis/netmod/ib/subconfigure.m4
index 2cdcce6..adee81b 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/ib/subconfigure.m4
+++ b/src/mpid/ch3/channels/nemesis/netmod/ib/subconfigure.m4
@@ -17,6 +17,7 @@ AC_DEFUN([PAC_SUBCFG_BODY_]PAC_SUBCFG_AUTO_SUFFIX,[
AM_COND_IF([BUILD_NEMESIS_NETMOD_IB],[
AC_MSG_NOTICE([RUNNING CONFIGURE FOR ch3:nemesis:ib])
+ PAC_SET_HEADER_LIB_PATH(ib)
PAC_PUSH_FLAG(LIBS)
PAC_CHECK_HEADER_LIB(dcfa.h,dcfa,ibv_open_device,dcfa_found=yes,dcfa_found=no)
PAC_POP_FLAG(LIBS)
diff --git a/src/mpid/ch3/channels/nemesis/netmod/mx/subconfigure.m4 b/src/mpid/ch3/channels/nemesis/netmod/mx/subconfigure.m4
index 940f591..f2169e5 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mx/subconfigure.m4
+++ b/src/mpid/ch3/channels/nemesis/netmod/mx/subconfigure.m4
@@ -14,6 +14,7 @@ AC_DEFUN([PAC_SUBCFG_BODY_]PAC_SUBCFG_AUTO_SUFFIX,[
AM_COND_IF([BUILD_NEMESIS_NETMOD_MX],[
AC_MSG_NOTICE([RUNNING CONFIGURE FOR ch3:nemesis:mx])
+ PAC_SET_HEADER_LIB_PATH(mx)
PAC_PUSH_FLAG(LIBS)
PAC_CHECK_HEADER_LIB_FATAL(mx, myriexpress.h, myriexpress, mx_finalize)
PAC_POP_FLAG(LIBS)
diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/subconfigure.m4 b/src/mpid/ch3/channels/nemesis/netmod/mxm/subconfigure.m4
index efa3890..28dcdd2 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/mxm/subconfigure.m4
+++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/subconfigure.m4
@@ -14,6 +14,7 @@ AC_DEFUN([PAC_SUBCFG_BODY_]PAC_SUBCFG_AUTO_SUFFIX,[
AM_COND_IF([BUILD_NEMESIS_NETMOD_MXM],[
AC_MSG_NOTICE([RUNNING CONFIGURE FOR ch3:nemesis:mxm])
+ PAC_SET_HEADER_LIB_PATH(mxm)
PAC_PUSH_FLAG(LIBS)
PAC_CHECK_HEADER_LIB_FATAL(mxm, [mxm/api/mxm_api.h], mxm, mxm_get_version)
PAC_POP_FLAG(LIBS)
diff --git a/src/mpid/ch3/channels/nemesis/netmod/scif/subconfigure.m4 b/src/mpid/ch3/channels/nemesis/netmod/scif/subconfigure.m4
index 51c1d6b..7a314fd 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/scif/subconfigure.m4
+++ b/src/mpid/ch3/channels/nemesis/netmod/scif/subconfigure.m4
@@ -14,10 +14,10 @@ AC_DEFUN([PAC_SUBCFG_PREREQ_]PAC_SUBCFG_AUTO_SUFFIX,[
])dnl
AC_DEFUN([PAC_SUBCFG_BODY_]PAC_SUBCFG_AUTO_SUFFIX,[
-# nothing to do for scif right now
-dnl AM_COND_IF([BUILD_NEMESIS_NETMOD_SCIF],[
-dnl AC_MSG_NOTICE([RUNNING CONFIGURE FOR ch3:nemesis:scif])
-dnl ])dnl end AM_COND_IF(BUILD_NEMESIS_NETMOD_SCIF,...)
+AM_COND_IF([BUILD_NEMESIS_NETMOD_SCIF],[
+ AC_MSG_NOTICE([RUNNING CONFIGURE FOR ch3:nemesis:scif])
+ PAC_SET_HEADER_LIB_PATH(scif)
+])dnl end AM_COND_IF(BUILD_NEMESIS_NETMOD_SCIF,...)
])dnl end _BODY
[#] end of __file__
diff --git a/src/mpid/ch3/channels/nemesis/subconfigure.m4 b/src/mpid/ch3/channels/nemesis/subconfigure.m4
index ea46a69..062698f 100644
--- a/src/mpid/ch3/channels/nemesis/subconfigure.m4
+++ b/src/mpid/ch3/channels/nemesis/subconfigure.m4
@@ -91,12 +91,6 @@ This turns off error checking and timing collection],,enable_fast=no)
AC_CHECK_HEADERS(signal.h)
AC_CHECK_FUNCS(signal)
-# Check for netmod relevant headers and libraries
-PAC_SET_HEADER_LIB_PATH(mx)
-PAC_SET_HEADER_LIB_PATH(scif)
-PAC_SET_HEADER_LIB_PATH(ib)
-PAC_SET_HEADER_LIB_PATH(mxm)
-
nemesis_nets_dirs=""
nemesis_nets_strings=""
nemesis_nets_array=""
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 11 ++++-------
.../ch3/channels/nemesis/netmod/ib/subconfigure.m4 | 1 +
.../ch3/channels/nemesis/netmod/mx/subconfigure.m4 | 1 +
.../channels/nemesis/netmod/mxm/subconfigure.m4 | 1 +
.../channels/nemesis/netmod/scif/subconfigure.m4 | 8 ++++----
src/mpid/ch3/channels/nemesis/subconfigure.m4 | 6 ------
6 files changed, 11 insertions(+), 17 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list