Merge pull request #478 from bgoglin/master

hwloc 2.10.0

index.php

@@ -95,9 +95,9 @@ function pr($name, $url, $comma) {
 news("Open MPI v4.0.7 released",
      "Bug fix release",
      "https://www.mail-archive.com/[email protected]/msg00144.html");
-news("hwloc 2.9.3",
-     "Stable release",
-     "https://www.mail-archive.com/[email protected]/msg00161.html");
+news("hwloc 2.10.0",
+     "Major release",
+     "https://www.mail-archive.com/[email protected]/msg00164.html");
 ?>
 </td>
 </tr>

projects/hwloc/doc/index.php

@@ -36,7 +36,7 @@ function print_docs($desc, $letterpdf, $a4pdf, $html) {
 
 #########################################################
 
-$versions = array();
+$versions = array("v2.10.0");
 $first = 1;
 foreach ($versions as $key => $v) {
 #    print_docs("Release $v (stable" . (!$first ? ", old" : "") . ")",

projects/hwloc/doc/v2.10.0rc2/a00125_source.php → projects/hwloc/doc/v2.10.0/a00125_source.php

@@ -130,16 +130,16 @@
 <div class="line"><a id="l00244" name="l00244"></a><span class="lineno">  244</span> </div>
 <div class="line"><a id="l00256" name="l00256"></a><span class="lineno"><a class="line" href="a00181.php#ga8a14dd7d01efbdd97af7fe85e8b84b20">  256</a></span>HWLOC_DECLSPEC <span class="keywordtype">int</span> <a class="code hl_function" href="a00181.php#ga8a14dd7d01efbdd97af7fe85e8b84b20">hwloc_topology_diff_export_xml</a>(<a class="code hl_union" href="a00305.php">hwloc_topology_diff_t</a> diff, <span class="keyword">const</span> <span class="keywordtype">char</span> *refname, <span class="keyword">const</span> <span class="keywordtype">char</span> *xmlpath);</div>
 <div class="line"><a id="l00257" name="l00257"></a><span class="lineno">  257</span> </div>
-<div class="line"><a id="l00271" name="l00271"></a><span class="lineno"><a class="line" href="a00181.php#gad693810a5c51628529b9dd56f040fb81">  271</a></span>HWLOC_DECLSPEC <span class="keywordtype">int</span> <a class="code hl_function" href="a00181.php#gad693810a5c51628529b9dd56f040fb81">hwloc_topology_diff_load_xmlbuffer</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *xmlbuffer, <span class="keywordtype">int</span> buflen, <a class="code hl_union" href="a00305.php">hwloc_topology_diff_t</a> *diff, <span class="keywordtype">char</span> **refname);</div>
-<div class="line"><a id="l00272" name="l00272"></a><span class="lineno">  272</span> </div>
-<div class="line"><a id="l00289" name="l00289"></a><span class="lineno"><a class="line" href="a00181.php#gaa2f0918df60c1c4a0bef9411f7d92a13">  289</a></span>HWLOC_DECLSPEC <span class="keywordtype">int</span> <a class="code hl_function" href="a00181.php#gaa2f0918df60c1c4a0bef9411f7d92a13">hwloc_topology_diff_export_xmlbuffer</a>(<a class="code hl_union" href="a00305.php">hwloc_topology_diff_t</a> diff, <span class="keyword">const</span> <span class="keywordtype">char</span> *refname, <span class="keywordtype">char</span> **xmlbuffer, <span class="keywordtype">int</span> *buflen);</div>
-<div class="line"><a id="l00290" name="l00290"></a><span class="lineno">  290</span> </div>
-<div class="line"><a id="l00294" name="l00294"></a><span class="lineno">  294</span><span class="preprocessor">#ifdef __cplusplus</span></div>
-<div class="line"><a id="l00295" name="l00295"></a><span class="lineno">  295</span>} <span class="comment">/* extern &quot;C&quot; */</span></div>
-<div class="line"><a id="l00296" name="l00296"></a><span class="lineno">  296</span><span class="preprocessor">#endif</span></div>
-<div class="line"><a id="l00297" name="l00297"></a><span class="lineno">  297</span> </div>
-<div class="line"><a id="l00298" name="l00298"></a><span class="lineno">  298</span> </div>
-<div class="line"><a id="l00299" name="l00299"></a><span class="lineno">  299</span><span class="preprocessor">#endif </span><span class="comment">/* HWLOC_DIFF_H */</span><span class="preprocessor"></span></div>
+<div class="line"><a id="l00276" name="l00276"></a><span class="lineno"><a class="line" href="a00181.php#gad693810a5c51628529b9dd56f040fb81">  276</a></span>HWLOC_DECLSPEC <span class="keywordtype">int</span> <a class="code hl_function" href="a00181.php#gad693810a5c51628529b9dd56f040fb81">hwloc_topology_diff_load_xmlbuffer</a>(<span class="keyword">const</span> <span class="keywordtype">char</span> *xmlbuffer, <span class="keywordtype">int</span> buflen, <a class="code hl_union" href="a00305.php">hwloc_topology_diff_t</a> *diff, <span class="keywordtype">char</span> **refname);</div>
+<div class="line"><a id="l00277" name="l00277"></a><span class="lineno">  277</span> </div>
+<div class="line"><a id="l00294" name="l00294"></a><span class="lineno"><a class="line" href="a00181.php#gaa2f0918df60c1c4a0bef9411f7d92a13">  294</a></span>HWLOC_DECLSPEC <span class="keywordtype">int</span> <a class="code hl_function" href="a00181.php#gaa2f0918df60c1c4a0bef9411f7d92a13">hwloc_topology_diff_export_xmlbuffer</a>(<a class="code hl_union" href="a00305.php">hwloc_topology_diff_t</a> diff, <span class="keyword">const</span> <span class="keywordtype">char</span> *refname, <span class="keywordtype">char</span> **xmlbuffer, <span class="keywordtype">int</span> *buflen);</div>
+<div class="line"><a id="l00295" name="l00295"></a><span class="lineno">  295</span> </div>
+<div class="line"><a id="l00299" name="l00299"></a><span class="lineno">  299</span><span class="preprocessor">#ifdef __cplusplus</span></div>
+<div class="line"><a id="l00300" name="l00300"></a><span class="lineno">  300</span>} <span class="comment">/* extern &quot;C&quot; */</span></div>
+<div class="line"><a id="l00301" name="l00301"></a><span class="lineno">  301</span><span class="preprocessor">#endif</span></div>
+<div class="line"><a id="l00302" name="l00302"></a><span class="lineno">  302</span> </div>
+<div class="line"><a id="l00303" name="l00303"></a><span class="lineno">  303</span> </div>
+<div class="line"><a id="l00304" name="l00304"></a><span class="lineno">  304</span><span class="preprocessor">#endif </span><span class="comment">/* HWLOC_DIFF_H */</span><span class="preprocessor"></span></div>
 <div class="ttc" id="aa00139_php_ga9d1e76ee15a7dee158b786c30b6a6e38"><div class="ttname"><a href="a00139.php#ga9d1e76ee15a7dee158b786c30b6a6e38">hwloc_topology_t</a></div><div class="ttdeci">struct hwloc_topology * hwloc_topology_t</div><div class="ttdoc">Topology context.</div><div class="ttdef"><b>Definition:</b> hwloc.h:742</div></div>
 <div class="ttc" id="aa00181_php_ga1bd6363f26f7961f83153aaa484a9b85"><div class="ttname"><a href="a00181.php#ga1bd6363f26f7961f83153aaa484a9b85">hwloc_topology_diff_t</a></div><div class="ttdeci">union hwloc_topology_diff_u * hwloc_topology_diff_t</div><div class="ttdoc">One element of a difference list between two topologies.</div></div>
 <div class="ttc" id="aa00181_php_ga2cd902ce8766e90d4f2523a8e87640e9"><div class="ttname"><a href="a00181.php#ga2cd902ce8766e90d4f2523a8e87640e9">hwloc_topology_diff_load_xml</a></div><div class="ttdeci">int hwloc_topology_diff_load_xml(const char *xmlpath, hwloc_topology_diff_t *diff, char **refname)</div><div class="ttdoc">Load a list of topology differences from a XML file.</div></div>

