Update merlin6 scripts to use --gpu

In particular, this fixes a bug where rtx2080ti gpus were being excluded
This commit is contained in:
2021-02-24 21:30:17 +01:00
parent 84ec47f273
commit bbcad2e6fd
4 changed files with 11 additions and 11 deletions

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
# cryoSPARC cluster submission script template for SLURM
# Lane: merlin6-big v1.3.1 (2020-07-15)
# Lane: merlin6-big v1.4.0 (2021-02-24)
#
# This is the 'big' GPU configuration, meaning it requests exclusive access to
# the 4x GTX1080Ti/RTX2080Ti nodes (with 11GB video RAM). Please use the normal gpu
@ -64,8 +64,8 @@
# Use GPU cluster
#SBATCH --partition=gpu
#SBATCH --account=merlin-gpu
#SBATCH --gres=gpu:4
#SBATCH --exclude=merlin-g-00[1-5]
#SBATCH --gpus=4
#SBATCH --constraint=gpumem_11gb
{%- endif %}
# Print hostname, for debugging

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
# cryoSPARC cluster submission script template for SLURM
# Lane: merlin6 v1.3.1 (2020-07-15)
# Lane: merlin6-rtx2080ti v1.4.0 (2021-02-24)
#
# If you edit this file, run 'cryosparcm cluster connect'
@ -59,8 +59,8 @@
# Use GPU cluster
#SBATCH --partition=gpu
#SBATCH --account=merlin-gpu
#SBATCH --gres=gpu:{{ _min(num_gpu, 4) }}
#SBATCH --exclude=merlin-g-00[1-9]
#SBATCH --gpus=RTX2080Ti:{{ num_gpu }}
#SBATCH --gres=gpu:RTX2080Ti:{{ num_gpu }}
{%- if num_gpu <= 2 %}
#SBATCH --cpus-per-task={{ _min(num_cpu, 8) }}
{%- else %}

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
# cryoSPARC cluster submission script template for SLURM
# Lane: merlin6-short v1.3.1 (2020-07-15)
# Lane: merlin6-short v1.4.0 (2021-02-24)
#
# This is the 'short' configuration, intended for interactive jobs and rapid
# experimentation. Jobs are limited to 1 hour.
@ -60,10 +60,10 @@
#SBATCH --cpus-per-task={{ num_cpu }}
{%- else %}
# Use GPU cluster
#SBATCH --partition=gpu-short,gpu
#SBATCH --partition=gpu-short
#SBATCH --time=2:00:00
#SBATCH --account=merlin-gpu
#SBATCH --gres=gpu:{{ _min(num_gpu, 2) }}
#SBATCH --gpus={{ num_gpu }}
{%- if num_gpu <= 2 %}
#SBATCH --cpus-per-task={{ _min(num_cpu, 8) }}
{%- else %}

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash
# cryoSPARC cluster submission script template for SLURM
# Lane: merlin6 v1.3.1 (2020-07-15)
# Lane: merlin6 v1.4.0 (2021-02-24)
#
# If you edit this file, run 'cryosparcm cluster connect'
@ -59,7 +59,7 @@
# Use GPU cluster
#SBATCH --partition=gpu
#SBATCH --account=merlin-gpu
#SBATCH --gres=gpu:{{ _min(num_gpu, 4) }}
#SBATCH --gpus={{ num_gpu }}
{%- if num_gpu <= 2 %}
#SBATCH --cpus-per-task={{ _min(num_cpu, 8) }}
{%- else %}