[mpich2-commits] r7800 - in mpich2/trunk/src/pm/hydra: . tools/bind/hwloc/hwloc tools/bind/hwloc/hwloc/config tools/bind/hwloc/hwloc/doc tools/bind/hwloc/hwloc/include tools/bind/hwloc/hwloc/utils tools/bind/plpa/plpa
balaji at mcs.anl.gov
balaji at mcs.anl.gov
Thu Jan 20 22:16:05 CST 2011
Author: balaji
Date: 2011-01-20 22:16:05 -0600 (Thu, 20 Jan 2011)
New Revision: 7800
Removed:
mpich2/trunk/src/pm/hydra/tools/bind/plpa/plpa/autogen.sh
Modified:
mpich2/trunk/src/pm/hydra/autogen.sh
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/NEWS
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/VERSION
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/autogen.sh
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc_internal.m4
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/doc/Makefile.am
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc.h
mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/Makefile.am
Log:
Update hwloc to 1.1.1rc3. Make some changes to hydra's autogen.sh, so
we don't have to maintain some of the patches for hwloc that we used
to.
Modified: mpich2/trunk/src/pm/hydra/autogen.sh
===================================================================
--- mpich2/trunk/src/pm/hydra/autogen.sh 2011-01-21 04:16:00 UTC (rev 7799)
+++ mpich2/trunk/src/pm/hydra/autogen.sh 2011-01-21 04:16:05 UTC (rev 7800)
@@ -1,8 +1,5 @@
#! /bin/sh
-(cd tools/bind/hwloc/hwloc && ./autogen.sh)
-(cd tools/bind/plpa/plpa && ./autogen.sh)
-
if [ -n "$MPICH2_AUTOTOOLS_DIR" ] ; then
libtoolize=${MPICH2_AUTOTOOLS_DIR}/libtoolize
autoreconf=${MPICH2_AUTOTOOLS_DIR}/autoreconf
@@ -12,6 +9,8 @@
fi
(cd mpl && $autoreconf -vif)
+(cd tools/bind/hwloc/hwloc && $autoreconf -vif)
+(cd tools/bind/plpa/plpa && $autoreconf -vif)
$autoreconf -vif
# Remove the autom4te.cache folders for a release-like structure.
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/NEWS
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/NEWS 2011-01-21 04:16:00 UTC (rev 7799)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/NEWS 2011-01-21 04:16:05 UTC (rev 7800)
@@ -20,19 +20,25 @@
Version 1.1.1
-------------
* Add hwloc_get_api_version() which returns the version of hwloc used
- at runtime.
+ at runtime. Thanks to Guy Streeter for the suggestion.
* Fix hwloc_bitmap_to_ulong() right after allocating the bitmap.
+ Thanks to Bernd Kallies for reporting the problem.
* Fix hwloc_bitmap_from_ith_ulong() to properly zero the first ulong.
+ Thanks to Guy Streeter for reporting the problem.
* Fix hwloc_get_membind_nodeset() on Linux.
+ Thanks to Bernd Kallies for reporting the problem and providing a patch.
* Fix some file descriptor leaks in the Linux discovery.
* Fix the minimum width of NUMA nodes, caches and the legend in the graphical
- lstopo output.
+ lstopo output. Thanks to Jirka Hladky for reporting the problem.
* Various fixes to bitmap conversion from/to taskset-strings.
* Fix and document snprintf functions behavior when the buffer size is too
- small or zero.
+ small or zero. Thanks to Guy Streeter for reporting the problem.
* Fix configure to avoid spurious enabling of the cpuid backend.
+ Thanks to Tim Anderson for reporting the problem.
* Cleanup error management in hwloc-gather-topology.sh.
+ Thanks to Jirka Hladky for reporting the problem and providing a patch.
* Add a manpage and usage for hwloc-gather-topology.sh on Linux.
+ Thanks to Jirka Hladky for providing a patch.
* Memory binding documentation enhancements.
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/VERSION
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/VERSION 2011-01-21 04:16:00 UTC (rev 7799)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/VERSION 2011-01-21 04:16:05 UTC (rev 7800)
@@ -16,7 +16,7 @@
# requirement is that it must be entirely printable ASCII characters
# and have no white space.
-greek=rc1
+greek=rc3
# If want_svn=1, then the SVN r number will be included in the overall
# hwloc version number in some form.
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/autogen.sh
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/autogen.sh 2011-01-21 04:16:00 UTC (rev 7799)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/autogen.sh 2011-01-21 04:16:05 UTC (rev 7800)
@@ -1,11 +1,2 @@
-#! /bin/sh
-
-if [ -n "$MPICH2_AUTOTOOLS_DIR" ] ; then
- libtoolize=${MPICH2_AUTOTOOLS_DIR}/libtoolize
- autoreconf=${MPICH2_AUTOTOOLS_DIR}/autoreconf
-else
- libtoolize=${LIBTOOLIZE:-libtoolize}
- autoreconf=${AUTORECONF:-autoreconf}
-fi
-
-$autoreconf -vif
+:
+autoreconf -ivf
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4 2011-01-21 04:16:00 UTC (rev 7799)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc.m4 2011-01-21 04:16:05 UTC (rev 7800)
@@ -236,7 +236,7 @@
AC_MSG_WARN([***********************************************************])
AC_MSG_WARN([*** hwloc does not support this system.])
AC_MSG_WARN([*** hwloc will *attempt* to build (but it may not work).])
- AC_MSG_WARN([*** hwloc's run-time results may be reduced to showing just one processor.])
+ AC_MSG_WARN([*** hwloc run-time results may be reduced to showing just one processor.])
AC_MSG_WARN([*** You have been warned.])
AC_MSG_WARN([*** Pausing to give you time to read this message...])
AC_MSG_WARN([***********************************************************])
@@ -281,7 +281,7 @@
_HWLOC_CHECK_VISIBILITY
HWLOC_CFLAGS="$HWLOC_FLAGS $HWLOC_VISIBILITY_CFLAGS"
AS_IF([test "$HWLOC_VISIBILITY_CFLAGS" != ""],
- [AC_MSG_WARN(["$HWLOC_VISIBILITY_CFLAGS" has been added to hwloc's CFLAGS])])
+ [AC_MSG_WARN(["$HWLOC_VISIBILITY_CFLAGS" has been added to the hwloc CFLAGS])])
#
# Check for inline compatibility support
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc_internal.m4
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc_internal.m4 2011-01-21 04:16:00 UTC (rev 7799)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/config/hwloc_internal.m4 2011-01-21 04:16:05 UTC (rev 7800)
@@ -105,6 +105,22 @@
[hwloc_generate_doxs=yes], [hwloc_generate_doxs=no])
AC_MSG_RESULT([$hwloc_generate_doxs])
+ # Linux and OS X take different sed arguments.
+ AC_PROG_SED
+ AC_MSG_CHECKING([if the sed -i option requires an argument])
+ rm -f conftest
+ cat > conftest <<EOF
+hello
+EOF
+ $SED -i -e s/hello/goodbye/ conftest 2> /dev/null
+ AS_IF([test -f conftest-e],
+ [SED_I="$SED -i ''"
+ AC_MSG_RESULT([yes])],
+ [SED_I="$SED -i"
+ AC_MSG_RESULT([no])])
+ rm -f conftest conftest-e
+ AC_SUBST([SED_I])
+
# Making the top-level README requires w3m or lynx.
AC_ARG_VAR([W3M], [Location of the w3m program (required to building the top-level hwloc README file)])
AC_PATH_TOOL([W3M], [w3m])
@@ -143,6 +159,9 @@
# specifically disabled by the user.
AC_MSG_CHECKING([whether to enable "picky" compiler mode])
hwloc_want_picky=0
+ AS_IF([test "$GCC" = "yes"],
+ [AS_IF([test -d "$srcdir/.svn" -o -d "$srcdir/.hg"],
+ [hwloc_want_picky=1])])
if test "$enable_picky" = "yes"; then
if test "$GCC" = "yes"; then
AC_MSG_RESULT([yes])
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/doc/Makefile.am
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/doc/Makefile.am 2011-01-21 04:16:00 UTC (rev 7799)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/doc/Makefile.am 2011-01-21 04:16:05 UTC (rev 7800)
@@ -1,6 +1,6 @@
# Copyright © 2009-2010 INRIA
# Copyright © 2009-2010 Université Bordeaux 1
-# Copyright © 2009-2010 Cisco Systems, Inc. All rights reserved.
+# Copyright © 2009-2011 Cisco Systems, Inc. All rights reserved.
AM_CPPFLAGS = $(HWLOC_CPPFLAGS)
@@ -108,38 +108,23 @@
$(DOX_TAG): $(BUILT_SOURCES) $(dox_inputs) $(PREBUILT_IMAGES)
rm -fr $(DOX_DIR)
$(DOXYGEN) $(DOX_CONFIG)
- -sed -i -e 's/__hwloc_restrict/restrict/g' \
+ -$(SED_I) -e 's/__hwloc_restrict/restrict/g' \
+ -e 's/\\_\\-\\_\\-hwloc\\_\\-restrict/restrict/g' \
+ -e 's/__hwloc_attribute_unused//g' \
+ -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-unused//g' \
+ -e 's/__hwloc_attribute_malloc//g' \
+ -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-malloc//g' \
+ -e 's/__hwloc_attribute_const//g' \
+ -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-const//g' \
+ -e 's/__hwloc_attribute_pure//g' \
+ -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-pure//g' \
+ -e 's/__hwloc_attribute_deprecated//g' \
+ -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-deprecated//g' \
+ -e 's/HWLOC_DECLSPEC//g' \
+ -e 's/HWLOC\\_\\-DECLSPEC//g' \
+ -e 's/__hwloc_inline/inline/g' \
+ -e 's/\\_\\-\\_\\-hwloc\\_\\-inline/inline/g' \
$(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-restrict/restrict/g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/__hwloc_attribute_unused//g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-unused//g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/__hwloc_attribute_malloc//g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-malloc//g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/__hwloc_attribute_const//g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-const//g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/__hwloc_attribute_pure//g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-pure//g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/__hwloc_attribute_deprecated//g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-attribute\\_\\-deprecated//g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/HWLOC_DECLSPEC//g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/HWLOC\\_\\-DECLSPEC//g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/__hwloc_inline/inline/g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
- -sed -i -e 's/\\_\\-\\_\\-hwloc\\_\\-inline/inline/g' \
- $(DOX_DIR)/html/*.html $(DOX_DIR)/latex/*.tex $(DOX_DIR)/man/man3/*.3
@echo "Work-around spurious leading _ in doxygen filenames..."
-(cd $(DOX_DIR)/man/man3 ; \
for i in _hwloc* ; do \
@@ -200,7 +185,7 @@
$(DOX_LETTERPDF): $(DOX_TAG)
cd $(DOX_LATEX_DIR); \
rm -f *.aux *.toc *.idx *.ind *.ilg *.log *.out; \
- sed -e 's/a4paper/letterpaper/g' -e 's/\\usepackage{a4wide}//' refman.tex > letter-refman.tex; \
+ $(SED) -e 's/a4paper/letterpaper/g' -e 's/\\usepackage{a4wide}//' refman.tex > letter-refman.tex; \
$(PDFLATEX) letter-refman.tex; \
$(MAKEINDEX) letter-refman.idx; \
$(PDFLATEX) letter-refman.tex; \
@@ -566,7 +551,7 @@
if HWLOC_BUILD_README
doc readme: all $(HWLOC_top_srcdir)/README
$(HWLOC_top_srcdir)/README: $(DOX_HTML_DIR)
- LC_ALL=C $(HWLOC_W3_GENERATOR) $(DOX_HTML_DIR)/index.html | sed -n -e 's/^ //' -e '/^Introduction$$/,$$p' > $@
+ LC_ALL=C $(HWLOC_W3_GENERATOR) $(DOX_HTML_DIR)/index.html | $(SED) -n -e 's/^ //' -e '/^Introduction$$/,$$p' > $@
else
doc readme: no-build-readme
$(HWLOC_top_srcdir)/README: no-build-readme
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc.h
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc.h 2011-01-21 04:16:00 UTC (rev 7799)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/include/hwloc.h 2011-01-21 04:16:05 UTC (rev 7800)
@@ -74,10 +74,10 @@
/** \defgroup hwlocality_sets Object sets (hwloc_cpuset_t and hwloc_nodeset_t)
*
- * Hwloc uses bitmasks to represent two distinct kinds of object sets:
+ * Hwloc uses bitmaps to represent two distinct kinds of object sets:
* CPU sets (::hwloc_cpuset_t) and NUMA node sets (::hwloc_nodeset_t).
* These types are both typedefs to a common back end type
- * (::hwloc_bitmask_t), and therefore all the hwloc bitmap functions
+ * (::hwloc_bitmap_t), and therefore all the hwloc bitmap functions
* are applicable to both ::hwloc_cpuset_t and ::hwloc_nodeset_t (see
* \ref hwlocality_bitmap).
*
@@ -239,7 +239,7 @@
/** \brief Structure of a topology object
*
- * Applications mustn't modify any field except ::userdata .
+ * Applications must not modify any field except hwloc_obj.userdata.
*/
struct hwloc_obj {
/* physical information */
Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/Makefile.am
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/Makefile.am 2011-01-21 04:16:00 UTC (rev 7799)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/hwloc/utils/Makefile.am 2011-01-21 04:16:05 UTC (rev 7800)
@@ -42,32 +42,40 @@
# Only install man pages if we're building in standalone mode
if HWLOC_BUILD_UTILS
+man7_pages = hwloc.7
+EXTRA_DIST += $(man7_pages:.7=.7in)
+nodist_man_MANS = $(man7_pages)
+
man1_pages = lstopo.1 hwloc-bind.1 hwloc-distrib.1 hwloc-calc.1 hwloc-ps.1
+EXTRA_DIST += $(man1_pages:.1=.1in)
+nodist_man_MANS += $(man1_pages)
+
+# Only install the gather-topology page if we're on Linux, but we need
+# to include it in the tarball, regardless of what OS we're building
+# on.
+hgt_page = hwloc-gather-topology.sh.1
+EXTRA_DIST += $(hgt_page:.1=.1in)
if HWLOC_HAVE_LINUX
-man1_pages += hwloc-gather-topology.sh.1
+nodist_man_MANS += $(hgt_page)
endif HWLOC_HAVE_LINUX
-man7_pages = hwloc.7
-man_pages = $(man7_pages) $(man1_pages)
-EXTRA_DIST += $(man1_pages:.1=.1in) $(man7_pages:.7=.7in)
-nodist_man_MANS = $(man_pages)
.1in.1:
@ echo Creating $@ man page...
- @ sed -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
+ @ $(SED) -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
-e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \
-e 's/#HWLOC_DATE#/@HWLOC_RELEASE_DATE@/g' \
> $@ < $<
.3in.3:
@ echo Creating $@ man page...
- @ sed -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
+ @ $(SED) -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
-e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \
-e 's/#HWLOC_DATE#/@HWLOC_RELEASE_DATE@/g' \
> $@ < $<
.7in.7:
@ echo Creating $@ man page...
- @ sed -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
+ @ $(SED) -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
-e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \
-e 's/#HWLOC_DATE#/@HWLOC_RELEASE_DATE@/g' \
> $@ < $<
@@ -83,5 +91,5 @@
rm -f $(DESTDIR)$(man1dir)/hwloc-ls.1 $(DESTDIR)$(man1dir)/hwloc-info.1 $(DESTDIR)$(man1dir)/hwloc-mask.1
distclean-local:
- rm -f $(man_pages)
+ rm -f $(nodist_man_MANS)
endif
Deleted: mpich2/trunk/src/pm/hydra/tools/bind/plpa/plpa/autogen.sh
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/plpa/plpa/autogen.sh 2011-01-21 04:16:00 UTC (rev 7799)
+++ mpich2/trunk/src/pm/hydra/tools/bind/plpa/plpa/autogen.sh 2011-01-21 04:16:05 UTC (rev 7800)
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-if [ -n "$MPICH2_AUTOTOOLS_DIR" ] ; then
- libtoolize=${MPICH2_AUTOTOOLS_DIR}/libtoolize
- autoreconf=${MPICH2_AUTOTOOLS_DIR}/autoreconf
-else
- libtoolize=${LIBTOOLIZE:-libtoolize}
- autoreconf=${AUTORECONF:-autoreconf}
-fi
-
-$autoreconf -vif
More information about the mpich2-commits
mailing list