From 6f46b91e9127bd5cd6991f07703aeec3de5d7e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krup=C4=8D=C3=ADk?= <lukas.krupcik@vsb.cz>
Date: Wed, 22 Sep 2021 11:10:15 +0200
Subject: [PATCH] Update docs.it4i/software/numerical-languages/octave.md,
mkdocs.yml files Deleted docs.it4i/software/numerical-libraries/trilinos.md
---
.../software/numerical-languages/octave.md | 6 +-
.../software/numerical-libraries/trilinos.md | 55 -------------------
mkdocs.yml | 1 -
3 files changed, 4 insertions(+), 58 deletions(-)
delete mode 100644 docs.it4i/software/numerical-libraries/trilinos.md
diff --git a/docs.it4i/software/numerical-languages/octave.md b/docs.it4i/software/numerical-languages/octave.md
index 32b1c4d4f..7e863cdf8 100644
--- a/docs.it4i/software/numerical-languages/octave.md
+++ b/docs.it4i/software/numerical-languages/octave.md
@@ -8,6 +8,8 @@ For a list of available modules, type:
```console
$ ml av octave
+------------------------------- /apps/modules/math -------------------------------
+ Octave/6.3.0-intel-2020b-without-X11
```
## Modules and Execution
@@ -18,7 +20,7 @@ To load the latest version of Octave load the module:
$ ml Octave
```
-Octave on clusters is linked to a highly optimized MKL mathematical library. This provides threaded parallelization to many Octave kernels, notably the linear algebra subroutines. Octave runs these heavy calculation kernels without any penalty. By default, Octave would parallelize to 24 threads on Salomon. You may control the threads by setting the `OMP_NUM_THREADS` environment variable.
+Octave on clusters is linked to a highly optimized MKL mathematical library. This provides threaded parallelization to many Octave kernels, notably the linear algebra subroutines. Octave runs these heavy calculation kernels without any penalty. By default, Octave would parallelize to 128 threads on Karolina. You may control the threads by setting the `OMP_NUM_THREADS` environment variable.
To run Octave interactively, log in with the `ssh -X` parameter for X11 forwarding. Run Octave:
@@ -26,7 +28,7 @@ To run Octave interactively, log in with the `ssh -X` parameter for X11 forwardi
$ octave
```
-To run Octave in batch mode, write an Octave script, then write a bash jobscript and execute via the `qsub` command. By default, Octave will use 24 threads on Salomon when running MKL kernels.
+To run Octave in batch mode, write an Octave script, then write a bash jobscript and execute via the `qsub` command. By default, Octave will use 128 threads on Karolina when running MKL kernels.
```bash
#!/bin/bash
diff --git a/docs.it4i/software/numerical-libraries/trilinos.md b/docs.it4i/software/numerical-libraries/trilinos.md
deleted file mode 100644
index 61ca1759a..000000000
--- a/docs.it4i/software/numerical-libraries/trilinos.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# Trilinos
-
-Packages for large-scale scientific and engineering problems. Provides MPI and hybrid parallelization.
-
-## Introduction
-
-Trilinos is a collection of software packages for the numerical solution of large-scale scientific and engineering problems. It is based on C++ and features modern object-oriented design. Both serial as well as parallel computations based on MPI and hybrid parallelization are supported within Trilinos packages.
-
-## Installed Packages
-
-Current Trilinos installation contains (among others) the following main packages:
-
-* **Epetra** - core linear algebra package containing classes for manipulation with serial and distributed vectors, matrices, and graphs. Dense linear solvers are supported via interface to BLAS and LAPACK (Intel MKL). Its extension **EpetraExt** contains, for example, methods for matrix-matrix multiplication.
-* **Tpetra** - next-generation linear algebra package. Supports 64-bit indexing and arbitrary data type using C++ templates.
-* **Belos** - library of various iterative solvers (CG, block CG, GMRES, block GMRES, etc.).
-* **Amesos** - interface to direct sparse solvers.
-* **Anasazi** - framework for large-scale eigenvalue algorithms.
-* **IFPACK** - distributed algebraic preconditioner (includes, for example, incomplete LU factorization).
-* **Teuchos** - common tools packages. This package contains classes for memory management, output, performance monitoring, BLAS and LAPACK wrappers, etc.
-
-For the full list of Trilinos packages, descriptions of their capabilities, and user manuals, see [the webpage][a].
-
-## Installed Version
-
-For the list of available versions, use the command:
-
-```console
-$ ml av trilinos
-```
-
-## Compiling Against Trilinos
-
-First, load the appropriate module:
-
-```console
-$ ml trilinos
-```
-
-For the compilation of CMake-aware project, Trilinos provides the `FIND_PACKAGE( Trilinos )` capability, which makes it easy to build against Trilinos, including linking against the correct list of libraries.
-
-For compiling using simple Makefiles, Trilinos provides `Makefile.export` system, which allows users to include important Trilinos variables directly into their Makefiles. This can be done simply by inserting the following line into the Makefile:
-
-```cpp
-include Makefile.export.Trilinos
-```
-
-or
-
-```cpp
-include Makefile.export.<package>
-```
-
-if you are interested only in a specific Trilinos package. This will give you access to the variables such as `Trilinos_CXX_COMPILER`, `Trilinos_INCLUDE_DIRS`, `Trilinos_LIBRARY_DIRS`, etc.
-
-[a]: http://www.mcs.anl.gov/petsc/miscellaneous/external.html
diff --git a/mkdocs.yml b/mkdocs.yml
index 96fd623f9..aded0562e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -190,7 +190,6 @@ nav:
- HDF5: software/numerical-libraries/hdf5.md
- Intel Numerical Libraries: software/numerical-libraries/intel-numerical-libraries.md
- PETSc: software/numerical-libraries/petsc.md
- - Trilinos: software/numerical-libraries/trilinos.md
- Languages:
- Java: software/lang/java.md
- C#: software/lang/csc.md
--
GitLab