Merge branch 'master' into dev

This commit is contained in:
AUTOMATIC 2023-05-02 09:25:47 +03:00
commit 4499bead4c
2 changed files with 11 additions and 3 deletions

View File

@ -1,4 +1,8 @@
## Upcoming version: ## 1.1.1
### Bug Fixes:
* fix an error that prevents running webui on torch<2.0 without --disable-safe-unpickle
## 1.1.0
### Features: ### Features:
* switch to torch 2.0.0 (except for AMD GPUs) * switch to torch 2.0.0 (except for AMD GPUs)
* visual improvements to custom code scripts * visual improvements to custom code scripts
@ -54,5 +58,5 @@
* outpainting Mk2 & Poorman should use the SAMPLE file format to save images, not GRID file format * outpainting Mk2 & Poorman should use the SAMPLE file format to save images, not GRID file format
* do not fail all Loras if some have failed to load when making a picture * do not fail all Loras if some have failed to load when making a picture
## Before versions: ## 1.0.0
* everything * everything

View File

@ -24,7 +24,11 @@ class RestrictedUnpickler(pickle.Unpickler):
def persistent_load(self, saved_id): def persistent_load(self, saved_id):
assert saved_id[0] == 'storage' assert saved_id[0] == 'storage'
return TypedStorage(_internal=True)
try:
return TypedStorage(_internal=True)
except TypeError:
return TypedStorage() # PyTorch before 2.0 does not have the _internal argument
def find_class(self, module, name): def find_class(self, module, name):
if self.extra_handler is not None: if self.extra_handler is not None: