[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-293-g933ba22
mysql vizuser
noreply at mpich.org
Sun Jun 9 00:40:13 CDT 2013
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 933ba2260c0107f474c902acff3db6f8aa0d737c (commit)
via b07eeac6314fe966312f21ee820a757ce0b1d33d (commit)
via 2f17bd3f021086ce48479ba44dad97768bb6eb13 (commit)
via 3c2da592b28366b0cd7eb22295cce18d176c87b0 (commit)
from 5ebed0363a14a822eb7c8aa48678386df314d526 (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/933ba2260c0107f474c902acff3db6f8aa0d737c
commit 933ba2260c0107f474c902acff3db6f8aa0d737c
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date: Sun Jun 9 00:39:27 2013 -0500
Added CHANGES log for mpich-3.1b1.
diff --git a/CHANGES b/CHANGES
index 51b88e3..d827e2a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,27 @@
===============================================================================
+ Changes in 3.1
+===============================================================================
+
+ # OVERALL: Integrated MPICH-PAMI code base for Blue Gene/Q and other
+ IBM platforms.
+
+ # OVERALL: Added environment variables to control a lot more
+ capabilities for collectives. See the README.envvar file for more
+ information.
+
+ # BUILD: Enable shared library builds by default.
+
+ # PM/PMI: Upgraded hwloc to 1.7.1.
+
+ # PM/PMI: Several improvements to the Hydra-SLURM integration.
+
+ # Several other minor bug fixes, memory leak fixes, and code cleanup.
+ A full list of changes is available at the following link:
+
+ http://git.mpich.org/mpich.git/shortlog/v3.0.4..v3.1b1
+
+
+===============================================================================
Changes in 3.0.4
===============================================================================
http://git.mpich.org/mpich.git/commitdiff/b07eeac6314fe966312f21ee820a757ce0b1d33d
commit b07eeac6314fe966312f21ee820a757ce0b1d33d
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date: Sun Jun 9 00:32:05 2013 -0500
Updated version information for the 3.1b1 release.
The ABI string is updated to 11:x:y since we added the C++ binding for
distgraph. No interfaces were deleted, so 'x' goes to 0, and 'y' goes
to 1.
diff --git a/maint/version.m4 b/maint/version.m4
index e64f652..892fdd6 100644
--- a/maint/version.m4
+++ b/maint/version.m4
@@ -14,7 +14,7 @@
# changing this by playing with diversions, but then we would probably be
# playing with autotools-fire.
-m4_define([MPICH_VERSION_m4],[3.0.4])dnl
+m4_define([MPICH_VERSION_m4],[3.1b1])dnl
m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl
# For libtool ABI versioning rules see:
@@ -31,6 +31,6 @@ 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.
-m4_define([libmpich_so_version_m4],[10:4:0])dnl
+m4_define([libmpich_so_version_m4],[11:0:1])dnl
[#] end of __file__
http://git.mpich.org/mpich.git/commitdiff/2f17bd3f021086ce48479ba44dad97768bb6eb13
commit 2f17bd3f021086ce48479ba44dad97768bb6eb13
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date: Sun May 19 00:17:55 2013 -0500
Hydra-specific patches for hwloc.
Picked up the relevant parts of [2bda6bc7] and [49b74176].
diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/Makefile.am b/src/pm/hydra/tools/topo/hwloc/hwloc/Makefile.am
index a76d42e..5d635d5 100644
--- a/src/pm/hydra/tools/topo/hwloc/hwloc/Makefile.am
+++ b/src/pm/hydra/tools/topo/hwloc/hwloc/Makefile.am
@@ -9,10 +9,10 @@ ACLOCAL_AMFLAGS = -I ./config
SUBDIRS = src include
if HWLOC_BUILD_STANDALONE
-SUBDIRS += utils tests
+# SUBDIRS += utils tests
# We need doc/ if HWLOC_BUILD_DOXYGEN, or during make install if HWLOC_INSTALL_DOXYGEN.
# There's no INSTALL_SUBDIRS, so always enter doc/ and check HWLOC_BUILD/INSTALL_DOXYGEN there
-SUBDIRS += doc
+# SUBDIRS += doc
endif
# Do not let automake automatically add the non-standalone dirs to the
diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh b/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh
index d69ef09..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 -ivf
+autoreconf ${autoreconf_args:-"-ivf"}
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 02b1e6f..b9ab48f 100644
--- a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4
+++ b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4
@@ -441,7 +441,25 @@ EOF])
])
AC_CHECK_DECLS([strtoull], [], [], [AC_INCLUDES_DEFAULT])
- 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 <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 <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]))
case ${target} in
*-*-mingw*|*-*-cygwin*)
@@ -1232,7 +1250,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/3c2da592b28366b0cd7eb22295cce18d176c87b0
commit 3c2da592b28366b0cd7eb22295cce18d176c87b0
Author: Pavan Balaji <balaji at mcs.anl.gov>
Date: Sun Jun 9 00:20:03 2013 -0500
Upgraded to hwloc-1.7.1
diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/Makefile.am b/src/pm/hydra/tools/topo/hwloc/hwloc/Makefile.am
index 5d635d5..a76d42e 100644
--- a/src/pm/hydra/tools/topo/hwloc/hwloc/Makefile.am
+++ b/src/pm/hydra/tools/topo/hwloc/hwloc/Makefile.am
@@ -9,10 +9,10 @@ ACLOCAL_AMFLAGS = -I ./config
SUBDIRS = src include
if HWLOC_BUILD_STANDALONE
-# SUBDIRS += utils tests
+SUBDIRS += utils tests
# We need doc/ if HWLOC_BUILD_DOXYGEN, or during make install if HWLOC_INSTALL_DOXYGEN.
# There's no INSTALL_SUBDIRS, so always enter doc/ and check HWLOC_BUILD/INSTALL_DOXYGEN there
-# SUBDIRS += doc
+SUBDIRS += doc
endif
# Do not let automake automatically add the non-standalone dirs to the
diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/VERSION b/src/pm/hydra/tools/topo/hwloc/hwloc/VERSION
index 5cc8694..b057041 100644
--- a/src/pm/hydra/tools/topo/hwloc/hwloc/VERSION
+++ b/src/pm/hydra/tools/topo/hwloc/hwloc/VERSION
@@ -16,7 +16,7 @@ release=1
# requirement is that it must be entirely printable ASCII characters
# and have no white space.
-greek=rc1
+greek=rc2
# If want_repo_rev=1, then the SVN r number will be included in the overall
# hwloc version number in some form.
diff --git a/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh b/src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh
index df42802..d69ef09 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 -ivf
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 b9ab48f..02b1e6f 100644
--- a/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4
+++ b/src/pm/hydra/tools/topo/hwloc/hwloc/config/hwloc.m4
@@ -441,25 +441,7 @@ EOF])
])
AC_CHECK_DECLS([strtoull], [], [], [AC_INCLUDES_DEFAULT])
- # 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 <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 <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]))
+ AC_CHECK_FUNCS([sysctl sysctlbyname])
case ${target} in
*-*-mingw*|*-*-cygwin*)
@@ -1250,10 +1232,7 @@ 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(int,long,int,long,int,long,int,long,int,long);],
- [$1(1,2,3,4,5,6,7,8,9,10);])],
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4])],[$1(1,2,3,4,5,6,7,8,9,10);])],
[AC_MSG_RESULT([no])
$3],
[AC_MSG_RESULT([yes])
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 eddec79..7e13ca1 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
@@ -164,7 +164,7 @@ hwloc_freebsd_get_thread_cpubind(hwloc_topology_t topology __hwloc_attribute_unu
#endif
#endif
-#if defined(HAVE_SYSCTL) && defined(HAVE_SYS_SYSCTL_H)
+#if (defined HAVE_SYSCTL) && (defined HAVE_SYS_SYSCTL_H)
static void
hwloc_freebsd_node_meminfo_info(struct hwloc_topology *topology)
{
@@ -187,7 +187,7 @@ hwloc_look_freebsd(struct hwloc_backend *backend)
}
/* Add FreeBSD specific information */
-#if defined(HAVE_SYSCTL) && defined(HAVE_SYS_SYSCTL_H)
+#if (defined HAVE_SYSCTL) && (defined HAVE_SYS_SYSCTL_H)
hwloc_freebsd_node_meminfo_info(topology);
#endif
hwloc_obj_add_info(topology->levels[0][0], "Backend", "FreeBSD");
-----------------------------------------------------------------------
Summary of changes:
CHANGES | 23 ++++++++++++++++++++
maint/version.m4 | 4 +-
src/pm/hydra/tools/topo/hwloc/hwloc/VERSION | 2 +-
.../tools/topo/hwloc/hwloc/src/topology-freebsd.c | 4 +-
4 files changed, 28 insertions(+), 5 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list