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

Fix validation and test split not being reproducible #218

Merged
merged 18 commits into from
Oct 28, 2024
Merged

Fix validation and test split not being reproducible #218

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
52fe50d
Fix validation and test split not being reproducible
sfmig Jul 8, 2024
0b2c7b2
Check-manifest fix
sfmig Oct 18, 2024
26f2b75
Draft dataset split tests
sfmig Oct 18, 2024
17501d3
Simplify dummy dataset fixture
sfmig Oct 21, 2024
d54ee25
Add dummy dataset directories fixture
sfmig Oct 21, 2024
85484ba
Add annotations file to fixture
sfmig Oct 21, 2024
e76896c
Create fixture as factory of dummy datasets
sfmig Oct 21, 2024
ce3a3f8
Tests pass
sfmig Oct 21, 2024
09ac681
Make fixture factory of dataset dirs
sfmig Oct 21, 2024
215e366
Expand test parametrisation
sfmig Oct 21, 2024
f0bf285
Merge branch 'main' into smg/fix-reproducible-val-test-split
sfmig Oct 21, 2024
11f481c
Small edits to docstrings
sfmig Oct 21, 2024
870b524
Move bbox_tensors_to_COCO_dict to utils
sfmig Oct 23, 2024
8336236
Clarify comment
sfmig Oct 23, 2024
07a752a
Restore pre-commit config
sfmig Oct 23, 2024
c678df6
Rename generators
sfmig Oct 24, 2024
206934f
Fix image ID default indexing (it is 1-based in VIA tool)
sfmig Oct 28, 2024
fb1ad06
Remove n=10 comment in the dummy dataset fixture
sfmig Oct 28, 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
8 changes: 5 additions & 3 deletions crabs/detector/datamodules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,10 @@ def _compute_splits(
"""

# Optionally fix the generator for a reproducible split of data
generator = None
generator_1, generator_2 = None, None
sfmig marked this conversation as resolved.
Show resolved Hide resolved
if self.split_seed:
generator = torch.Generator().manual_seed(self.split_seed)
generator_1 = torch.Generator().manual_seed(self.split_seed)
generator_2 = torch.Generator().manual_seed(self.split_seed)

# Create dataset (combining all datasets passed)
full_dataset = CrabsCocoDetection(
Expand All @@ -189,7 +190,7 @@ def _compute_splits(
train_dataset, test_val_dataset = random_split(
full_dataset,
[self.config["train_fraction"], 1 - self.config["train_fraction"]],
generator=generator,
generator=generator_1,
)

# Split test/val sets from the remainder
Expand All @@ -199,6 +200,7 @@ def _compute_splits(
1 - self.config["val_over_test_fraction"],
self.config["val_over_test_fraction"],
],
generator=generator_2,
)

return train_dataset, test_dataset, val_dataset
Expand Down