Merge branch 'development' into cmake

cmake
sfilippone 1 year ago
commit 91bea72cfe

Binary file not shown.

@ -31,7 +31,7 @@ class="cmr-12">University of Rome Tor-Vergata and IAC-CNR</span><br
class="newline" /> <span class="newline" /> <span
class="cmr-12">Software version: 1.2</span><br class="cmr-12">Software version: 1.2</span><br
class="newline" /><span class="newline" /><span
class="cmr-12">December 31st, 2024</span> class="cmr-12">June 9th, 2025</span>

@ -31,7 +31,7 @@ class="cmr-12">University of Rome Tor-Vergata and IAC-CNR</span><br
class="newline" /> <span class="newline" /> <span
class="cmr-12">Software version: 1.2</span><br class="cmr-12">Software version: 1.2</span><br
class="newline" /><span class="newline" /><span
class="cmr-12">December 31st, 2024</span> class="cmr-12">June 9th, 2025</span>

@ -38,33 +38,35 @@ class="cmr-12">AMG4PSBLAS is available from the web site</span>
href="https://psctoolkit.github.io/products/amg4psblas/" ><span href="https://psctoolkit.github.io/products/amg4psblas/" ><span
class="cmr-12">https://psctoolkit.github.io/products/amg4psblas/</span></a></blockquote> class="cmr-12">https://psctoolkit.github.io/products/amg4psblas/</span></a></blockquote>
<!--l. 10--><p class="noindent" ><span <!--l. 10--><p class="noindent" ><span
class="cmr-12">where contact points for further information can be also found.</span> class="cmr-12">where contact points for further information can be also found. The software is available</span>
<!--l. 12--><p class="indent" > <span <span
class="cmr-12">The software is available under a modified BSD license, as specified in Appendix</span><span class="cmr-12">under a modified BSD license, as specified in Appendix</span><span
class="cmr-12">&#x00A0;</span><a class="cmr-12">&#x00A0;</span><a
href="userhtmlse8.html#x11-33000A"><span href="userhtmlse8.html#x11-33000A"><span
class="cmr-12">A</span><!--tex4ht:ref: sec:license --></a><span class="cmr-12">A</span><!--tex4ht:ref: sec:license --></a><span
class="cmr-12">;</span> class="cmr-12">; please note that some of the</span>
<span <span
class="cmr-12">please note that some of the optional third party libraries may be licensed under a</span> class="cmr-12">optional third party libraries may be licensed under a different and more stringent</span>
<span <span
class="cmr-12">different and more stringent license, most notably the GPL, and this should be taken</span> class="cmr-12">license, most notably the GPL, and this should be taken into account when treating</span>
<span <span
class="cmr-12">into account when treating derived works.</span> class="cmr-12">derived works.</span>
<!--l. 18--><p class="indent" > <span <!--l. 17--><p class="indent" > <span
class="cmr-12">The library defines a version string with the constant</span> class="cmr-12">The library defines a version string with the constant</span>
<div class="math-display" > <div class="math-display" >
<img <img
src="userhtml1x.png" alt="amg_version_string_ src="userhtml1x.png" alt="amg_version_string_
" class="math-display" ></div> " class="math-display" ></div>
<!--l. 20--><p class="nopar" > <span <!--l. 19--><p class="nopar" > <span
class="cmr-12">whose current value is </span><span class="obeylines-h"><span class="verb"><span class="cmr-12">whose current value is </span><span class="obeylines-h"><span class="verb"><span
class="cmtt-12">1.0</span></span></span><span class="cmtt-12">1.2</span></span></span><span
class="cmr-12">.</span> class="cmr-12">.</span>
<!--l. 23--><p class="noindent" > <!--l. 22--><p class="noindent" >
<h4 class="likesubsectionHead"><a <h4 class="likesubsectionHead"><a
id="x5-5000"></a><span id="x5-5000"></a><span
class="cmr-12">Contributors</span></h4> class="cmr-12">Development team</span></h4>
<!--l. 23--><p class="noindent" ><span
class="cmr-12">The main development team for AMG4PSBLAS is:</span>
<ul class="itemize1"> <ul class="itemize1">
<li class="itemize"> <li class="itemize">
<!--l. 25--><p class="noindent" ><span <!--l. 25--><p class="noindent" ><span
@ -77,27 +79,56 @@ class="cmr-12">Fabio Durastante, University of Pisa and IAC-CNR, IT;</span>
<li class="itemize"> <li class="itemize">
<!--l. 27--><p class="noindent" ><span <!--l. 27--><p class="noindent" ><span
class="cmr-12">Salvatore Filippone, University of Rome Tor-Vergata and IAC-CNR, IT;</span></li></ul> class="cmr-12">Salvatore Filippone, University of Rome Tor-Vergata and IAC-CNR, IT;</span></li></ul>
<!--l. 29--><p class="noindent" ><span
class="cmr-12">Other contributors:</span>
<div class="center"
>
<!--l. 30--><p class="noindent" > <!--l. 30--><p class="noindent" >
<div class="minipage"> <ul class="itemize1">
<li class="itemize">
<!--l. 33--><p class="noindent" ><span
class="cmr-12">Luca Pep</span><span
class="cmr-12">è Sciarria;</span>
</li>
<li class="itemize">
<!--l. 34--><p class="noindent" ><span
class="cmr-12">Andea Di Iorio;</span></li></ul> </div> <div class="minipage"> <ul class="itemize1">
<li class="itemize">
<!--l. 40--><p class="noindent" ><span
class="cmr-12">Zaak Beekman;</span>
</li>
<li class="itemize">
<!--l. 41--><p class="noindent" ><span
class="cmr-12">Ambra Abdullahi Hassan.</span></li></ul> </div></div>
<!--l. 45--><p class="noindent" >
<h4 class="likesubsectionHead"><a <h4 class="likesubsectionHead"><a
id="x5-6000"></a><span id="x5-6000"></a><span
class="cmr-12">Citing AMG4PSBLAS</span></h4> class="cmr-12">Citing AMG4PSBLAS</span></h4>
<!--l. 31--><p class="noindent" ><span <!--l. 46--><p class="noindent" ><span
class="cmr-12">When use the library, please cite the following:</span> class="cmr-12">When using the library, please cite the following:</span>
<pre class="verbatim" id="verbatim-1"> <pre class="verbatim" id="verbatim-1">
@article{DDF2021, @article&#x00A0;{MR4331965,
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;author&#x00A0;=&#x00A0;{D&#8217;Ambra,&#x00A0;Pasqua&#x00A0;and&#x00A0;Durastante,&#x00A0;Fabio&#x00A0;and&#x00A0;Filippone,&#x00A0;Salvatore}, &#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;AUTHOR&#x00A0;=&#x00A0;{D&#8217;Ambra,&#x00A0;Pasqua&#x00A0;and&#x00A0;Durastante,&#x00A0;Fabio&#x00A0;and&#x00A0;Filippone,&#x00A0;Salvatore},
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;title&#x00A0;=&#x00A0;{{{AMG&#x00A0;Preconditioners&#x00A0;for&#x00A0;Linear&#x00A0;Solvers&#x00A0;towards&#x00A0;Extreme&#x00A0;Scale}}, &#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;TITLE&#x00A0;=&#x00A0;{A{MG}&#x00A0;preconditioners&#x00A0;for&#x00A0;linear&#x00A0;solvers&#x00A0;towards&#x00A0;extreme
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;journal&#x00A0;=&#x00A0;{arXiv&#x00A0;e-preprints}, &#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;scale},
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;eprint&#x00A0;=&#x00A0;{2006.16147v3}, &#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;JOURNAL&#x00A0;=&#x00A0;{SIAM&#x00A0;J.&#x00A0;Sci.&#x00A0;Comput.},
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;archivePrefix&#x00A0;=&#x00A0;{arXiv}, &#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;FJOURNAL&#x00A0;=&#x00A0;{SIAM&#x00A0;Journal&#x00A0;on&#x00A0;Scientific&#x00A0;Computing},
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;year={2021} &#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;VOLUME&#x00A0;=&#x00A0;{43},
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;} &#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;YEAR&#x00A0;=&#x00A0;{2021},
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;NUMBER&#x00A0;=&#x00A0;{5},
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;PAGES&#x00A0;=&#x00A0;{S679--S703},
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;ISSN&#x00A0;=&#x00A0;{1064-8275,1095-7197},
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;MRCLASS&#x00A0;=&#x00A0;{65F50&#x00A0;(65F08&#x00A0;65F10&#x00A0;65N55&#x00A0;65Y05)},
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;MRNUMBER&#x00A0;=&#x00A0;{4331965},
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;MRREVIEWER&#x00A0;=&#x00A0;{Yongzhong\&#x00A0;Song},
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;DOI&#x00A0;=&#x00A0;{10.1137/20M134914X},
}
@Misc{psctoolkit-web-page, @Misc{psctoolkit-web-page,
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;author&#x00A0;=&#x00A0;{D&#8217;Ambra,&#x00A0;Pasqua&#x00A0;and&#x00A0;Durastante,&#x00A0;Fabio&#x00A0;and&#x00A0;Filippone,&#x00A0;Salvatore}, &#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;author&#x00A0;=&#x00A0;{D&#8217;Ambra,&#x00A0;Pasqua&#x00A0;and&#x00A0;Durastante,&#x00A0;Fabio&#x00A0;and&#x00A0;Filippone,&#x00A0;Salvatore},
@ -107,7 +138,7 @@ class="cmr-12">When use the library, please cite the following:</span>
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;year&#x00A0;=&#x00A0;{2021} &#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;year&#x00A0;=&#x00A0;{2021}
&#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;} &#x00A0;&#x00A0;&#x00A0;&#x00A0;&#x00A0;}
</pre> </pre>
<!--l. 70--><p class="nopar" > <!--l. 92--><p class="nopar" >

@ -790,15 +790,13 @@ class="cmr-12">In this particular example we are choosing to employ a </span><sp
class="cmtt-12">HLG</span></span></span> <span class="cmtt-12">HLG</span></span></span> <span
class="cmr-12">data structure for</span> class="cmr-12">data structure for</span>
<span <span
class="cmr-12">sparse matrices on GPUs; for more information please refer to the PSBLAS-EXT users&#8217;</span> class="cmr-12">sparse matrices on GPUs; for more information please refer to the PSBLAS users&#8217;</span>
<span <span
class="cmr-12">guide.</span> class="cmr-12">guide.</span>
<!--l. 482--><p class="indent" > <span <!--l. 482--><p class="indent" > <span
class="cmr-12">We then have to initialize the GPU environment, and pass the appropriate MOLD</span> class="cmr-12">We then have to initialize the GPU environment, and pass the appropriate MOLD</span>
<span <span
class="cmr-12">variables to the build methods (see also the PSBLAS and PSBLAS-EXT users&#8217;</span> class="cmr-12">variables to the build methods (see also the PSBLAS users&#8217; guide).</span>
<span
class="cmr-12">guides).</span>
@ -914,8 +912,11 @@ class="cmtt-12">INVT</span></span></span>
<li class="itemize"> <li class="itemize">
<!--l. 601--><p class="noindent" ><span class="obeylines-h"><span class="verb"><span <!--l. 601--><p class="noindent" ><span class="obeylines-h"><span class="verb"><span
class="cmtt-12">AINV</span></span></span></li></ul> class="cmtt-12">AINV</span></span></span></li></ul>
</li></ul> </li>
<!--l. 604--><p class="noindent" ><span <li class="itemize">
<!--l. 603--><p class="noindent" ><span class="obeylines-h"><span class="verb"><span
class="cmtt-12">POLY</span></span></span></li></ul>
<!--l. 605--><p class="noindent" ><span
class="cmr-12">and their </span><span class="cmr-12">and their </span><span
class="cmmi-12">&#x2113;</span><sub><span class="cmmi-12">&#x2113;</span><sub><span
class="cmr-8">1</span></sub> <span class="cmr-8">1</span></sub> <span

@ -1871,9 +1871,9 @@ class="cmr-10">Degree of the polynomial accelerator, is</span>
<span <span
class="cmr-10">equal to the number of matrix-vector</span> class="cmr-10">equal to the number of matrix-vector</span>
<span <span
class="cmr-10">products performed by the smoother. Is</span> class="cmr-10">products performed by the smoother.</span>
<span <span
class="cmr-10">ignored if the smoother is not </span><code class="lstinline"><span style="color:#000000">&#8217;</span><span style="color:#000000">POLY</span><span style="color:#000000">&#8217;</span></code> </td> class="cmr-10">Ignored if the smoother is not </span><code class="lstinline"><span style="color:#000000">&#8217;</span><span style="color:#000000">POLY</span><span style="color:#000000">&#8217;</span></code> </td>
</tr><tr </tr><tr
class="hline"><td><hr></td><td><hr></td><td><hr></td><td><hr></td><td><hr></td></tr><tr class="hline"><td><hr></td><td><hr></td><td><hr></td><td><hr></td><td><hr></td></tr><tr
style="vertical-align:baseline;" id="TBL-9-6-"><td style="white-space:normal; text-align:left;" id="TBL-9-6-1" style="vertical-align:baseline;" id="TBL-9-6-"><td style="white-space:normal; text-align:left;" id="TBL-9-6-1"

@ -8,7 +8,6 @@ AMG4PSBLAS is available from the web site
\href{https://psctoolkit.github.io/products/amg4psblas/}{https://psctoolkit.github.io/products/amg4psblas/} \href{https://psctoolkit.github.io/products/amg4psblas/}{https://psctoolkit.github.io/products/amg4psblas/}
\end{quotation} \end{quotation}
where contact points for further information can be also found. where contact points for further information can be also found.
The software is available under a modified BSD license, as specified The software is available under a modified BSD license, as specified
in Appendix~\ref{sec:license}; please note that some of the optional in Appendix~\ref{sec:license}; please note that some of the optional
third party libraries may be licensed under a different and more third party libraries may be licensed under a different and more
@ -18,47 +17,70 @@ account when treating derived works.
The library defines a version string with the The library defines a version string with the
constant constant
\[ \verb|amg_version_string_|\] \[ \verb|amg_version_string_|\]
whose current value is \verb|1.0|. whose current value is \verb|1.2|.
\subsection*{Contributors} \subsection*{Development team}
The main development team for AMG4PSBLAS is:
\begin{itemize} \begin{itemize}
\item Pasqua D'Ambra, IAC-CNR, IT; \item Pasqua D'Ambra, IAC-CNR, IT;
\item Fabio Durastante, University of Pisa and IAC-CNR, IT; \item Fabio Durastante, University of Pisa and IAC-CNR, IT;
\item Salvatore Filippone, University of Rome Tor-Vergata and IAC-CNR, IT; \item Salvatore Filippone, University of Rome Tor-Vergata and IAC-CNR, IT;
\end{itemize} \end{itemize}
Other contributors:
\begin{center}
\begin{minipage}{.48\textwidth}
\begin{itemize}
\item Luca Pepè Sciarria;
\item Andea Di Iorio;
\end{itemize}
\end{minipage}
\hfill
\begin{minipage}{.48\textwidth}
\begin{itemize}
\item Zaak Beekman;
\item Ambra Abdullahi Hassan.
\end{itemize}
\end{minipage}
\end{center}
\subsection*{Citing AMG4PSBLAS} \subsection*{Citing AMG4PSBLAS}
When use the library, please cite the following: When using the library, please cite the following:
% \ifpdf
\ifpdf % \begin{minted}[breakanywhere,fontsize=\small]{bibtex}
\begin{minted}[breakanywhere,fontsize=\small]{bibtex} % @article{DDF2021,
@article{DDF2021, % author = {D'Ambra, Pasqua and Durastante, Fabio and Filippone, Salvatore},
author = {D'Ambra, Pasqua and Durastante, Fabio and Filippone, Salvatore}, % title = {{{AMG Preconditioners for Linear Solvers towards Extreme Scale}},
title = {{{AMG Preconditioners for Linear Solvers towards Extreme Scale}}, % journal = {arXiv e-preprints},
journal = {arXiv e-preprints}, % eprint = {2006.16147v3},
eprint = {2006.16147v3}, % archivePrefix = {arXiv},
archivePrefix = {arXiv}, % year={2021}
year={2021} % }
}
@Misc{psctoolkit-web-page, % @Misc{psctoolkit-web-page,
author = {D'Ambra, Pasqua and Durastante, Fabio and Filippone, Salvatore}, % author = {D'Ambra, Pasqua and Durastante, Fabio and Filippone, Salvatore},
title = {{PSCToolkit} {W}eb page}, % title = {{PSCToolkit} {W}eb page},
url = {https://psctoolkit.github.io/}, % url = {https://psctoolkit.github.io/},
howpublished = {\url{https://psctoolkit.github.io/}}, % howpublished = {\url{https://psctoolkit.github.io/}},
year = {2021} % year = {2021}
} % }
\end{minted} % \end{minted}
\else % \else
\begin{verbatim} \begin{verbatim}
@article{DDF2021, @article {MR4331965,
author = {D'Ambra, Pasqua and Durastante, Fabio and Filippone, Salvatore}, AUTHOR = {D'Ambra, Pasqua and Durastante, Fabio and Filippone, Salvatore},
title = {{{AMG Preconditioners for Linear Solvers towards Extreme Scale}}, TITLE = {A{MG} preconditioners for linear solvers towards extreme
journal = {arXiv e-preprints}, scale},
eprint = {2006.16147v3}, JOURNAL = {SIAM J. Sci. Comput.},
archivePrefix = {arXiv}, FJOURNAL = {SIAM Journal on Scientific Computing},
year={2021} VOLUME = {43},
} YEAR = {2021},
NUMBER = {5},
PAGES = {S679--S703},
ISSN = {1064-8275,1095-7197},
MRCLASS = {65F50 (65F08 65F10 65N55 65Y05)},
MRNUMBER = {4331965},
MRREVIEWER = {Yongzhong\ Song},
DOI = {10.1137/20M134914X},
}
@Misc{psctoolkit-web-page, @Misc{psctoolkit-web-page,
author = {D'Ambra, Pasqua and Durastante, Fabio and Filippone, Salvatore}, author = {D'Ambra, Pasqua and Durastante, Fabio and Filippone, Salvatore},
@ -68,4 +90,14 @@ When use the library, please cite the following:
year = {2021} year = {2021}
} }
\end{verbatim} \end{verbatim}
\fi %\fi
% @article{DDF2021,
% author = {D'Ambra, Pasqua and Durastante, Fabio and Filippone, Salvatore},
% title = {{{AMG Preconditioners for Linear Solvers towards Extreme Scale}},
% journal = {arXiv e-preprints},
% eprint = {2006.16147v3},
% archivePrefix = {arXiv},
% year={2021}
% }

@ -477,11 +477,11 @@ program amg_dexample_gpu
\end{listing} \end{listing}
In this particular example we are choosing to employ a \verb|HLG| data In this particular example we are choosing to employ a \verb|HLG| data
structure for sparse matrices on GPUs; for more information please structure for sparse matrices on GPUs; for more information please
refer to the PSBLAS-EXT users' guide. refer to the PSBLAS users' guide.
We then have to initialize the GPU environment, and pass the We then have to initialize the GPU environment, and pass the
appropriate MOLD variables to the build methods (see also the PSBLAS appropriate MOLD variables to the build methods (see also the PSBLAS
and PSBLAS-EXT users' guides). users' guide).
\begin{listing}[h!] \begin{listing}[h!]
\ifpdf \ifpdf
\begin{minted}[breaklines=true,bgcolor=bg,fontsize=\small]{fortran} \begin{minted}[breaklines=true,bgcolor=bg,fontsize=\small]{fortran}
@ -600,6 +600,7 @@ system solve kernels. Methods that satisfy this constraint include:
\item \verb|INVT| \item \verb|INVT|
\item \verb|AINV| \item \verb|AINV|
\end{itemize} \end{itemize}
\item \verb|POLY|
\end{itemize} \end{itemize}
and their $\ell_1$ variants. and their $\ell_1$ variants.

@ -154,7 +154,7 @@ Preconditioners Package based on PSBLAS}
\flushright \flushright
\large Software version: 1.2\\ \large Software version: 1.2\\
%\todaym %\todaym
\large Deceber 31st, 2024 \large June 9th, 2025
\end{minipage}} \end{minipage}}
%\addtolength{\textwidth}{\centeroffset} %\addtolength{\textwidth}{\centeroffset}
\vspace{\stretch{2}} \vspace{\stretch{2}}

@ -114,7 +114,7 @@
%\today %\today
Software version: 1.2\\ Software version: 1.2\\
%\today %\today
December 31st, 2024 June 9th, 2025
\clearpage \clearpage
\ \\ \ \\
\thispagestyle{empty} \thispagestyle{empty}

@ -625,7 +625,7 @@ level (continued).\label{tab:p_coarse_1}}
\fortinline|'POLY_DEGREE'| & \fortinline|integer| \fortinline|'POLY_DEGREE'| & \fortinline|integer|
& Any integer \par number~$\ge 1$ and~$\le 30$ & Any integer \par number~$\ge 1$ and~$\le 30$
& 1 & 1
& Degree of the polynomial accelerator, is equal to the number of matrix-vector products performed by the smoother. Is ignored if the smoother is not \fortinline|'POLY'|\\ \hline & Degree of the polynomial accelerator, is equal to the number of matrix-vector products performed by the smoother. Ignored if the smoother is not \fortinline|'POLY'|\\ \hline
\end{tabular} \end{tabular}
\end{center} \end{center}
\caption{Parameters defining the smoother or the details of the one-level preconditioner. \caption{Parameters defining the smoother or the details of the one-level preconditioner.

Loading…
Cancel
Save