From ba4e377d13722ed250cfb3e4e71b25647d5a186a Mon Sep 17 00:00:00 2001 From: Luke Barr Date: Tue, 14 May 2019 02:30:23 -0500 Subject: [PATCH 1/6] Don't pass multiprocess object on pickle (#261) --- utils/iter_utils.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/utils/iter_utils.py b/utils/iter_utils.py index 75fb21f..eb00c55 100644 --- a/utils/iter_utils.py +++ b/utils/iter_utils.py @@ -48,6 +48,11 @@ class SubprocessGenerator(object): def __iter__(self): return self + def __getstate__(self): + self_dict = self.__dict__.copy() + del self_dict['p'] + return self_dict + def __next__(self): if self.p == None: user_param = self.user_param From 66a12a973aac717e51e8ca0f9e9259192c6c9510 Mon Sep 17 00:00:00 2001 From: iperov Date: Tue, 14 May 2019 17:00:25 +0400 Subject: [PATCH 2/6] fix choosing preview image on options override --- models/ModelBase.py | 60 ++++++++++++++++++++++----------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/models/ModelBase.py b/models/ModelBase.py index 1ae8dbb..af31e7e 100644 --- a/models/ModelBase.py +++ b/models/ModelBase.py @@ -74,8 +74,8 @@ class ModelBase(object): self.options.pop('epoch') if self.iter != 0: self.options = model_data['options'] - self.loss_history = model_data['loss_history'] if 'loss_history' in model_data.keys() else [] - self.sample_for_preview = model_data['sample_for_preview'] if 'sample_for_preview' in model_data.keys() else None + self.loss_history = model_data.get('loss_history', []) + self.sample_for_preview = model_data.get('sample_for_preview', None) ask_override = self.is_training_mode and self.iter != 0 and io.input_in_time ("Press enter in 2 seconds to override model settings.", 5 if io.is_colab() else 2 ) @@ -178,36 +178,34 @@ class ModelBase(object): if not isinstance(generator, SampleGeneratorBase): raise ValueError('training data generator is not subclass of SampleGeneratorBase') - if (self.sample_for_preview is None) or (self.iter == 0): - - if self.iter == 0: - if choose_preview_history and io.is_support_windows(): - wnd_name = "[p] - next. [enter] - confirm." - io.named_window(wnd_name) - io.capture_keys(wnd_name) - choosed = False - while not choosed: - self.sample_for_preview = self.generate_next_sample() - preview = self.get_static_preview() - io.show_image( wnd_name, (preview*255).astype(np.uint8) ) - - while True: - key_events = io.get_key_events(wnd_name) - key, chr_key, ctrl_pressed, alt_pressed, shift_pressed = key_events[-1] if len(key_events) > 0 else (0,0,False,False,False) - if key == ord('\n') or key == ord('\r'): - choosed = True - break - elif key == ord('p'): - break - - try: - io.process_messages(0.1) - except KeyboardInterrupt: - choosed = True - - io.destroy_window(wnd_name) - else: + if self.sample_for_preview is None or choose_preview_history: + if choose_preview_history and io.is_support_windows(): + wnd_name = "[p] - next. [enter] - confirm." + io.named_window(wnd_name) + io.capture_keys(wnd_name) + choosed = False + while not choosed: self.sample_for_preview = self.generate_next_sample() + preview = self.get_static_preview() + io.show_image( wnd_name, (preview*255).astype(np.uint8) ) + + while True: + key_events = io.get_key_events(wnd_name) + key, chr_key, ctrl_pressed, alt_pressed, shift_pressed = key_events[-1] if len(key_events) > 0 else (0,0,False,False,False) + if key == ord('\n') or key == ord('\r'): + choosed = True + break + elif key == ord('p'): + break + + try: + io.process_messages(0.1) + except KeyboardInterrupt: + choosed = True + + io.destroy_window(wnd_name) + else: + self.sample_for_preview = self.generate_next_sample() model_summary_text = [] From 7be97af845b4924026f571141608699d28c4f2d8 Mon Sep 17 00:00:00 2001 From: iperov Date: Wed, 15 May 2019 07:58:40 +0400 Subject: [PATCH 3/6] upd paypal link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2dd541c..0439403 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ GOAL: next DeepFacelab update. [Donate via Yandex.Money](https://money.yandex.ru/to/41001142318065) -[Donate via Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=KK5ZCH4JXWMQS&source=url) - +[Donate via Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WZ872T22BQ5AU&source=url) + [Donate via Alipay](https://i.loli.net/2019/01/13/5c3ae3829809f.jpg) bitcoin:31mPd6DxPCzbpCMZk4k1koWAbErSyqkAXr From 06831517f5d7286834a23ec541eed4babb50466b Mon Sep 17 00:00:00 2001 From: iperov Date: Wed, 15 May 2019 08:03:50 +0400 Subject: [PATCH 4/6] upd --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0439403..bc24ed1 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ GOAL: next DeepFacelab update. [Donate via Yandex.Money](https://money.yandex.ru/to/41001142318065) -[Donate via Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=WZ872T22BQ5AU&source=url) +[Donate via Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=lepersorium@gmail.com&lc=US&no_note=0&item_name=Support+DeepFaceLab&cn=&curency_code=USD&bn=PP-DonationsBF:btn_donateCC_LG.gif:NonHosted) [Donate via Alipay](https://i.loli.net/2019/01/13/5c3ae3829809f.jpg) From 480360ba10c8a9885092fdce5f82525da86fb749 Mon Sep 17 00:00:00 2001 From: iperov Date: Sat, 18 May 2019 23:43:40 +0400 Subject: [PATCH 5/6] upd --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index bc24ed1..8addd4b 100644 --- a/README.md +++ b/README.md @@ -46,6 +46,4 @@ bitcoin:31mPd6DxPCzbpCMZk4k1koWAbErSyqkAXr [deepfakes (Chinese) (outdated) ](https://deepfakes.com.cn/) -[mrdeepfakes (English)](https://mrdeepfakes.com/forums/) - [reddit (English)](https://www.reddit.com/r/GifFakes/new/) \ No newline at end of file From 3114ae9d7ba9de641f4c05f0d5b87bcb16d785d5 Mon Sep 17 00:00:00 2001 From: iperov Date: Mon, 20 May 2019 22:42:34 +0400 Subject: [PATCH 6/6] upd plaidml ver --- requirements-cuda.txt | 2 +- requirements-opencl.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-cuda.txt b/requirements-cuda.txt index 92a318b..5e50c09 100644 --- a/requirements-cuda.txt +++ b/requirements-cuda.txt @@ -3,7 +3,7 @@ h5py==2.9.0 Keras==2.2.4 opencv-python==4.0.0.21 tensorflow-gpu==1.12.0 -plaidml==0.6.0rc1 +plaidml==0.6.0 plaidml-keras==0.5.0 scikit-image tqdm diff --git a/requirements-opencl.txt b/requirements-opencl.txt index f53c1f2..99a13c1 100644 --- a/requirements-opencl.txt +++ b/requirements-opencl.txt @@ -3,7 +3,7 @@ h5py==2.9.0 Keras==2.2.4 opencv-python==4.0.0.21 tensorflow==1.12.0 -plaidml==0.6.0rc1 +plaidml==0.6.0 plaidml-keras==0.5.0 scikit-image tqdm