From 1b521674c5c760824c80d8bb93e4d36503e6d295 Mon Sep 17 00:00:00 2001 From: seranus Date: Thu, 9 Dec 2021 18:27:47 +0100 Subject: [PATCH] amp - preview sample fix --- models/Model_AMP/Model.py | 7 ++----- models/Model_AMP/config_schema.json | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/models/Model_AMP/Model.py b/models/Model_AMP/Model.py index 151da7b..34bc9bd 100644 --- a/models/Model_AMP/Model.py +++ b/models/Model_AMP/Model.py @@ -69,7 +69,7 @@ class AMPModel(ModelBase): self.ask_session_name() self.ask_maximum_n_backups() self.ask_write_preview_history() - self.options['preview_samples'] = np.clip ( io.input_int ("Number of samples to preview", default_cpu_cap, add_info="1 - 16", help_message="Typical fine value is 4"), 1, 16 ) + self.options['preview_samples'] = np.clip ( io.input_int ("Number of samples to preview", default_preview_samples, add_info="1 - 16", help_message="Typical fine value is 4"), 1, 16 ) self.ask_target_iter() self.ask_retraining_samples() self.ask_random_src_flip() @@ -933,10 +933,7 @@ class AMPModel(ModelBase): target_srcm, target_dstm = [ nn.to_data_format(x,"NHWC", self.model_data_format) for x in ([target_srcm, target_dstm] )] - if self.options['force_preview_samples_num'] is None: - n_samples = min(4, self.get_batch_size(), 800 // self.resolution ) - else: - n_samples = min(self.get_batch_size(), self.options['force_preview_samples_num']) + n_samples = min(self.get_batch_size(), self.options['preview_samples']) result = [] diff --git a/models/Model_AMP/config_schema.json b/models/Model_AMP/config_schema.json index 08e8330..223e197 100644 --- a/models/Model_AMP/config_schema.json +++ b/models/Model_AMP/config_schema.json @@ -179,7 +179,7 @@ "random_dst_flip": { "type": "boolean" }, - "force_preview_samples_num": { + "preview_samples": { "type": "integer", "minimum": 1, "maximum": 64