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)
henryaddison · Aug 7, 2024 · 9309247 · 9309247
1 parent 29e58c8
commit 9309247
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 27 deletions.
diff --git a/bin/jasmin/lotus-sampling-wrapper b/bin/jasmin/lotus-sampling-wrapper
diff --git a/bin/jasmin/lotus-training-wrapper → bin/jasmin/lotus-wrapper b/bin/jasmin/lotus-training-wrapper → 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
@@ -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
@@ -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 $@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 $@