Merge pull request #5810 from brkirch/fix-training-mps

Training fixes for MPS

1 files changed, 6 insertions, 6 deletions

diff --git a/modules/safe.py b/modules/safe.py
index 10460ad0..7c89c4c2 100644
--- a/modules/safe.py
+++ b/modules/safe.py
@@ -37,16 +37,16 @@ class RestrictedUnpickler(pickle.Unpickler):
 

         if module == 'collections' and name == 'OrderedDict':

             return getattr(collections, name)

-        if module == 'torch._utils' and name in ['_rebuild_tensor_v2', '_rebuild_parameter']:

+        if module == 'torch._utils' and name in ['_rebuild_tensor_v2', '_rebuild_parameter', '_rebuild_device_tensor_from_numpy']:

             return getattr(torch._utils, name)

-        if module == 'torch' and name in ['FloatStorage', 'HalfStorage', 'IntStorage', 'LongStorage', 'DoubleStorage', 'ByteStorage']:

+        if module == 'torch' and name in ['FloatStorage', 'HalfStorage', 'IntStorage', 'LongStorage', 'DoubleStorage', 'ByteStorage', 'float32']:

             return getattr(torch, name)

         if module == 'torch.nn.modules.container' and name in ['ParameterDict']:

             return getattr(torch.nn.modules.container, name)

-        if module == 'numpy.core.multiarray' and name == 'scalar':

-            return numpy.core.multiarray.scalar

-        if module == 'numpy' and name == 'dtype':

-            return numpy.dtype

+        if module == 'numpy.core.multiarray' and name in ['scalar', '_reconstruct']:

+            return getattr(numpy.core.multiarray, name)

+        if module == 'numpy' and name in ['dtype', 'ndarray']:

+            return getattr(numpy, name)

         if module == '_codecs' and name == 'encode':

             return encode

         if module == "pytorch_lightning.callbacks" and name == 'model_checkpoint':