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 692a280f5d46d68b0d699310abb5a5aa99692047 (commit) from 3d356c72cd87c744dd20f900f5c9db75aef53a2f (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/692a280f5d46d68b0d699310abb5a5aa99... commit 692a280f5d46d68b0d699310abb5a5aa99692047 Author: Michael Blocksome <[email protected]> Date: Thu Aug 8 10:17:21 2013 -0500 Fix pamid bgq configure for v1r2m1 installs There are three configure options and two install cases that need to be handled. The configure could have be done on a bgq system that has V1R2M1+ installed or on a bgq system that has a pre-V1R2M1 installation. In V1R2M1 the location and names of the pami libraries changed. The three configure options are: --with-bgq-install-dir ..... forces use of a specific bgq install --with-pami[-include|-lib] . forces use of a specific pami install PAMILIBNAME ................ forces use of a specific pami library name Signed-off-by: Bob Cernohous <[email protected]> Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4 index 25b0f67..d96cd2f 100644 --- a/src/mpid/pamid/subconfigure.m4 +++ b/src/mpid/pamid/subconfigure.m4 @@ -125,52 +125,55 @@ if test "${pamid_platform}" = "BGQ" ; then for bgq_driver in $bgq_driver_search_path ; do if test -d ${bgq_driver}/spi/include ; then + found_bgq_driver=yes + PAC_APPEND_FLAG([-I${bgq_driver}], [CPPFLAGS]) PAC_APPEND_FLAG([-I${bgq_driver}/spi/include/kernel/cnk], [CPPFLAGS]) - - PAC_APPEND_FLAG([-I${bgq_driver}], [WRAPPER_CFLAGS]) - PAC_APPEND_FLAG([-I${bgq_driver}], [WRAPPER_CXXFLAGS]) - PAC_APPEND_FLAG([-I${bgq_driver}], [WRAPPER_FCFLAGS]) - PAC_APPEND_FLAG([-I${bgq_driver}], [WRAPPER_FFLAGS]) - - if test -d {bgq_driver}/comm/include ; then - PAC_APPEND_FLAG([-I${bgq_driver}/comm/include], [CPPFLAGS]) - - PAC_APPEND_FLAG([-I${bgq_driver}/comm/include], [WRAPPER_CFLAGS]) - PAC_APPEND_FLAG([-I${bgq_driver}/comm/include], [WRAPPER_CXXFLAGS]) - PAC_APPEND_FLAG([-I${bgq_driver}/comm/include], [WRAPPER_FCFLAGS]) - PAC_APPEND_FLAG([-I${bgq_driver}/comm/include], [WRAPPER_FFLAGS]) - else - PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [CPPFLAGS]) - - PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [WRAPPER_CFLAGS]) - PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [WRAPPER_CXXFLAGS]) - PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [WRAPPER_FCFLAGS]) - PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include], [WRAPPER_FFLAGS]) - fi - - PAC_APPEND_FLAG([-I${bgq_driver}/spi/include/kernel/cnk], [WRAPPER_CFLAGS]) - PAC_APPEND_FLAG([-I${bgq_driver}/spi/include/kernel/cnk], [WRAPPER_CXXFLAGS]) - PAC_APPEND_FLAG([-I${bgq_driver}/spi/include/kernel/cnk], [WRAPPER_FCFLAGS]) - PAC_APPEND_FLAG([-I${bgq_driver}/spi/include/kernel/cnk], [WRAPPER_FFLAGS]) - PAC_APPEND_FLAG([-L${bgq_driver}/spi/lib], [LDFLAGS]) - PAC_APPEND_FLAG([-L${bgq_driver}/spi/lib], [WRAPPER_LDFLAGS]) - if test -d ${bgq_driver}/comm/lib ; then - PAC_APPEND_FLAG([-L${bgq_driver}/comm/lib], [WRAPPER_LDFLAGS]) - if test x${original_PAMILIBNAME} = x ; then - PAMILIBNAME=pami-gcc - fi - else - PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib], [WRAPPER_LDFLAGS]) - fi + + dnl If the '--with-pami' and the '--with-pami-include' configure options + dnl were NOT specified then test for a V1R2M1+ comm include directory. + dnl + AS_IF([test "x${with_pami_include}" = "x" ], + [AS_IF([test "x${with_pami}" = "x" ], + [AS_IF([test -d ${bgq_driver}/comm/include ], + [PAC_APPEND_FLAG([-I${bgq_driver}/comm/include], [CPPFLAGS])], + [PAC_APPEND_FLAG([-I${bgq_driver}/comm/sys/include],[CPPFLAGS])])])]) + + dnl If the '--with-pami' and the '--with-pami-lib' configure options were + dnl NOT specified then + dnl + dnl if a custom pami library name was NOT specified then test for a + dnl V1R2M1+ pami lib in a V1R2M1+ comm lib directory then test for a + dnl pre-V1R2M1 pami lib in a pre-V1R2M1 comm lib directory; otherwise + dnl + dnl if a custom pami library name WAS specified then test for a custom + dnl pami lib in a V1R2M1+ comm lib directory then test for a custom + dnl pami lib in a pre-V1R2M1 comm lib directory + dnl + AS_IF([test "x${with_pami_lib}" = "x" ], + [AS_IF([test "x${with_pami}" = "x" ], + [AS_IF([test "x${original_PAMILIBNAME}" = "x" ], + [AS_IF([test -f ${bgq_driver}/comm/lib/libpami-gcc.a ], + [PAMILIBNAME=pami-gcc + PAC_APPEND_FLAG([-L${bgq_driver}/comm/lib], [LDFLAGS]) + PAC_APPEND_FLAG([-L${bgq_driver}/comm/lib], [WRAPPER_LDFLAGS])], + [AS_IF([test -f ${bgq_driver}/comm/sys/lib/libpami.a ], + [PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib],[LDFLAGS]) + PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib],[WRAPPER_LDFLAGS])])])], + [AS_IF([test -f ${bgq_driver}/comm/lib/lib${PAMILIBNAME}.a ], + [PAC_APPEND_FLAG([-L${bgq_driver}/comm/lib], [LDFLAGS]) + PAC_APPEND_FLAG([-L${bgq_driver}/comm/lib], [WRAPPER_LDFLAGS])], + [AS_IF([test -f ${bgq_driver}/comm/sys/lib/lib${PAMILIBNAME}.a ], + [PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib],[LDFLAGS]) + PAC_APPEND_FLAG([-L${bgq_driver}/comm/sys/lib],[WRAPPER_LDFLAGS])])])])])]) break fi done - if test x"$bgq_driver" != "x"; then + if test "x${found_bgq_driver}" = "xyes"; then AC_MSG_RESULT('$bgq_driver') else AC_MSG_RESULT('no') @@ -179,12 +182,14 @@ if test "${pamid_platform}" = "BGQ" ; then # # The bgq compile requires these libraries. # - PAC_APPEND_FLAG([-l${PAMILIBNAME}], [WRAPPER_LIBS]) - PAC_APPEND_FLAG([-lSPI], [WRAPPER_LIBS]) - PAC_APPEND_FLAG([-lSPI_cnk], [WRAPPER_LIBS]) - PAC_APPEND_FLAG([-lrt], [WRAPPER_LIBS]) - PAC_APPEND_FLAG([-lpthread], [WRAPPER_LIBS]) - PAC_APPEND_FLAG([-lstdc++], [WRAPPER_LIBS]) + PAC_APPEND_FLAG([-lSPI], [LIBS]) + PAC_APPEND_FLAG([-lSPI_cnk], [LIBS]) + PAC_APPEND_FLAG([-lrt], [LIBS]) + PAC_APPEND_FLAG([-lpthread], [LIBS]) + PAC_APPEND_FLAG([-lstdc++], [LIBS]) + + AC_SEARCH_LIBS([PAMI_Send], [${PAMILIBNAME} pami-gcc]) + # For some reason, on bgq, libtool will incorrectly attempt a static link # of libstdc++.so unless this '-all-static' option is used. This seems to ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/subconfigure.m4 | 91 +++++++++++++++++++++------------------- 1 files changed, 48 insertions(+), 43 deletions(-) hooks/post-receive -- MPICH primary repository