Skip to content

Commit

Permalink
docs: switch to gnu14
Browse files Browse the repository at this point in the history 
Signed-off-by: Adrian Reber <[email protected]>
  • Loading branch information
@adrianreber
adrianreber committed Sep 27, 2024
1 parent 3fe9996 commit 6e3ff48
Show file tree
Hide file tree
Showing 15 changed files with 58 additions and 58 deletions.
10 changes: 5 additions & 5 deletions docs/recipes/install/common/build_tables.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ sub usage {

my @ohpcCategories = ("admin","compiler-families","dev-tools","distro-packages","io-libs","mpi-families",
"parallel-libs","serial-libs","perf-tools","provisioning","rms", "runtimes");
my @compiler_familes = ("gnu","gnu7","intel","gnu8","gnu9","gnu12","gnu13","arm1");
my @compiler_familes = ("gnu","gnu7","intel","gnu8","gnu9","gnu12","gnu13","gnu14","arm1");
my @mpi_families = ("mvapich2","openmpi","openmpi3","openmpi4","openmpi5","impi","mpich");

my @single_package_exceptions = ();
Expand Down Expand Up @@ -77,11 +77,11 @@ sub usage {
my %page_breaks = ();
if ( $ENV{'PWD'} =~ /\S+\/x86_64\// ) {
$page_breaks{"mpiP-gnu-impi-ohpc"} = 2;
$page_breaks{"pdtoolkit-gnu13-ohpc"} = 2;
$page_breaks{"pdtoolkit-gnu14-ohpc"} = 2;
# $page_breaks{"pdtoolkit-gnu13-ohpc"} = 3;
$page_breaks{"pnetcdf-gnu13-impi-ohpc"} = 2;
$page_breaks{"mumps-gnu13-impi-ohpc"} = 2;
$page_breaks{"superlu_dist-gnu13-impi-ohpc"} = 3;
$page_breaks{"pnetcdf-gnu14-impi-ohpc"} = 2;
$page_breaks{"mumps-gnu14-impi-ohpc"} = 2;
$page_breaks{"superlu_dist-gnu14-impi-ohpc"} = 3;
} elsif ( $ENV{'PWD'} =~ /\S+\/aarch64\// ) {
$page_breaks{"scalapack-gnu9-mpich-ohpc"} = 2;
}
Expand Down
2 changes: 1 addition & 1 deletion docs/recipes/install/common/compilers.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
% begin_ohpc_run
% ohpc_comment_header Install Compilers \ref{sec:install_compilers}
\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) gnu13-compilers-ohpc
[sms](*\#*) (*\install*) gnu14-compilers-ohpc
\end{lstlisting}
% end_ohpc_run

Expand Down
2 changes: 1 addition & 1 deletion docs/recipes/install/common/component_list.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ sub usage {
'serial-libs' => 'Serial / Threaded Libraries');


my @compiler_familes = ("gnu","gnu7","intel","gnu8","gnu9","gnu12","gnu13","arm1");
my @compiler_familes = ("gnu","gnu7","intel","gnu8","gnu9","gnu12","gnu13","gnu14","arm1");
my @mpi_families = ("mvapich2","openmpi","openmpi3","openmpi4","impi","mpich");

my @package_skip = ("ohpc-release","gnu-compilers","R_base","mvapich2-psm","openmpi-psm2","scotch",
Expand Down
8 changes: 4 additions & 4 deletions docs/recipes/install/common/default_dev.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

% begin_ohpc_run
\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) lmod-defaults-gnu13-openmpi5-ohpc
[sms](*\#*) (*\install*) lmod-defaults-gnu14-openmpi5-ohpc
\end{lstlisting}
% end_ohpc_run

Expand All @@ -28,10 +28,10 @@
\fi

\begin{itemize*}
\item lmod-defaults-gnu13-mpich-ofi-ohpc
\item lmod-defaults-gnu13-mpich-ucx-ohpc
\item lmod-defaults-gnu14-mpich-ofi-ohpc
\item lmod-defaults-gnu14-mpich-ucx-ohpc
\iftoggleverb{isx86}
\item lmod-defaults-gnu13-mvapich2-ohpc
\item lmod-defaults-gnu14-mvapich2-ohpc
\fi
\end{itemize*}
\end{tcolorbox}
Expand Down
6 changes: 3 additions & 3 deletions docs/recipes/install/common/mpi_aarch_openpbs.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
% ohpc_command if [[ ${enable_mpi_defaults} -eq 1 ]];then
% ohpc_indent 5
\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) openmpi5-gnu13-ohpc mpich-ofi-gnu13-ohpc
[sms](*\#*) (*\install*) openmpi5-gnu14-ohpc mpich-ofi-gnu14-ohpc
\end{lstlisting}
% ohpc_indent 0
% ohpc_command fi
Expand All @@ -30,7 +30,7 @@
% ohpc_command if [[ ${enable_mpich_ucx} -eq 1 ]];then
% ohpc_indent 5
\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) mpich-ucx-gnu13-ohpc
[sms](*\#*) (*\install*) mpich-ucx-gnu14-ohpc
\end{lstlisting}
% ohpc_indent 0
% ohpc_command fi
Expand All @@ -43,7 +43,7 @@
\begin{lstlisting}[language=bash]
[sms](*\#*) module avail mpich

-------------------- /opt/ohpc/pub/moduledeps/gnu13 ---------------------
-------------------- /opt/ohpc/pub/moduledeps/gnu14 ---------------------
mpich/3.4.3-ofi mpich/3.4.3-ucx (D)
\end{lstlisting}

Expand Down
6 changes: 3 additions & 3 deletions docs/recipes/install/common/mpi_aarch_slurm.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
% ohpc_command if [[ ${enable_mpi_defaults} -eq 1 ]];then
% ohpc_indent 5
\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) openmpi5-pmix-gnu13-ohpc mpich-ofi-gnu13-ohpc
[sms](*\#*) (*\install*) openmpi5-pmix-gnu14-ohpc mpich-ofi-gnu14-ohpc
\end{lstlisting}
% ohpc_indent 0
% ohpc_command fi
Expand All @@ -30,7 +30,7 @@
% ohpc_command if [[ ${enable_mpich_ucx} -eq 1 ]];then
% ohpc_indent 5
\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) mpich-ucx-gnu13-ohpc
[sms](*\#*) (*\install*) mpich-ucx-gnu14-ohpc
\end{lstlisting}
% ohpc_indent 0
% ohpc_command fi
Expand All @@ -43,7 +43,7 @@
\begin{lstlisting}[language=bash]
[sms](*\#*) module avail mpich

-------------------- /opt/ohpc/pub/moduledeps/gnu13 ---------------------
-------------------- /opt/ohpc/pub/moduledeps/gnu14 ---------------------
mpich/3.4.3-ofi mpich/3.4.3-ucx (D)
\end{lstlisting}

Expand Down
10 changes: 5 additions & 5 deletions docs/recipes/install/common/mpi_openpbs.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
% ohpc_command if [[ ${enable_mpi_defaults} -eq 1 ]];then
% ohpc_indent 5
\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) openmpi5-gnu13-ohpc mpich-ofi-gnu13-ohpc
[sms](*\#*) (*\install*) openmpi5-gnu14-ohpc mpich-ofi-gnu14-ohpc
\end{lstlisting}
% ohpc_indent 0
% ohpc_command fi
Expand All @@ -62,7 +62,7 @@
instead as a drop-in MPICH replacement:

\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) mpich-ucx-gnu13-ohpc
[sms](*\#*) (*\install*) mpich-ucx-gnu14-ohpc
\end{lstlisting}

In the case where both MPICH variants are installed, two modules will be
Expand All @@ -72,7 +72,7 @@
\begin{lstlisting}[language=bash]
[sms](*\#*) module avail mpich

-------------------- /opt/ohpc/pub/moduledeps/gnu13---------------------
-------------------- /opt/ohpc/pub/moduledeps/gnu14---------------------
mpich/3.4.3-ofi mpich/3.4.3-ucx (D)
\end{lstlisting}

Expand All @@ -85,7 +85,7 @@
% ohpc_command if [[ ${enable_ib} -eq 1 ]];then
% ohpc_indent 5
\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) mvapich2-gnu13-ohpc
[sms](*\#*) (*\install*) mvapich2-gnu14-ohpc
\end{lstlisting}
% ohpc_indent 0
% ohpc_command fi
Expand All @@ -98,7 +98,7 @@
% ohpc_command if [[ ${enable_opa} -eq 1 ]];then
% ohpc_indent 5
\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) mvapich2-psm2-gnu13-ohpc
[sms](*\#*) (*\install*) mvapich2-psm2-gnu14-ohpc
\end{lstlisting}
% ohpc_indent 0
% ohpc_command fi
Expand Down
10 changes: 5 additions & 5 deletions docs/recipes/install/common/mpi_slurm.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
% ohpc_command if [[ ${enable_mpi_defaults} -eq 1 ]];then
% ohpc_indent 5
\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) openmpi5-pmix-gnu13-ohpc mpich-ofi-gnu13-ohpc
[sms](*\#*) (*\install*) openmpi5-pmix-gnu14-ohpc mpich-ofi-gnu14-ohpc
\end{lstlisting}
% ohpc_indent 0
% ohpc_command fi
Expand All @@ -61,7 +61,7 @@
instead as a drop-in MPICH replacement:

\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) mpich-ucx-gnu13-ohpc
[sms](*\#*) (*\install*) mpich-ucx-gnu14-ohpc
\end{lstlisting}

In the case where both MPICH variants are installed, two modules will be
Expand All @@ -71,7 +71,7 @@
\begin{lstlisting}[language=bash]
[sms](*\#*) module avail mpich

-------------------- /opt/ohpc/pub/moduledeps/gnu13---------------------
-------------------- /opt/ohpc/pub/moduledeps/gnu14---------------------
mpich/3.4.3-ofi mpich/3.4.3-ucx (D)
\end{lstlisting}

Expand All @@ -84,7 +84,7 @@
% ohpc_command if [[ ${enable_ib} -eq 1 ]];then
% ohpc_indent 5
\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) mvapich2-gnu13-ohpc
[sms](*\#*) (*\install*) mvapich2-gnu14-ohpc
\end{lstlisting}
% ohpc_indent 0
% ohpc_command fi
Expand All @@ -97,7 +97,7 @@
% ohpc_command if [[ ${enable_opa} -eq 1 ]];then
% ohpc_indent 5
\begin{lstlisting}[language=bash]
[sms](*\#*) (*\install*) mvapich2-psm2-gnu13-ohpc
[sms](*\#*) (*\install*) mvapich2-psm2-gnu14-ohpc
\end{lstlisting}
% ohpc_indent 0
% ohpc_command fi
Expand Down
2 changes: 1 addition & 1 deletion docs/recipes/install/common/perf_tools.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
% ohpc_comment_header Install Performance Tools \ref{sec:install_perf_tools}
\begin{lstlisting}[language=bash,keywords={},literate={-}{-}1]
# Install perf-tools meta-package
[sms](*\#*) (*\install*) ohpc-gnu13-perf-tools
[sms](*\#*) (*\install*) ohpc-gnu14-perf-tools
\end{lstlisting}
% end_ohpc_run
4 changes: 2 additions & 2 deletions docs/recipes/install/common/perf_tools_with_geopm.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
% ohpc_comment_header Install Performance Tools \ref{sec:install_perf_tools}
\begin{lstlisting}[language=bash,keywords={},literate={-}{-}1]
# Install perf-tools meta-package
[sms](*\#*) (*\install*) ohpc-gnu13-perf-tools
[sms](*\#*) (*\install*) ohpc-gnu14-perf-tools
\end{lstlisting}
% end_ohpc_run

Expand All @@ -21,7 +21,7 @@
% ohpc_indent 5
\begin{lstlisting}[language=bash,keywords={},upquote=true]
# Install GEOPM meta-package
[sms](*\#*) (*\install*) ohpc-gnu13-geopm
[sms](*\#*) (*\install*) ohpc-gnu14-geopm

\end{lstlisting}
% ohpc_indent 0
Expand Down
8 changes: 4 additions & 4 deletions docs/recipes/install/common/third_party_libs.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@
% ohpc_comment_header Install 3rd Party Libraries and Tools \ref{sec:3rdparty}
\begin{lstlisting}[language=bash,keywords={},upquote=true,keepspaces]
# Install 3rd party libraries/tools meta-packages built with GNU toolchain
[sms](*\#*) (*\install*) ohpc-gnu13-serial-libs
[sms](*\#*) (*\install*) ohpc-gnu13-io-libs
[sms](*\#*) (*\install*) ohpc-gnu13-python-libs
[sms](*\#*) (*\install*) ohpc-gnu13-runtimes
[sms](*\#*) (*\install*) ohpc-gnu14-serial-libs
[sms](*\#*) (*\install*) ohpc-gnu14-io-libs
[sms](*\#*) (*\install*) ohpc-gnu14-python-libs
[sms](*\#*) (*\install*) ohpc-gnu14-runtimes
\end{lstlisting}
% end_ohpc_run

Expand Down
20 changes: 10 additions & 10 deletions docs/recipes/install/common/third_party_libs_petsc_centos.tex
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
\iftoggleverb{isx86}
\begin{lstlisting}[language=bash,keywords={}]
[sms](*\#*) dnf search petsc-gnu13 ohpc
[sms](*\#*) dnf search petsc-gnu14 ohpc
Loaded plugins: fastestmirror
Loading mirror speeds from cached hostfile
=========================== N/S matched: petsc-gnu13, ohpc ===========================
petsc-gnu13-impi-ohpc.x86_64 : Portable Extensible Toolkit for Scientific Computation
petsc-gnu13-mpich-ohpc.x86_64 : Portable Extensible Toolkit for Scientific Computation
petsc-gnu13-mvapich2-ohpc.x86_64 : Portable Extensible Toolkit for Scientific Computation
petsc-gnu13-openmpi5-ohpc.x86_64 : Portable Extensible Toolkit for Scientific Computation
=========================== N/S matched: petsc-gnu14, ohpc ===========================
petsc-gnu14-impi-ohpc.x86_64 : Portable Extensible Toolkit for Scientific Computation
petsc-gnu14-mpich-ohpc.x86_64 : Portable Extensible Toolkit for Scientific Computation
petsc-gnu14-mvapich2-ohpc.x86_64 : Portable Extensible Toolkit for Scientific Computation
petsc-gnu14-openmpi5-ohpc.x86_64 : Portable Extensible Toolkit for Scientific Computation
\end{lstlisting}
\fi

\iftoggleverb{isaarch}
\begin{lstlisting}[language=bash,keywords={}]
[sms](*\#*) dnf search petsc-gnu13 ohpc
[sms](*\#*) dnf search petsc-gnu14 ohpc
Loaded plugins: fastestmirror
Loading mirror speeds from cached hostfile
=========================== N/S matched: petsc-gnu13, ohpc ===========================
petsc-gnu13-mpich-ohpc.x86_64 : Portable Extensible Toolkit for Scientific Computation
petsc-gnu13-openmpi5-ohpc.x86_64 : Portable Extensible Toolkit for Scientific Computation
=========================== N/S matched: petsc-gnu14, ohpc ===========================
petsc-gnu14-mpich-ohpc.x86_64 : Portable Extensible Toolkit for Scientific Computation
petsc-gnu14-openmpi5-ohpc.x86_64 : Portable Extensible Toolkit for Scientific Computation
\end{lstlisting}
\fi

16 changes: 8 additions & 8 deletions docs/recipes/install/common/third_party_libs_petsc_sles.tex
View file
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
\iftoggleverb{isx86}
\begin{lstlisting}[language=bash,keepspaces=true,keywords={}]
[sms](*\#*) zypper search -t package petsc-gnu13-*-ohpc
[sms](*\#*) zypper search -t package petsc-gnu14-*-ohpc
Loading repository data...
Reading installed packages...

S | Name | Summary
--+-------------------------+--------------------------------------------------------+--------
| petsc-gnu13-impi-ohpc | Portable Extensible Toolkit for Scientific Computation | package
| petsc-gnu13-mpich-ohpc | Portable Extensible Toolkit for Scientific Computation | package
| petsc-gnu13-mvapich2-ohpc | Portable Extensible Toolkit for Scientific Computation | package
| petsc-gnu13-openmpi5-ohpc | Portable Extensible Toolkit for Scientific Computation | package
| petsc-gnu14-impi-ohpc | Portable Extensible Toolkit for Scientific Computation | package
| petsc-gnu14-mpich-ohpc | Portable Extensible Toolkit for Scientific Computation | package
| petsc-gnu14-mvapich2-ohpc | Portable Extensible Toolkit for Scientific Computation | package
| petsc-gnu14-openmpi5-ohpc | Portable Extensible Toolkit for Scientific Computation | package
\end{lstlisting}
\fi

\iftoggleverb{isaarch}
\begin{lstlisting}[language=bash,keepspaces=true,keywords={}]
[sms](*\#*) zypper search -t package petsc-gnu13-*-ohpc
[sms](*\#*) zypper search -t package petsc-gnu14-*-ohpc
Loading repository data...
Reading installed packages...

S | Name | Summary
--+-------------------------+--------------------------------------------------------+--------
| petsc-gnu13-mpich-ohpc | Portable Extensible Toolkit for Scientific Computation | package
| petsc-gnu13-openmpi5-ohpc | Portable Extensible Toolkit for Scientific Computation | package
| petsc-gnu14-mpich-ohpc | Portable Extensible Toolkit for Scientific Computation | package
| petsc-gnu14-openmpi5-ohpc | Portable Extensible Toolkit for Scientific Computation | package
\end{lstlisting}
\fi

Expand Down
4 changes: 2 additions & 2 deletions docs/recipes/install/common/third_party_mpi_libs_aarch.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
% ohpc_indent 5
\begin{lstlisting}[language=bash,keywords={},upquote=true,keepspaces]
# Install parallel lib meta-packages for all available MPI toolchains
[sms](*\#*) (*\install*) ohpc-gnu13-mpich-parallel-libs
[sms](*\#*) (*\install*) ohpc-gnu13-openmpi5-parallel-libs
[sms](*\#*) (*\install*) ohpc-gnu14-mpich-parallel-libs
[sms](*\#*) (*\install*) ohpc-gnu14-openmpi5-parallel-libs
\end{lstlisting}
% ohpc_indent 0
% ohpc_command fi
Expand Down
8 changes: 4 additions & 4 deletions docs/recipes/install/common/third_party_mpi_libs_x86.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@
% ohpc_indent 5
\begin{lstlisting}[language=bash,keywords={},upquote=true,keepspaces]
# Install parallel lib meta-packages for all available MPI toolchains
[sms](*\#*) (*\install*) ohpc-gnu13-mpich-parallel-libs
[sms](*\#*) (*\install*) ohpc-gnu13-openmpi5-parallel-libs
[sms](*\#*) (*\install*) ohpc-gnu14-mpich-parallel-libs
[sms](*\#*) (*\install*) ohpc-gnu14-openmpi5-parallel-libs
\end{lstlisting}
% ohpc_indent 0
% ohpc_command fi
% ohpc_command if [[ ${enable_ib} -eq 1 ]];then
% ohpc_indent 5
% ohpc_command (*\install*) ohpc-gnu13-mvapich2-parallel-libs
% ohpc_command (*\install*) ohpc-gnu14-mvapich2-parallel-libs
% ohpc_indent 0
% ohpc_command fi
% ohpc_command if [[ ${enable_opa} -eq 1 ]];then
% ohpc_indent 5
% ohpc_command (*\install*) ohpc-gnu13-mvapich2-parallel-libs
% ohpc_command (*\install*) ohpc-gnu14-mvapich2-parallel-libs
% ohpc_indent 0
% ohpc_command fi
% end_ohpc_run

0 comments on commit 6e3ff48

Please sign in to comment.