diff --git a/CHANGELOG.md b/CHANGELOG.md index d3cdc0e..2083f82 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] n/a +## [1.1.2] - 2020-03-12 +### Fixed +- [Fixed missing predicted src mask in 'SAEHD masked' preview](doc/fixes/predicted_src_mask/README.md) + ## [1.1.1] - 2020-03-12 ### Added - CHANGELOG file for tracking updates, new features, and bug fixes @@ -22,7 +26,8 @@ n/a - Reset stale master branch to [seranus/DeepFaceLab](https://github.com/seranus/DeepFaceLab), 21 commits ahead of [iperov/DeepFaceLab](https://github.com/iperov/DeepFaceLab) ([compare](https://github.com/iperov/DeepFaceLab/compare/4818183...seranus:3f5ae05)) -[Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.1.0...HEAD +[Unreleased]: https://github.com/olivierlacan/keep-a-changelog/compare/v1.1.2...HEAD +[1.1.2]: https://github.com/faceshiftlabs/DeepFaceLab/compare/v1.1.1...v1.1.2 [1.1.1]: https://github.com/faceshiftlabs/DeepFaceLab/compare/v1.1.0...v1.1.1 [1.1.0]: https://github.com/faceshiftlabs/DeepFaceLab/compare/v1.0.0...v1.1.0 [1.0.0]: https://github.com/faceshiftlabs/DeepFaceLab/releases/tag/v1.0.0 diff --git a/doc/fixes/predicted_src_mask/README.md b/doc/fixes/predicted_src_mask/README.md new file mode 100644 index 0000000..1247442 --- /dev/null +++ b/doc/fixes/predicted_src_mask/README.md @@ -0,0 +1,5 @@ +# Example of bug: +![](preview_image_bug.jpeg) + +# Demonstration of fix: +![](preview_image_fix.jpeg) diff --git a/doc/fixes/predicted_src_mask/preview_image_bug.jpeg b/doc/fixes/predicted_src_mask/preview_image_bug.jpeg new file mode 100644 index 0000000..52767fa Binary files /dev/null and b/doc/fixes/predicted_src_mask/preview_image_bug.jpeg differ diff --git a/doc/fixes/predicted_src_mask/preview_image_fix.jpeg b/doc/fixes/predicted_src_mask/preview_image_fix.jpeg new file mode 100644 index 0000000..43a8b19 Binary files /dev/null and b/doc/fixes/predicted_src_mask/preview_image_fix.jpeg differ diff --git a/models/Model_SAEHD/Model.py b/models/Model_SAEHD/Model.py index 16d63da..00c1fc0 100644 --- a/models/Model_SAEHD/Model.py +++ b/models/Model_SAEHD/Model.py @@ -359,9 +359,9 @@ Examples: df, liae, df-d, df-ud, liae-ud, ... gpu_target_src = self.target_src [batch_slice,:,:,:] gpu_target_dst = self.target_dst [batch_slice,:,:,:] gpu_target_srcm_all = self.target_srcm[batch_slice,:,:,:] - gpu_target_srcm_em = self.target_srcm_em[batch_slice,:,:,:] + gpu_target_srcm_em = self.target_srcm_em[batch_slice,:,:,:] gpu_target_dstm_all = self.target_dstm[batch_slice,:,:,:] - gpu_target_dstm_em = self.target_dstm_em[batch_slice,:,:,:] + gpu_target_dstm_em = self.target_dstm_em[batch_slice,:,:,:] # process model tensors if 'df' in archi_type: @@ -590,7 +590,7 @@ Examples: df, liae, df-d, df-ud, liae-ud, ... def AE_view(warped_src, warped_dst): - return nn.tf_sess.run ( [pred_src_src, pred_dst_dst, pred_dst_dstm, pred_src_dst, pred_src_dstm], + return nn.tf_sess.run ( [pred_src_src, pred_src_srcm, pred_dst_dst, pred_dst_dstm, pred_src_dst, pred_src_dstm], feed_dict={self.warped_src:warped_src, self.warped_dst:warped_dst}) self.AE_view = AE_view @@ -744,8 +744,8 @@ Examples: df, liae, df-d, df-ud, liae-ud, ... ( (warped_src, target_src, target_srcm, target_srcm_em), (warped_dst, target_dst, target_dstm, target_dstm_em) ) = samples - S, D, SS, DD, DDM, SD, SDM = [ np.clip( nn.to_data_format(x,"NHWC", self.model_data_format), 0.0, 1.0) for x in ([target_src,target_dst] + self.AE_view (target_src, target_dst) ) ] - DDM, SDM, = [ np.repeat (x, (3,), -1) for x in [DDM, SDM] ] + S, D, SS, SSM, DD, DDM, SD, SDM = [ np.clip( nn.to_data_format(x,"NHWC", self.model_data_format), 0.0, 1.0) for x in ([target_src,target_dst] + self.AE_view (target_src, target_dst) ) ] + SSM, DDM, SDM, = [ np.repeat (x, (3,), -1) for x in [SSM, DDM, SDM] ] target_srcm, target_dstm = [ nn.to_data_format(x,"NHWC", self.model_data_format) for x in ([target_srcm, target_dstm] )] @@ -765,7 +765,7 @@ Examples: df, liae, df-d, df-ud, liae-ud, ... for i in range(n_samples): SD_mask = DDM[i]*SDM[i] if self.face_type < FaceType.HEAD else SDM[i] - ar = S[i]*target_srcm[i], SS[i], D[i]*target_dstm[i], DD[i]*DDM[i], SD[i]*SD_mask + ar = S[i]*target_srcm[i], SS[i]*SSM[i], D[i]*target_dstm[i], DD[i]*DDM[i], SD[i]*SD_mask st_m.append ( np.concatenate ( ar, axis=1) ) result += [ ('SAEHD masked', np.concatenate (st_m, axis=0 )), ] @@ -793,7 +793,7 @@ Examples: df, liae, df-d, df-ud, liae-ud, ... st_m = [] for i in range(n_samples): - ar = S[i]*target_srcm[i], SS[i] + ar = S[i]*target_srcm[i], SS[i]*SSM[i] st_m.append ( np.concatenate ( ar, axis=1) ) result += [ ('SAEHD masked src-src', np.concatenate (st_m, axis=0 )), ]