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.

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

Integrate dreamsim #148

Merged
merged 13 commits into from
Jul 26, 2023
Merged

Integrate dreamsim #148

merged 13 commits into from
Jul 26, 2023

Conversation

LukasMut
Copy link
Collaborator

@LukasMut LukasMut commented Jul 25, 2023

Integrating DreamSim into thingsvision and minor changes to the codebase (mainly for refactoring purposes)

Copy link
Collaborator

Choose a reason for hiding this comment

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

The checkpoint_path is currently not passed to the dreamsim function which has the option cache_dir. There, the default cache dir is ./models. I think we should store the checkpoints in the torch default cache dir, as we do for all the ssl models.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

What are your thoughts @ssundaram21?

Copy link
Collaborator

@ssundaram21 ssundaram21 Jul 25, 2023

Choose a reason for hiding this comment

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

I agree! It's a change we've been planning to make for dreamsim anyways. The checkpoint_path argument was supposed to be deleted, apologies for that.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Great! We should also pass the device to the dreamsim function. This is cuda by default and currently the reason why the tests fail (the ci worker has no GPU).

@codecov-commenter
Copy link

Codecov Report

Patch coverage: 92.50% and project coverage change: +0.47% 🎉

Comparison is base (6f7c777) 74.28% compared to head (7aefc0e) 74.75%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #148      +/-   ##
==========================================
+ Coverage   74.28%   74.75%   +0.47%     
==========================================
  Files          27       28       +1     
  Lines        1287     1319      +32     
  Branches      185      186       +1     
==========================================
+ Hits          956      986      +30     
- Misses        277      278       +1     
- Partials       54       55       +1     
Flag Coverage Δ
unittests 74.75% <92.50%> (+0.47%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
thingsvision/custom_models/official_clip.py 100.00% <ø> (ø)
thingsvision/custom_models/vgg16_ecoset.py 100.00% <ø> (ø)
thingsvision/core/extraction/extractors.py 77.58% <75.00%> (ø)
thingsvision/custom_models/dreamsim.py 93.93% <93.93%> (ø)
thingsvision/core/extraction/base.py 59.18% <100.00%> (ø)
thingsvision/core/extraction/torch.py 74.19% <100.00%> (ø)

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@LukasMut LukasMut added documentation Improvements or additions to documentation enhancement New feature or request labels Jul 26, 2023
@LukasMut LukasMut requested a review from jonasd4 July 26, 2023 08:36
@LukasMut LukasMut enabled auto-merge July 26, 2023 08:43
@LukasMut LukasMut requested a review from Alxmrphi July 26, 2023 08:44
Copy link
Collaborator

@andropar andropar left a comment

Choose a reason for hiding this comment

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

Great addition!

@LukasMut LukasMut added this pull request to the merge queue Jul 26, 2023
Merged via the queue into master with commit 948c3a4 Jul 26, 2023
4 checks passed
@LukasMut LukasMut deleted the integrate_dreamsim branch August 4, 2023 20:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Improvements or additions to documentation enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants