From cc4f5f214639ba62dfa0a7f467007fa07e606180 Mon Sep 17 00:00:00 2001 From: Trevor Keller Date: Wed, 10 Jan 2024 11:15:17 -0500 Subject: [PATCH] Fold templated stuff into core lesson --- _episodes/14-modules.md | 5 +++-- .../modules}/sbatch-options.snip | 0 .../EPCC_Cirrus_slurm/scheduler/sbatch-options.snip | 7 ------- .../Magic_Castle_EESSI_slurm/scheduler/sbatch-options.snip | 0 .../NIST_CTCMS_slurm/scheduler/sbatch-options.snip | 2 -- .../Norway_SIGMA2_SAGA_slurm/scheduler/sbatch-options.snip | 0 .../UCL_Myriad_sge/scheduler/sbatch-options.snip | 0 7 files changed, 3 insertions(+), 11 deletions(-) rename _includes/snippets_library/{ComputeCanada_Graham_slurm/scheduler => Birmingham_Baskerville_slurm/modules}/sbatch-options.snip (100%) delete mode 100644 _includes/snippets_library/EPCC_Cirrus_slurm/scheduler/sbatch-options.snip delete mode 100644 _includes/snippets_library/Magic_Castle_EESSI_slurm/scheduler/sbatch-options.snip delete mode 100644 _includes/snippets_library/NIST_CTCMS_slurm/scheduler/sbatch-options.snip delete mode 100644 _includes/snippets_library/Norway_SIGMA2_SAGA_slurm/scheduler/sbatch-options.snip delete mode 100644 _includes/snippets_library/UCL_Myriad_sge/scheduler/sbatch-options.snip diff --git a/_episodes/14-modules.md b/_episodes/14-modules.md index cbbe07e8..08a80f6a 100644 --- a/_episodes/14-modules.md +++ b/_episodes/14-modules.md @@ -195,8 +195,9 @@ Let's examine the output of `module avail` more closely. > > > > ``` > > {{ site.remote.bash_shebang }} -> > {% include {{ site.snippets }}/scheduler/sbatch-options.snip %} -> > {{ site.sched.comment }} {{ site.sched.flag.time }} 00:00:30 +> > {{ site.sched.comment }} {{ site.sched.flag.partition }}{% if site.sched.flag.qos %} +> > {{ site.sched.comment }} {{ site.sched.flag.qos }} +> > {% endif %}{{ site.sched.comment }} {{ site.sched.flag.time }} 00:00:30 > > > > module load {{ site.remote.module_python3 }} > > diff --git a/_includes/snippets_library/ComputeCanada_Graham_slurm/scheduler/sbatch-options.snip b/_includes/snippets_library/Birmingham_Baskerville_slurm/modules/sbatch-options.snip similarity index 100% rename from _includes/snippets_library/ComputeCanada_Graham_slurm/scheduler/sbatch-options.snip rename to _includes/snippets_library/Birmingham_Baskerville_slurm/modules/sbatch-options.snip diff --git a/_includes/snippets_library/EPCC_Cirrus_slurm/scheduler/sbatch-options.snip b/_includes/snippets_library/EPCC_Cirrus_slurm/scheduler/sbatch-options.snip deleted file mode 100644 index 321fccc4..00000000 --- a/_includes/snippets_library/EPCC_Cirrus_slurm/scheduler/sbatch-options.snip +++ /dev/null @@ -1,7 +0,0 @@ -``` -# You can also add Slurm options that were previously passed to sbatch. - -{{ site.sched.comment }} {{ site.sched.flag.partition }} -{{ site.sched.comment }} {{ site.sched.flag.qos }} -``` -{: .language-bash} diff --git a/_includes/snippets_library/Magic_Castle_EESSI_slurm/scheduler/sbatch-options.snip b/_includes/snippets_library/Magic_Castle_EESSI_slurm/scheduler/sbatch-options.snip deleted file mode 100644 index e69de29b..00000000 diff --git a/_includes/snippets_library/NIST_CTCMS_slurm/scheduler/sbatch-options.snip b/_includes/snippets_library/NIST_CTCMS_slurm/scheduler/sbatch-options.snip deleted file mode 100644 index 1d753f7f..00000000 --- a/_includes/snippets_library/NIST_CTCMS_slurm/scheduler/sbatch-options.snip +++ /dev/null @@ -1,2 +0,0 @@ -# You can also add Slurm options that were previously passed to sbatch. -{{ site.sched.comment }} {{ site.sched.flag.partition }} diff --git a/_includes/snippets_library/Norway_SIGMA2_SAGA_slurm/scheduler/sbatch-options.snip b/_includes/snippets_library/Norway_SIGMA2_SAGA_slurm/scheduler/sbatch-options.snip deleted file mode 100644 index e69de29b..00000000 diff --git a/_includes/snippets_library/UCL_Myriad_sge/scheduler/sbatch-options.snip b/_includes/snippets_library/UCL_Myriad_sge/scheduler/sbatch-options.snip deleted file mode 100644 index e69de29b..00000000