diff --git a/pages/merlin7/02-How-To-Use-Merlin/software-repositories.md b/pages/merlin7/02-How-To-Use-Merlin/software-repositories.md index 96642be..7452d40 100644 --- a/pages/merlin7/02-How-To-Use-Merlin/software-repositories.md +++ b/pages/merlin7/02-How-To-Use-Merlin/software-repositories.md @@ -13,7 +13,7 @@ permalink: /merlin7/software-repositories.html Merlin7 provides a modular environment to ensure flexibility, compatibility, and optimized performance. The system supports three primary module types: PSI Environment Modules (PModules), Spack Modules, and Cray Environment Modules. -## PSI Environment Modules (PModules) +### PSI Environment Modules (PModules) The PModules system, developed by PSI, is the officially supported module system on Merlin7. It is the preferred choice for accessing validated software across a wide range of applications. @@ -26,7 +26,7 @@ Key Features: For further information about Pmodules on Merlin7 please refer to the PSI Modules chapter. {{site.data.alerts.end}} -## Spack Modules +### Spack Modules Merlin7 also provides Spack modules, offering a modern and flexible package management system. Spack supports a wide variety of software packages and versions. For more information, refer to the **external [PSI Spack](https://gitlab.psi.ch/lsm-hpce/spack-psi) documentation**. @@ -34,7 +34,7 @@ Merlin7 also provides Spack modules, offering a modern and flexible package mana For further information about Spack on Merlin7 please refer to the Spack chapter. {{site.data.alerts.end}} -## Cray Environment Modules +### Cray Environment Modules Merlin7 also supports Cray Environment Modules, which include compilers, MPI implementations, and libraries optimized for Cray systems. However, Cray modules are not recommended as the default choice due to potential backward compatibility diff --git a/pages/merlin7/03-Slurm-General-Documentation/slurm-configuration.md b/pages/merlin7/03-Slurm-General-Documentation/slurm-configuration.md index 44def4d..ebe6bbe 100644 --- a/pages/merlin7/03-Slurm-General-Documentation/slurm-configuration.md +++ b/pages/merlin7/03-Slurm-General-Documentation/slurm-configuration.md @@ -27,8 +27,8 @@ This documentation shows basic Slurm configuration and options needed to run job | PartitionName | DefaultTime | MaxTime | Priority | Account | Per Job Limits | Per User Limits | | -------------------: | -----------: | ----------: | ---------: | -------------: | -------------------------------: | -------------------------------: | | **a100-general** | 1-00:00:00 | 7-00:00:00 | Low | merlin | gres/gpu=4 | gres/gpu=8 | -| **a100-daily** | 0-01:00:00 | 1-00:00:00 | Medium | merlin | gres/gpu=8 | gres/gpu=16 | -| **a100-hourly** | 0-00:30:00 | 0-01:00:00 | High | merlin | gres/gpu=8 | gres/gpu=16 | +| **a100-daily** | 0-01:00:00 | 1-00:00:00 | Medium | merlin | gres/gpu=8 | gres/gpu=8 | +| **a100-hourly** | 0-00:30:00 | 0-01:00:00 | High | merlin | gres/gpu=8 | gres/gpu=8 | | **a100-interactive** | 0-01:00:00 | 0-12:00:00 | Very High | merlin | cpu=16,gres/gpu=1,mem=60G,node=1 | cpu=16,gres/gpu=1,mem=60G,node=1 | #### Grace-Hopper nodes @@ -36,8 +36,8 @@ This documentation shows basic Slurm configuration and options needed to run job | PartitionName | DefaultTime | MaxTime | Priority | Account | Per Job Limits | Per User Limits | | -------------------: | -----------: | ----------: | ---------: | -------------: | -------------------------------: | -------------------------------: | | **gh-general** | 1-00:00:00 | 7-00:00:00 | Low | merlin | gres/gpu=4 | gres/gpu=8 | -| **gh-daily** | 0-01:00:00 | 1-00:00:00 | Medium | merlin | gres/gpu=8 | gres/gpu=16 | -| **gh-hourly** | 0-00:30:00 | 0-01:00:00 | High | merlin | gres/gpu=8 | gres/gpu=16 | +| **gh-daily** | 0-01:00:00 | 1-00:00:00 | Medium | merlin | gres/gpu=8 | gres/gpu=8 | +| **gh-hourly** | 0-00:30:00 | 0-01:00:00 | High | merlin | gres/gpu=8 | gres/gpu=8 | | **gh-interactive** | 0-01:00:00 | 0-12:00:00 | Very High | merlin | cpu=16,gres/gpu=1,mem=46G,node=1 | cpu=16,gres/gpu=1,mem=46G,node=1 | ## CPU cluster: merlin7 @@ -272,8 +272,8 @@ various QoS definitions applicable to the merlin7 CPU-based cluster. Here: | -----------------------: | -------------------------------: | ------------------------------: | ---------------------: | | **normal** | | | partition | | **gpu_general** | gres/gpu=4 | gres/gpu=8 | user, partition | -| **gpu_daily** | gres/gpu=8 | gres/gpu=16 | partition | -| **gpu_hourly** | gres/gpu=8 | gres/gpu=16 | partition | +| **gpu_daily** | gres/gpu=8 | gres/gpu=8 | partition | +| **gpu_hourly** | gres/gpu=8 | gres/gpu=8 | partition | | **gpu_gh_interactive** | cpu=16,gres/gpu=1,mem=46G,node=1 |cpu=16,gres/gpu=1,mem=46G,node=1 | partition | | **gpu_a100_interactive** | cpu=16,gres/gpu=1,mem=60G,node=1 |cpu=16,gres/gpu=1,mem=60G,node=1 | partition |