Skip to content

Commit bc9fc27

Browse files
committed
Fix error in description of contents of matrix contructed from GrB_Matrix_diag
1 parent 9964941 commit bc9fc27

File tree

3 files changed

+42
-35
lines changed

3 files changed

+42
-35
lines changed

graph-api-c/GraphBLAS_API_C.tex

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -95,17 +95,17 @@
9595
\newcommand{\bDin}[1]{\mbox{$\mathbf{D}_{in_{#1}}$}}
9696
\newcommand{\bDout}{\mbox{$\mathbf{D}_{out}$}}
9797

98-
%\newcommand{\aydin}[1]{{{\color{orange}[Aydin: #1]}}}
99-
%\newcommand{\scott}[1]{{{\color{violet}[Scott: #1]}}}
100-
%\newcommand{\tim}[1]{{{\color{teal}[Tim: #1]}}}
101-
%\newcommand{\jose}[1]{{{\color{red}[Jose: #1]}}}
102-
%\newcommand{\ben}[1]{{{\color{blue}[Ben: #1]}}}
103-
104-
\newcommand{\aydin}[1]{}
105-
\newcommand{\scott}[1]{}
106-
\newcommand{\tim}[1]{}
107-
\newcommand{\jose}[1]{}
108-
\newcommand{\ben}[1]{}
98+
\newcommand{\aydin}[1]{{{\color{orange}[Aydin: #1]}}}
99+
\newcommand{\scott}[1]{{{\color{violet}[Scott: #1]}}}
100+
\newcommand{\tim}[1]{{{\color{teal}[Tim: #1]}}}
101+
\newcommand{\jose}[1]{{{\color{red}[Jose: #1]}}}
102+
\newcommand{\ben}[1]{{{\color{blue}[Ben: #1]}}}
103+
104+
%\newcommand{\aydin}[1]{}
105+
%\newcommand{\scott}[1]{}
106+
%\newcommand{\tim}[1]{}
107+
%\newcommand{\jose}[1]{}
108+
%\newcommand{\ben}[1]{}
109109

110110
%\aydin{testing}
111111
%\scott{testing}
@@ -133,8 +133,8 @@
133133
\title{
134134
The GraphBLAS C API Specification
135135
\footnote{Based on \emph{GraphBLAS Mathematics} by Jeremy Kepner}: \\
136-
{\large Version 2.0.0} \\
137-
{\normalsize \scott{Remember to update acknowledgements and remove DRAFT}}
136+
{\large Version 2.0.1} \\
137+
{\normalsize \scott{THIS IS A DRAFT VERION. Update acks and remove DRAFT before release.}}
138138
}
139139

140140
\author{Benjamin Brock, Ayd\i n Bulu\c{c}, Timothy Mattson, Scott McMillan, Jos\'e Moreira}

graph-api-c/appendices.tex

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@ \chapter{Revision history}
22
\label{Chp:RevHistory}
33
%--------------------------------------------------------------
44

5-
Changes in 2.0.0 (Released: \#\#-Xxxxx-2021:
5+
Changes in 2.0.1 (Released: \#\# Xxxxx 2022:
6+
\begin{itemize}
7+
\item (Issue GH-69) Fix error in description of contents of matrix constructed from {\sf GrB\_Matrix\_diag}.
8+
\end{itemize}
9+
10+
%--------------------------------------------------------------
11+
12+
Changes in 2.0.0 (Released: 15 November 2021:
613
\begin{itemize}
714
\item Reorganized Chapters 2 and 3: Chapter 2 contains prose regarding the basic concepts captured in the API; Chapter 3 presents all of the enumeratiosn, literals, data types, and predefined objects required by the API. Made short captions for the List of Tables.
815
\item (Issue BB-49, BB-50) Updated and corrected language regarding multithreading and completion, and requirements regarding acquire-release memory orders. Methods that used to force complete no longer do.

graph-api-c/vector_matrix_methods.tex

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ \subsubsection{{\sf Vector\_nvals}: Number of stored elements in a vector}
307307

308308
%-----------------------------------------------------------------------------
309309

310-
\subsubsection{{\sf Vector\_build}: Store elements from tuples into a vector \scott{NEW CONTENT}}
310+
\subsubsection{{\sf Vector\_build}: Store elements from tuples into a vector}
311311
\label{Sec:Vector_build}
312312

313313
\paragraph{\syntax}
@@ -332,7 +332,7 @@ \subsubsection{{\sf Vector\_build}: Store elements from tuples into a vector \sc
332332
to apply when duplicate values for the same location are present in the input
333333
arrays. All three domains of {\sf dup} must be the same; hence
334334
$dup=\langle D_{dup},D_{dup},D_{dup},\oplus \rangle$.
335-
If {\sf dup} is {\sf GrB\_NULL}, then duplicate locations will result in an error. \scott{NEW CONTENT}
335+
If {\sf dup} is {\sf GrB\_NULL}, then duplicate locations will result in an error.
336336
\end{itemize}
337337

338338
\paragraph{Return Values}
@@ -371,10 +371,10 @@ \subsubsection{{\sf Vector\_build}: Store elements from tuples into a vector \sc
371371
In other words, {\sf GrB\_Vector\_nvals(C)} returns a positive value.
372372

373373
\item[{\sf GrB\_INVALID\_VALUE}] {\sf indices} contains a duplicate location
374-
and {\sf dup} is {\sf GrB\_NULL}. \scott{NEW CONTENT}
374+
and {\sf dup} is {\sf GrB\_NULL}.
375375
\end{itemize}
376376

377-
\paragraph{Description \scott{NEW CONTENT}}
377+
\paragraph{Description}
378378

379379
If {\sf dup} is not {\sf GrB\_NULL}, an internal vector
380380
$\vector{\widetilde{w}} = \langle D_{dup},\mathbf{size}({\sf w}),\emptyset \rangle$
@@ -413,7 +413,7 @@ \subsubsection{{\sf Vector\_build}: Store elements from tuples into a vector \sc
413413

414414

415415
%-----------------------------------------------------------------------------
416-
\subsubsection{{\sf Vector\_setElement}: Set a single element in a vector\scott{NEW CONTENT}}
416+
\subsubsection{{\sf Vector\_setElement}: Set a single element in a vector}
417417

418418
Set one element of a vector to a given value.
419419

@@ -584,7 +584,7 @@ \subsubsection{{\sf Vector\_removeElement}: Remove an element from a vector}
584584

585585
%-----------------------------------------------------------------------------
586586

587-
\subsubsection{{\sf Vector\_extractElement}: Extract a single element from a vector.\scott{NEW CONTENT}}
587+
\subsubsection{{\sf Vector\_extractElement}: Extract a single element from a vector.}
588588
\label{Sec:Vector_extractElement}
589589
\label{Sec:extract_single_element_vec}
590590

@@ -910,7 +910,7 @@ \subsubsection{{\sf Matrix\_dup}: Construct a copy of a GraphBLAS matrix}
910910

911911
%-----------------------------------------------------------------------------
912912

913-
\subsubsection{{\sf Matrix\_diag}: Construct a diagonal GraphBLAS matrix \scott{NEW CONTENT}}
913+
\subsubsection{{\sf Matrix\_diag}: Construct a diagonal GraphBLAS matrix}
914914

915915
Creates a new matrix with the same domain and contents as a {\sf GrB\_Vector},
916916
and square dimensions appropriate for placing the contents of the vector along the
@@ -969,7 +969,7 @@ \subsubsection{{\sf Matrix\_diag}: Construct a diagonal GraphBLAS matrix \scott{
969969
\begin{eqnarray*}
970970
\mathbf{L}({\sf C}) & = & \{ (i, i + k, v_i) ~:~ (i, v_i) \in \mathbf{L}({\sf v})\} \mbox{~if~} k \ge 0
971971
\mbox{~or} \\
972-
\mathbf{L}({\sf C}) & = & \{ (i - k, i, v_i) ~:~ (i, v_i) \in \mathbf{L}({\sf v})\} \mbox{~if~} k \ge 0.
972+
\mathbf{L}({\sf C}) & = & \{ (i - k, i, v_i) ~:~ (i, v_i) \in \mathbf{L}({\sf v})\} \mbox{~if~} k < 0.
973973
\end{eqnarray*}
974974
It returns a handle to it in {\sf C}. It is not an error to call this method
975975
more than once on the same variable; however, the handle to the previously
@@ -1213,7 +1213,7 @@ \subsubsection{{\sf Matrix\_nvals}: Number of stored elements in a matrix}
12131213

12141214
%-----------------------------------------------------------------------------
12151215

1216-
\subsubsection{{\sf Matrix\_build}: Store elements from tuples into a matrix \scott{NEW CONTENT}}
1216+
\subsubsection{{\sf Matrix\_build}: Store elements from tuples into a matrix}
12171217
\label{Sec:Matrix_build}
12181218

12191219
\paragraph{\syntax}
@@ -1241,7 +1241,7 @@ \subsubsection{{\sf Matrix\_build}: Store elements from tuples into a matrix \sc
12411241
to apply when duplicate values for the same location are present in the input
12421242
arrays. All three domains of {\sf dup} must be the same; hence
12431243
$dup=\langle D_{dup},D_{dup},D_{dup},\oplus \rangle$.
1244-
If {\sf dup} is {\sf GrB\_NULL}, then duplicate locations will result in an error. \scott{NEW CONTENT}
1244+
If {\sf dup} is {\sf GrB\_NULL}, then duplicate locations will result in an error.
12451245
\end{itemize}
12461246

12471247
\paragraph{Return Values}
@@ -1279,10 +1279,10 @@ \subsubsection{{\sf Matrix\_build}: Store elements from tuples into a matrix \sc
12791279
In other words, {\sf GrB\_Matrix\_nvals(C)} returns a positive value.
12801280

12811281
\item[{\sf GrB\_INVALID\_VALUE}] {\sf indices} contains a duplicate location
1282-
and {\sf dup} is {\sf GrB\_NULL}. \scott{NEW CONTENT}
1282+
and {\sf dup} is {\sf GrB\_NULL}.
12831283
\end{itemize}
12841284

1285-
\paragraph{Description \scott{NEW CONTENT}}
1285+
\paragraph{Description}
12861286

12871287
If {\sf dup} is not {\sf GrB\_NULL}, an internal matrix
12881288
$\matrix{\widetilde{C}} = \langle D_{dup}, \mathbf{nrows}({\sf C}),
@@ -1321,7 +1321,7 @@ \subsubsection{{\sf Matrix\_build}: Store elements from tuples into a matrix \sc
13211321
modify or delete the arrays {\sf row\_indices}, {\sf col\_indices}, or {\sf values}.
13221322

13231323
%-----------------------------------------------------------------------------
1324-
\subsubsection{{\sf Matrix\_setElement}: Set a single element in matrix\scott{NEW CONTENT}}
1324+
\subsubsection{{\sf Matrix\_setElement}: Set a single element in matrix}
13251325

13261326
Set one element of a matrix to a given value.
13271327

@@ -1509,7 +1509,7 @@ \subsubsection{{\sf Matrix\_removeElement}: Remove an element from a matrix}
15091509

15101510
%-----------------------------------------------------------------------------
15111511

1512-
\subsubsection{{\sf Matrix\_extractElement}: Extract a single element from a matrix\scott{NEW CONTENT}}
1512+
\subsubsection{{\sf Matrix\_extractElement}: Extract a single element from a matrix}
15131513
\label{Sec:Matrix_extractElement}
15141514
\label{Sec:extract_single_element_mat}
15151515

@@ -1730,7 +1730,7 @@ \subsubsection{{\sf Matrix\_extractTuples}: Extract tuples from a matrix}
17301730

17311731
%-----------------------------------------------------------------------------
17321732

1733-
\subsubsection{{\sf Matrix\_exportHint}: Provide a hint as to which storage format might be most efficient for exporting a matrix \ben{NEW CONTENT}}
1733+
\subsubsection{{\sf Matrix\_exportHint}: Provide a hint as to which storage format might be most efficient for exporting a matrix}
17341734
\label{Sec:Matrix_exportHint}
17351735

17361736
\paragraph{\syntax}
@@ -1783,7 +1783,7 @@ \subsubsection{{\sf Matrix\_exportHint}: Provide a hint as to which storage form
17831783

17841784
%-----------------------------------------------------------------------------
17851785

1786-
\subsubsection{{\sf Matrix\_exportSize}: Return the array sizes necessary to export a GraphBLAS matrix object \ben{NEW CONTENT}}
1786+
\subsubsection{{\sf Matrix\_exportSize}: Return the array sizes necessary to export a GraphBLAS matrix object}
17871787
\label{Sec:Matrix_exportSize}
17881788

17891789
\paragraph{\syntax}
@@ -1843,7 +1843,7 @@ \subsubsection{{\sf Matrix\_exportSize}: Return the array sizes necessary to exp
18431843

18441844
%-----------------------------------------------------------------------------
18451845

1846-
\subsubsection{{\sf Matrix\_export}: Export a GraphBLAS matrix to a pre-defined format \ben{NEW CONTENT}}
1846+
\subsubsection{{\sf Matrix\_export}: Export a GraphBLAS matrix to a pre-defined format}
18471847
\label{Sec:Matrix_export}
18481848

18491849
\paragraph{\syntax}
@@ -1948,7 +1948,7 @@ \subsubsection{{\sf Matrix\_export}: Export a GraphBLAS matrix to a pre-defined
19481948

19491949
%-----------------------------------------------------------------------------
19501950

1951-
\subsubsection{{\sf Matrix\_import}: Import a matrix into a GraphBLAS object \ben{NEW CONTENT}}
1951+
\subsubsection{{\sf Matrix\_import}: Import a matrix into a GraphBLAS object}
19521952
\label{Sec:Matrix_import}
19531953

19541954
\paragraph{\syntax}
@@ -2038,7 +2038,7 @@ \subsubsection{{\sf Matrix\_import}: Import a matrix into a GraphBLAS object \be
20382038

20392039
%-----------------------------------------------------------------------------
20402040

2041-
\subsubsection{{\sf Matrix\_serializeSize}: Compute the serialize buffer size\ben{NEW CONTENT}}
2041+
\subsubsection{{\sf Matrix\_serializeSize}: Compute the serialize buffer size}
20422042
\label{Sec:Matrix_serializeSize}
20432043

20442044
Compute the buffer size (in bytes) necessary to serialize a {\sf GrB\_Matrix} using {\sf GrB\_Matrix\_serialize}.
@@ -2078,7 +2078,7 @@ \subsubsection{{\sf Matrix\_serializeSize}: Compute the serialize buffer size\be
20782078

20792079
%-----------------------------------------------------------------------------
20802080

2081-
\subsubsection{{\sf Matrix\_serialize}: Serialize a GraphBLAS matrix. \ben{NEW CONTENT}}
2081+
\subsubsection{{\sf Matrix\_serialize}: Serialize a GraphBLAS matrix.}
20822082
\label{Sec:Matrix_serialize}
20832083

20842084
Serialize a GraphBLAS Matrix object into an opaque stream of bytes.
@@ -2140,7 +2140,7 @@ \subsubsection{{\sf Matrix\_serialize}: Serialize a GraphBLAS matrix. \ben{NEW C
21402140

21412141
%-----------------------------------------------------------------------------
21422142

2143-
\subsubsection{{\sf Matrix\_deserialize}: Deserialize a GraphBLAS matrix. \ben{NEW CONTENT}}
2143+
\subsubsection{{\sf Matrix\_deserialize}: Deserialize a GraphBLAS matrix.}
21442144
\label{Sec:Matrix_deserialize}
21452145

21462146
Construct a new GraphBLAS matrix from a serialized object.

0 commit comments

Comments
 (0)