From c9137e03549661eecfcaa616d494d4c9728c67f1 Mon Sep 17 00:00:00 2001
From: Henry Addison <henryaddison@users.noreply.github.com>
Date: Wed, 7 Aug 2024 12:53:06 +0100
Subject: [PATCH] update lotus scripts to allow using old style deterministic
 models too

which also means the training and sampling wrapper can now be combined (just pushes more command to the CLI command)
---
 bin/jasmin/lotus-sampling-wrapper             | 23 -------------------
 .../{lotus-training-wrapper => lotus-wrapper} |  4 ++--
 bin/jasmin/queue-sampling                     |  2 +-
 bin/jasmin/queue-training                     |  2 +-
 4 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100755 bin/jasmin/lotus-sampling-wrapper
 rename bin/jasmin/{lotus-training-wrapper => lotus-wrapper} (73%)

diff --git a/bin/jasmin/lotus-sampling-wrapper b/bin/jasmin/lotus-sampling-wrapper
deleted file mode 100755
index 2cd64a0d..00000000
--- a/bin/jasmin/lotus-sampling-wrapper
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# Wrapper script around commands for training a model to queue on LOTUS on JASMIN
-
-module load gcc
-
-source ~/.bashrc
-mamba activate mv-mlde
-
-set -euo pipefail
-
-cd /home/users/vf20964/code/mlde
-
-export DERIVED_DATA=/gws/nopw/j04/bris_climdyn/henrya/bp-backups/
-export KK_SLACK_WH_URL=https://hooks.slack.com
-export WANDB_EXPERIMENT_NAME="ml-downscaling-emulator"
-
-checkpoint=$1
-em=$2
-dataset=$3
-split=$4
-workdir=$5
-
-python bin/predict.py --checkpoint ${checkpoint} --num-samples 1 --dataset ${dataset} --split ${split} --ensemble-member ${em} ${workdir}
diff --git a/bin/jasmin/lotus-training-wrapper b/bin/jasmin/lotus-wrapper
similarity index 73%
rename from bin/jasmin/lotus-training-wrapper
rename to bin/jasmin/lotus-wrapper
index 7552faa3..8603d406 100755
--- a/bin/jasmin/lotus-training-wrapper
+++ b/bin/jasmin/lotus-wrapper
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Wrapper script around commands for training a model to queue on LOTUS on JASMIN
+# Wrapper script around commands for interacting with a model to queue on LOTUS on JASMIN
 
 module load gcc
 
@@ -14,4 +14,4 @@ export DERIVED_DATA=/gws/nopw/j04/bris_climdyn/henrya/bp-backups/
 export KK_SLACK_WH_URL=https://hooks.slack.com
 export WANDB_EXPERIMENT_NAME="ml-downscaling-emulator"
 
-python bin/main.py $@
+$@
diff --git a/bin/jasmin/queue-sampling b/bin/jasmin/queue-sampling
index ebc5849c..778b1658 100755
--- a/bin/jasmin/queue-sampling
+++ b/bin/jasmin/queue-sampling
@@ -5,4 +5,4 @@ set -euo pipefail
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-sbatch --parsable --gres=gpu:1 --partition=orchid --account=orchid --time=01:00:00 --mem=16G -- ${SCRIPT_DIR}/lotus-sampling-wrapper $@
+sbatch --parsable --gres=gpu:1 --partition=orchid --account=orchid --time=01:00:00 --mem=16G -- ${SCRIPT_DIR}/lotus-wrapper $@
diff --git a/bin/jasmin/queue-training b/bin/jasmin/queue-training
index ef1ff249..bb169e07 100755
--- a/bin/jasmin/queue-training
+++ b/bin/jasmin/queue-training
@@ -5,4 +5,4 @@ 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-training-wrapper $@
+sbatch --parsable --gres=gpu:1 --partition=orchid --account=orchid --time=1-00:00:00 --mem=128G -- ${SCRIPT_DIR}/lotus-wrapper $@