diff options
| author | JC-Array <44535867+JC-Array@users.noreply.github.com> | 2022-10-10 23:06:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-10 23:06:07 +0000 |
| commit | aca1553bde726e1455f3a73a6378b31e93d3e8f2 (patch) | |
| tree | b5492fb630f58deddd9fbf812fdd7d9134a59cc1 /modules/safe.py | |
| parent | 45fbd1c5fec887988ab555aac75a999d4f3aff40 (diff) | |
| parent | 42bf5fa3256bff5e4640e5a626e750d4e49e01e1 (diff) | |
| download | stable-diffusion-webui-gfx803-aca1553bde726e1455f3a73a6378b31e93d3e8f2.tar.gz stable-diffusion-webui-gfx803-aca1553bde726e1455f3a73a6378b31e93d3e8f2.tar.bz2 stable-diffusion-webui-gfx803-aca1553bde726e1455f3a73a6378b31e93d3e8f2.zip | |
Merge pull request #1 from AUTOMATIC1111/master
updating files to resolve merge conflicts
Diffstat (limited to 'modules/safe.py')
| -rw-r--r-- | modules/safe.py | 6 |
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':
|