Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions tofu/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -453,8 +453,7 @@ def _filefind(name, path=None, lmodes=['.npz','.mat']):
return name, mode, pfe



def load(name, path=None, strip=None, verb=True):
def load(name, path=None, strip=None, verb=True, allow_pickle=None):
""" Load a tofu object file

Can load from .npz or .txt files
Expand Down Expand Up @@ -483,7 +482,7 @@ def load(name, path=None, strip=None, verb=True):
obj = _load_from_txt(name, pfe)
else:
if mode == 'npz':
dd = _load_npz(pfe)
dd = _load_npz(pfe, allow_pickle=allow_pickle)
elif mode == 'mat':
dd = _load_mat(pfe)

Expand Down Expand Up @@ -580,13 +579,15 @@ def _get_load_npzmat_dict(out, pfe, mode='npz', exclude_keys=[]):
return dout



def _load_npz(pfe):
def _load_npz(pfe, allow_pickle=None):
if allow_pickle is None:
allow_pickle = True

try:
out = np.load(pfe, mmap_mode=None)
out = np.load(pfe, mmap_mode=None, allow_pickle=allow_pickle)
except UnicodeError:
out = np.load(pfe, mmap_mode=None, encoding='latin1')
out = np.load(pfe, mmap_mode=None, allow_pickle=allow_pickle,
encoding='latin1')
except Exception as err:
raise err

Expand Down
2 changes: 1 addition & 1 deletion tofu/version.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Do not edit, pipeline versioning governed by git tags!
__version__ = '1.4.2b4-56-g4622b310'
__version__ = '1.4.2b4-63-gf16dd82e'