From 3a9e851339a480e1e8603c450d800c5abd77c019 Mon Sep 17 00:00:00 2001 From: Colombo Date: Sat, 18 Apr 2020 18:29:55 +0400 Subject: [PATCH 1/6] fix bug --- README.md | 4 ++-- merger/MergeMasked.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 96680ed..e846946 100644 --- a/README.md +++ b/README.md @@ -153,9 +153,9 @@ Unfortunately, there is no "make everything ok" button in DeepFaceLab. You shoul ||bitcoin:bc1qkhh7h0gwwhxgg6h6gpllfgstkd645fefrd5s6z| |Alipay 捐款|![](doc/Alipay_donation.jpg)| ||| -|Last donations|10$ ( Mélio Mascort )| +|Last donations|10$ ( Mattia Romanut )| +||10$ ( Mélio Mascort )| ||25$ ( Maria Grasmeder )| -||10$ ( Amien Phillips )| ||| |Collect facesets|You can collect faceset of any celebrity that can be used in DeepFaceLab and share it [in the community](https://mrdeepfakes.com/forums/forum-celebrity-facesets)| ||| diff --git a/merger/MergeMasked.py b/merger/MergeMasked.py index 47d117f..aaea66a 100644 --- a/merger/MergeMasked.py +++ b/merger/MergeMasked.py @@ -305,7 +305,9 @@ def MergeMaskedFace (predictor_func, predictor_input_shape, else: alpha = cfg.color_degrade_power / 100.0 out_img = (out_img*(1.0-alpha) + out_img_reduced*alpha) - + else: + out_img = img_bgr.copy() + out_merging_mask_a = img_face_mask_a return out_img, out_merging_mask_a From 4fe45adc7c56976bce370e67512e10a57ebdfd90 Mon Sep 17 00:00:00 2001 From: Colombo Date: Mon, 20 Apr 2020 10:24:51 +0400 Subject: [PATCH 2/6] . --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e846946..c58e114 100644 --- a/README.md +++ b/README.md @@ -153,9 +153,9 @@ Unfortunately, there is no "make everything ok" button in DeepFaceLab. You shoul ||bitcoin:bc1qkhh7h0gwwhxgg6h6gpllfgstkd645fefrd5s6z| |Alipay 捐款|![](doc/Alipay_donation.jpg)| ||| -|Last donations|10$ ( Mattia Romanut )| +|Last donations|200$ ( Alejandro B. )| +||10$ ( Mattia R. )| ||10$ ( Mélio Mascort )| -||25$ ( Maria Grasmeder )| ||| |Collect facesets|You can collect faceset of any celebrity that can be used in DeepFaceLab and share it [in the community](https://mrdeepfakes.com/forums/forum-celebrity-facesets)| ||| From 7b49220ee9a9dd44daa9bbeaaf657926810ce8cf Mon Sep 17 00:00:00 2001 From: Colombo Date: Mon, 20 Apr 2020 18:40:12 +0400 Subject: [PATCH 3/6] fix --- XSegEditor/XSegEditor.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/XSegEditor/XSegEditor.py b/XSegEditor/XSegEditor.py index d40f4dc..0e06b10 100644 --- a/XSegEditor/XSegEditor.py +++ b/XSegEditor/XSegEditor.py @@ -1141,7 +1141,10 @@ class LoaderQSubprocessor(QSubprocessor): class MainWindow(QXMainWindow): def __init__(self, input_dirpath, cfg_root_path): + self.loading_frame = None + super().__init__() + self.input_dirpath = input_dirpath self.cfg_root_path = cfg_root_path @@ -1367,7 +1370,7 @@ def start(input_dirpath): returns exit_code """ io.log_info("Running XSeg editor.") - + if PackedFaceset.path_contains(input_dirpath): io.log_info (f'\n{input_dirpath} contains packed faceset! Unpack it first.\n') return 1 From f935bf0465b7009e63f73c5c034266734baca495 Mon Sep 17 00:00:00 2001 From: Colombo Date: Tue, 28 Apr 2020 19:04:44 +0400 Subject: [PATCH 4/6] . --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c58e114..b767314 100644 --- a/README.md +++ b/README.md @@ -153,9 +153,9 @@ Unfortunately, there is no "make everything ok" button in DeepFaceLab. You shoul ||bitcoin:bc1qkhh7h0gwwhxgg6h6gpllfgstkd645fefrd5s6z| |Alipay 捐款|![](doc/Alipay_donation.jpg)| ||| -|Last donations|200$ ( Alejandro B. )| -||10$ ( Mattia R. )| -||10$ ( Mélio Mascort )| +|Last donations|20$ ( Michael V. )| +||5$ ( Boris H. )| +||10$ ( John R. )| ||| |Collect facesets|You can collect faceset of any celebrity that can be used in DeepFaceLab and share it [in the community](https://mrdeepfakes.com/forums/forum-celebrity-facesets)| ||| From dcf380345ba6b83826c011eb60cb98c622c66dd8 Mon Sep 17 00:00:00 2001 From: Colombo Date: Sat, 2 May 2020 14:04:32 +0400 Subject: [PATCH 5/6] fix --- merger/InteractiveMergerSubprocessor.py | 1 + 1 file changed, 1 insertion(+) diff --git a/merger/InteractiveMergerSubprocessor.py b/merger/InteractiveMergerSubprocessor.py index bbec108..47c8a38 100644 --- a/merger/InteractiveMergerSubprocessor.py +++ b/merger/InteractiveMergerSubprocessor.py @@ -393,6 +393,7 @@ class InteractiveMergerSubprocessor(Subprocessor): # unable to read? recompute then cur_frame.is_done = False else: + image = imagelib.normalize_channels(image, 3) image_mask = imagelib.normalize_channels(image_mask, 1) cur_frame.image = np.concatenate([image, image_mask], -1) From 0c18b1f011e0e842fa7b6e43d6035c0886cbed9d Mon Sep 17 00:00:00 2001 From: Colombo Date: Wed, 6 May 2020 19:21:23 +0400 Subject: [PATCH 6/6] changed uhd arhi: you have to retrain uhd arhis from scratch. --- core/leras/archis/DeepFakeArchi.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/leras/archis/DeepFakeArchi.py b/core/leras/archis/DeepFakeArchi.py index dcd7017..8f82aaa 100644 --- a/core/leras/archis/DeepFakeArchi.py +++ b/core/leras/archis/DeepFakeArchi.py @@ -389,16 +389,14 @@ class DeepFakeArchi(nn.ArchiBase): class ResidualBlock(nn.ModelBase): def on_build(self, ch, kernel_size=3 ): - self.conv1 = nn.Conv2D( ch, ch*2, kernel_size=kernel_size, padding='SAME') - self.conv2 = nn.Conv2D( ch*2, ch, kernel_size=kernel_size, padding='SAME') - self.scale_add = nn.ScaleAdd(ch) + self.conv1 = nn.Conv2D( ch, ch, kernel_size=kernel_size, padding='SAME') + self.conv2 = nn.Conv2D( ch, ch, kernel_size=kernel_size, padding='SAME') def forward(self, inp): x = self.conv1(inp) x = tf.nn.leaky_relu(x, 0.2) x = self.conv2(x) - x = tf.nn.leaky_relu(x, 0.2) - x = self.scale_add([inp, x]) + x = tf.nn.leaky_relu(inp + x, 0.2) return x class Encoder(nn.ModelBase):