@@ -659,12 +659,12 @@ def change_sr2(sr2, if_f0_3, version19):
659
659
if_pretrained_discriminator_exist = os .access (
660
660
"pretrained%s/%sD%s.pth" % (path_str , f0_str , sr2 ), os .F_OK
661
661
)
662
- if if_pretrained_generator_exist is not False :
662
+ if not if_pretrained_generator_exist :
663
663
print (
664
664
"pretrained%s/%sG%s.pth" % (path_str , f0_str , sr2 ),
665
665
"not exist, will not use pretrained model" ,
666
666
)
667
- if if_pretrained_discriminator_exist is not False :
667
+ if not if_pretrained_discriminator_exist :
668
668
print (
669
669
"pretrained%s/%sD%s.pth" % (path_str , f0_str , sr2 ),
670
670
"not exist, will not use pretrained model" ,
@@ -675,8 +675,7 @@ def change_sr2(sr2, if_f0_3, version19):
675
675
else "" ,
676
676
"pretrained%s/%sD%s.pth" % (path_str , f0_str , sr2 )
677
677
if if_pretrained_discriminator_exist
678
- else "" ,
679
- {"visible" : True , "__type__" : "update" },
678
+ else ""
680
679
)
681
680
682
681
@@ -685,9 +684,9 @@ def change_version19(sr2, if_f0_3, version19):
685
684
if sr2 == "32k" and version19 == "v1" :
686
685
sr2 = "40k"
687
686
to_return_sr2 = (
688
- {"choices" : ["40k" , "48k" ], "__type__" : "update" }
687
+ {"choices" : ["40k" , "48k" ], "__type__" : "update" , "value" : sr2 }
689
688
if version19 == "v1"
690
- else {"choices" : ["32k " , "40k" , "48k " ], "__type__" : "update" }
689
+ else {"choices" : ["40k " , "48k" , "32k " ], "__type__" : "update" , "value" : sr2 }
691
690
)
692
691
f0_str = "f0" if if_f0_3 else ""
693
692
if_pretrained_generator_exist = os .access (
@@ -713,7 +712,7 @@ def change_version19(sr2, if_f0_3, version19):
713
712
"pretrained%s/%sD%s.pth" % (path_str , f0_str , sr2 )
714
713
if if_pretrained_discriminator_exist
715
714
else "" ,
716
- to_return_sr2 ,
715
+ to_return_sr2
717
716
)
718
717
719
718
@@ -1758,7 +1757,7 @@ def export_onnx(ModelPath, ExportedPath):
1758
1757
sr2 .change (
1759
1758
change_sr2 ,
1760
1759
[sr2 , if_f0_3 , version19 ],
1761
- [pretrained_G14 , pretrained_D15 , version19 ],
1760
+ [pretrained_G14 , pretrained_D15 ],
1762
1761
)
1763
1762
version19 .change (
1764
1763
change_version19 ,
0 commit comments