projects/hwloc/doc/v2.10.0rc2/a00131_source.php → projects/hwloc/doc/v2.10.0/a00131_source.php

@@ -292,9 +292,9 @@
 <div class="ttc" id="aa00137_php_ggacd37bb612667dc437d66bfb175a8dc55a5d8117a54df1fbd3606ab19e42cb0ea9"><div class="ttname"><a href="a00137.php#ggacd37bb612667dc437d66bfb175a8dc55a5d8117a54df1fbd3606ab19e42cb0ea9">HWLOC_OBJ_PCI_DEVICE</a></div><div class="ttdeci">@ HWLOC_OBJ_PCI_DEVICE</div><div class="ttdoc">PCI device (filtered out by default).</div><div class="ttdef"><b>Definition:</b> hwloc.h:295</div></div>
 <div class="ttc" id="aa00139_php_ga9d1e76ee15a7dee158b786c30b6a6e38"><div class="ttname"><a href="a00139.php#ga9d1e76ee15a7dee158b786c30b6a6e38">hwloc_topology_t</a></div><div class="ttdeci">struct hwloc_topology * hwloc_topology_t</div><div class="ttdoc">Topology context.</div><div class="ttdef"><b>Definition:</b> hwloc.h:742</div></div>
 <div class="ttc" id="aa00146_php_ga137ad1178f7a79f2383974d983083401"><div class="ttname"><a href="a00146.php#ga137ad1178f7a79f2383974d983083401">hwloc_topology_get_type_filter</a></div><div class="ttdeci">int hwloc_topology_get_type_filter(hwloc_topology_t topology, hwloc_obj_type_t type, enum hwloc_type_filter_e *filter)</div><div class="ttdoc">Get the current filtering for the given object type.</div></div>
