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

InceptionResnetV2 feature for Query-by-Example #243

Merged
merged 32 commits into from
Jan 5, 2022
Merged

InceptionResnetV2 feature for Query-by-Example #243

merged 32 commits into from
Jan 5, 2022

Conversation

Spiess
Copy link
Member

@Spiess Spiess commented Jan 3, 2022

Refactored InceptionResnetV2 feature encoding into its own separate feature from inside VisualTextCoEmbedding.
This allows it to be used as a feature for query-by-example that is less abstracted towards semantic content than the visual-text co-embedding.

Spiess and others added 16 commits December 8, 2021 10:19
@Spiess
Implemented visual-text co-embedding extraction of full video segment…
54a9b4f 
…s rather than only the most representative frame.
@silvanheller
bumping version number
a67249e
@lucaro
Added ThreadLocalObjectCache to reuse objects in a thread-safe manner
8e714c9
@Spiess
Implemented early return to conform to codebase guidelines.
8f4cfcf
@Spiess
Refactored visual-text co-embedding to load buffered image only once …
ee7819d 
…needed.
@Spiess
Merge pull request #238 from vitrivr/feature/video-coembedding
0a9b5fc 
Visual-text co-embedding video extraction
@sauterl
Merge branch 'dev' of github.com:vitrivr/cineast into dev
5d21c8e
@Spiess
Removed unused and empty JavaDoc.
3713d0a
@Spiess
Removed unused commented code.
9dd6759
@Spiess
Fixed JavaDoc errors.
1b0e445
@Spiess
Raised source and target language compatibility to Java 9.
c713422 
This is required since FFMpegAudioDecoder and TechnicalVideoMetadataExtractor use Math.floorDiv, which is a function only available since Java 9.
@lucaro
Updated log4j *again* to 2.16
f681f54
@Spiess
Raised source and target language compatibility to Java 11 (LTS).
455e8a5 
Due to popular demand.
@silvanheller
Merge pull request #240 from vitrivr/log4j-2.16
69747dc 
Updated log4j *again* to 2.16
@Spiess
Reformatted all code to adhere to the project code-style.
350e1d6
@Spiess
Refactored InceptionResnetV2 feature encoding into its own separate f…
8427d5c 
…eature.
@Spiess Spiess requested a review from silvanheller January 3, 2022 15:39
silvanheller
silvanheller previously approved these changes Jan 3, 2022
View reviewed changes
Copy link
Member

@silvanheller silvanheller left a comment

Choose a reason for hiding this comment

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

Looks good to me

@silvanheller silvanheller requested a review from lucaro January 3, 2022 19:01
lucaro
lucaro requested changes Jan 3, 2022
View reviewed changes
Copy link
Member

@lucaro lucaro left a comment

Choose a reason for hiding this comment

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

I generally agree that it makes much more sense to have the output of the resnet as a feature directly. I only have one minor comment regarding the method used for image scaling, see inline comment.

cineast-core/src/main/java/org/vitrivr/cineast/core/features/InceptionResnetV2.java Outdated Show resolved Hide resolved
silvanheller and others added 10 commits January 4, 2022 09:13
@silvanheller
bumping version number
7805260
@lucaro @silvanheller
Added ThreadLocalObjectCache to reuse objects in a thread-safe manner
d10d914
@Spiess @silvanheller
Implemented visual-text co-embedding extraction of full video segment…
201edae 
…s rather than only the most representative frame.
@Spiess @silvanheller
Implemented early return to conform to codebase guidelines.
1ecf39a
@Spiess @silvanheller
Refactored visual-text co-embedding to load buffered image only once …
f774eb9 
…needed.
@Spiess @silvanheller
Removed unused and empty JavaDoc.
e442ec5
@Spiess @silvanheller
Removed unused commented code.
8a2ff57
@Spiess @silvanheller
Fixed JavaDoc errors.
0d9e982
@Spiess @silvanheller
Raised source and target language compatibility to Java 9.
6a2c5cd 
This is required since FFMpegAudioDecoder and TechnicalVideoMetadataExtractor use Math.floorDiv, which is a function only available since Java 9.
@Spiess @silvanheller
Raised source and target language compatibility to Java 11 (LTS).
4b2e801 
Due to popular demand.
@Spiess
Merge branch 'dev' into feature/inceptionresnetv2-similarity
16dc283 
# Conflicts:
#	cineast-core/src/main/java/org/vitrivr/cineast/core/features/VisualTextCoEmbedding.java
#	gradle.properties
@silvanheller silvanheller changed the base branch from dev to master January 4, 2022 10:19
@silvanheller silvanheller dismissed their stale review January 4, 2022 10:19

The base branch was changed.

@silvanheller
Merge branch 'master' into feature/inceptionresnetv2-similarity
8d4d3a1 
# Conflicts:
#	build.gradle
#	cineast-core/src/main/java/org/vitrivr/cineast/core/features/VisualTextCoEmbedding.java
silvanheller
silvanheller previously approved these changes Jan 4, 2022
View reviewed changes
Copy link
Member

@silvanheller silvanheller left a comment

Choose a reason for hiding this comment

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

I bumped the version number to v3.6.2, since that's what the next minor release would be

@Spiess Spiess requested a review from lucaro January 4, 2022 10:27
silvanheller
silvanheller previously approved these changes Jan 4, 2022
View reviewed changes
@Spiess
Updated InceptionResnetV2 feature to aggregate video frame features i…
2577d35 
…nstead of only using most representative frame.
@Spiess Spiess dismissed stale reviews from lucaro and silvanheller via 2577d35 January 4, 2022 15:20
@Spiess Spiess requested a review from lucaro January 4, 2022 15:21
silvanheller
silvanheller previously approved these changes Jan 4, 2022
View reviewed changes
@Spiess Spiess dismissed stale reviews from lucaro and silvanheller via 1db1dc2 January 5, 2022 12:46
@Spiess Spiess requested a review from lucaro January 5, 2022 12:47
@Spiess Spiess merged commit 9c5c771 into master Jan 5, 2022
@Spiess Spiess deleted the feature/inceptionresnetv2-similarity branch January 5, 2022 12:59
@Spiess Spiess restored the feature/inceptionresnetv2-similarity branch January 5, 2022 13:04
@Spiess Spiess mentioned this pull request Jan 5, 2022
Merged
@silvanheller silvanheller deleted the feature/inceptionresnetv2-similarity branch January 5, 2022 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@silvanheller silvanheller silvanheller approved these changes

@lucaro lucaro lucaro approved these changes

Assignees

@Spiess Spiess

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Spiess @lucaro @silvanheller @sauterl