Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fer va estimation #264

Merged
merged 147 commits into from
Dec 21, 2022
Merged
Changes from 1 commit
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
24423e5
facial_va_estimation added
negarhdr Jun 14, 2022
abf6f11
names updated
negarhdr Jun 14, 2022
e5ccc9a
style fixed
negarhdr Jun 15, 2022
5de7224
style fixed
negarhdr Jun 15, 2022
78a6557
style fixed
negarhdr Jun 20, 2022
90eab77
demo&doc updated
negarhdr Jul 21, 2022
c348d0d
Merge branch 'develop' into fer_va_estimation
negarhdr Jul 21, 2022
2004b10
Merge branch 'develop' into fer_va_estimation
passalis Sep 5, 2022
b34e172
Merge branch 'develop' into fer_va_estimation
passalis Sep 12, 2022
8388d99
doc&dependencies updated
negarhdr Sep 12, 2022
ad88f72
demo updated
negarhdr Sep 12, 2022
5299499
Revert "demo updated"
negarhdr Sep 12, 2022
b796aca
demo updated
negarhdr Sep 12, 2022
62eef12
ROS1 node updated
negarhdr Sep 13, 2022
f5af9ba
ROS1 node updated
negarhdr Sep 13, 2022
10584e4
ROS1 node updated
negarhdr Sep 13, 2022
b46499a
Merge branch 'develop' into fer_va_estimation
ad-daniel Sep 20, 2022
4ebd94a
Merge branch 'develop' into fer_va_estimation
passalis Sep 21, 2022
f799c38
Merge branch 'develop' into fer_va_estimation
negarhdr Oct 20, 2022
6d9736a
ros1_node fixed
negarhdr Oct 20, 2022
8df9d90
ros1 fixed
negarhdr Oct 20, 2022
63163e3
diversity extention added
negarhdr Oct 20, 2022
3288671
style fixed
negarhdr Oct 20, 2022
25c1133
benchmark added
negarhdr Oct 20, 2022
3097bd7
Merge branch 'develop' into fer_va_estimation
tsampazk Oct 24, 2022
a23c517
Merge branch 'develop' into fer_va_estimation
tsampazk Oct 24, 2022
0e111b4
Merge branch 'develop' into fer_va_estimation
tsampazk Oct 25, 2022
9084f83
Merge branch 'develop' into fer_va_estimation
tsampazk Oct 25, 2022
8295496
folder moved
negarhdr Oct 27, 2022
f16c157
folder moved
negarhdr Oct 27, 2022
83adbb1
benchmark updated
negarhdr Oct 28, 2022
88bef72
benchmark updated
negarhdr Oct 28, 2022
a36c4d5
benchmark updated
negarhdr Oct 28, 2022
0984b27
benchmark updated
negarhdr Oct 28, 2022
dcc9e1f
benchmark updated
negarhdr Oct 28, 2022
7a6b84a
benchmark updated
negarhdr Oct 28, 2022
caa907a
benchmark updated
negarhdr Oct 28, 2022
5920f67
benchmark updated
negarhdr Oct 28, 2022
a49be29
benchmark updated
negarhdr Oct 28, 2022
25252dc
benchmark updated
negarhdr Oct 28, 2022
4dd682e
benchmark updated
negarhdr Oct 28, 2022
99b12a3
benchmark updated
negarhdr Oct 28, 2022
3b099b3
benchmark updated
negarhdr Oct 28, 2022
40ce7e6
benchmark updated
negarhdr Oct 28, 2022
6c3f5b1
benchmark updated
negarhdr Oct 28, 2022
0d872ab
benchmark updated
negarhdr Oct 28, 2022
38a4005
model updated
negarhdr Nov 1, 2022
dbc7e12
model updated
negarhdr Nov 1, 2022
69a4099
model updated
negarhdr Nov 1, 2022
048d18c
model updated
negarhdr Nov 1, 2022
e0b7063
download updated
negarhdr Nov 2, 2022
c2bb984
code style fixed
negarhdr Nov 2, 2022
2a5f4cd
Remove pkg-resources
ad-daniel Nov 22, 2022
e48a0c0
Enforce torch dependency
ad-daniel Nov 22, 2022
3104883
tests updated
negarhdr Nov 24, 2022
f6418f6
test_pstbln updated
negarhdr Nov 24, 2022
5a7bfac
tests updated
negarhdr Nov 24, 2022
33116e1
download updated
negarhdr Nov 24, 2022
de74f25
Merge branch 'develop' into fer_va_estimation
ad-daniel Nov 25, 2022
148c7bd
download updated
negarhdr Nov 25, 2022
10c4f0e
Update facial_emotion_learner.py
negarhdr Nov 28, 2022
3b95d8d
download updated
negarhdr Nov 28, 2022
f6e6a21
download updated
negarhdr Nov 28, 2022
949af8b
doc updated
negarhdr Nov 28, 2022
557d823
doc updated
negarhdr Nov 28, 2022
7f5afd3
optimize updated
negarhdr Dec 12, 2022
9439f70
Merge branch 'develop' into fer_va_estimation
negarhdr Dec 12, 2022
678f875
download updated
negarhdr Dec 12, 2022
8fd7c5b
download updated
negarhdr Dec 12, 2022
d614243
infer updated
negarhdr Dec 13, 2022
aee9d66
Merge branch 'develop' into fer_va_estimation
negarhdr Dec 14, 2022
c781158
optimize updated
negarhdr Dec 16, 2022
b575a02
Merge remote-tracking branch 'origin/fer_va_estimation' into fer_va_e…
negarhdr Dec 16, 2022
602395e
optimize updated
negarhdr Dec 16, 2022
0ec3e98
optimize updated
negarhdr Dec 17, 2022
80f066d
optimize updated
negarhdr Dec 17, 2022
daa6ce0
code style fixed
negarhdr Dec 17, 2022
ec0466d
code style fixed
negarhdr Dec 17, 2022
b983959
code style fixed
negarhdr Dec 17, 2022
50e62b6
Minor fixes
ad-daniel Dec 19, 2022
fcc3e50
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
f1be494
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
4f0ac85
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
b0963d3
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
3709c0d
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
2a75d5e
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
ec6b42d
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
ec40c5b
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
abaae27
Update projects/opendr_ws/src/perception/scripts/facial_emotion_estim…
negarhdr Dec 19, 2022
e3fd13e
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
5ce9f20
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
da2f29f
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
73aabfe
Update src/opendr/perception/facial_expression_recognition/image_base…
negarhdr Dec 19, 2022
62c0300
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
2927321
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
b219b52
Moved and applied several fixes on facial emotion ros node
tsampazk Dec 19, 2022
f28fd15
Update projects/python/perception/facial_expression_recognition/image…
negarhdr Dec 19, 2022
d2a46c0
Update projects/python/perception/facial_expression_recognition/image…
negarhdr Dec 19, 2022
937bd45
Update projects/python/perception/facial_expression_recognition/image…
negarhdr Dec 19, 2022
cc27d06
Update projects/python/perception/facial_expression_recognition/image…
negarhdr Dec 19, 2022
eb7540a
Update projects/python/perception/facial_expression_recognition/image…
negarhdr Dec 19, 2022
1aca526
Update src/opendr/perception/facial_expression_recognition/image_base…
negarhdr Dec 19, 2022
4ae1144
Update src/opendr/perception/facial_expression_recognition/image_base…
negarhdr Dec 19, 2022
26c638b
Update src/opendr/perception/facial_expression_recognition/image_base…
negarhdr Dec 19, 2022
319a17f
Update src/opendr/perception/facial_expression_recognition/image_base…
negarhdr Dec 19, 2022
2ba0bd4
Update src/opendr/perception/facial_expression_recognition/image_base…
negarhdr Dec 19, 2022
9022256
Update src/opendr/perception/facial_expression_recognition/image_base…
negarhdr Dec 19, 2022
7b9f7a9
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
0121849
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
a30deea
Update docs/reference/image_based_facial_emotion_estimation.md
negarhdr Dec 19, 2022
1ba916f
Update projects/python/perception/facial_expression_recognition/image…
negarhdr Dec 19, 2022
17a0bbe
Update projects/opendr_ws/src/opendr_perception/scripts/facial_emotio…
negarhdr Dec 19, 2022
72ecb00
Merge branch 'develop' into fer_va_estimation
ad-daniel Dec 19, 2022
87a6216
index.md, CHANGELOG.md updated
negarhdr Dec 19, 2022
28b4863
download added to demo
negarhdr Dec 19, 2022
faf6c4d
download is updated. Demo downloads image/video files.
negarhdr Dec 19, 2022
70fb00a
evaluation results added to doc
negarhdr Dec 19, 2022
6bde13f
benchmark updated
negarhdr Dec 19, 2022
9f45b65
verbose added
negarhdr Dec 19, 2022
7219c7d
init_model added
negarhdr Dec 19, 2022
349cd0d
face detector path updated
negarhdr Dec 19, 2022
b07b7df
Merge branch 'develop' into fer_va_estimation
ad-daniel Dec 19, 2022
e57f67d
fix sources
ad-daniel Dec 19, 2022
5e350a3
Inference demo argument fixes
tsampazk Dec 20, 2022
bca3963
fix download, fix demo, fix image preprocess in ros node
negarhdr Dec 20, 2022
15b2506
Learner device argument fix
tsampazk Dec 20, 2022
f3914e4
demo implemented from scratch
negarhdr Dec 21, 2022
274bfdf
Merge remote-tracking branch 'origin/fer_va_estimation' into fer_va_e…
negarhdr Dec 21, 2022
6d722f3
style fixed
negarhdr Dec 21, 2022
6b6cd95
style fixed
negarhdr Dec 21, 2022
6871524
style fixed
negarhdr Dec 21, 2022
0109b59
style fixed
negarhdr Dec 21, 2022
6c192e1
ROS updated
negarhdr Dec 21, 2022
41d4d2f
ROS updated
negarhdr Dec 21, 2022
612d52a
ROS updated
negarhdr Dec 21, 2022
a0a4605
ROS updated
negarhdr Dec 21, 2022
627348b
Merge branch 'develop' into fer_va_estimation
tsampazk Dec 21, 2022
4591a19
Removed import for deleted script
tsampazk Dec 21, 2022
c360229
Modify cv2 show window to update properly
tsampazk Dec 21, 2022
e4860d0
ROS node now uses retina face detector and also outputs annotated images
tsampazk Dec 21, 2022
5d81220
Merge branch 'develop' into fer_va_estimation
tsampazk Dec 21, 2022
948ed10
ROS index addition of emotion estimation
tsampazk Dec 21, 2022
491a1ed
Added ros node emotion estimation entry
tsampazk Dec 21, 2022
e034c8f
Merge branch 'develop' into fer_va_estimation
ad-daniel Dec 21, 2022
9649dea
Fixed video and img modes
tsampazk Dec 21, 2022
18033ff
fixed path in download
tsampazk Dec 21, 2022
4561c8d
Merge branch 'develop' into fer_va_estimation
tsampazk Dec 21, 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
Prev Previous commit
Next Next commit
benchmark updated
  • Loading branch information
negarhdr committed Oct 28, 2022

Verified

This commit was signed with the committer’s verified signature.
tyearke Tom Yearke
commit 40ce7e65c3089cebc161d26d70207eafa1c2703e
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ def benchmark_esr(args):
learner.model.cuda()

num_runs = 100
batch_size = 1
batch_size = 32
C = 3
H = 96
W = 96