Merge pull request #458 from UCL-ARC/cdkharris/UCL-update-site-snippets

Update UCL site snippets
carpentries-incubator · Sep 23, 2024 · 39981f1 · 39981f1
2 parents 6fef636 + c7b43fc
commit 39981f1
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 11 deletions.
diff --git a/_includes/snippets_library/UCL_Myriad_sge/_config_options.yml b/_includes/snippets_library/UCL_Myriad_sge/_config_options.yml
@@ -7,7 +7,8 @@ local:
 remote:
   name: "Myriad"
   login: "myriad.rc.ucl.ac.uk"
-  node: node-d00a-001
+  host: "login12.myriad.ucl.ac.uk"
+  node: node-d00a-005
   location: "University College London"
   homedir: "/home"
   user: "yourUsername"

diff --git a/_includes/snippets_library/UCL_Myriad_sge/parallel/eight-tasks-jobscript.snip b/_includes/snippets_library/UCL_Myriad_sge/parallel/eight-tasks-jobscript.snip
@@ -1,13 +1,17 @@
 ```
 {{ site.remote.bash_shebang }}
 {{ site.sched.comment }} {{ site.sched.flag.name }} parallel-job
-{{ site.sched.comment }} {{ site.sched.flag.queue }} {{ site.sched.queue.testing }}
-{{ site.sched.comment }} -l nodes=1:ppn=8
+{{ site.sched.comment }} -l mem=3G
+{{ site.sched.comment }} -l h_rt=00:30:00
+{{ site.sched.comment }} -pe mpi 8
+{{ site.sched.comment }} -cwd
 
 # Load the computing environment we need
 module load python3
+module unload compilers mpi
+module load mpi4py
 
 # Execute the task
-mpiexec amdahl
+gerun amdahl
 ```
 {: .language-bash}
diff --git a/_includes/snippets_library/UCL_Myriad_sge/parallel/four-tasks-jobscript.snip b/_includes/snippets_library/UCL_Myriad_sge/parallel/four-tasks-jobscript.snip
@@ -1,13 +1,17 @@
 ```
 {{ site.remote.bash_shebang }}
 {{ site.sched.comment }} {{ site.sched.flag.name }} parallel-job
-{{ site.sched.comment }} {{ site.sched.flag.queue }} {{ site.sched.queue.testing }}
-{{ site.sched.comment }} -l nodes=1:ppn=4
+{{ site.sched.comment }} -l mem=3G
+{{ site.sched.comment }} -l h_rt=00:30:00
+{{ site.sched.comment }} -pe mpi 4
+{{ site.sched.comment }} -cwd
 
 # Load the computing environment we need
 module load python3
+module unload compilers mpi
+module load mpi4py
 
 # Execute the task
-mpiexec amdahl
+gerun amdahl
 ```
 {: .language-bash}
diff --git a/_includes/snippets_library/UCL_Myriad_sge/parallel/one-task-jobscript.snip b/_includes/snippets_library/UCL_Myriad_sge/parallel/one-task-jobscript.snip
@@ -1,11 +1,15 @@
 ```
 {{ site.remote.bash_shebang }}
 {{ site.sched.comment }} {{ site.sched.flag.name }} solo-job
-{{ site.sched.comment }} {{ site.sched.flag.queue }} {{ site.sched.queue.testing }}
-{{ site.sched.comment }} -l nodes=1:ppn=1
+{{ site.sched.comment }} -l mem=3G
+{{ site.sched.comment }} -l h_rt=00:30:00
+{{ site.sched.comment }} -pe mpi 1
+{{ site.sched.comment }} -cwd
 
 # Load the computing environment we need
 module load python3
+module unload compilers mpi
+module load mpi4py
 
 # Execute the task
 amdahl

diff --git a/_includes/snippets_library/UCL_Myriad_sge/scheduler/option-flags-list.snip b/_includes/snippets_library/UCL_Myriad_sge/scheduler/option-flags-list.snip
@@ -4,8 +4,8 @@
 * `-pe mpi <ncpus>` &mdash; How many CPUs does your job need? If you only need
   one CPU you can leave this out.
 
-* `mem=<bytes>` &mdash; How much memory per process does your job need? Must be
+* `-l mem=<bytes>` &mdash; How much memory per process does your job need? Must be
   an integer followed by M, G, or T to specify Mega, Giga or Terabytes.
 
-* `wd /home/<your_UCL_id>/Scratch/<your_run_directory>` &mdash; Set the working
+* `-wd /home/<your_UCL_id>/Scratch/<your_run_directory>` &mdash; Set the working
   directory to somewhere in your scratch space.