Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix torch.load() frequently warning in PersistentDataset and GDSDataset #8177

Merged
merged 9 commits into from
Oct 25, 2024
Merged

Fix torch.load() frequently warning in PersistentDataset and GDSDataset #8177

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e03821d
Fix torch.load() in PersistentDataset and GDSDataset to maintain load…
bnbqq8 Oct 24, 2024
f51cf60
Merge branch 'dev' into dev
bnbqq8 Oct 25, 2024
38d5a71
Add compatibility for PyTorch v1.12.0 and below
bnbqq8 Oct 25, 2024
7c0562b
Merge branch 'dev' of https://github.com/bnbqq8/MONAI into dev
bnbqq8 Oct 25, 2024
719e33d
Refactor dataset.py import order
bnbqq8 Oct 25, 2024
3c2a012
Refactor dataset.py to use signature parameters for torch.load
bnbqq8 Oct 25, 2024
5ac10ff
Refactor formatted by Black
bnbqq8 Oct 25, 2024
b12261e
DCO Remediation Commit for bnbqq8 <[email protected]>
bnbqq8 Oct 25, 2024
306516f
Merge branch 'dev' into dev
bnbqq8 Oct 25, 2024
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
11 changes: 9 additions & 2 deletions monai/data/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import warnings
from collections.abc import Callable, Sequence
from copy import copy, deepcopy
from inspect import signature
from multiprocessing.managers import ListProxy
from multiprocessing.pool import ThreadPool
from pathlib import Path
Expand Down Expand Up @@ -371,7 +372,10 @@ def _cachecheck(self, item_transformed):

if hashfile is not None and hashfile.is_file(): # cache hit
try:
return torch.load(hashfile)
if "weights_only" in signature(torch.load).parameters:
return torch.load(hashfile, weights_only=False)
else:
return torch.load(hashfile)
except PermissionError as e:
if sys.platform != "win32":
raise e
Expand Down Expand Up @@ -1670,4 +1674,7 @@ def _load_meta_cache(self, meta_hash_file_name):
if meta_hash_file_name in self._meta_cache:
return self._meta_cache[meta_hash_file_name]
else:
return torch.load(self.cache_dir / meta_hash_file_name)
if "weights_only" in signature(torch.load).parameters:
return torch.load(self.cache_dir / meta_hash_file_name, weights_only=False)
else:
return torch.load(self.cache_dir / meta_hash_file_name)
Loading