Skip to content
Snippets Groups Projects
Commit 4376db2f authored by Michael Langguth's avatar Michael Langguth
Browse files

Some small clean-ups in runscript-configurators.

parent fc906899
No related branches found
No related tags found
No related merge requests found
Pipeline #89788 failed
...@@ -14,6 +14,7 @@ from model_modules.model_architectures import known_models ...@@ -14,6 +14,7 @@ from model_modules.model_architectures import known_models
from data_preprocess.dataset_options import known_datasets from data_preprocess.dataset_options import known_datasets
from runscript_generator.config_utils import Config_runscript_base # import parent class from runscript_generator.config_utils import Config_runscript_base # import parent class
class Config_Train(Config_runscript_base): class Config_Train(Config_runscript_base):
cls_name = "Config_Train"#.__name__ cls_name = "Config_Train"#.__name__
...@@ -32,13 +33,15 @@ class Config_Train(Config_runscript_base): ...@@ -32,13 +33,15 @@ class Config_Train(Config_runscript_base):
self.long_name_wrk_step = "Training" self.long_name_wrk_step = "Training"
self.rscrpt_tmpl_prefix = "train_model_" self.rscrpt_tmpl_prefix = "train_model_"
# initialize additional runscript-specific attributes to be set via keyboard interaction # initialize additional runscript-specific attributes to be set via keyboard interaction
self.dataset = None
self.runscript_template = None
self.model = None self.model = None
self.source_dir = None
self.destination_dir = None self.destination_dir = None
self.datasplit_dict = None self.datasplit_dict = None
self.model_hparams = None self.model_hparams = None
# list of variables to be written to runscript # list of variables to be written to runscript
self.list_batch_vars = ["VIRT_ENV_NAME", "source_dir", "model", "destination_dir", "datasplit_dict", self.list_batch_vars = ["VIRT_ENV_NAME", "source_dir", "model", "destination_dir"]
"model_hparams"]
# copy over method for keyboard interaction # copy over method for keyboard interaction
self.run_config = Config_Train.run_training self.run_config = Config_Train.run_training
# #
...@@ -59,7 +62,8 @@ class Config_Train(Config_runscript_base): ...@@ -59,7 +62,8 @@ class Config_Train(Config_runscript_base):
dset_err, ntries=2) dset_err, ntries=2)
# get source dir (relative to base_dir_source!) # get source dir (relative to base_dir_source!)
self.runscript_template = os.path.join(self.runscript_dir, "train_model_{0}{1}".format(self.dataset, self.suffix_template)) self.runscript_template = os.path.join(self.runscript_dir, "train_model_{0}{1}"
.format(self.dataset, self.suffix_template))
source_dir_base = Config_Train.handle_source_dir(self, "preprocessedData") source_dir_base = Config_Train.handle_source_dir(self, "preprocessedData")
expdir_req_str = "Choose a subdirectory listed above where the preprocessed TFrecords are located:" expdir_req_str = "Choose a subdirectory listed above where the preprocessed TFrecords are located:"
...@@ -85,7 +89,6 @@ class Config_Train(Config_runscript_base): ...@@ -85,7 +89,6 @@ class Config_Train(Config_runscript_base):
prefix2arg=os.path.join(self.source_dir, prefix2arg=os.path.join(self.source_dir,
Config_Train.basename_tfdirs)) Config_Train.basename_tfdirs))
# split up directory path in order to retrieve exp_dir used for setting up the destination directory # split up directory path in order to retrieve exp_dir used for setting up the destination directory
exp_dir_split = Config_Train.path_rec_split(self.source_dir) exp_dir_split = Config_Train.path_rec_split(self.source_dir)
index = [idx for idx, s in enumerate(exp_dir_split) if self.dataset in s] index = [idx for idx, s in enumerate(exp_dir_split) if self.dataset in s]
......
...@@ -128,7 +128,8 @@ class Config_runscript_base: ...@@ -128,7 +128,8 @@ class Config_runscript_base:
if stat_batch_var: if stat_batch_var:
stat = os.system(write_cmd) stat = os.system(write_cmd)
if stat > 0: if stat > 0:
print("%{0}: Runscript script variable {1} could not be set properly.".format(method_name, batch_var)) print("%{0}: Runscript script variable {1} could not be set properly."
.format(method_name, batch_var))
else: else:
print("%{0}: Could not find variable {1} in runscript {2} could not be set.".format(method_name, batch_var, runscript)) print("%{0}: Could not find variable {1} in runscript {2} could not be set.".format(method_name, batch_var, runscript))
# #
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment