From 883da4b9edbfbe8bba22ae99cc82027a8d23e61b Mon Sep 17 00:00:00 2001 From: iperov Date: Tue, 5 Feb 2019 14:43:54 +0400 Subject: [PATCH] fix Util.py, SAE: lowest ae dims now can be 32 (for testing) --- mainscripts/Util.py | 11 ++++++++++- models/Model_SAE/Model.py | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/mainscripts/Util.py b/mainscripts/Util.py index c2fbea1..9f2f99b 100644 --- a/mainscripts/Util.py +++ b/mainscripts/Util.py @@ -29,7 +29,16 @@ def convert_png_to_jpg_file (filepath): img = cv2.imread (str(filepath)) new_filepath = str(filepath.parent / (filepath.stem + '.jpg')) cv2.imwrite ( new_filepath, img, [int(cv2.IMWRITE_JPEG_QUALITY), 85]) - DFLJPG.embed_data( new_filepath, **dfl_dict ) + + DFLJPG.embed_data( new_filepath, + face_type=dfl_dict.get('face_type', None), + landmarks=dfl_dict.get('landmarks', None), + yaw_value=dfl_dict.get('yaw_value', None), + pitch_value=dfl_dict.get('pitch_value', None), + source_filename=dfl_dict.get('source_filename', None), + source_rect=dfl_dict.get('source_rect', None), + source_landmarks=dfl_dict.get('source_landmarks', None) ) + filepath.unlink() diff --git a/models/Model_SAE/Model.py b/models/Model_SAE/Model.py index 53ea0e0..1ef5ac3 100644 --- a/models/Model_SAE/Model.py +++ b/models/Model_SAE/Model.py @@ -60,7 +60,7 @@ class SAEModel(ModelBase): default_ae_dims = 256 if self.options['archi'] == 'liae' else 512 default_ed_ch_dims = 42 if is_first_run: - self.options['ae_dims'] = np.clip ( input_int("AutoEncoder dims (128-1024 ?:help skip:%d) : " % (default_ae_dims) , default_ae_dims, help_message="More dims are better, but requires more VRAM. You can fine-tune model size to fit your GPU." ), 128, 1024 ) + self.options['ae_dims'] = np.clip ( input_int("AutoEncoder dims (32-1024 ?:help skip:%d) : " % (default_ae_dims) , default_ae_dims, help_message="More dims are better, but requires more VRAM. You can fine-tune model size to fit your GPU." ), 32, 1024 ) self.options['ed_ch_dims'] = np.clip ( input_int("Encoder/Decoder dims per channel (21-85 ?:help skip:%d) : " % (default_ed_ch_dims) , default_ed_ch_dims, help_message="More dims are better, but requires more VRAM. You can fine-tune model size to fit your GPU." ), 21, 85 ) self.options['face_type'] = input_str ("Half or Full face? (h/f, ?:help skip:f) : ", default_face_type, ['h','f'], help_message="Half face has better resolution, but covers less area of cheeks.").lower() else: