Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[linalg.conj.conjugated] Rearrange to match P3050R3 #7506

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 16 additions & 22 deletions source/numerics.tex
Original file line number Diff line number Diff line change
Expand Up @@ -12812,41 +12812,35 @@
\begin{itemize}
\item
\tcode{remove_cvref_t<decltype(a.accessor().nested_accessor())>}
if \tcode{Accessor} is a specialization of \tcode{conjugated_accessor}; otherwise,
if \tcode{Accessor} is a specialization of \tcode{conjugated_accessor};
\item
\tcode{Accessor} if \tcode{remove_cvref_t<ElementType>} is an arithmetic type; otherwise,
otherwise,
\tcode{Accessor} if \tcode{remove_cvref_t<ElementType>} is an arithmetic type;
\item
\tcode{Accessor} if the expression \tcode{conj(E)} is not valid for any subexpression \tcode{E}
otherwise,
\tcode{conjugated_accessor<Accessor>}
if the expression \tcode{conj(E)} is valid for any subexpression \tcode{E}
whose type is \tcode{remove_cvref_t<ElementType>}
with overload resolution performed in a context that includes the declaration
\tcode{template<class T> conj(const T\&) = delete;}; and otherwise,
\tcode{template<class U> conj(const U\&) = delete;};
jwakely marked this conversation as resolved.
Show resolved Hide resolved
jwakely marked this conversation as resolved.
Show resolved Hide resolved
\item
\tcode{conjugated_accessor<Accessor>}.
otherwise,
\tcode{Accessor}.
\end{itemize}

\pnum
\returns
Let \tcode{MD} be \tcode{mdspan<typename A::element_type, Extents, Layout, A>}.
\begin{itemize}
\item
The value
\begin{codeblock}
mdspan<typename A::element_type, Extents, Layout, A>(a.data_handle(), a.mapping(),
a.accessor().nested_accessor())
\end{codeblock}
if \tcode{Accessor} is a specialization of \tcode{conjugated_accessor}; otherwise,
\item
\tcode{a} if \tcode{remove_cvref_t<ElementType>} is an arithmetic type; otherwise,
\tcode{MD(a.data_handle(), a.mapping(), a.accessor().nested_accessor())}
if \tcode{Accessor} is a\newline specialization of \tcode{conjugated_accessor};
\item
\tcode{a} if the expression \tcode{conj(E)} is not valid for any subexpression \tcode{E}
whose type is \tcode{remove_cvref_t<ElementType>}
with overload resolution performed in a context that includes the declaration
\tcode{template<class T> conj(const T\&) = delete;}; and otherwise,
otherwise,
\tcode{a}, if \tcode{is_same_v<A, Accessor>} is \tcode{true};
Comment on lines +12839 to +12840
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is this editorially-obviously related to the struck text talking about conj(E) ?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to read the preceding paragraph too. In R2 (as applied to the draft) the text in p2 talking about conj(E) was duplicating exactly the condition in 1.3, which was just unnecessarily verbose and repetitive.

We don't need to repeat exactly the two conditions in 1.2 and 1.3 as 2.2 and 2.3, we can just say that if the type A determined in p2 is Accessor, then we return a.

So this is replacing everything in p2 that repeats conditions from p1 by specifying the return value in terms of what was determined in p1.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In other words, previously we had:

  • (1.2) Accessor if remove_cvref_t<ElementType> is an arithmetic type; otherwise,

  • (1.3) Accessor if the expression conj(E) is not valid for any subexpression E whose type T is expression-equivalent to remove_cvref_t<ElementType> with overload resolution performed in a context that includes the declaration template<class T> conj(const T&) = delete;; otherwise,

and

  • (2.2) a if remove_cvref_t<ElementType> is an arithmetic type; otherwise,

  • (2.3) a if the expression conj(E) is not valid for any subexpression E whose type T is expression-equivalent to remove_cvref_t<ElementType> with overload resolution performed in a context that includes the declaration template<class T> conj(const T&) = delete;; otherwise,

But now p2 just says we return a if it's already the right type and doesn't need to be transformed.

\item
the value
\begin{codeblock}
mdspan<typename A::element_type, Extents, Layout, A>(a.data_handle(), a.mapping(),
conjugated_accessor(a.accessor()))
\end{codeblock}
otherwise,
\tcode{MD(a.data_handle(), a.mapping(), conjugated_accessor(a.accessor()))}.
\end{itemize}
\end{itemdescr}

Expand Down
Loading