aboutsummaryrefslogtreecommitdiffstats
path: root/modules/safe.py
diff options
context:
space:
mode:
authorDepFA <35278260+dfaker@users.noreply.github.com>2022-10-10 14:13:48 +0000
committerGitHub <noreply@github.com>2022-10-10 14:13:48 +0000
commitce2d7f7eaccbd1843835ca2d048d78ba5cb1ea13 (patch)
tree948c77a1ed9ed85278bc97ca02857b0c9efbd4b0 /modules/safe.py
parent4117afff11c7b0a2162c73ea02be8cfa30d02640 (diff)
parentce37fdd30e9fc0fe0bc5805a068ce8b11b42b5a3 (diff)
downloadstable-diffusion-webui-gfx803-ce2d7f7eaccbd1843835ca2d048d78ba5cb1ea13.tar.gz
stable-diffusion-webui-gfx803-ce2d7f7eaccbd1843835ca2d048d78ba5cb1ea13.tar.bz2
stable-diffusion-webui-gfx803-ce2d7f7eaccbd1843835ca2d048d78ba5cb1ea13.zip
Merge branch 'master' into embed-embeddings-in-images
Diffstat (limited to 'modules/safe.py')
-rw-r--r--modules/safe.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/safe.py b/modules/safe.py
index 4d06f2a5..05917463 100644
--- a/modules/safe.py
+++ b/modules/safe.py
@@ -12,6 +12,10 @@ import _codecs
import zipfile
+# PyTorch 1.13 and later have _TypedStorage renamed to TypedStorage
+TypedStorage = torch.storage.TypedStorage if hasattr(torch.storage, 'TypedStorage') else torch.storage._TypedStorage
+
+
def encode(*args):
out = _codecs.encode(*args)
return out
@@ -20,7 +24,7 @@ def encode(*args):
class RestrictedUnpickler(pickle.Unpickler):
def persistent_load(self, saved_id):
assert saved_id[0] == 'storage'
- return torch.storage._TypedStorage()
+ return TypedStorage()
def find_class(self, module, name):
if module == 'collections' and name == 'OrderedDict':