Commit 9536ba2
authored
Convert custom VAEs during legacy checkpoint loading (#3010)
- When a legacy checkpoint model is loaded via --convert_ckpt and its
models.yaml stanza refers to a custom VAE path (using the 'vae:' key),
the custom VAE will be converted and used within the diffusers model.
Otherwise the VAE contained within the legacy model will be used.
- Note that the checkpoint import functions in the CLI or Web UIs
continue to default to the standard stabilityai/sd-vae-ft-mse VAE. This
can be fixed after the fact by editing VAE key using either the CLI or
Web UI.
- Fixes issue #2917File tree
3 files changed
+53
-60
lines changed- invokeai
- backend/model_management
- frontend/CLI
3 files changed
+53
-60
lines changedLines changed: 25 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1036 | 1036 | | |
1037 | 1037 | | |
1038 | 1038 | | |
| 1039 | + | |
| 1040 | + | |
| 1041 | + | |
| 1042 | + | |
| 1043 | + | |
| 1044 | + | |
| 1045 | + | |
| 1046 | + | |
| 1047 | + | |
1039 | 1048 | | |
1040 | 1049 | | |
1041 | 1050 | | |
| |||
1048 | 1057 | | |
1049 | 1058 | | |
1050 | 1059 | | |
| 1060 | + | |
1051 | 1061 | | |
1052 | 1062 | | |
1053 | 1063 | | |
| |||
1078 | 1088 | | |
1079 | 1089 | | |
1080 | 1090 | | |
| 1091 | + | |
| 1092 | + | |
1081 | 1093 | | |
1082 | 1094 | | |
1083 | 1095 | | |
| |||
1214 | 1226 | | |
1215 | 1227 | | |
1216 | 1228 | | |
1217 | | - | |
1218 | | - | |
1219 | | - | |
| 1229 | + | |
| 1230 | + | |
| 1231 | + | |
| 1232 | + | |
| 1233 | + | |
| 1234 | + | |
| 1235 | + | |
| 1236 | + | |
| 1237 | + | |
| 1238 | + | |
| 1239 | + | |
| 1240 | + | |
| 1241 | + | |
1220 | 1242 | | |
1221 | 1243 | | |
1222 | 1244 | | |
| |||
1226 | 1248 | | |
1227 | 1249 | | |
1228 | 1250 | | |
1229 | | - | |
1230 | | - | |
1231 | 1251 | | |
1232 | 1252 | | |
1233 | 1253 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
48 | | - | |
49 | | - | |
50 | | - | |
51 | 48 | | |
52 | 49 | | |
53 | 50 | | |
| |||
457 | 454 | | |
458 | 455 | | |
459 | 456 | | |
460 | | - | |
461 | | - | |
462 | | - | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
463 | 466 | | |
464 | 467 | | |
465 | 468 | | |
466 | 469 | | |
467 | 470 | | |
468 | | - | |
| 471 | + | |
469 | 472 | | |
470 | 473 | | |
471 | 474 | | |
| |||
512 | 515 | | |
513 | 516 | | |
514 | 517 | | |
| 518 | + | |
515 | 519 | | |
516 | 520 | | |
517 | 521 | | |
| |||
795 | 799 | | |
796 | 800 | | |
797 | 801 | | |
798 | | - | |
799 | | - | |
800 | | - | |
801 | | - | |
802 | | - | |
803 | | - | |
804 | | - | |
805 | | - | |
806 | | - | |
| 802 | + | |
| 803 | + | |
| 804 | + | |
| 805 | + | |
| 806 | + | |
| 807 | + | |
| 808 | + | |
| 809 | + | |
| 810 | + | |
| 811 | + | |
807 | 812 | | |
808 | 813 | | |
809 | 814 | | |
| |||
831 | 836 | | |
832 | 837 | | |
833 | 838 | | |
834 | | - | |
| 839 | + | |
| 840 | + | |
| 841 | + | |
| 842 | + | |
835 | 843 | | |
836 | 844 | | |
837 | 845 | | |
838 | 846 | | |
839 | 847 | | |
840 | 848 | | |
| 849 | + | |
841 | 850 | | |
842 | 851 | | |
843 | 852 | | |
| |||
884 | 893 | | |
885 | 894 | | |
886 | 895 | | |
887 | | - | |
888 | | - | |
889 | | - | |
890 | | - | |
891 | | - | |
892 | | - | |
893 | | - | |
894 | | - | |
895 | | - | |
896 | | - | |
897 | | - | |
898 | | - | |
899 | | - | |
900 | | - | |
901 | | - | |
902 | | - | |
903 | | - | |
904 | | - | |
905 | | - | |
906 | | - | |
907 | | - | |
908 | | - | |
909 | | - | |
910 | | - | |
911 | | - | |
912 | | - | |
913 | | - | |
914 | | - | |
915 | | - | |
916 | | - | |
917 | 896 | | |
918 | 897 | | |
919 | 898 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
772 | 772 | | |
773 | 773 | | |
774 | 774 | | |
775 | | - | |
| 775 | + | |
776 | 776 | | |
777 | 777 | | |
778 | 778 | | |
779 | | - | |
780 | | - | |
781 | | - | |
782 | | - | |
783 | | - | |
784 | | - | |
785 | 779 | | |
786 | 780 | | |
787 | 781 | | |
| |||
790 | 784 | | |
791 | 785 | | |
792 | 786 | | |
793 | | - | |
| 787 | + | |
794 | 788 | | |
795 | 789 | | |
796 | 790 | | |
| |||
0 commit comments