diff --git a/images/merlin-slurm-architecture.png b/images/merlin-slurm-architecture.png index d004c51..38e44a8 100644 Binary files a/images/merlin-slurm-architecture.png and b/images/merlin-slurm-architecture.png differ diff --git a/pages/merlin6/01-Quick-Start-Guide/introduction.md b/pages/merlin6/01-Quick-Start-Guide/introduction.md index 88fbd9f..393836a 100644 --- a/pages/merlin6/01-Quick-Start-Guide/introduction.md +++ b/pages/merlin6/01-Quick-Start-Guide/introduction.md @@ -16,7 +16,18 @@ redirect_from: Historically, the local HPC clusters at PSI were named **Merlin**. Over the years, multiple generations of Merlin have been deployed. -At present, the **Merlin local HPC cluster** contains _two_ generations of it: the old **Merlin5** cluster and the newest **Merlin6**. +At present, the **Merlin local HPC cluster** contains _two_ generations of it: +* the old **Merlin5** cluster (`merlin5` Slurm cluster), and +* the newest generation **Merlin6**, which is divided in two Slurm clusters: + * `merlin6` as the Slurm CPU cluster + * `gmerlin6` as the Slurm GPU cluster. + +Access to the different Slurm clusters is possible from the [**Merlin login nodes**](/merlin6/interactive.html), +which can be accessed through the [SSH protocol](/merlin6/interactive.html#ssh-access) or the [NoMachine (NX) service](/merlin6/nomachine.html). + +The following image shows the Slurm architecture design for the Merlin5 & Merlin6 (CPU & GPU) clusters: + +![Merlin6 Slurm Architecture Design]({{ "/images/merlin-slurm-architecture.png" }}) ### Merlin6 @@ -51,15 +62,3 @@ The old Slurm **CPU** *merlin* cluster is still active and is maintained in a be **Merlin5** only contains **computing nodes** resources in a dedicated **[Slurm](https://slurm.schedmd.com/overview.html)** cluster. * The Merlin5 CPU cluster is called [**merlin5**](/merlin5/slurm-configuration.html). -## Merlin Architecture - -The following image shows the Slurm architecture design for the Merlin5 & Merlin6 clusters: - -![Merlin6 Slurm Architecture Design]({{ "/images/merlin-slurm-architecture.png" }}) - -### Merlin6 Architecture Diagram - -The following image shows the Merlin6 cluster architecture diagram: - -![Merlin6 Architecture Diagram]({{ "/images/merlinschema3.png" }}) -