May 2013 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.0.4-153-g1be61fb
by noreply＠mpich.org 06 May '13

06 May '13

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 1be61fbcad263cffe6dedfb1597be46ccad2b714 (commit) via 3b8afffb24a94858a44c20f6c4fd1ab11838fc1f (commit) via c18320d3188bfc075e04dbcba3e2899451e133ee (commit) via 9164d3db668e1f2c0f82cd238599782dfc1fc045 (commit) via 9d291d1ee2015c96969df984af28b56ed6726f31 (commit) via 2bfe261f076b3845159f1d1c87cec4c3129fa3ee (commit) via 1170238979cfa69a7c9645e115e041f8cf43e3e4 (commit) via 47ea47409a0785044f94435d7565ff4d30f4520f (commit) from bff81082f8524d2a74f7bfd2f85623bb103a6557 (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/1be61fbcad263cffe6dedfb1597be46cc… commit 1be61fbcad263cffe6dedfb1597be46ccad2b714 Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Wed Jan 30 11:33:05 2013 -0600 Allow f90 mod files to be installed in an arbitrary directory. Instead of using 'includedir' to install the mod file headers the automake 'modincdir' is used instead. For example: ./configure --includedir=$some_dir modincdir=$some_dir/gnu This is needed because the fortran mod files are essentially pre-compiled headers and are therefore compiler-specific. This means that an application can not compile with xlf90 using a mpif90 script that was configured and installed using gfortran. By separating out the mod files generated by gfortran and xlf90 we can create compile scripts that use the appropriate mod files depending on the compiler used. Note: For some reason the normal configure processing does NOT check for a user-specified 'modincdir' variable and, if not set, default to use 'includedir'. (ibm) CPS 92BQ9Q (ibm) 52931bf950b389d49177a9aa94acf01c3583a8ce diff --git a/configure.ac b/configure.ac index d560419..7836b1c 100644 --- a/configure.ac +++ b/configure.ac @@ -2310,6 +2310,12 @@ if test "$enable_fc" = "yes" ; then # ------------------------------------------------ fi +if test "X$modincdir" = "X" ; then + modincdir=$includedir +fi +export modincdir +AC_SUBST(modincdir) + # ---------------------------------------------------------------------------- # We previously allowed "default" as a valid value for $enable_cxx. Now we # assume its available by default and error out if it doesn't work (just like diff --git a/src/binding/f90/buildiface b/src/binding/f90/buildiface index fdd5109..7ae05be 100755 --- a/src/binding/f90/buildiface +++ b/src/binding/f90/buildiface @@ -1016,7 +1016,7 @@ mpi_f90_modules = \\ src/binding/f90/\$(MPIBASEMOD).\$(MOD) # the modules are effectively precompiled headers for Fortran programs -include_HEADERS += \$(mpi_f90_modules) +modinc_HEADERS = \$(mpi_f90_modules) # We need a free-format version of mpif.h with no external commands, # including no wtime/wtick (removing MPI_WTICK also removes MPI_WTIME, diff --git a/src/env/mpif90.bash.in b/src/env/mpif90.bash.in index 1e23550..e3529af 100644 --- a/src/env/mpif90.bash.in +++ b/src/env/mpif90.bash.in @@ -33,6 +33,7 @@ exec_prefix=@exec_prefix@ sysconfdir=@sysconfdir@ includedir=@includedir@ libdir=@libdir@ +modincdir=@modincdir@ # Default settings for compiler, flags, and libraries # Determined by a combination of environment variables and tests within @@ -308,7 +309,6 @@ else fi # Handle the specification of the directory containing the modules -# For now, these are in the includedir (no choice argument supported) modulelib="@FCWRAPNAME@" if [ -n "$FCMODINCSPEC" ] ; then newarg=`echo A"$FCMODINCSPEC" | \ @@ -316,7 +316,7 @@ if [ -n "$FCMODINCSPEC" ] ; then FCMODDIRS="$newarg" FCMODLIBS="-l$modulelib" elif [ -n "$FCMODINC" ] ; then - FCMODDIRS="${FCMODINC}$includedir" + FCMODDIRS="${FCMODINC}$modincdir" FCMODLIBS="-l$modulelib" fi diff --git a/src/env/mpif90.sh.in b/src/env/mpif90.sh.in index 7527e78..238df12 100644 --- a/src/env/mpif90.sh.in +++ b/src/env/mpif90.sh.in @@ -33,6 +33,7 @@ exec_prefix=@exec_prefix@ sysconfdir=@sysconfdir@ includedir=@includedir@ libdir=@libdir@ +modincdir=@modincdir@ # Default settings for compiler, flags, and libraries # Determined by a combination of environment variables and tests within @@ -325,7 +326,6 @@ else fi # Handle the specification of the directory containing the modules -# For now, these are in the includedir (no choice argument supported) modulelib="@FCWRAPNAME@" if [ -n "$FCMODINCSPEC" ] ; then newarg=`echo A"$FCMODINCSPEC" | \ @@ -333,7 +333,7 @@ if [ -n "$FCMODINCSPEC" ] ; then FCMODDIRS="$newarg" FCMODLIBS="-l$modulelib" elif [ -n "$FCMODINC" ] ; then - FCMODDIRS="${FCMODINC}$includedir" + FCMODDIRS="${FCMODINC}$modincdir" FCMODLIBS="-l$modulelib" fi http://git.mpich.org/mpich.git/commitdiff/3b8afffb24a94858a44c20f6c4fd1ab11… commit 3b8afffb24a94858a44c20f6c4fd1ab11838fc1f Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Thu Feb 14 13:44:06 2013 -0600 Add '--with-mpl-prefix=DIR' configure option. (ibm) CPS 92XMVJ (ibm) db1d16976caeaece627c157ad258f5c361ecf80e diff --git a/Makefile.am b/Makefile.am index ca283d3..779fad4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,9 +47,9 @@ pkgconfigdir = @pkgconfigdir@ # to build src/mpi/errhan/defmsg.h errnames_txt_files = -external_subdirs = src/mpl @opasrcdir@ +external_subdirs = @mplsrcdir@ @opasrcdir@ # FIXME how/where does external_libs/ldflags get used? -external_ldflags = -L$(top_builddir)/src/mpl -L@opalibdir@ +external_ldflags = -L@mpllibdir@ -L@opalibdir@ external_libs = -l@MPLLIBNAME@ -l@OPALIBNAME@ # NOTE on our semi-unconventional usage of DIST_SUBDIRS: diff --git a/configure.ac b/configure.ac index ecc8438..d560419 100644 --- a/configure.ac +++ b/configure.ac @@ -1168,10 +1168,38 @@ AC_ARG_VAR([MPLLIBNAME],[can be used to override the name of the MPL library (de MPLLIBNAME=${MPLLIBNAME:-"mpl"} export MPLLIBNAME AC_SUBST(MPLLIBNAME) -PAC_CONFIG_SUBDIR(src/mpl,,AC_MSG_ERROR(MPL configure failed)) -PAC_PREPEND_FLAG([-l${MPLLIBNAME}], [WRAPPER_LIBS]) -PAC_APPEND_FLAG([-I${master_top_builddir}/src/mpl/include], [CPPFLAGS]) -PAC_APPEND_FLAG([-I${use_top_srcdir}/src/mpl/include], [CPPFLAGS]) +AC_ARG_WITH([mpl-prefix], + [AS_HELP_STRING([[--with-mpl-prefix[=DIR]]], + [use the MPL library installed in DIR, + rather than the one included in src/mpl. Pass + "embedded" to force usage of the MPL source + distributed with MPICH2.])], + [],dnl action-if-given + [with_mpl_prefix=embedded]) dnl action-if-not-given +mpldir="" +AC_SUBST([mpldir]) +mplsrcdir="" +AC_SUBST([mplsrcdir]) +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_APPEND_FLAG([-I${master_top_builddir}/src/mpl/include], [CPPFLAGS]) + PAC_APPEND_FLAG([-I${use_top_srcdir}/src/mpl/include], [CPPFLAGS]) + + mpllibdir="${master_top_builddir}/src/mpl" + mplsrcdir="${master_top_builddir}/src/mpl" +else + # The user specified an already-installed MPL; just sanity check, don't + # subconfigure it + 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_APPEND_FLAG([-L${with_mpl_prefix}/lib],[WRAPPER_LDFLAGS]) + mpllibdir="${with_mpl_prefix}/lib" +fi # OpenPA AC_ARG_VAR([OPALIBNAME],[can be used to override the name of the OpenPA library (default: "opa")]) diff --git a/examples/Makefile.am b/examples/Makefile.am index c97b378..77b21f0 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -36,7 +36,7 @@ cpi_DEPENDENCIES = # the make-time instances of libpmpich.la and libmpich.la live here LDFLAGS += -L../lib # the make-time instances of libmpl.la and libopa.la live here -LDFLAGS += -L../src/mpl -L@opalibdir@ +LDFLAGS += -L@mpllibdir@ -L@opalibdir@ # Wrapper LDFLAGS need to be added at the end to make sure we link # with the libraries we just built, and not any previously installed http://git.mpich.org/mpich.git/commitdiff/c18320d3188bfc075e04dbcba3e289945… commit c18320d3188bfc075e04dbcba3e2899451e133ee Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Thu Feb 14 10:35:52 2013 -0600 Fix '--with-openpa-prefix=DIR' so it actually works. (ibm) CPS 92XMVJ (ibm) 10855cb7c8e22e9018144ce14b986a3aa8f9d80f diff --git a/Makefile.am b/Makefile.am index 29a2d3e..ca283d3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,9 +47,9 @@ pkgconfigdir = @pkgconfigdir@ # to build src/mpi/errhan/defmsg.h errnames_txt_files = -external_subdirs = src/mpl src/openpa +external_subdirs = src/mpl @opasrcdir@ # FIXME how/where does external_libs/ldflags get used? -external_ldflags = -L$(top_builddir)/src/mpl -L$(top_builddir)/src/openpa/src +external_ldflags = -L$(top_builddir)/src/mpl -L@opalibdir@ external_libs = -l@MPLLIBNAME@ -l@OPALIBNAME@ # NOTE on our semi-unconventional usage of DIST_SUBDIRS: diff --git a/configure.ac b/configure.ac index ed41a25..ecc8438 100644 --- a/configure.ac +++ b/configure.ac @@ -1200,8 +1200,15 @@ OPA_fetch_and_incr_int(&i,5); PAC_POP_FLAG([LIBS]) ]) +opasrcdir="" +AC_SUBST([opasrcdir]) +opalibdir="" +AC_SUBST([opalibdir]) + if test "$with_openpa_prefix" = "embedded" ; then if test -e "${use_top_srcdir}/src/openpa" ; then + opasrcdir="${master_top_builddir}/src/openpa" + opalibdir="${master_top_builddir}/src/openpa/src" PAC_APPEND_FLAG([-I${use_top_srcdir}/src/openpa/src],[CPPFLAGS]) PAC_APPEND_FLAG([-I${master_top_builddir}/src/openpa/src],[CPPFLAGS]) @@ -1237,6 +1244,9 @@ else PAC_PREPEND_FLAG([-l${OPALIBNAME}],[WRAPPER_LIBS]) if test -d ${with_openpa_prefix}/lib64 ; then PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib64],[WRAPPER_LDFLAGS]) + opalibdir="${with_openpa_prefix}/lib64" + else + opalibdir="${with_openpa_prefix}/lib" fi PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib],[WRAPPER_LDFLAGS]) fi diff --git a/examples/Makefile.am b/examples/Makefile.am index c846a98..c97b378 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -36,7 +36,7 @@ cpi_DEPENDENCIES = # the make-time instances of libpmpich.la and libmpich.la live here LDFLAGS += -L../lib # the make-time instances of libmpl.la and libopa.la live here -LDFLAGS += -L../src/mpl -L../src/openpa/src +LDFLAGS += -L../src/mpl -L@opalibdir@ # Wrapper LDFLAGS need to be added at the end to make sure we link # with the libraries we just built, and not any previously installed http://git.mpich.org/mpich.git/commitdiff/9164d3db668e1f2c0f82cd238599782df… commit 9164d3db668e1f2c0f82cd238599782dfc1fc045 Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Thu Jan 31 12:26:00 2013 -0600 Allow pkgconfig files to be installed in an arbitrary directory. Instead of using 'libdir' to install the pkgconfig files the automake variable 'pkgconfigdir' is used instead. The configure processing checks for a user-specified 'pkgconfigdir' variable and, if not set, defaults to use 'libdir' as before. (ibm) CPS 92XMVJ (ibm) 1a294c56db2e0d9405f14558d2943ea5ac8211a1 diff --git a/Makefile.am b/Makefile.am index f1bb3b9..29a2d3e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -41,7 +41,7 @@ doc1_src_txt = CLEAN_LOCAL_TARGETS = # used by nodist_pkgconfig_DATA -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = @pkgconfigdir@ # contains all of the "errnames.txt" files that are used by maint/extracterrmsgs # to build src/mpi/errhan/defmsg.h diff --git a/configure.ac b/configure.ac index 805bc84..ed41a25 100644 --- a/configure.ac +++ b/configure.ac @@ -6137,6 +6137,13 @@ fi ######################################################################## +if test -z "$pkgconfigdir" ; then + # The default pkgconfig dir is under the lib dir + pkgconfigdir=$libdir/pkgconfig +fi +AC_SUBST(pkgconfigdir) +export pkgconfigdir + dnl This includes an experimental pkgconfig file for ch3 in the src/pkgconfig dnl directory AC_OUTPUT(Makefile \ diff --git a/src/openpa/Makefile.am b/src/openpa/Makefile.am index dedda7a..fa3afba 100644 --- a/src/openpa/Makefile.am +++ b/src/openpa/Makefile.am @@ -28,7 +28,7 @@ prettycheck: all-executable: # pkgconfig files -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = @pkgconfigdir@ pkgconfig_DATA = openpa.pc $(pkgconfig_DATA): config.status diff --git a/src/openpa/configure.ac b/src/openpa/configure.ac index 5063164..11d677f 100644 --- a/src/openpa/configure.ac +++ b/src/openpa/configure.ac @@ -431,6 +431,12 @@ fi export libopa_so_versionflags AC_SUBST(libopa_so_versionflags) +if test -z "$pkgconfigdir" ; then + # The default pkgconfig dir is under the lib dir + pkgconfigdir=$libdir/pkgconfig +fi +AC_SUBST(pkgconfigdir) +export pkgconfigdir AC_CONFIG_FILES([Makefile src/Makefile test/Makefile openpa.pc]) AC_OUTPUT http://git.mpich.org/mpich.git/commitdiff/9d291d1ee2015c96969df984af28b56ed… commit 9d291d1ee2015c96969df984af28b56ed6726f31 Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Mon Feb 4 12:25:13 2013 -0600 Add ability to customize the PAMI library name To change the name from the default ("pami") specify the environment variable "PAMILIBNAME=name" on configure. (ibm) CPS 92XMVJ (ibm) 61c11409a6a9af43994bbca99614f1cddc9c71ab diff --git a/src/mpid/pamid/subconfigure.m4 b/src/mpid/pamid/subconfigure.m4 index 0ca5777..507243c 100644 --- a/src/mpid/pamid/subconfigure.m4 +++ b/src/mpid/pamid/subconfigure.m4 @@ -26,6 +26,11 @@ dnl _PREREQ handles the former role of mpichprereq, setup_device, etc AC_DEFUN([PAC_SUBCFG_PREREQ_]PAC_SUBCFG_AUTO_SUFFIX,[ AM_CONDITIONAL([BUILD_PAMID],[test "$device_name" = "pamid"]) +AC_ARG_VAR([PAMILIBNAME],[can be used to override the name of the PAMI library (default: "pami")]) +PAMILIBNAME=${PAMILIBNAME:-"pami"} +AC_SUBST(PAMILIBNAME) +export PAMILIBNAME + dnl this subconfigure.m4 handles the configure work for the ftb subdir too dnl this AM_CONDITIONAL only works because enable_ftb is set very early on by dnl autoconf's argument parsing code. The "action-if-given" from the @@ -146,12 +151,12 @@ if test "${pamid_platform}" = "BGQ" ; then # # The bgq compile requires these libraries. # - PAC_APPEND_FLAG([-lpami], [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([-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]) # 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 http://git.mpich.org/mpich.git/commitdiff/2bfe261f076b3845159f1d1c87cec4c31… commit 2bfe261f076b3845159f1d1c87cec4c3129fa3ee Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Wed Jan 30 16:36:19 2013 -0600 Add ability to customize the MPL library name To change the name from the default ("mpl") specify the environment variable "MPLLIBNAME=name" on configure. (ibm) CPS 92XMVJ (ibm) 27904f81cf1fbc5f3230adecd5317ddf5c29e800 diff --git a/Makefile.am b/Makefile.am index a5c0404..f1bb3b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,7 +50,7 @@ errnames_txt_files = external_subdirs = src/mpl src/openpa # FIXME how/where does external_libs/ldflags get used? external_ldflags = -L$(top_builddir)/src/mpl -L$(top_builddir)/src/openpa/src -external_libs = -lmpl -l@OPALIBNAME@ +external_libs = -l@MPLLIBNAME@ -l@OPALIBNAME@ # NOTE on our semi-unconventional usage of DIST_SUBDIRS: # The automake manual recommends thinking of DIST_SUBDIRS as the list of all diff --git a/configure.ac b/configure.ac index 631ae31..805bc84 100644 --- a/configure.ac +++ b/configure.ac @@ -777,6 +777,7 @@ export MPILIBNAME export PMPILIBNAME export RANLIB export OPALIBNAME +export MPLLIBNAME # ---------------------------------------------------------------------------- # with-device if test "$with_device" = "default" ; then @@ -1163,8 +1164,12 @@ if test "$MPID_NO_SPAWN" = yes ; then fi # MPL +AC_ARG_VAR([MPLLIBNAME],[can be used to override the name of the MPL library (default: "mpl")]) +MPLLIBNAME=${MPLLIBNAME:-"mpl"} +export MPLLIBNAME +AC_SUBST(MPLLIBNAME) PAC_CONFIG_SUBDIR(src/mpl,,AC_MSG_ERROR(MPL configure failed)) -PAC_PREPEND_FLAG([-lmpl], [WRAPPER_LIBS]) +PAC_PREPEND_FLAG([-l${MPLLIBNAME}], [WRAPPER_LIBS]) PAC_APPEND_FLAG([-I${master_top_builddir}/src/mpl/include], [CPPFLAGS]) PAC_APPEND_FLAG([-I${use_top_srcdir}/src/mpl/include], [CPPFLAGS]) diff --git a/examples/Makefile.am b/examples/Makefile.am index b0b1cf4..c846a98 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -43,7 +43,7 @@ LDFLAGS += -L../src/mpl -L../src/openpa/src # libraries. LDFLAGS += $(WRAPPER_LDFLAGS) -external_libs = -lmpl -l@OPALIBNAME@ $(WRAPPER_LIBS) +external_libs = -l@MPLLIBNAME@ -l@OPALIBNAME@ $(WRAPPER_LIBS) if BUILD_PROFILING_LIB LIBS += -l@PMPILIBNAME@ cpi_DEPENDENCIES += ../lib/lib@[email protected] diff --git a/src/mpl/Makefile.am b/src/mpl/Makefile.am index 5b266e3..8693ae6 100644 --- a/src/mpl/Makefile.am +++ b/src/mpl/Makefile.am @@ -7,15 +7,15 @@ ACLOCAL_AMFLAGS = -I confdb AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -lib_LTLIBRARIES = libmpl.la -libmpl_la_SOURCES = src/mplstr.c src/mpltrmem.c src/mplenv.c -libmpl_la_LDFLAGS = ${libmpl_so_versionflags} +lib_LTLIBRARIES = lib@[email protected] +lib@MPLLIBNAME@_la_SOURCES = src/mplstr.c src/mpltrmem.c src/mplenv.c +lib@MPLLIBNAME@_la_LDFLAGS = ${lib@MPLLIBNAME@_so_versionflags} MPL_TESTS = strsep TESTS = $(MPL_TESTS) check_PROGRAMS = $(MPL_TESTS) strsep_SOURCES = test/strsep.c -strsep_LDADD = libmpl.la +strsep_LDADD = lib@[email protected] mpl_headers = \ include/mpl.h \ diff --git a/src/mpl/configure.ac b/src/mpl/configure.ac index d048814..451ffb4 100644 --- a/src/mpl/configure.ac +++ b/src/mpl/configure.ac @@ -25,6 +25,13 @@ PAC_PUSH_FLAG([CFLAGS]) LT_INIT(disable-shared) PAC_POP_FLAG([CFLAGS]) +# ---------------------------------------------------------------------------- +# Set default library names if names haven't already been provided +AC_ARG_VAR([MPLLIBNAME],[can be used to override the name of the MPL library (default: "mpl")]) +MPLLIBNAME=${MPLLIBNAME:-"mpl"} +AC_SUBST(MPLLIBNAME) +export MPLLIBNAME + if test -s "$srcdir/VERSION" ; then . $srcdir/VERSION AC_SUBST(libmpl_so_version) http://git.mpich.org/mpich.git/commitdiff/1170238979cfa69a7c9645e115e041f8c… commit 1170238979cfa69a7c9645e115e041f8cf43e3e4 Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Wed Jan 30 14:24:51 2013 -0600 Add ability to customize the OpenPA library name To change the name from the default ("opa") specify the environment variable "OPALIBNAME=name" on configure. (ibm) CPS 92XMVJ (ibm) cde8a03e9d2745a32901878b73b2b3047fa0f9d6 diff --git a/Makefile.am b/Makefile.am index 52a4e94..a5c0404 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,7 +50,7 @@ errnames_txt_files = external_subdirs = src/mpl src/openpa # FIXME how/where does external_libs/ldflags get used? external_ldflags = -L$(top_builddir)/src/mpl -L$(top_builddir)/src/openpa/src -external_libs = -lmpl -lopa +external_libs = -lmpl -l@OPALIBNAME@ # NOTE on our semi-unconventional usage of DIST_SUBDIRS: # The automake manual recommends thinking of DIST_SUBDIRS as the list of all diff --git a/configure.ac b/configure.ac index a56bd3b..631ae31 100644 --- a/configure.ac +++ b/configure.ac @@ -776,7 +776,7 @@ export LIBS export MPILIBNAME export PMPILIBNAME export RANLIB - +export OPALIBNAME # ---------------------------------------------------------------------------- # with-device if test "$with_device" = "default" ; then @@ -1169,6 +1169,10 @@ PAC_APPEND_FLAG([-I${master_top_builddir}/src/mpl/include], [CPPFLAGS]) PAC_APPEND_FLAG([-I${use_top_srcdir}/src/mpl/include], [CPPFLAGS]) # OpenPA +AC_ARG_VAR([OPALIBNAME],[can be used to override the name of the OpenPA library (default: "opa")]) +OPALIBNAME=${OPALIBNAME:-"opa"} +export OPALIBNAME +AC_SUBST(OPALIBNAME) AC_ARG_WITH([openpa-prefix], [AS_HELP_STRING([[--with-openpa-prefix[=DIR]]], [use the OpenPA atomics library installed in DIR, @@ -1178,7 +1182,7 @@ AC_ARG_WITH([openpa-prefix], [], [# see if OPA is already installed on the system PAC_PUSH_FLAG([LIBS]) - PAC_PREPEND_FLAG([-lopa],[LIBS]) + PAC_PREPEND_FLAG([-l${OPALIBNAME}],[LIBS]) AC_LINK_IFELSE([AC_LANG_PROGRAM([dnl #include "opa_primitives.h" ],[ @@ -1209,12 +1213,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([-lopa],[WRAPPER_LIBS]) + PAC_PREPEND_FLAG([-l${OPALIBNAME}],[WRAPPER_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([-lopa],[WRAPPER_LIBS]) + PAC_PREPEND_FLAG([-l${OPALIBNAME}],[WRAPPER_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. @@ -1225,7 +1229,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([-lopa],[WRAPPER_LIBS]) + PAC_PREPEND_FLAG([-l${OPALIBNAME}],[WRAPPER_LIBS]) if test -d ${with_openpa_prefix}/lib64 ; then PAC_APPEND_FLAG([-L${with_openpa_prefix}/lib64],[WRAPPER_LDFLAGS]) fi diff --git a/examples/Makefile.am b/examples/Makefile.am index 3c33360..b0b1cf4 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -43,7 +43,7 @@ LDFLAGS += -L../src/mpl -L../src/openpa/src # libraries. LDFLAGS += $(WRAPPER_LDFLAGS) -external_libs = -lmpl -lopa $(WRAPPER_LIBS) +external_libs = -lmpl -l@OPALIBNAME@ $(WRAPPER_LIBS) if BUILD_PROFILING_LIB LIBS += -l@PMPILIBNAME@ cpi_DEPENDENCIES += ../lib/lib@[email protected] diff --git a/src/openpa/configure.ac b/src/openpa/configure.ac index fe8865a..5063164 100644 --- a/src/openpa/configure.ac +++ b/src/openpa/configure.ac @@ -25,6 +25,13 @@ save_cflags=$CFLAGS LT_INIT(disable-shared) CFLAGS=$save_cflags +# ---------------------------------------------------------------------------- +# Set default library names if names haven't already been provided +AC_ARG_VAR([OPALIBNAME],[can be used to override the name of the OpenPA library (default: "opa")]) +OPALIBNAME=${OPALIBNAME:-"opa"} +AC_SUBST(OPALIBNAME) +export OPALIBNAME + if test -s "$srcdir/VERSION" ; then . $srcdir/VERSION AC_SUBST([libopa_so_version]) diff --git a/src/openpa/src/Makefile.am b/src/openpa/src/Makefile.am index 7f55e44..2283681 100644 --- a/src/openpa/src/Makefile.am +++ b/src/openpa/src/Makefile.am @@ -3,9 +3,9 @@ # (C) 2008 by Argonne National Laboratory. # See COPYRIGHT in top-level directory. -lib_LTLIBRARIES = libopa.la -libopa_la_SOURCES = opa_primitives.c opa_queue.c -libopa_la_LDFLAGS = ${libopa_so_versionflags} +lib_LTLIBRARIES = lib@[email protected] +lib@OPALIBNAME@_la_SOURCES = opa_primitives.c opa_queue.c +lib@OPALIBNAME@_la_LDFLAGS = ${lib@OPALIBNAME@_so_versionflags} include_HEADERS = opa_primitives.h opa_queue.h opa_util.h nodist_include_HEADERS = opa_config.h diff --git a/src/openpa/test/Makefile.am b/src/openpa/test/Makefile.am index 9efd79c..8006f22 100644 --- a/src/openpa/test/Makefile.am +++ b/src/openpa/test/Makefile.am @@ -8,8 +8,8 @@ TESTS = sanity test_primitives test_barriers test_queue check_PROGRAMS = $(TESTS) AM_LDFLAGS = -L../src -LDADD = -lopa -DEPENDENCIES = libopa.la +LDADD = -l@OPALIBNAME@ +DEPENDENCIES = lib@[email protected] sanity_SOURCES = sanity.c test_primitives_SOURCES = test_primitives.c opa_test.h http://git.mpich.org/mpich.git/commitdiff/47ea47409a0785044f94435d7565ff4d3… commit 47ea47409a0785044f94435d7565ff4d30f4520f Author: Michael Blocksome <blocksom(a)us.ibm.com> Date: Wed Jan 30 11:44:05 2013 -0600 Add ability to customize the mpich fortran 90 library name Previously, the f90 library name was forced to be: lib@MPILIBNAME@f90 This change adds the '--with-fcwrapname' configure option so that the following is now allowed: ./configure --with-fcwrapname=mpichf90-foo .. which results in the f90 mpich library named: lib@FCWRAPNAME@ (ibm) CPS 92XMVJ (ibm) 9346973f8d1dbf6a09b28446b2f7c3c7c5953ea8 diff --git a/configure.ac b/configure.ac index f3d3c2d..a56bd3b 100644 --- a/configure.ac +++ b/configure.ac @@ -628,6 +628,13 @@ AC_ARG_WITH(fwrapname, [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. diff --git a/src/binding/f90/buildiface b/src/binding/f90/buildiface index d84ef1f..fdd5109 100755 --- a/src/binding/f90/buildiface +++ b/src/binding/f90/buildiface @@ -898,7 +898,7 @@ if BUILD_F90_LIB # in a VPATH build) AM_FCFLAGS += \@FCINCFLAG\@src/binding/f90 -lib_LTLIBRARIES += lib/lib\@MPILIBNAME\@f90.la +lib_LTLIBRARIES += lib/lib\@FCWRAPNAME\@.la EOT @@ -930,27 +930,27 @@ nodist_noinst_HEADERS += \\ src/binding/f90/mpif90model.h # actual f90 code that also gets compiled into modules -lib_lib\@MPILIBNAME\@f90_la_LDFLAGS = \$(ABIVERSIONFLAGS) +lib_lib\@FCWRAPNAME\@_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/f90 # we "manually" build the f90 sources and add them with LIBADD -lib_lib\@MPILIBNAME\@f90_la_SOURCES = -lib_lib\@MPILIBNAME\@f90_la_LIBADD = \\ +lib_lib\@FCWRAPNAME\@_la_SOURCES = +lib_lib\@FCWRAPNAME\@_la_LIBADD = \\ src/binding/f90/mpi.lo \\ src/binding/f90/mpi_constants.lo \\ src/binding/f90/mpi_sizeofs.lo \\ src/binding/f90/${outfile_prefix}_base.lo # now force libtool FC rules/variables to be generated and cause FC linking to -# be selected for lib/lib\@MPILIBNAME\@f90.la -EXTRA_lib_lib\@MPILIBNAME\@f90_la_SOURCES = \\ +# be selected for lib/lib\@FCWRAPNAME\@.la +EXTRA_lib_lib\@FCWRAPNAME\@_la_SOURCES = \\ src/binding/f90/mpi.f90 \\ src/binding/f90/mpi_constants.f90 -nodist_EXTRA_lib_lib\@MPILIBNAME\@f90_la_SOURCES = \\ +nodist_EXTRA_lib_lib\@FCWRAPNAME\@_la_SOURCES = \\ src/binding/f90/mpi_sizeofs.f90 \\ src/binding/f90/${outfile_prefix}_base.f90 diff --git a/src/env/mpif90.bash.in b/src/env/mpif90.bash.in index 75aadd6..1e23550 100644 --- a/src/env/mpif90.bash.in +++ b/src/env/mpif90.bash.in @@ -309,7 +309,7 @@ fi # Handle the specification of the directory containing the modules # For now, these are in the includedir (no choice argument supported) -modulelib="@MPILIBNAME@f90" +modulelib="@FCWRAPNAME@" 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 8c72c9c..7527e78 100644 --- a/src/env/mpif90.sh.in +++ b/src/env/mpif90.sh.in @@ -326,7 +326,7 @@ fi # Handle the specification of the directory containing the modules # For now, these are in the includedir (no choice argument supported) -modulelib="@MPILIBNAME@f90" +modulelib="@FCWRAPNAME@" if [ -n "$FCMODINCSPEC" ] ; then newarg=`echo A"$FCMODINCSPEC" | \ sed -e 's/^A//' -e 's%<dir>%'"$includedir%g" -e 's/<file>/mpi/g'` ----------------------------------------------------------------------- Summary of changes: Makefile.am | 8 ++-- configure.ac | 85 +++++++++++++++++++++++++++++++++++---- examples/Makefile.am | 4 +- src/binding/f90/buildiface | 16 ++++---- src/env/mpif90.bash.in | 6 +- src/env/mpif90.sh.in | 6 +- src/mpid/pamid/subconfigure.m4 | 17 +++++--- src/mpl/Makefile.am | 8 ++-- src/mpl/configure.ac | 7 +++ src/openpa/Makefile.am | 2 +- src/openpa/configure.ac | 13 ++++++ src/openpa/src/Makefile.am | 6 +- src/openpa/test/Makefile.am | 4 +- 13 files changed, 137 insertions(+), 45 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-145-gbff8108
by noreply＠mpich.org 06 May '13

06 May '13

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 bff81082f8524d2a74f7bfd2f85623bb103a6557 (commit) from 384e0138cec5abac9afe9533f2d3b25a93c8eabb (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/bff81082f8524d2a74f7bfd2f85623bb1… commit bff81082f8524d2a74f7bfd2f85623bb103a6557 Author: James Dinan <dinan(a)mcs.anl.gov> Date: Mon May 6 10:52:17 2013 -0500 Add missing initializer Reviewer: None diff --git a/src/mpid/ch3/src/ch3u_rma_sync.c b/src/mpid/ch3/src/ch3u_rma_sync.c index 1f6cbf9..00b0a76 100644 --- a/src/mpid/ch3/src/ch3u_rma_sync.c +++ b/src/mpid/ch3/src/ch3u_rma_sync.c @@ -2507,7 +2507,7 @@ static int MPIDI_CH3I_Do_passive_target_rma(MPID_Win *win_ptr, int target_rank, { int mpi_errno = MPI_SUCCESS, nops; MPIDI_RMA_Op_t *curr_ptr; - MPI_Win source_win_handle, target_win_handle = MPI_WIN_NULL; + MPI_Win source_win_handle = MPI_WIN_NULL, target_win_handle = MPI_WIN_NULL; int nRequest=0, nRequestNew=0; MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3I_DO_PASSIVE_TARGET_RMA); ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/ch3u_rma_sync.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-144-g384e013
by noreply＠mpich.org 06 May '13

06 May '13

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 384e0138cec5abac9afe9533f2d3b25a93c8eabb (commit) via 59e0d3b2971a2fcd31f82def69fa15968bbbd658 (commit) via af11500e1fbacbe31c231ee1dea8cb7bd23457b6 (commit) via b0ec78c5004601025cfb2f4d521057b80c698686 (commit) from 939601e06b888bb350e8a7bc5decc7332659ab07 (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/384e0138cec5abac9afe9533f2d3b25a9… commit 384e0138cec5abac9afe9533f2d3b25a93c8eabb Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun May 5 21:52:44 2013 -0500 Allow devices to override the number of handles and indices through mpidpre.h. See trac ticket #1645 at mpich.org for background information, and trac ticket #1831 for discussion. https://trac.mpich.org/projects/mpich/ticket/1645 The default values for HANDLE_NUM_BLOCKS and HANDLE_NUM_INDICES in the src/include/mpihandlemem.h file can be overridden by setting the MPID_HANDLE_NUM_BLOCKS and MPID_HANDLE_NUM_INDICES #define in the adi `mpidpre.h` file. --- The motivation for this change is to allow bgq to customize how quickly the memory pools grow without changing the behavior for all other platforms. Before the changes for ticket 1645, in commits 72eb56 and 62c720, the default pool limit was 256k (256 elements * 1024 blocks) and the current default pool limit is 8192k (1024 elements * 8192 blocks). With this change the default pool limit for bgq in the pamid deivce is 2048k (256 elements * 8102 blocks). The current mpich default number of elements causes gpaw on bgq to run out of memory at scale - an increment of 1024 communicators in a pool is too large. While the new bgq defaults will limit the maximum pool size, it is unlikely that bgq will support such large pools given the bgq memory limitations. (ibm) Issue 8178 (ibm) 2ed3b95378bba964e276772bac3bb6aa45b007da diff --git a/src/include/mpihandlemem.h b/src/include/mpihandlemem.h index 584d8e8..905deec 100644 --- a/src/include/mpihandlemem.h +++ b/src/include/mpihandlemem.h @@ -97,10 +97,19 @@ const char *MPIU_Handle_get_kind_str(int kind); #define HANDLE_BLOCK_INDEX(a) ((a) & 0x00000FFF) /* Number of blocks is between 1 and 16384 */ +#if defined MPID_HANDLE_NUM_BLOCKS +#define HANDLE_NUM_BLOCKS MPID_HANDLE_NUM_BLOCKS +#else #define HANDLE_NUM_BLOCKS 8192 +#endif /* MPID_HANDLE_NUM_BLOCKS */ + /* Number of objects in a block is bewtween 1 and 4096 (each obj has an index * within its block) */ +#if defined MPID_HANDLE_NUM_INDICES +#define HANDLE_NUM_INDICES MPID_HANDLE_NUM_INDICES +#else #define HANDLE_NUM_INDICES 1024 +#endif /* MPID_HANDLE_NUM_INDICES */ /* For direct, the remainder of the handle is the index into a predefined block */ diff --git a/src/mpid/pamid/include/mpidpre.h b/src/mpid/pamid/include/mpidpre.h index 4214268..68ab472 100644 --- a/src/mpid/pamid/include/mpidpre.h +++ b/src/mpid/pamid/include/mpidpre.h @@ -66,4 +66,8 @@ #define HAVE_GPID_ROUTINES #endif +#ifdef __BGQ__ +#define MPID_HANDLE_NUM_INDICES 256 +#endif /* __BGQ__ */ + #endif http://git.mpich.org/mpich.git/commitdiff/59e0d3b2971a2fcd31f82def69fa15968… commit 59e0d3b2971a2fcd31f82def69fa15968bbbd658 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Mon May 6 06:26:46 2013 -0500 Fix typo in hwloc's autogen.sh. No reviewer. diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh b/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh index 88a122a..df42802 100755 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh @@ -1,2 +1,2 @@ : -autoreconf ${autoreconf_args:"-ivf"} +autoreconf ${autoreconf_args:-"-ivf"} http://git.mpich.org/mpich.git/commitdiff/af11500e1fbacbe31c231ee1dea8cb7bd… commit af11500e1fbacbe31c231ee1dea8cb7bd23457b6 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Mon May 6 06:25:41 2013 -0500 Use hwloc's autogen.sh directly. Don't just run autoreconf from hydra and use hwloc's autogen.sh, since it might do more work than just autoreconf in the future. No reviewer. diff --git a/src/pm/hydra/autogen.sh b/src/pm/hydra/autogen.sh index b84ab3b..e13fb9f 100755 --- a/src/pm/hydra/autogen.sh +++ b/src/pm/hydra/autogen.sh @@ -10,7 +10,7 @@ echo "=== running autoreconf in 'mpl' ===" (cd mpl && $autoreconf ${autoreconf_args:-"-vif"}) || exit 1 echo "=== running autoreconf in 'tools/topo/hwloc/hwloc' ===" -(cd tools/topo/hwloc/hwloc && $autoreconf ${autoreconf_args:-"-vif"}) || exit 1 +(cd tools/topo/hwloc/hwloc && ./autogen.sh) || exit 1 echo "=== running autoreconf in '.' ===" $autoreconf ${autoreconf_args:-"-vif"} || exit 1 http://git.mpich.org/mpich.git/commitdiff/b0ec78c5004601025cfb2f4d521057b80… commit b0ec78c5004601025cfb2f4d521057b80c698686 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun May 5 20:46:39 2013 -0500 Reorder compiler preference. clang seems to have the same or slightly better performance compared to gcc, which, in turn has the same or slightly better performance compared to cc. No reviewer. diff --git a/confdb/aclocal_cc.m4 b/confdb/aclocal_cc.m4 index 98fdc34..f8ace03 100644 --- a/confdb/aclocal_cc.m4 +++ b/confdb/aclocal_cc.m4 @@ -11,7 +11,7 @@ AC_DEFUN([PAC_PROG_CC],[ dnl developers notice this case. AC_BEFORE([$0],[AC_PROG_CC]) PAC_PUSH_FLAG([CFLAGS]) - AC_PROG_CC([icc pgcc xlc xlC pathcc cc gcc clang]) + AC_PROG_CC([icc pgcc xlc xlC pathcc clang gcc cc]) PAC_POP_FLAG([CFLAGS]) ]) dnl ----------------------------------------------------------------------- Summary of changes: confdb/aclocal_cc.m4 | 2 +- src/include/mpihandlemem.h | 9 +++++++++ src/mpid/pamid/include/mpidpre.h | 4 ++++ src/pm/hydra/autogen.sh | 2 +- src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh | 2 +- 5 files changed, 16 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-140-g939601e
by noreply＠mpich.org 05 May '13

05 May '13

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 939601e06b888bb350e8a7bc5decc7332659ab07 (commit) from 259e65db9ecda965c47949295adc80978913fd80 (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/939601e06b888bb350e8a7bc5decc7332… commit 939601e06b888bb350e8a7bc5decc7332659ab07 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun May 5 20:17:15 2013 -0500 hwloc fix to support c89 builds. No reviewer. diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 index 564ede4..3bec360 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 @@ -460,6 +460,10 @@ EOF]) [return sysctlbyname(NULL,NULL,NULL,NULL,0);], AC_DEFINE([HAVE_SYSCTLBYNAME],[1],[Define to '1' if sysctlbyname is present and usable])) + AC_CHECK_DECLS([strtoull], + [AC_DEFINE([HWLOC_HAVE_DECL_STRTOULL],[1],[Define to '1' if strtoull declaration is present])],, + [AC_INCLUDES_DEFAULT]) + case ${target} in *-*-mingw*|*-*-cygwin*) hwloc_pid_t=HANDLE diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/include/private/misc.h b/src/pm/hydra/tools/topo/hwloc/hwloc/include/private/misc.h index f2d475e..e1ce98a 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/include/private/misc.h +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/include/private/misc.h @@ -28,6 +28,10 @@ #error "unknown size for unsigned int." #endif +#if !defined(HWLOC_HAVE_DECL_STRTOULL) +unsigned long long int strtoull(const char *nptr, char **endptr, int base); +#endif /* HWLOC_HAVE_DECL_STRTOULL */ + /** * ffsl helpers. ----------------------------------------------------------------------- Summary of changes: .../hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 | 4 ++++ .../tools/topo/hwloc/hwloc/include/private/misc.h | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-139-g259e65d
by noreply＠mpich.org 05 May '13

05 May '13

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 259e65db9ecda965c47949295adc80978913fd80 (commit) from d207289628674edd0f4036f1745a1b97d6eaa403 (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/259e65db9ecda965c47949295adc80978… commit 259e65db9ecda965c47949295adc80978913fd80 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun May 5 16:05:20 2013 -0500 Revert IBM hwloc versioning patch. This patch is not required since mpich does not build libhwloc at all. It always builds libhwloc_embedded which is neither versioned nor installed. No reviewer. diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac b/src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac index 5700b77..db3bd69 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac @@ -187,20 +187,6 @@ fi # Is ltdl included? # AM_CONDITIONAL([HWLOC_LTDL_INCLUDED], [test "x$with_included_ltdl" = xyes]) - -## Enable creation of libtool-style versioning or no versioning -AC_ARG_ENABLE(versioning, - [AC_HELP_STRING([--enable-versioning],[Enable library versioning])],, - [enable_versioning=yes]) - -if test "$enable_versioning" = "yes" ; then - libhwloc_so_versionflags="-version-info \$(libhwloc_so_version)" -else - libhwloc_so_versionflags="-avoid-version" -fi -export libhwloc_so_versionflags -AC_SUBST(libhwloc_so_versionflags) - # Party on AC_OUTPUT diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/src/Makefile.am b/src/pm/hydra/tools/topo/hwloc/hwloc/src/Makefile.am index 44413cd..53de278 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/src/Makefile.am +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/src/Makefile.am @@ -201,7 +201,7 @@ endif HWLOC_HAVE_WINDOWS # Installable library libhwloc_la_SOURCES = $(sources) -libhwloc_la_LDFLAGS = $(ldflags) $(libhwloc_so_versionflags) $(HWLOC_LIBS) +libhwloc_la_LDFLAGS = $(ldflags) -version-info $(libhwloc_so_version) $(HWLOC_LIBS) if HWLOC_HAVE_PLUGINS AM_CPPFLAGS += $(LTDLINCL) ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/tools/topo/hwloc/hwloc/configure.ac | 14 -------------- .../hydra/tools/topo/hwloc/hwloc/src/Makefile.am | 2 +- 2 files changed, 1 insertions(+), 15 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-138-gd207289
by noreply＠mpich.org 05 May '13

05 May '13

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 d207289628674edd0f4036f1745a1b97d6eaa403 (commit) via ea41f80f7807ea22599f3d6d7ed93ff791af342f (commit) via 350fe9b85399f00d4505864f4aba2c45f3df5e38 (commit) via 43bd72a48283612bd86cf8603ce99cb2104a64c8 (commit) from 5b7f9166920e16e02eeb2bc1c4153c9c9795eac0 (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/d207289628674edd0f4036f1745a1b97d… commit d207289628674edd0f4036f1745a1b97d6eaa403 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun May 5 14:42:37 2013 -0500 Include stdio.h in the configure test for the definition of NULL. No reviewer. diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 index 2ffb4ad..564ede4 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 @@ -447,10 +447,16 @@ EOF]) # or other similar definitions. So while the symbols "sysctl" and # "sysctlbyname" might still be available in libc (which autoconf # checks for), they might not be actually usable. - AC_TRY_LINK([#include <sys/sysctl.h>], + AC_TRY_LINK([ + #include <stdio.h> + #include <sys/sysctl.h> + ], [return sysctl(NULL,0,NULL,NULL,NULL,0);], AC_DEFINE([HAVE_SYSCTL],[1],[Define to '1' if sysctl is present and usable])) - AC_TRY_LINK([#include <sys/sysctl.h>], + AC_TRY_LINK([ + #include <stdio.h> + #include <sys/sysctl.h> + ], [return sysctlbyname(NULL,NULL,NULL,NULL,0);], AC_DEFINE([HAVE_SYSCTLBYNAME],[1],[Define to '1' if sysctlbyname is present and usable])) http://git.mpich.org/mpich.git/commitdiff/ea41f80f7807ea22599f3d6d7ed93ff79… commit ea41f80f7807ea22599f3d6d7ed93ff791af342f Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun May 5 14:31:01 2013 -0500 Include stdio.h in the configure test for getifaddrs. No reviewer. diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac index 68289ec..46a980e 100644 --- a/src/pm/hydra/configure.ac +++ b/src/pm/hydra/configure.ac @@ -160,6 +160,7 @@ if test "$ac_cv_func_killpg" = "yes" ; then fi AC_TRY_LINK([ + #include <stdio.h> #include <sys/types.h> #include <ifaddrs.h> ], http://git.mpich.org/mpich.git/commitdiff/350fe9b85399f00d4505864f4aba2c45f… commit 350fe9b85399f00d4505864f4aba2c45f3df5e38 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun May 5 14:22:19 2013 -0500 Simplify C89 header checks. We can assume that C89 headers exist. Just throw an error in hydra if the compiler can't even support that, though that shouldn't be necessary either. No reviewer. diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac index 053e98d..68289ec 100644 --- a/src/pm/hydra/configure.ac +++ b/src/pm/hydra/configure.ac @@ -134,10 +134,10 @@ AC_SUBST(top_srcdir) PAC_ENABLE_COVERAGE # Check if the necessary headers are available -AC_CHECK_HEADERS(unistd.h stdlib.h string.h strings.h stdarg.h sys/types.h sys/socket.h \ - sched.h sys/stat.h sys/param.h netinet/in.h netinet/tcp.h \ - sys/un.h netdb.h sys/time.h time.h ifaddrs.h arpa/inet.h \ - errno.h poll.h fcntl.h netdb.h winsock2.h windows.h signal.h) +AC_HEADER_STDC +AC_CHECK_HEADERS(unistd.h strings.h sys/types.h sys/socket.h sched.h sys/stat.h sys/param.h \ + netinet/in.h netinet/tcp.h sys/un.h netdb.h sys/time.h time.h ifaddrs.h arpa/inet.h \ + poll.h fcntl.h netdb.h winsock2.h windows.h) AC_CHECK_LIB(socket,socket,LDFLAGS="$LDFLAGS -lsocket",) AC_CHECK_LIB(nsl,gethostbyname,LDFLAGS="$LDFLAGS -lnsl",) diff --git a/src/pm/hydra/include/hydra.h b/src/pm/hydra/include/hydra.h index adfcdeb..491a2e9 100644 --- a/src/pm/hydra/include/hydra.h +++ b/src/pm/hydra/include/hydra.h @@ -18,7 +18,17 @@ extern char *HYD_dbg_prefix; +/* C89 headers can be included without a check */ +#if defined STDC_HEADERS #include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> +#include <errno.h> +#include <signal.h> +#else +#error "STDC_HEADERS are assumed in the Hydra code" +#endif /* STDC_HEADERS */ #if defined NEEDS_POSIX_FOR_SIGACTION #define _POSIX_SOURCE @@ -33,22 +43,10 @@ extern char *HYD_dbg_prefix; #include <unistd.h> #endif /* HAVE_UNISTD_H */ -#if defined HAVE_STDLIB_H -#include <stdlib.h> -#endif /* HAVE_STDLIB_H */ - -#if defined HAVE_STRING_H -#include <string.h> -#endif /* HAVE_STRING_H */ - #if defined HAVE_STRINGS_H #include <strings.h> #endif /* HAVE_STRINGS_H */ -#if defined HAVE_STDARG_H -#include <stdarg.h> -#endif /* HAVE_STDARG_H */ - #if defined HAVE_SYS_TYPES_H #include <sys/types.h> #endif /* HAVE_SYS_TYPES_H */ @@ -73,10 +71,6 @@ extern char *HYD_dbg_prefix; #include <arpa/inet.h> #endif /* HAVE_ARPA_INET_H */ -#if defined HAVE_ERRNO_H -#include <errno.h> -#endif /* HAVE_ERRNO_H */ - #if !defined HAVE_GETTIMEOFDAY #error "hydra requires gettimeofday support" #endif /* HAVE_GETTIMEOFDAY */ http://git.mpich.org/mpich.git/commitdiff/43bd72a48283612bd86cf8603ce99cb21… commit 43bd72a48283612bd86cf8603ce99cb2104a64c8 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun May 5 13:47:02 2013 -0500 Die on autoreconf error instead of chugging along. No reviewer. diff --git a/src/pm/hydra/autogen.sh b/src/pm/hydra/autogen.sh index 51306b9..b84ab3b 100755 --- a/src/pm/hydra/autogen.sh +++ b/src/pm/hydra/autogen.sh @@ -8,9 +8,12 @@ fi echo "=== running autoreconf in 'mpl' ===" (cd mpl && $autoreconf ${autoreconf_args:-"-vif"}) || exit 1 + echo "=== running autoreconf in 'tools/topo/hwloc/hwloc' ===" (cd tools/topo/hwloc/hwloc && $autoreconf ${autoreconf_args:-"-vif"}) || exit 1 -$autoreconf ${autoreconf_args:-"-vif"} + +echo "=== running autoreconf in '.' ===" +$autoreconf ${autoreconf_args:-"-vif"} || exit 1 # Remove the autom4te.cache folders for a release-like structure. find . -name autom4te.cache | xargs rm -rf ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/autogen.sh | 5 +++- src/pm/hydra/configure.ac | 9 ++++--- src/pm/hydra/include/hydra.h | 26 +++++++------------ .../hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 | 10 ++++++- 4 files changed, 27 insertions(+), 23 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-134-g5b7f916
by noreply＠mpich.org 05 May '13

05 May '13

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 5b7f9166920e16e02eeb2bc1c4153c9c9795eac0 (commit) from d2338c2d853b9f6c20f882975df6883a858afc91 (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/5b7f9166920e16e02eeb2bc1c4153c9c9… commit 5b7f9166920e16e02eeb2bc1c4153c9c9795eac0 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun May 5 11:54:59 2013 -0500 Warning squash. No reviewer. diff --git a/src/pm/hydra/utils/sock/sock.c b/src/pm/hydra/utils/sock/sock.c index 0bdb63c..af04cba 100644 --- a/src/pm/hydra/utils/sock/sock.c +++ b/src/pm/hydra/utils/sock/sock.c @@ -499,8 +499,8 @@ HYD_status HYDU_sock_is_local(char *host, int *is_local) { struct hostent *ht; char *ip1 = NULL, *ip2 = NULL; - char buf1[INET_ADDRSTRLEN], buf2[INET_ADDRSTRLEN]; - struct sockaddr_in *sa_ptr, sa; + char buf1[INET_ADDRSTRLEN]; + struct sockaddr_in sa; #if defined(HAVE_GETIFADDRS) struct ifaddrs *ifaddr, *ifa; @@ -546,13 +546,19 @@ HYD_status HYDU_sock_is_local(char *host, int *is_local) for (ifa = ifaddr; ifa; ifa = ifa->ifa_next) { if (ifa->ifa_addr && ifa->ifa_addr->sa_family == AF_INET) { + struct sockaddr_in *sa_ptr; + sa_ptr = (struct sockaddr_in *) ifa->ifa_addr; #if defined HAVE_INET_NTOP - ip2 = HYDU_strdup((char *) - inet_ntop(AF_INET, (const void *) &(sa_ptr->sin_addr), buf2, - MAX_HOSTNAME_LEN)); - HYDU_ASSERT(ip2, status); + { + char buf2[INET_ADDRSTRLEN]; + + ip2 = HYDU_strdup((char *) + inet_ntop(AF_INET, (const void *) &(sa_ptr->sin_addr), buf2, + MAX_HOSTNAME_LEN)); + HYDU_ASSERT(ip2, status); + } #endif /* HAVE_INET_NTOP */ if (!strcmp(ip1, ip2)) { ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/utils/sock/sock.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-133-gd2338c2
by noreply＠mpich.org 05 May '13

05 May '13

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 d2338c2d853b9f6c20f882975df6883a858afc91 (commit) via db276e4eca99a9dee6f1b9c30f28e3c6b9af924a (commit) via 90da6e9004433937e0b54bd847c09e1e982a1744 (commit) via 255da3f6dff4aa605b00d36316497100d4bfa017 (commit) via 581d59f5cf0926cc828fe6302f371cb427bb9bbd (commit) via e801995ec7558e5fa24ee462aac395c6acad374c (commit) from 33e53f7ad9043bcd1b6578a0b7f1157c45f28438 (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/d2338c2d853b9f6c20f882975df6883a8… commit d2338c2d853b9f6c20f882975df6883a858afc91 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun May 5 10:51:20 2013 -0500 Include strings.h for strcasecmp. No reviewer. diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/src/traversal.c b/src/pm/hydra/tools/topo/hwloc/hwloc/src/traversal.c index 452462b..40f1263 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/src/traversal.c +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/src/traversal.c @@ -11,6 +11,9 @@ #include <private/private.h> #include <private/misc.h> #include <private/debug.h> +#ifdef HAVE_STRINGS_H +#include <strings.h> +#endif /* HAVE_STRINGS_H */ int hwloc_get_type_depth (struct hwloc_topology *topology, hwloc_obj_type_t type) http://git.mpich.org/mpich.git/commitdiff/db276e4eca99a9dee6f1b9c30f28e3c6b… commit db276e4eca99a9dee6f1b9c30f28e3c6b9af924a Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat May 4 11:34:21 2013 -0500 Fixes for sysctl checks in strict builds of hwloc. Do a full link test instead of just using AC_CHECK_FUNCS, which just checks to see if the symbol exists or not. For example, the prototype of sysctl uses u_int, which on some platforms (such as FreeBSD) is only defined under __BSD_VISIBLE, __USE_BSD or other similar definitions. So while the symbols "sysctl" and "sysctlbyname" might still be available in libc (which autoconf checks for), they might not be actually usable. No reviewer. diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 index 8a6445f..2ffb4ad 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 @@ -439,7 +439,20 @@ EOF]) #include <sys/param.h> #endif ]) - AC_CHECK_FUNCS([sysctl sysctlbyname]) + + # Do a full link test instead of just using AC_CHECK_FUNCS, which + # just checks to see if the symbol exists or not. For example, + # the prototype of sysctl uses u_int, which on some platforms + # (such as FreeBSD) is only defined under __BSD_VISIBLE, __USE_BSD + # or other similar definitions. So while the symbols "sysctl" and + # "sysctlbyname" might still be available in libc (which autoconf + # checks for), they might not be actually usable. + AC_TRY_LINK([#include <sys/sysctl.h>], + [return sysctl(NULL,0,NULL,NULL,NULL,0);], + AC_DEFINE([HAVE_SYSCTL],[1],[Define to '1' if sysctl is present and usable])) + AC_TRY_LINK([#include <sys/sysctl.h>], + [return sysctlbyname(NULL,NULL,NULL,NULL,0);], + AC_DEFINE([HAVE_SYSCTLBYNAME],[1],[Define to '1' if sysctlbyname is present and usable])) case ${target} in *-*-mingw*|*-*-cygwin*) http://git.mpich.org/mpich.git/commitdiff/90da6e9004433937e0b54bd847c09e1e9… commit 90da6e9004433937e0b54bd847c09e1e982a1744 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun May 5 10:33:46 2013 -0500 Fix check for declarations in hwloc. hwloc's check for whether an explicitly function declaration is needed was relying on whether a redefinition of the function throws an error. This only works if the function declaration is already present in one of the headers. If such a declaration is not present, the test might fail with "implicit function declaration" with the right CFLAGS. This leads the m4 macro to think that the declaration is already there in one of the headers and an additional declaration is not needed. This commit fixes this by adding a dummy function declaration, together with the dummy function definition. No reviewer. diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 index c66f26c..8a6445f 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 @@ -1217,7 +1217,10 @@ dnl number of arguments (10). Success means the compiler couldn't really check. AC_DEFUN([_HWLOC_CHECK_DECL], [ AC_MSG_CHECKING([whether function $1 is declared]) AC_REQUIRE([AC_PROG_CC]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4])],[$1(1,2,3,4,5,6,7,8,9,10);])], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM( + [AC_INCLUDES_DEFAULT([$4]) + $1(int,long,int,long,int,long,int,long,int,long);], + [$1(1,2,3,4,5,6,7,8,9,10);])], [AC_MSG_RESULT([no]) $3], [AC_MSG_RESULT([yes]) http://git.mpich.org/mpich.git/commitdiff/255da3f6dff4aa605b00d36316497100d… commit 255da3f6dff4aa605b00d36316497100d4bfa017 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Fri May 3 22:28:56 2013 -0500 Fixes for hwloc to build with -D_POSIX_C_SOURCE=200112L. No reviewer. diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology-freebsd.c b/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology-freebsd.c index c172264..c3a82f7 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology-freebsd.c +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology-freebsd.c @@ -19,7 +19,7 @@ #ifdef HAVE_SYS_CPUSET_H #include <sys/cpuset.h> #endif -#ifdef HAVE_SYSCTL +#ifdef HAVE_SYS_SYSCTL_H #include <sys/sysctl.h> #endif @@ -164,7 +164,7 @@ hwloc_freebsd_get_thread_cpubind(hwloc_topology_t topology __hwloc_attribute_unu #endif #endif -#ifdef HAVE_SYSCTL +#if defined(HAVE_SYSCTL) && defined(HAVE_SYSCTL_H) static void hwloc_freebsd_node_meminfo_info(struct hwloc_topology *topology) { http://git.mpich.org/mpich.git/commitdiff/581d59f5cf0926cc828fe6302f371cb42… commit 581d59f5cf0926cc828fe6302f371cb427bb9bbd Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sun May 5 08:31:52 2013 -0500 Fix strict build errors in PMI simple. FreeBSD seems to require arpa/inet.h for htons/ntohs definitions during a strict build. This header might always be required on all machines TCP/IP is present, but I'm configure protecting it to play safe. No reviewer. diff --git a/src/pmi/simple/simple_pmiutil.h b/src/pmi/simple/simple_pmiutil.h index ed0b741..020398d 100644 --- a/src/pmi/simple/simple_pmiutil.h +++ b/src/pmi/simple/simple_pmiutil.h @@ -16,6 +16,10 @@ # define PMIU_Assert(expr) #endif +#if defined HAVE_ARPA_INET_H +#include <arpa/inet.h> +#endif /* HAVE_ARPA_INET_H */ + /* prototypes for PMIU routines */ void PMIU_Set_rank( int PMI_rank ); diff --git a/src/pmi/simple/subconfigure.m4 b/src/pmi/simple/subconfigure.m4 index 73ce6d5..a108cc9 100644 --- a/src/pmi/simple/subconfigure.m4 +++ b/src/pmi/simple/subconfigure.m4 @@ -12,13 +12,14 @@ AM_COND_IF([BUILD_PMI_SIMPLE],[ if test "$enable_pmiport" != "no" ; then enable_pmiport=yes fi -AC_CHECK_HEADERS(unistd.h string.h stdlib.h sys/socket.h strings.h assert.h) +AC_CHECK_HEADERS(unistd.h string.h stdlib.h sys/socket.h strings.h assert.h arpa/inet.h) dnl Use snprintf if possible when creating messages AC_CHECK_FUNCS(snprintf) if test "$ac_cv_func_snprintf" = "yes" ; then PAC_FUNC_NEEDS_DECL([#include <stdio.h>],snprintf) fi AC_CHECK_FUNCS(strncasecmp) + # # PM's that need support for a port can set the environment variable # NEED_PMIPORT in their setup_pm script. http://git.mpich.org/mpich.git/commitdiff/e801995ec7558e5fa24ee462aac395c6a… commit e801995ec7558e5fa24ee462aac395c6acad374c Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat May 4 13:02:40 2013 -0500 Fix strict build failure in hydra. No reviewer. diff --git a/src/pm/hydra/configure.ac b/src/pm/hydra/configure.ac index 892363f..053e98d 100644 --- a/src/pm/hydra/configure.ac +++ b/src/pm/hydra/configure.ac @@ -137,15 +137,34 @@ PAC_ENABLE_COVERAGE AC_CHECK_HEADERS(unistd.h stdlib.h string.h strings.h stdarg.h sys/types.h sys/socket.h \ sched.h sys/stat.h sys/param.h netinet/in.h netinet/tcp.h \ sys/un.h netdb.h sys/time.h time.h ifaddrs.h arpa/inet.h \ - errno.h poll.h fcntl.h netdb.h winsock2.h windows.h) + errno.h poll.h fcntl.h netdb.h winsock2.h windows.h signal.h) AC_CHECK_LIB(socket,socket,LDFLAGS="$LDFLAGS -lsocket",) AC_CHECK_LIB(nsl,gethostbyname,LDFLAGS="$LDFLAGS -lnsl",) # Check for necessary functions AC_CHECK_FUNCS(gettimeofday time strdup sigaction signal usleep alloca unsetenv \ - strerror strsignal stat getifaddrs fcntl alarm isatty inet_ntop getpgid \ - setsid) + strerror strsignal stat fcntl alarm isatty inet_ntop getpgid \ + setsid killpg) + +if test "$ac_cv_func_gettimeofday" = "yes" ; then + PAC_FUNC_NEEDS_DECL([#include <sys/time.h>],gettimeofday) +fi + +if test "$ac_cv_func_getpgid" = "yes" ; then + PAC_FUNC_NEEDS_DECL([#include <unistd.h>],getpgid) +fi + +if test "$ac_cv_func_killpg" = "yes" ; then + PAC_FUNC_NEEDS_DECL([#include <signal.h>],killpg) +fi + +AC_TRY_LINK([ + #include <sys/types.h> + #include <ifaddrs.h> + ], + [return getifaddrs(NULL);], + [AC_DEFINE([HAVE_GETIFADDRS],1,[Define to '1' if getifaddrs is present and usable])]) # Check what we need to do about the environ extern AC_CACHE_CHECK([for environ in unistd.h],pac_cv_environ_in_unistd, diff --git a/src/pm/hydra/include/hydra.h b/src/pm/hydra/include/hydra.h index 6cdbfa9..adfcdeb 100644 --- a/src/pm/hydra/include/hydra.h +++ b/src/pm/hydra/include/hydra.h @@ -112,7 +112,11 @@ extern char *HYD_dbg_prefix; #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> -#endif +#endif /* HAVE_SYS_SOCKET_H */ + +#ifdef HAVE_SIGNAL_H +#include <signal.h> +#endif /* HAVE_SIGNAL_H */ #define HYD_POLLIN (0x0001) #define HYD_POLLOUT (0x0002) @@ -159,6 +163,18 @@ extern char *HYD_dbg_prefix; extern char **environ; #endif /* MANUAL_EXTERN_ENVIRON */ +#if defined NEEDS_GETTIMEOFDAY_DECL +int gettimeofday(struct timeval *tv, struct timezone *tz); +#endif /* NEEDS_GETTIMEOFDAY_DECL */ + +#if defined NEEDS_GETPGID_DECL +pid_t getpgid(pid_t pid); +#endif /* NEEDS_GETPGID_DECL */ + +#if defined NEEDS_KILLPG_DECL +int killpg(int pgrp, int sig); +#endif /* NEEDS_KILLPG_DECL */ + #define HYD_SILENT_ERROR(status) (((status) == HYD_GRACEFUL_ABORT) || ((status) == HYD_TIMED_OUT)) #define HYDRA_NAMESERVER_DEFAULT_PORT 6392 ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/configure.ac | 25 +++++++++++++++++-- src/pm/hydra/include/hydra.h | 18 +++++++++++++- .../hydra/tools/topo/hwloc/hwloc/config/hwloc.m4 | 20 ++++++++++++++- .../tools/topo/hwloc/hwloc/src/topology-freebsd.c | 4 +- .../hydra/tools/topo/hwloc/hwloc/src/traversal.c | 3 ++ src/pmi/simple/simple_pmiutil.h | 4 +++ src/pmi/simple/subconfigure.m4 | 3 +- 7 files changed, 68 insertions(+), 9 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-127-g33e53f7
by noreply＠mpich.org 04 May '13

04 May '13

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 33e53f7ad9043bcd1b6578a0b7f1157c45f28438 (commit) from a755eba66cb49c99d5a41b537dc9b730b679caf8 (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/33e53f7ad9043bcd1b6578a0b7f1157c4… commit 33e53f7ad9043bcd1b6578a0b7f1157c45f28438 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Sat May 4 03:15:58 2013 -0500 Fix minor typo. No reviewer. diff --git a/src/include/mpiutil.h b/src/include/mpiutil.h index 0e0dfaa..ae03f78 100644 --- a/src/include/mpiutil.h +++ b/src/include/mpiutil.h @@ -183,7 +183,7 @@ int MPIR_Assert_fail_fmt(const char *cond, const char *file_name, int line_num, /* Helper macros that give us a crude version of C++'s * "std::numeric_limits<TYPE>" functionality. These rely on either C11 * "_Generic" functionality or some unfortunately complicated GCC builtins. */ -#if HAVE_C11__GENERIC +#if defined(HAVE_C11__GENERIC) #define expr_inttype_max(expr_) \ _Generic(expr_, \ signed char: SCHAR_MAX, \ ----------------------------------------------------------------------- Summary of changes: src/include/mpiutil.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.0.4-126-ga755eba
by noreply＠mpich.org 03 May '13

03 May '13

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 a755eba66cb49c99d5a41b537dc9b730b679caf8 (commit) from bdd8c149c5077bd0d7abc2a167eaf2670a03fec4 (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/a755eba66cb49c99d5a41b537dc9b730b… commit a755eba66cb49c99d5a41b537dc9b730b679caf8 Author: Pavan Balaji <balaji(a)mcs.anl.gov> Date: Fri May 3 22:14:06 2013 -0500 Pull in r5559 from hwloc-upstream. No reviewer. diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c b/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c index 708ed83..05f65c4 100644 --- a/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c +++ b/src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c @@ -143,9 +143,10 @@ hwloc_fallback_nbprocessors(struct hwloc_topology *topology) { host_info(mach_host_self(), HOST_BASIC_INFO, (integer_t*) &info, &count); n = info.avail_cpus; #elif defined(HAVE_SYSCTLBYNAME) - int64_t n; - if (hwloc_get_sysctlbyname("hw.ncpu", &n)) - n = -1; + int64_t nn; + if (hwloc_get_sysctlbyname("hw.ncpu", &nn)) + nn = -1; + n = nn; #elif defined(HAVE_SYSCTL) && HAVE_DECL_CTL_HW && HAVE_DECL_HW_NCPU static int name[2] = {CTL_HW, HW_NPCU}; if (hwloc_get_sysctl(name, sizeof(name)/sizeof(*name)), &n) ----------------------------------------------------------------------- Summary of changes: src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0