-<div class="ttc" id="aa00146_php_ga9a5a1f0140cd1952544477833733195b"><div class="ttname"><a href="a00146.php#ga9a5a1f0140cd1952544477833733195b">hwloc_type_filter_e</a></div><div class="ttdeci">hwloc_type_filter_e</div><div class="ttdoc">Type filtering flags.</div><div class="ttdef"><b>Definition:</b> hwloc.h:2410</div></div>
-<div class="ttc" id="aa00146_php_gga9a5a1f0140cd1952544477833733195ba4f835955414de92c77d99b8419d4647a"><div class="ttname"><a href="a00146.php#gga9a5a1f0140cd1952544477833733195ba4f835955414de92c77d99b8419d4647a">HWLOC_TYPE_FILTER_KEEP_NONE</a></div><div class="ttdeci">@ HWLOC_TYPE_FILTER_KEEP_NONE</div><div class="ttdoc">Ignore all objects of this type.</div><div class="ttdef"><b>Definition:</b> hwloc.h:2424</div></div>
-<div class="ttc" id="aa00146_php_gga9a5a1f0140cd1952544477833733195ba63fd24954e18c83ff7eae9588759adb5"><div class="ttname"><a href="a00146.php#gga9a5a1f0140cd1952544477833733195ba63fd24954e18c83ff7eae9588759adb5">HWLOC_TYPE_FILTER_KEEP_IMPORTANT</a></div><div class="ttdeci">@ HWLOC_TYPE_FILTER_KEEP_IMPORTANT</div><div class="ttdoc">Only keep likely-important objects of the given type.</div><div class="ttdef"><b>Definition:</b> hwloc.h:2453</div></div>
+<div class="ttc" id="aa00146_php_ga9a5a1f0140cd1952544477833733195b"><div class="ttname"><a href="a00146.php#ga9a5a1f0140cd1952544477833733195b">hwloc_type_filter_e</a></div><div class="ttdeci">hwloc_type_filter_e</div><div class="ttdoc">Type filtering flags.</div><div class="ttdef"><b>Definition:</b> hwloc.h:2411</div></div>
+<div class="ttc" id="aa00146_php_gga9a5a1f0140cd1952544477833733195ba4f835955414de92c77d99b8419d4647a"><div class="ttname"><a href="a00146.php#gga9a5a1f0140cd1952544477833733195ba4f835955414de92c77d99b8419d4647a">HWLOC_TYPE_FILTER_KEEP_NONE</a></div><div class="ttdeci">@ HWLOC_TYPE_FILTER_KEEP_NONE</div><div class="ttdoc">Ignore all objects of this type.</div><div class="ttdef"><b>Definition:</b> hwloc.h:2425</div></div>
+<div class="ttc" id="aa00146_php_gga9a5a1f0140cd1952544477833733195ba63fd24954e18c83ff7eae9588759adb5"><div class="ttname"><a href="a00146.php#gga9a5a1f0140cd1952544477833733195ba63fd24954e18c83ff7eae9588759adb5">HWLOC_TYPE_FILTER_KEEP_IMPORTANT</a></div><div class="ttdeci">@ HWLOC_TYPE_FILTER_KEEP_IMPORTANT</div><div class="ttdoc">Only keep likely-important objects of the given type.</div><div class="ttdef"><b>Definition:</b> hwloc.h:2454</div></div>
 <div class="ttc" id="aa00158_php_gaa3c2bf4c776d603dcebbb61b0c923d84"><div class="ttname"><a href="a00158.php#gaa3c2bf4c776d603dcebbb61b0c923d84">hwloc_bitmap_t</a></div><div class="ttdeci">struct hwloc_bitmap_s * hwloc_bitmap_t</div><div class="ttdoc">Set of bits represented as an opaque pointer to an internal bitmap.</div><div class="ttdef"><b>Definition:</b> bitmap.h:69</div></div>
 <div class="ttc" id="aa00184_php_ga4715779d7191833e9b1a7490989a7497"><div class="ttname"><a href="a00184.php#ga4715779d7191833e9b1a7490989a7497">hwloc_backend_enable</a></div><div class="ttdeci">int hwloc_backend_enable(struct hwloc_backend *backend)</div><div class="ttdoc">Enable a previously allocated and setup backend.</div></div>
 <div class="ttc" id="aa00184_php_ga600bba1a62022d5f516800649b1edb61"><div class="ttname"><a href="a00184.php#ga600bba1a62022d5f516800649b1edb61">hwloc_disc_phase_t</a></div><div class="ttdeci">enum hwloc_disc_phase_e hwloc_disc_phase_t</div><div class="ttdoc">Discovery phase.</div></div>

