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

Feature/pose queries #285

Merged
merged 71 commits into from
Apr 26, 2022
Merged

Feature/pose queries #285

merged 71 commits into from
Apr 26, 2022

Conversation

lucaro
Copy link
Member

@lucaro lucaro commented Mar 28, 2022 •
edited by silvanheller
Loading

This adds the relevant functionality for pose-based queries.

silvanheller and others added 30 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 @silvanheller
Reformatted all code to adhere to the project code-style.
ef8d793
@Spiess
Fixed CottontailWrapper pretending connection was successful even whe…
cea3083 
…n it wasn't.
@lucaro
Merge master into dev
baa963e 
# Conflicts:
#	build.gradle
#	cineast-core/src/main/java/org/vitrivr/cineast/core/features/VisualTextCoEmbedding.java
@lucaro
Added base structure for skeleton pose feature
fa880b8
@lucaro
Implemented first version of skeleton retrieval logic
cb2e51a
@lucaro
Added import mechanism for pre-extracted skeletons
a0b1ac2
@lucaro
Fix in entity creation for SkeletonPose
7d557b9
@lucaro
Towards querying with new cottontail functionality
d11ca23
@lucaro
Fixed some issues in query construction, successfully retrieved results
946381b
@lucaro
Added SkeletonQueryTermContainer
8b2d4c0
@ppanopticon
Corrected query.
38fa477
@lucaro
Extended function to be evaluated by cottontail
090dfd9
@lucaro
Merge branch 'feature/PoseQueries' of https://github.com/vitrivr/cineast
6524d81 
 into feature/PoseQueries

# Conflicts:
#	cineast-core/src/main/java/org/vitrivr/cineast/core/features/SkeletonPose.java
Added missing alias for distance column.
36acbb7
@ppanopticon
Optimised INSERT in order to speed them up a little.
814b088
@ppanopticon
Added todos and fixmes :-)
f929ebd
@lucaro
Merge tag 'v3.7.0' into feature/PoseQueries
7f716ab 
# Conflicts:
#	cineast-core/src/main/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailEntityCreator.java
#	cineast-core/src/main/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailSelector.java
#	cineast-core/src/main/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailWrapper.java
#	cineast-core/src/main/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailWriter.java
#	cineast-core/src/test/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailIntegrationTest.java
#	cineast-core/src/test/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailMetadataTest.java
#	cineast-runtime/src/main/java/org/vitrivr/cineast/standalone/cli/CineastCli.java
#	cineast-runtime/src/main/java/org/vitrivr/cineast/standalone/cli/OptimizeEntitiesCommand.java
#	cineast-runtime/src/main/java/org/vitrivr/cineast/standalone/cli/db/LSC21TemporalUpdateCommand.java
#	gradle.properties
@lucaro
Fixed post-merge issues
14cf627
@lucaro
Added quantization to weights and fixed sort order in SkeletonPose
7967139
@silvanheller
moving wrapper-creation to trace
84888c5
@lucaro
Merge remote-tracking branch 'origin/master' into dev
4df6743 
# Conflicts:
#	cineast-api/src/main/java/org/vitrivr/cineast/api/messages/query/TemporalQuery.java
#	cineast-core/src/main/java/org/vitrivr/cineast/core/temporal/TemporalScoring.java
@lucaro
Merge branch 'dev' into feature/PoseQueries
de5c217 
# Conflicts:
#	cineast-core/src/main/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailEntityCreator.java
#	cineast-runtime/src/main/java/org/vitrivr/cineast/standalone/cli/db/LSC21TemporalUpdateCommand.java
silvanheller
silvanheller requested changes Mar 28, 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.

There are some changes which require additional documentation, and some which might be merge errors. I think it would be good to open also a PR for vitrivr-ng to dev, which we can have a look at in parallel.

cineast-api/src/main/java/org/vitrivr/cineast/api/messages/query/TemporalQuery.java Outdated Show resolved Hide resolved
...st-api/src/main/java/org/vitrivr/cineast/api/rest/resolvers/FileSystemThumbnailResolver.java Outdated Show resolved Hide resolved
...ast-core/src/main/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailEntityCreator.java Outdated Show resolved Hide resolved
...ast-core/src/main/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailEntityCreator.java Outdated Show resolved Hide resolved
silvanheller
silvanheller reviewed Apr 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.

Looks good to me. I'll have to play around with the UI & import to see if it works, but generally speaking this works for me.

@silvanheller silvanheller mentioned this pull request Apr 8, 2022
Merged
ppanopticon
ppanopticon requested changes Apr 22, 2022
View reviewed changes
Copy link
Member

@ppanopticon ppanopticon left a comment

Choose a reason for hiding this comment

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

Tests still fail because the branch requires 0.15.0-SNAPSHOT version of Cottontail DB to run, which is not available as Docker Image yet.

We can finalise this PR, once Cottontail DB has been released.

...ast-core/src/main/java/org/vitrivr/cineast/core/db/cottontaildb/CottontailEntityCreator.java Outdated Show resolved Hide resolved
@silvanheller silvanheller changed the base branch from dev to master April 24, 2022 13:51
silvanheller
silvanheller approved these changes Apr 25, 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.

LGTM! We'll wait with merging until v0.15 of Cottontail is out, but this looks really cool.

@silvanheller silvanheller merged commit 832751a into master Apr 26, 2022
@silvanheller silvanheller deleted the feature/PoseQueries branch April 26, 2022 07:50
silvanheller added a commit that referenced this pull request Jun 10, 2022
@lucaro @silvanheller
@Spiess @ppanopticon
Pose query retrieval & new cottontail api (#285)
4169bcd 
Co-authored-by: Silvan Heller <silvan.heller@unibas.ch>
Co-authored-by: Florian Spiess <florian.spiess@unibas.ch>
Co-authored-by: Ralph Gasser <rg@pontius.ch>
Co-authored-by: Ralph Gasser <ralph.gasser@unibas.ch>
Former-commit-id: 832751a
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ppanopticon ppanopticon ppanopticon approved these changes

@silvanheller silvanheller silvanheller approved these changes

@Spiess Spiess Awaiting requested review from Spiess

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

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