Skip to content

fix batchsampler does not work correctly #20327

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

Merged
merged 6 commits into from
Nov 13, 2024
Merged

fix batchsampler does not work correctly #20327

Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0fd3e8a
fix batchsampler does not work correctly
Oct 9, 2024
232fe8e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 9, 2024
5aee597
add batch sampler shuffle state test
dadwadw233 Oct 9, 2024
ab29ee6
fix pre_commit confict
dadwadw233 Oct 9, 2024
cc90ac9
Merge branch 'master' into master
dadwadw233 Oct 23, 2024
f14d0d6
Merge branch 'master' into master
t-vi Nov 13, 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
9 changes: 8 additions & 1 deletion src/lightning/pytorch/utilities/data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,14 @@ def _is_dataloader_shuffled(dataloader: object) -> bool:
if not hasattr(dataloader, "sampler"):
# shuffling is enabled via a sampler. No sampler, no shuffling
return False
sampler = dataloader.sampler

batch_sampler = dataloader.batch_sampler
if batch_sampler is not None:
# batchsize == 1 case:
sampler = batch_sampler.sampler
else:
sampler = dataloader.sampler

if isinstance(sampler, SequentialSampler):
return False
return isinstance(sampler, RandomSampler)
Loading