Ah. Whoops. I'll fix. :-)
On Oct 8, 2009, at 7:40 AM, Brice Goglin wrote:
> Jeff Squyres wrote:
> > Is this what you had in mind?
> >
> > https://svn.open-mpi.org/trac/hwloc/changeset/1120
>
> No, this removes sections 1 "hwloc" and 2 "glossary" (pages 10-22 of
> the
> PDF). These are generated from the doxy file. But the doxy file is
> also
> considered as a source/header file, causing a manpage and a file
> section
> to be created in the PDF as well. We want the former but not the
> latter.
> We had both but your commit removed both :)
>
> Brice
>
>
>
> >
> >
> > On Oct 8, 2009, at 5:27 AM, <bgog...@osl.iu.edu> wrote:
> >
> >> Author: bgoglin
> >> Date: 2009-10-08 05:27:48 EDT (Thu, 08 Oct 2009)
> >> New Revision: 1119
> >> URL: https://svn.open-mpi.org/trac/hwloc/changeset/1119
> >>
> >> Log:
> >> Fix some doxygen comments
> >> Fix the suffix of the attribute structures
> >>
> >> We should remove hwloc.doxy from the list of files in the
> >> documentation and we should not generate a manpage for it
> >> (both are empty), but I didn't find how to do that.
> >>
> >> Update README
> >>
> >>
> >> Text files modified:
> >> trunk/README | 8 ++++----
> >> trunk/doc/Makefile.am | 8 ++++----
> >> trunk/include/hwloc.h | 14 +++++++-------
> >> 3 files changed, 15 insertions(+), 15 deletions(-)
> >>
> >> Modified: trunk/README
> >> =
> >> =
> >> =
> >> =
> >> =
> >> =
> >> =
> >> =
> >>
>
======================================================================
> >> --- trunk/README (original)
> >> +++ trunk/README 2009-10-08 05:27:48 EDT (Thu, 08 Oct
2009)
> >> @@ -286,13 +286,13 @@
> >> Because of functional and ideological overlap, these two code
> bases
> >> and ideas
> >> were merged and released under the name "hwloc" as an Open MPI
> >> sub-project.
> >>
> >> -PLPA was initially developed by the Open MPI development team
as a
> >> sub-project.
> >> libtopology was initially developed by the INRIA Runtime
> >> Team-Project (http://
> >> runtime.bordeaux.inria.fr/) (headed by Raymond Namyst (http://
> >> -dept-info.labri.fr/~namyst/)). Both are now deprecated in
favor of
> >> the hwloc
> >> -Open MPI sub-project.
> >> +dept-info.labri.fr/~namyst/)). PLPA was initially developed by
the
> >> Open MPI
> >> +development team as a sub-project. Both are now deprecated in
> favor
> >> of hwloc,
> >> +which is distributed as an Open MPI sub-project.
> >>
> >>
>
-------------------------------------------------------------------------------
> >>
> >>
> >> -Generated on Wed Oct 7 17:25:25 2009 for Hardware Locality
(hwloc)
> >> by doxygen
> >> +Generated on Thu Oct 8 11:07:01 2009 for Hardware Locality
(hwloc)
> >> by doxygen
> >> 1.6.1
> >>
> >> Modified: trunk/doc/Makefile.am
> >>
> =
> =
> =
> =
> =
> =
> =
> =
>
======================================================================
> >>
> >> --- trunk/doc/Makefile.am (original)
> >> +++ trunk/doc/Makefile.am 2009-10-08 05:27:48 EDT (Thu, 08
> Oct
> >> 2009)
> >> @@ -242,10 +242,10 @@
> >> $(DOX_MAN_DIR)/man3/hwloc_get_type_or_below_depth.3 \
> >> $(DOX_MAN_DIR)/man3/hwloc_obj.3 \
> >> $(DOX_MAN_DIR)/man3/hwloc_obj_attr_u.3 \
> >> - $(DOX_MAN_DIR)/man3/hwloc_obj_attr_u_hwloc_cache_attr_u.
> 3 \
> >> - $(DOX_MAN_DIR)/man3/
> hwloc_obj_attr_u_hwloc_machine_attr_u.3 \
> >> - $(DOX_MAN_DIR)/man3/
hwloc_obj_attr_u_hwloc_memory_attr_u.
> 3 \
> >> - $(DOX_MAN_DIR)/man3/hwloc_obj_attr_u_hwloc_misc_attr_u.
3 \
> >> + $(DOX_MAN_DIR)/man3/hwloc_obj_attr_u_hwloc_cache_attr_s.
> 3 \
> >> + $(DOX_MAN_DIR)/man3/
> hwloc_obj_attr_u_hwloc_machine_attr_s.3 \
> >> + $(DOX_MAN_DIR)/man3/
hwloc_obj_attr_u_hwloc_memory_attr_s.
> 3 \
> >> + $(DOX_MAN_DIR)/man3/hwloc_obj_attr_u_hwloc_misc_attr_s.
3 \
> >> $(DOX_MAN_DIR)/man3/hwloc_obj_cpuset_snprintf.3 \
> >> $(DOX_MAN_DIR)/man3/hwloc_obj_is_in_subtree.3 \
> >> $(DOX_MAN_DIR)/man3/hwloc_obj_snprintf.3 \
> >>
> >> Modified: trunk/include/hwloc.h
> >>
> =
> =
> =
> =
> =
> =
> =
> =
>
======================================================================
> >>
> >> --- trunk/include/hwloc.h (original)
> >> +++ trunk/include/hwloc.h 2009-10-08 05:27:48 EDT (Thu, 08
> Oct
> >> 2009)
> >> @@ -161,27 +161,27 @@
> >> /** \brief Object type-specific Attributes */
> >> union hwloc_obj_attr_u {
> >> /** \brief Cache-specific Object Attributes */
> >> - struct hwloc_cache_attr_u {
> >> + struct hwloc_cache_attr_s {
> >> unsigned long memory_kB; /**< \brief Size of
> cache */
> >> unsigned depth; /**< \brief Depth of
> cache */
> >> } cache;
> >> /** \brief Node-specific Object Attributes */
> >> - struct hwloc_memory_attr_u {
> >> + struct hwloc_memory_attr_s {
> >> unsigned long memory_kB; /**< \brief Size of
> memory
> >> node */
> >> unsigned long huge_page_free; /**< \brief Number of
> >> available huge pages */
> >> } node;
> >> - /**< \brief Machine-specific Object Attributes */
> >> - struct hwloc_machine_attr_u {
> >> + /** \brief Machine-specific Object Attributes */
> >> + struct hwloc_machine_attr_s {
> >> char *dmi_board_vendor; /**< \brief DMI board
> >> vendor name */
> >> char *dmi_board_name; /**< \brief DMI board
> model
> >> name */
> >> unsigned long memory_kB; /**< \brief Size of
> memory
> >> node */
> >> unsigned long huge_page_free; /**< \brief Number of
> >> available huge pages */
> >> unsigned long huge_page_size_kB; /**< \brief Size of
huge
> >> pages */
> >> } machine;
> >> - /**< \brief System-specific Object Attributes */
> >> - struct hwloc_machine_attr_u system;
> >> + /** \brief System-specific Object Attributes */
> >> + struct hwloc_machine_attr_s system;
> >> /** \brief Misc-specific Object Attributes */
> >> - struct hwloc_misc_attr_u {
> >> + struct hwloc_misc_attr_s {
> >> unsigned depth; /**< \brief Depth of
misc
> >> object */
> >> } misc;
> >> };
> >> _______________________________________________
> >> hwloc-svn mailing list
> >> hwloc-...@open-mpi.org
> >> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-svn
> >>
> >
> >
>
> _______________________________________________
> hwloc-devel mailing list
> hwloc-de...@open-mpi.org
> http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
>
--
Jeff Squyres
jsquy...@cisco.com
_______________________________________________
hwloc-devel mailing list
hwloc-de...@open-mpi.org
http://www.open-mpi.org/mailman/listinfo.cgi/hwloc-devel
