@@ -653,13 +653,9 @@ def change_sr2(sr2, if_f0_3, version19):
653
653
"not exist, will not use pretrained model" ,
654
654
)
655
655
return (
656
- "pretrained%s/%sG%s.pth" % (path_str , f0_str , sr2 )
657
- if if_pretrained_generator_exist
658
- else "" ,
659
- "pretrained%s/%sD%s.pth" % (path_str , f0_str , sr2 )
660
- if if_pretrained_discriminator_exist
661
- else "" ,
662
- {"visible" : True , "__type__" : "update" },
656
+ "pretrained%s/%sG%s.pth" % (path_str , f0_str , sr2 ) if if_pretrained_generator_exist else "" ,
657
+ "pretrained%s/%sD%s.pth" % (path_str , f0_str , sr2 ) if if_pretrained_discriminator_exist else "" ,
658
+ {"visible" : True , "__type__" : "update" }
663
659
)
664
660
665
661
@@ -683,12 +679,8 @@ def change_version19(sr2, if_f0_3, version19):
683
679
"not exist, will not use pretrained model" ,
684
680
)
685
681
return (
686
- "pretrained%s/%sG%s.pth" % (path_str , f0_str , sr2 )
687
- if if_pretrained_generator_exist
688
- else "" ,
689
- "pretrained%s/%sD%s.pth" % (path_str , f0_str , sr2 )
690
- if if_pretrained_discriminator_exist
691
- else "" ,
682
+ "pretrained%s/%sG%s.pth" % (path_str , f0_str , sr2 ) if if_pretrained_generator_exist else "" ,
683
+ "pretrained%s/%sD%s.pth" % (path_str , f0_str , sr2 ) if if_pretrained_discriminator_exist else "" ,
692
684
)
693
685
694
686
@@ -722,12 +714,8 @@ def change_f0(if_f0_3, sr2, version19): # f0method8,pretrained_G14,pretrained_D
722
714
)
723
715
return (
724
716
{"visible" : False , "__type__" : "update" },
725
- ("pretrained%s/G%s.pth" % (path_str , sr2 ))
726
- if if_pretrained_generator_exist
727
- else "" ,
728
- ("pretrained%s/D%s.pth" % (path_str , sr2 ))
729
- if if_pretrained_discriminator_exist
730
- else "" ,
717
+ "pretrained%s/G%s.pth" % (path_str , sr2 ) if if_pretrained_generator_exist else "" ,
718
+ "pretrained%s/D%s.pth" % (path_str , sr2 ) if if_pretrained_discriminator_exist else "" ,
731
719
)
732
720
733
721
@@ -834,8 +822,8 @@ def click_train(
834
822
gpus16 ,
835
823
total_epoch11 ,
836
824
save_epoch10 ,
837
- ( "-pg %s" % pretrained_G14 ) if pretrained_G14 != "" else "" ,
838
- ( "-pd %s" % pretrained_D15 ) if pretrained_D15 != "" else "" ,
825
+ "-pg %s" % pretrained_G14 if pretrained_G14 != "" else "" ,
826
+ "-pd %s" % pretrained_D15 if pretrained_D15 != "" else "" ,
839
827
1 if if_save_latest13 == i18n ("是" ) else 0 ,
840
828
1 if if_cache_gpu17 == i18n ("是" ) else 0 ,
841
829
1 if if_save_every_weights18 == i18n ("是" ) else 0 ,
@@ -853,8 +841,8 @@ def click_train(
853
841
batch_size12 ,
854
842
total_epoch11 ,
855
843
save_epoch10 ,
856
- ( "-pg %s" % pretrained_G14 ) if pretrained_G14 != "" else "\b " ,
857
- ( "-pd %s" % pretrained_D15 ) if pretrained_D15 != "" else "\b " ,
844
+ "-pg %s" % pretrained_G14 if pretrained_G14 != "" else "\b " ,
845
+ "-pd %s" % pretrained_D15 if pretrained_D15 != "" else "\b " ,
858
846
1 if if_save_latest13 == i18n ("是" ) else 0 ,
859
847
1 if if_cache_gpu17 == i18n ("是" ) else 0 ,
860
848
1 if if_save_every_weights18 == i18n ("是" ) else 0 ,
@@ -1090,8 +1078,8 @@ def get_info_str(strr):
1090
1078
gpus16 ,
1091
1079
total_epoch11 ,
1092
1080
save_epoch10 ,
1093
- ( "-pg %s" % pretrained_G14 ) if pretrained_G14 != "" else "" ,
1094
- ( "-pd %s" % pretrained_D15 ) if pretrained_D15 != "" else "" ,
1081
+ "-pg %s" % pretrained_G14 if pretrained_G14 != "" else "" ,
1082
+ "-pd %s" % pretrained_D15 if pretrained_D15 != "" else "" ,
1095
1083
1 if if_save_latest13 == i18n ("是" ) else 0 ,
1096
1084
1 if if_cache_gpu17 == i18n ("是" ) else 0 ,
1097
1085
1 if if_save_every_weights18 == i18n ("是" ) else 0 ,
@@ -1109,8 +1097,8 @@ def get_info_str(strr):
1109
1097
batch_size12 ,
1110
1098
total_epoch11 ,
1111
1099
save_epoch10 ,
1112
- ( "-pg %s" % pretrained_G14 ) if pretrained_G14 != "" else "" ,
1113
- ( "-pd %s" % pretrained_D15 ) if pretrained_D15 != "" else "" ,
1100
+ "-pg %s" % pretrained_G14 if pretrained_G14 != "" else "" ,
1101
+ "-pd %s" % pretrained_D15 if pretrained_D15 != "" else "" ,
1114
1102
1 if if_save_latest13 == i18n ("是" ) else 0 ,
1115
1103
1 if if_cache_gpu17 == i18n ("是" ) else 0 ,
1116
1104
1 if if_save_every_weights18 == i18n ("是" ) else 0 ,
0 commit comments