From 5f2289b0d93b972f3ecda33e067e704bf36c5e2e Mon Sep 17 00:00:00 2001 From: James Byrne Date: Tue, 20 Aug 2024 20:42:40 +0100 Subject: [PATCH] Dev #38: Ensuring dawn specifics aren't polluting the variables passed through --- ensemble/predict.tmpl.yaml | 12 ++++++------ ensemble/train.tmpl.yaml | 8 ++++---- run_predict_ensemble.sh | 1 + run_train_ensemble.sh | 1 + 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ensemble/predict.tmpl.yaml b/ensemble/predict.tmpl.yaml index 55ad34d..e53d04b 100644 --- a/ensemble/predict.tmpl.yaml +++ b/ensemble/predict.tmpl.yaml @@ -13,8 +13,12 @@ ensemble: - ../../../network_datasets - ../../../processed - ../../../results - mem: 224gb - cluster: pvc + cluster: short + email: someone@example.com + length: 00:30:00 + mem: 128gb + nodes: 1 + ntasks: 2 pre_process: [] post_process: [] @@ -23,11 +27,7 @@ ensemble: templatedir: ../template templates: - icenet_predict.sh.j2 - email: someone@example.com job_file: icenet_predict.sh - nodes: 1 - ntasks: 8 - length: 00:30:00 maxruns: 100 maxjobs: 10 diff --git a/ensemble/train.tmpl.yaml b/ensemble/train.tmpl.yaml index 0a7e1c0..0448190 100644 --- a/ensemble/train.tmpl.yaml +++ b/ensemble/train.tmpl.yaml @@ -15,10 +15,13 @@ ensemble: - ../../../network_datasets - ../../../processed - ../../../results + cluster: long + email: someone@example.com gpus: 1 + length: 4-00:00:00 mem: 128gb - cluster: pvc nodes: 1 + ntasks: NTASKS pre_process: - name: execute @@ -31,10 +34,7 @@ ensemble: templatedir: ../template templates: - icenet_train.sh.j2 - email: someone@example.com job_file: icenet_train.sh - ntasks: NTASKS - length: 4-00:00:00 maxruns: 5 maxjobs: MAXJOBS diff --git a/run_predict_ensemble.sh b/run_predict_ensemble.sh index 280cce6..2d3e523 100755 --- a/run_predict_ensemble.sh +++ b/run_predict_ensemble.sh @@ -19,6 +19,7 @@ ENSEMBLE_SEEDS_DEFAULT=42,46,45 while getopts ":b:df:i:lm:p:r:x" opt; do case "$opt" in b) ENSEMBLE_ARGS="${ENSEMBLE_ARGS}arg_batch=$OPTARG ";; + c) ENSEMBLE_ARGS="${ENSEMBLE_ARGS}cluster=$OPTARG ";; d) ENSEMBLE_TARGET="dummy";; f) ENSEMBLE_ARGS="${ENSEMBLE_ARGS}arg_filter_factor=$OPTARG ";; i) ENSEMBLE_ARGS="${ENSEMBLE_ARGS}arg_ident=$OPTARG ";; diff --git a/run_train_ensemble.sh b/run_train_ensemble.sh index 2c86b12..cae9c9b 100755 --- a/run_train_ensemble.sh +++ b/run_train_ensemble.sh @@ -29,6 +29,7 @@ while getopts ":b:c:de:f:g:j:l:m:n:p:q:r:s:t:" opt; do l) ENSEMBLE_ARGS="${ENSEMBLE_ARGS}arg_preload=$OPTARG ";; m) ENSEMBLE_ARGS="${ENSEMBLE_ARGS}mem=$OPTARG ";; n) ENSEMBLE_ARGS="${ENSEMBLE_ARGS}nodelist=$OPTARG ";; + o) ENSEMBLE_ARGS="${ENSEMBLE_ARGS}nodes=$OPTARG ";; p) ENSEMBLE_ARGS="${ENSEMBLE_ARGS}arg_prep=$OPTARG ";; q) ENSEMBLE_ARGS="${ENSEMBLE_ARGS}arg_queue=$OPTARG ";; r) ENSEMBLE_RUNS=$OPTARG ;; # Ensemble member run seed values