projects/hwloc/doc/v2.10.0rc2/a00145.php → projects/hwloc/doc/v2.10.0/a00145.php

@@ -272,7 +272,7 @@
 </div><div class="memdoc">
 
 <p>Enable XML based topology using a memory buffer (instead of a file, as with <a class="el" href="a00145.php#ga879439b7ee99407ee911b3ac64e9a25e" title="Enable XML-file based topology.">hwloc_topology_set_xml()</a>). </p>
-<p >Gather topology information from the XML memory buffer given at <code>buffer</code> and of length <code>size</code>. This buffer may have been filled earlier with <a class="el" href="a00159.php#gad33b7f7c11db10459505a3b1634fd3f1" title="Export the topology into a newly-allocated XML memory buffer.">hwloc_topology_export_xmlbuffer()</a> in <a class="el" href="a00077_source.php">hwloc/export.h</a>.</p>
+<p >Gather topology information from the XML memory buffer given at <code>buffer</code> and of length <code>size</code> (including an ending \0). This buffer may have been filled earlier with <a class="el" href="a00159.php#gad33b7f7c11db10459505a3b1634fd3f1" title="Export the topology into a newly-allocated XML memory buffer.">hwloc_topology_export_xmlbuffer()</a> in <a class="el" href="a00077_source.php">hwloc/export.h</a>.</p>
 <p >Note that this function does not actually load topology information; it just tells hwloc where to load it from. You'll still need to invoke <a class="el" href="a00139.php#gabdf58d87ad77f6615fccdfe0535ff826" title="Build the actual topology.">hwloc_topology_load()</a> to actually load the topology information.</p>
 <dl class="section return"><dt>Returns</dt><dd>0 on success. </dd>
 <dd>

