diff --git a/pages/merlin6/accessing-merlin6/accessing-slurm.md b/pages/merlin6/accessing-merlin6/accessing-slurm.md index 826fac0..057615a 100644 --- a/pages/merlin6/accessing-merlin6/accessing-slurm.md +++ b/pages/merlin6/accessing-merlin6/accessing-slurm.md @@ -17,7 +17,7 @@ Slurm has been installed in a **multi-clustered** configuration, allowing to int * Two different Slurm clusters exist: **merlin5** and **merlin6**. * **merlin5** is a cluster with very old hardware (out-of-warranty). * **merlin5** will exist as long as hardware incidents are soft and easy to repair/fix (i.e. hard disk replacement) - * **merlin6** is the default cluster when submitting jobs. + * **merlin6** is the default cluster when running Slurm commands (i.e. sinfo). Please follow the section **Merlin6 Slurm** for more details about configuration and job submission. @@ -25,9 +25,14 @@ Please follow the section **Merlin6 Slurm** for more details about configuration Keeping the **merlin5** cluster will allow running jobs in the old computing nodes until users have fully migrated their codes to the new cluster. -From July 2019, **merlin6** becomes the **default cluster** and any job submitted to Slurm will be submitted to that cluster. -However, users can keep submitting to the old **merlin5** computing nodes by using the option ``--cluster=merlin5`` and using the corresponding -Slurm partition with ``--partition=merlin``. In example: +From July 2019, **merlin6** becomes the **default cluster**. However, users can keep submitting to the old **merlin5** computing nodes by using +the option ``--cluster=merlin5`` and using the corresponding Slurm partition with ``--partition=merlin``. In example: + +```bash +#SBATCH --clusters=merlin6 +``` + +Example of how to run a simple command: ```bash srun --clusters=merlin5 --partition=merlin hostname @@ -36,6 +41,15 @@ sbatch --clusters=merlin5 --partition=merlin myScript.batch ### Merlin6 Access -By default, any job submitted with specifying ``--clusters=`` should use the local cluster, so nothing extra should be specified. In any case, -you can optionally add ``--clusters=merlin6`` in order to force submission to the Merlin6 cluster. +In order to run jobs on the **Merlin6** cluster, you need to specify the following option in your batch scripts: +```bash +#SBATCH --clusters=merlin6 +``` + +Example of how to run a simple command: + +```bash +srun --clusters=merlin6 hostname +sbatch --clusters=merlin6 myScript.batch +``` diff --git a/pages/merlin6/merlin6-slurm/running-jobs.md b/pages/merlin6/merlin6-slurm/running-jobs.md index 32f0e68..041f324 100644 --- a/pages/merlin6/merlin6-slurm/running-jobs.md +++ b/pages/merlin6/merlin6-slurm/running-jobs.md @@ -22,11 +22,20 @@ but they will need to specify a couple of extra options to their scripts. ```bash #SBATCH --clusters=merlin5 -#SBATCH --partition=merlin ``` -By adding ``--clusters=merlin5`` it will send the jobs to the old Merlin5 computing nodes. Also, ``--partition=merlin`` needs to be specified in -order to use the old Merlin5 partitions: ``general`` (*default*), ``daily`` and ``hourly`` will not work when submitting to Merlin5. +By adding ``--clusters=merlin5`` it will send the jobs to the old Merlin5 computing nodes. Also, ``--partition=`` can be specified in +order to use the old Merlin5 partitions. + +## Running on Merlin6 + +In order to run on the **Merlin6** cluster, users have to add the following options: + +```bash +#SBATCH --clusters=merlin6 +``` + +By adding ``--clusters=merlin6`` it will send the jobs to the old Merlin6 computing nodes. ## Shared nodes and exclusivity