Skip to content

Commit 11a509e

Browse files
committed
P3371R0: Fix
1 parent 4dfa93e commit 11a509e

2 files changed

Lines changed: 12 additions & 21 deletions

File tree

fix-rankk-rank2k/P3371R0.html

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -456,18 +456,17 @@ <h1 id="toctitle">Contents</h1>
456456
rank-2 update functions</a></li>
457457
<li><a href="#fixes-for-some-wording-issues" id="toc-fixes-for-some-wording-issues"><span class="toc-section-number">7</span> Fixes for some wording
458458
issues</a></li>
459-
<li><a href="#acknowledgments" id="toc-acknowledgments"><span class="toc-section-number">8</span> Acknowledgments</a></li>
460-
<li><a href="#wording" id="toc-wording"><span class="toc-section-number">9</span> Wording</a>
459+
<li><a href="#wording" id="toc-wording"><span class="toc-section-number">8</span> Wording</a>
461460
<ul>
462-
<li><a href="#new-exposition-only-concept" id="toc-new-exposition-only-concept"><span class="toc-section-number">9.1</span> New exposition-only
461+
<li><a href="#new-exposition-only-concept" id="toc-new-exposition-only-concept"><span class="toc-section-number">8.1</span> New exposition-only
463462
concept</a></li>
464-
<li><a href="#rank-k-update-functions-in-synopsis" id="toc-rank-k-update-functions-in-synopsis"><span class="toc-section-number">9.2</span> Rank-k update functions in
463+
<li><a href="#rank-k-update-functions-in-synopsis" id="toc-rank-k-update-functions-in-synopsis"><span class="toc-section-number">8.2</span> Rank-k update functions in
465464
synopsis</a></li>
466-
<li><a href="#rank-2k-update-functions-in-synopsis" id="toc-rank-2k-update-functions-in-synopsis"><span class="toc-section-number">9.3</span> Rank-2k update functions in
465+
<li><a href="#rank-2k-update-functions-in-synopsis" id="toc-rank-2k-update-functions-in-synopsis"><span class="toc-section-number">8.3</span> Rank-2k update functions in
467466
synopsis</a></li>
468-
<li><a href="#specification-of-rank-k-update-functions" id="toc-specification-of-rank-k-update-functions"><span class="toc-section-number">9.4</span> Specification of rank-k update
467+
<li><a href="#specification-of-rank-k-update-functions" id="toc-specification-of-rank-k-update-functions"><span class="toc-section-number">8.4</span> Specification of rank-k update
469468
functions</a></li>
470-
<li><a href="#specification-of-rank-2k-update-functions" id="toc-specification-of-rank-2k-update-functions"><span class="toc-section-number">9.5</span> Specification of rank-2k update
469+
<li><a href="#specification-of-rank-2k-update-functions" id="toc-specification-of-rank-2k-update-functions"><span class="toc-section-number">8.5</span> Specification of rank-2k update
471470
functions</a></li>
472471
</ul></li>
473472
</ul>
@@ -664,11 +663,7 @@ <h1 data-number="7" id="fixes-for-some-wording-issues"><span class="header-secti
664663
propose “drive-by” fixes to these clauses in this proposal. We
665664
nevertheless plan to file an LWG issue to fix both these and other
666665
wording issues we have found.</p>
667-
<h1 data-number="8" id="acknowledgments"><span class="header-section-number">8</span> Acknowledgments<a href="#acknowledgments" class="self-link"></a></h1>
668-
<p>Many thanks (with permission) to Raffaele Solcà (CSCS Swiss National
669-
Supercomputing Centre, <code>raffaele.solca@cscs.ch</code>) for pointing
670-
out this issue.</p>
671-
<h1 data-number="9" id="wording"><span class="header-section-number">9</span> Wording<a href="#wording" class="self-link"></a></h1>
666+
<h1 data-number="8" id="wording"><span class="header-section-number">8</span> Wording<a href="#wording" class="self-link"></a></h1>
672667
<blockquote>
673668
<p>Text in blockquotes is not proposed wording, but rather instructions
674669
for generating proposed wording. The � character is used to denote a
@@ -680,7 +675,7 @@ <h1 data-number="9" id="wording"><span class="header-section-number">9</span> Wo
680675
<p>adjust the placeholder value <code>YYYYMML</code> as needed so as to
681676
denote this proposal’s date of adoption.</p>
682677
</blockquote>
683-
<h2 data-number="9.1" id="new-exposition-only-concept"><span class="header-section-number">9.1</span> New exposition-only concept<a href="#new-exposition-only-concept" class="self-link"></a></h2>
678+
<h2 data-number="8.1" id="new-exposition-only-concept"><span class="header-section-number">8.1</span> New exposition-only concept<a href="#new-exposition-only-concept" class="self-link"></a></h2>
684679
<blockquote>
685680
<p>In the header <code>&lt;linalg&gt;</code> synopsis
686681
<strong>[linalg.syn]</strong>, immediately before the following,</p>
@@ -708,7 +703,7 @@ <h2 data-number="9.1" id="new-exposition-only-concept"><span class="header-secti
708703
<span id="cb5-3"><a href="#cb5-3" aria-hidden="true" tabindex="-1"></a> is<span class="op">-</span>mdspan<span class="op">&lt;</span>T<span class="op">&gt;</span> <span class="op">&amp;&amp;</span> T<span class="op">::</span>rank<span class="op">()</span> <span class="op">==</span> <span class="dv">2</span> <span class="op">&amp;&amp;</span></span>
709704
<span id="cb5-4"><a href="#cb5-4" aria-hidden="true" tabindex="-1"></a> is_assignable_v<span class="op">&lt;</span><span class="kw">typename</span> T<span class="op">::</span>reference, <span class="kw">typename</span> T<span class="op">::</span>element_type<span class="op">&gt;</span> <span class="op">&amp;&amp;</span></span>
710705
<span id="cb5-5"><a href="#cb5-5" aria-hidden="true" tabindex="-1"></a> <span class="op">(</span>T<span class="op">::</span>is_always_unique<span class="op">()</span> <span class="op">||</span> is<span class="op">-</span>layout<span class="op">-</span>blas<span class="op">-</span>packed<span class="op">&lt;</span><span class="kw">typename</span> T<span class="op">::</span>layout_type<span class="op">&gt;)</span>;</span></code></pre></div>
711-
<h2 data-number="9.2" id="rank-k-update-functions-in-synopsis"><span class="header-section-number">9.2</span> Rank-k update functions in
706+
<h2 data-number="8.2" id="rank-k-update-functions-in-synopsis"><span class="header-section-number">8.2</span> Rank-k update functions in
712707
synopsis<a href="#rank-k-update-functions-in-synopsis" class="self-link"></a></h2>
713708
<blockquote>
714709
<p>In the header <code>&lt;linalg&gt;</code> synopsis
@@ -859,7 +854,7 @@ <h2 data-number="9.2" id="rank-k-update-functions-in-synopsis"><span class="head
859854
<span id="cb7-111"><a href="#cb7-111" aria-hidden="true" tabindex="-1"></a> <span class="dt">void</span> hermitian_matrix_rank_k_update<span class="op">(</span></span>
860855
<span id="cb7-112"><a href="#cb7-112" aria-hidden="true" tabindex="-1"></a> ExecutionPolicy<span class="op">&amp;&amp;</span> exec,</span>
861856
<span id="cb7-113"><a href="#cb7-113" aria-hidden="true" tabindex="-1"></a> InMat1 A, InMat2 E, OutMat C, Triangle t<span class="op">)</span>;</span></code></pre></div>
862-
<h2 data-number="9.3" id="rank-2k-update-functions-in-synopsis"><span class="header-section-number">9.3</span> Rank-2k update functions in
857+
<h2 data-number="8.3" id="rank-2k-update-functions-in-synopsis"><span class="header-section-number">8.3</span> Rank-2k update functions in
863858
synopsis<a href="#rank-2k-update-functions-in-synopsis" class="self-link"></a></h2>
864859
<blockquote>
865860
<p>In the header <code>&lt;linalg&gt;</code> synopsis
@@ -926,7 +921,7 @@ <h2 data-number="9.3" id="rank-2k-update-functions-in-synopsis"><span class="hea
926921
<span id="cb9-37"><a href="#cb9-37" aria-hidden="true" tabindex="-1"></a> <em>possibly-packed-out-matrix</em> OutMat, <span class="kw">class</span> Triangle<span class="op">&gt;</span></span>
927922
<span id="cb9-38"><a href="#cb9-38" aria-hidden="true" tabindex="-1"></a> <span class="dt">void</span> hermitian_matrix_rank_2k_update<span class="op">(</span>ExecutionPolicy<span class="op">&amp;&amp;</span> exec,</span>
928923
<span id="cb9-39"><a href="#cb9-39" aria-hidden="true" tabindex="-1"></a> InMat1 A, InMat2 B, InMat3 E, OutMat C, Triangle t<span class="op">)</span>;</span></code></pre></div>
929-
<h2 data-number="9.4" id="specification-of-rank-k-update-functions"><span class="header-section-number">9.4</span> Specification of rank-k update
924+
<h2 data-number="8.4" id="specification-of-rank-k-update-functions"><span class="header-section-number">8.4</span> Specification of rank-k update
930925
functions<a href="#specification-of-rank-k-update-functions" class="self-link"></a></h2>
931926
<blockquote>
932927
<p>Replace the entire contents of [linalg.algs.blas3.rankk] with the
@@ -1152,7 +1147,7 @@ <h2 data-number="9.4" id="specification-of-rank-k-update-functions"><span class=
11521147
<span id="cb17-20"><a href="#cb17-20" aria-hidden="true" tabindex="-1"></a> Triangle t<span class="op">)</span>;</span></code></pre></div>
11531148
<p><span class="marginalizedparent"><a class="marginalized">12</a></span>
11541149
<em>Effects:</em> Computes <span class="math inline"><em>C</em> = <em>E</em> + <em>A</em><em>A</em><sup><em>H</em></sup></span>.</p>
1155-
<h2 data-number="9.5" id="specification-of-rank-2k-update-functions"><span class="header-section-number">9.5</span> Specification of rank-2k update
1150+
<h2 data-number="8.5" id="specification-of-rank-2k-update-functions"><span class="header-section-number">8.5</span> Specification of rank-2k update
11561151
functions<a href="#specification-of-rank-2k-update-functions" class="self-link"></a></h2>
11571152
<blockquote>
11581153
<p>Replace the entire contents of [linalg.algs.blas3.rank2k] with the

fix-rankk-rank2k/fix-rankk-rank2k.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,6 @@ Since we do not propose changing the symmetric and Hermitian rank-1 and rank-2 f
8484

8585
There are some wording issues in **[linalg.algs.blas3.rankk]** and **[linalg.algs.blas3.rank2k]**, specifically in the Mandates, Preconditions, and Complexity clauses. These clauses do not reflect the design intent, which is expressed by the corresponding BLAS routines and the mathematical expressions in the current wording that express the functions' behavior. We have not yet filed an LWG issue for these wording issues. Given that the above changes will call for adjusting some parts of these clauses anyway (e.g., by changing `InOutMat` to `OutMat`), we have decided to propose "drive-by" fixes to these clauses in this proposal. We nevertheless plan to file an LWG issue to fix both these and other wording issues we have found.
8686

87-
# Acknowledgments
88-
89-
Many thanks (with permission) to Raffaele Solcà (CSCS Swiss National Supercomputing Centre, `raffaele.solca@cscs.ch`) for pointing out this issue.
90-
9187
# Wording
9288

9389
> Text in blockquotes is not proposed wording,

0 commit comments

Comments
 (0)