diff options
author | AUTOMATIC <16777216c@gmail.com> | 2023-05-02 09:25:47 +0300 |
---|---|---|
committer | AUTOMATIC <16777216c@gmail.com> | 2023-05-02 09:25:47 +0300 |
commit | 4499bead4c1a20cac94f5411f7ba343f663bd415 (patch) | |
tree | 17e3b11d8d930787c575a9dd11759e95a2aa6a6f | |
parent | b1717c0a4804f8ed3bb8cc2f3aea5d095778b447 (diff) | |
parent | 5ab7f213bec2f816f9c5644becb32eb72c8ffb89 (diff) |
Merge branch 'master' into dev
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | modules/safe.py | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 73b25eaf..8d2f96e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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:
* switch to torch 2.0.0 (except for AMD GPUs)
* 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
* do not fail all Loras if some have failed to load when making a picture
-## Before versions:
+## 1.0.0
* everything
diff --git a/modules/safe.py b/modules/safe.py index dadf319c..e6c2f2c0 100644 --- a/modules/safe.py +++ b/modules/safe.py @@ -24,7 +24,11 @@ class RestrictedUnpickler(pickle.Unpickler): def persistent_load(self, saved_id):
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):
if self.extra_handler is not None:
|