Skip to content

Update the dataset cache to factor input parameters #6234

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 2 commits into from
Jul 5, 2022
Merged

Update the dataset cache to factor input parameters #6234

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
11a076c
Update the dataset cache to factor in parameters from the args.
datumbox Jul 4, 2022
cb1f462
Fix linter
datumbox Jul 4, 2022
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: 5 additions & 4 deletions references/video_classification/train.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,11 @@ def evaluate(model, criterion, data_loader, device):
return metric_logger.acc1.global_avg


def _get_cache_path(filepath):
def _get_cache_path(filepath, args):
import hashlib

h = hashlib.sha1(filepath.encode()).hexdigest()
value = f"{filepath}-{args.clip_len}-{args.kinetics_version}-{args.frame_rate}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we also add args.step_between_clips here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't have such as parameter on args. If we introduce it, we should absolutely add it here.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got it

h = hashlib.sha1(value.encode()).hexdigest()
cache_path = os.path.join("~", ".torch", "vision", "datasets", "kinetics", h[:10] + ".pt")
cache_path = os.path.expanduser(cache_path)
return cache_path
Expand Down Expand Up @@ -135,7 +136,7 @@ def main(args):

print("Loading training data")
st = time.time()
cache_path = _get_cache_path(traindir)
cache_path = _get_cache_path(traindir, args)
transform_train = presets.VideoClassificationPresetTrain(crop_size=(112, 112), resize_size=(128, 171))

if args.cache_dataset and os.path.exists(cache_path):
Expand Down Expand Up @@ -167,7 +168,7 @@ def main(args):
print("Took", time.time() - st)

print("Loading validation data")
cache_path = _get_cache_path(valdir)
cache_path = _get_cache_path(valdir, args)

if args.weights and args.test_only:
weights = torchvision.models.get_weight(args.weights)
Expand Down