From 61258e3ecaaef28a1ffc6bf5aa664ec58e9d139c Mon Sep 17 00:00:00 2001
From: Henry Addison <henryaddison@users.noreply.github.com>
Date: Thu, 8 Aug 2024 21:15:21 +0100
Subject: [PATCH] merge queue training and sampling jobs on JASMIN into one

---
 bin/jasmin/queue-mlde     | 30 ++++++++++++++++++++++++++++++
 bin/jasmin/queue-sampling |  8 --------
 bin/jasmin/queue-training |  8 --------
 3 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100755 bin/jasmin/queue-mlde
 delete mode 100755 bin/jasmin/queue-sampling
 delete mode 100755 bin/jasmin/queue-training

diff --git a/bin/jasmin/queue-mlde b/bin/jasmin/queue-mlde
new file mode 100755
index 00000000..c45954de
--- /dev/null
+++ b/bin/jasmin/queue-mlde
@@ -0,0 +1,30 @@
+#!/bin/bash
+# Script for queueing a model job on LOTUS on JASMIN via lotus-wrapper script
+
+set -euo pipefail
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+smem=128G
+stime=1-00:00:00
+
+while getopts ":m:t:" opt; do
+  case ${opt} in
+    m)
+      smem=${OPTARG}
+      ;;
+    t)
+      stime=${OPTARG}
+      ;;
+    \? )
+      # echo "Invalid option: -${OPTARG}" 1>&2
+     ;;
+    : )
+      echo "Invalid option: $OPTARG requires an argument" 1>&2
+      exit 1
+      ;;
+  esac
+done
+shift "$((OPTIND -1))"
+
+sbatch --parsable --partition=orchid --account=orchid --time=${stime} --mem=${smem} -- ${SCRIPT_DIR}/lotus-wrapper $@
diff --git a/bin/jasmin/queue-sampling b/bin/jasmin/queue-sampling
deleted file mode 100755
index 3e179360..00000000
--- a/bin/jasmin/queue-sampling
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# Script for queueing a sampling job on LOTUS on JASMIN via lotus-wrapper script
-
-set -euo pipefail
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-sbatch --parsable --gres=gpu:1 --partition=orchid --account=orchid --time=1-00:00:00 --mem=16G -- ${SCRIPT_DIR}/lotus-wrapper $@
diff --git a/bin/jasmin/queue-training b/bin/jasmin/queue-training
deleted file mode 100755
index bb169e07..00000000
--- a/bin/jasmin/queue-training
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-# Script for queueing a training job on LOTUS on JASMIN via lotus-wrapper script
-
-set -euo pipefail
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-sbatch --parsable --gres=gpu:1 --partition=orchid --account=orchid --time=1-00:00:00 --mem=128G -- ${SCRIPT_DIR}/lotus-wrapper $@