From 84a5db9c38d54a6d7aacd6de096448d62e7c3f12 Mon Sep 17 00:00:00 2001
From: Michael <m.langguth@fz-juelich.de>
Date: Thu, 24 Sep 2020 14:10:35 +0200
Subject: [PATCH] Adaption of destination_dir according to updated convention
 for storing trained model (data), i.e. add user and timestamp.

---
 .../HPC_scripts/train_era5_template.sh                 | 10 ++++------
 .../Zam347_scripts/train_era5_template.sh              |  9 +++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/video_prediction_savp/HPC_scripts/train_era5_template.sh b/video_prediction_savp/HPC_scripts/train_era5_template.sh
index f368a8a1..5342c32a 100644
--- a/video_prediction_savp/HPC_scripts/train_era5_template.sh
+++ b/video_prediction_savp/HPC_scripts/train_era5_template.sh
@@ -34,18 +34,16 @@ if [ -z ${VIRTUAL_ENV} ]; then
    fi
 fi
 
-
-
-
 # declare directory-variables which will be modified appropriately during Preprocessing (invoked by mpi_split_data_multi_years.py)
 source_dir=/p/project/deepacf/deeprain/video_prediction_shared_folder/preprocessedData/
 destination_dir=/p/project/deepacf/deeprain/video_prediction_shared_folder/models/
 
-# for choosing the model for choosing the model, convLSTM,savp, mcnet,vae
+# valid identifiers for model-argument are: convLSTM, savp, mcnet and vae
 model=convLSTM
 model_hparams=../hparams/era5/${model}/model_hparams.json
+destination_dir=${destination_dir}/${model}/"$(date +"%Y%m%dT%H%M")_"$USER"/"
 
-# rund training
-srun python ../scripts/train_dummy.py --input_dir  ${source_dir}/tfrecords/ --dataset era5  --model ${model} --model_hparams_dict ${model_hparams} --output_dir ${destination_dir}/${model}/
+# run training
+srun python ../scripts/train_dummy.py --input_dir  ${source_dir}/tfrecords/ --dataset era5  --model ${model} --model_hparams_dict ${model_hparams} --output_dir ${destination_dir}
 
  
diff --git a/video_prediction_savp/Zam347_scripts/train_era5_template.sh b/video_prediction_savp/Zam347_scripts/train_era5_template.sh
index d0639262..c8fcf81f 100644
--- a/video_prediction_savp/Zam347_scripts/train_era5_template.sh
+++ b/video_prediction_savp/Zam347_scripts/train_era5_template.sh
@@ -9,10 +9,11 @@ exit 99
 source_dir=/home/${USER}/preprocessedData/
 destination_dir=/home/${USER}/models/
 
-# for choosing the model
+# valid identifiers for model-argument are: convLSTM, savp, mcnet and vae
 model=mcnet
 model_hparams=../hparams/era5/model_hparams.json
+destination_dir=${destination_dir}/${model}/"$(date +"%Y%m%dT%H%M")_"$USER"/"
+
+# run training
+python ../scripts/train_dummy.py --input_dir  ${source_dir}/tfrecords/ --dataset era5  --model ${model} --model_hparams_dict ${model_hparams} --output_dir ${destination_dir}
 
-# execute respective Python-script
-python ../scripts/train_dummy.py --input_dir  ${source_dir}/tfrecords/ --dataset era5  --model ${model} --model_hparams_dict ${model_hparams} --output_dir ${destination_dir}/${model}/
-#srun  python scripts/train.py --input_dir data/era5 --dataset era5  --model savp --model_hparams_dict hparams/kth/ours_savp/model_hparams.json --output_dir logs/era5/ours_savp
-- 
GitLab