projects/hwloc/doc/v2.10.0rc2/a00181.php → projects/hwloc/doc/v2.10.0/a00181.php

@@ -487,6 +487,7 @@
 </div><div class="memdoc">
 
 <p>Load a list of topology differences from a XML buffer. </p>
+<p >Build a list of differences from the XML memory buffer given at <code>xmlbuffer</code> and of length <code>buflen</code> (including an ending \0). This buffer may have been filled earlier with <a class="el" href="a00181.php#gaa2f0918df60c1c4a0bef9411f7d92a13" title="Export a list of topology differences to a XML buffer.">hwloc_topology_diff_export_xmlbuffer()</a>.</p>
 <p >If not <code>NULL</code>, <code>refname</code> will be filled with the identifier string of the reference topology for the difference file, if any was specified in the XML file. This identifier is usually the name of the other XML file that contains the reference topology.</p>
 <dl class="section return"><dt>Returns</dt><dd>0 on success, -1 on error.</dd></dl>
 <dl class="section note"><dt>Note</dt><dd>the pointer returned in refname should later be freed by the caller. </dd></dl>

projects/hwloc/index.php

@@ -16,15 +16,12 @@
 <div style="float: right; clear: both"><!-- "clear: both" prevents news from going near the float image above -->
 <?php
 # Lists are not mirrored - use an absolute URL
-news("hwloc 2.10.0rc2",
-     "Beta release",
-     "https://www.mail-archive.com/[email protected]/msg00163.html");
-news("hwloc 2.9.3",
-     "Stable release",
-     "https://www.mail-archive.com/[email protected]/msg00161.html");
+news("hwloc 2.10.0",
+     "Major release",
+     "https://www.mail-archive.com/[email protected]/msg00164.html");
 news("Upgrading to v2.0 API",
      "Guide for Porting your Code",
-     "doc/v2.9.3/a00375.php");
+     "doc/v2.10.0/a00351.php");
 news("XML topology database",
      "Repository of XML topologies",
      "https://hwloc.gitlabpages.inria.fr/xmls/");
@@ -100,7 +97,7 @@
 </p>
 
 <p> hwloc may display the topology in multiple convenient formats (see
-<a href="doc/v<?php print($last_dir); ?>/a00359.php#cli_examples">v<?php
+<a href="doc/v<?php print($last_dir); ?>/index.php#cli_examples">v<?php
 print($last_ver); ?> examples</a> and the <a href="lstopo">Best of lstopo</a>).
 It also offers a powerful programming interface to gather information
 about the hardware, bind processes, and much more.</p>
@@ -122,9 +119,9 @@
 
 <p> More details are available in the <a href="doc/">Documentation</a>
 (in both PDF and HTML).  The documentation for each version contains
-<a href="doc/v<?php print($last_dir); ?>/a00359.php#cli_examples">examples of
+<a href="doc/v<?php print($last_dir); ?>/index.php#cli_examples">examples of
 outputs</a> and an <a href="doc/v<?php print($last_ver);
-?>/a00359.php#interface">API interface example</a> (these links are for v<?php
+?>/index.php#interface">API interface example</a> (these links are for v<?php
 print($last_ver); ?>).</p>
 
 <p>The materials from several hwloc tutorials are

software/hwloc/current/version.inc

@@ -7,7 +7,7 @@
 # $last_dir: the directory of the last release on that series
 # (relative to $topdir/software/hwloc/$series_dir or $topdir/projects/hwloc/doc)
 #
-$series_dir = "v2.9";
+$series_dir = "v2.10";
 
 include_once("$topdir/software/hwloc/$series_dir/version.inc");
 

software/hwloc/v2.10/version.inc

@@ -11,8 +11,8 @@ $download_prefix="https://download.open-mpi.org/release/hwloc/v" . $release_seri
 $s3_prefix = "release/hwloc/v" . $release_series . "/";
 
 /* releases must be ordered newest to oldest */
-$releases = array();
+$releases = array("2.10.0");
 /* prereleases must be ordered newest to oldest.  All prereleases
    will be shown, so make an empty array when the official release
    is added to releases above */
-$prereleases = array("2.10.0rc2", "2.10.0rc1");
+$prereleases = array();