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

Fix the version_id changes after moving the weight files; fix dependency issues with temporal models #1249

Open
wants to merge 129 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
d97d452
feature: support temporal models for neural alignment by chaning Temp…
Feb 25, 2024
2a32f46
Merge branch 'brain-score:master' into master
YingtianDt Feb 25, 2024
c372d12
add example temporal submission
YingtianDt Feb 26, 2024
40d2d2b
Merge branch 'master' of https://github.com/YingtianDt/brain-score
YingtianDt Feb 26, 2024
c0827b3
Merge branch 'brain-score:master' into master
YingtianDt Feb 26, 2024
92cede9
complete new framework
YingtianDt Feb 27, 2024
e74015d
Merge branch 'master' of https://github.com/YingtianDt/brain-score
YingtianDt Feb 27, 2024
088b9af
new module: temporal model helpers
YingtianDt Mar 3, 2024
c5b9097
change the arch of temporal; add tutorials
YingtianDt Mar 5, 2024
8f301a3
improve: better naming
YingtianDt Mar 5, 2024
3c3e475
update: wrapper tutorial on brain model
YingtianDt Mar 5, 2024
34fbc08
add feature: inferencer identifier tracked by extractor for result ca…
YingtianDt Mar 5, 2024
f6c2fe4
fix: video fps sampling; need more tests!
YingtianDt Mar 6, 2024
7e948ed
fix bugs: video sampling based on fps was wrong.
YingtianDt Mar 6, 2024
3998027
Merge branch 'brain-score:master' into master
YingtianDt Mar 6, 2024
17ecc5d
add mmaction2 models; add more features to the inferencers
YingtianDt Mar 8, 2024
5fac41c
Merge branch 'master' of https://github.com/YingtianDt/brain-score
YingtianDt Mar 8, 2024
20941fe
Merge branch 'brain-score:master' into master
YingtianDt Mar 11, 2024
89bf58c
PR: temporal model helpers
YingtianDt Mar 11, 2024
1433635
PR fix: not including gitmodules for now
YingtianDt Mar 11, 2024
b678e95
Update brainscore_vision/model_helpers/brain_transformation/temporal.py
YingtianDt Mar 11, 2024
905c964
Update brainscore_vision/model_helpers/brain_transformation/temporal.py
YingtianDt Mar 11, 2024
e1e77ca
Update brainscore_vision/model_helpers/brain_transformation/temporal.py
YingtianDt Mar 11, 2024
817b448
Update brainscore_vision/models/temporal_models/test.py
YingtianDt Mar 11, 2024
ad8cf5a
add mae_st; add ding2012
YingtianDt Mar 11, 2024
749c371
Merge branch 'master' of https://github.com/YingtianDt/brain-score
YingtianDt Mar 11, 2024
95e413e
try new arch
YingtianDt Mar 12, 2024
d020363
merge
YingtianDt Mar 12, 2024
d6960fc
init ding2012
YingtianDt Mar 12, 2024
227e801
add tests for temporal model helpers; add block inferencer
YingtianDt Mar 12, 2024
7906ddd
Delete tests/test_model_helpers/temporal/test___init__.py
YingtianDt Mar 16, 2024
9316398
add benchmark ding2012
YingtianDt Mar 18, 2024
e0ba781
merge pr version
YingtianDt Mar 18, 2024
6151364
resolve merge conflict
YingtianDt Mar 18, 2024
8fcb49f
add mutliple libs for temporal models
YingtianDt Mar 19, 2024
f6b6554
change executor output format; add more inference tests; init load_we…
YingtianDt Mar 19, 2024
bf82677
add openstl
YingtianDt Mar 20, 2024
4d2b669
merge
YingtianDt Mar 20, 2024
66dafe0
update backend for executor
YingtianDt Mar 23, 2024
c7b2a84
feat:load_weight_file and corresponding test
YingtianDt Mar 25, 2024
4b77eab
change:resize strategy changed from bilinear to pooling
YingtianDt Mar 25, 2024
d56f164
change:resize strategy changed from bilinear to pooling
YingtianDt Mar 25, 2024
70fdb9e
fix mae_st submission
YingtianDt Mar 25, 2024
e7c37fc
minor
YingtianDt Mar 25, 2024
beba210
fix:dtype in assembly time align
YingtianDt Mar 26, 2024
83585a1
minor
YingtianDt Mar 26, 2024
d2d2673
update model submissions
YingtianDt Mar 26, 2024
8e84c09
Merge branch 'brain-score:master' into master
YingtianDt Mar 26, 2024
0b0d598
fix dependency
YingtianDt Mar 27, 2024
89d5424
Merge branch 'master' of https://github.com/YingtianDt/brain-score
YingtianDt Mar 27, 2024
df51aea
refactor: simplify the inferencer methods
YingtianDt Mar 27, 2024
f6f3105
fix:block inferencer, neuroid coord while merging
YingtianDt Mar 28, 2024
323eb8a
fix:inferencer identifier
YingtianDt Mar 29, 2024
244d38d
fix:weigh download
YingtianDt Apr 2, 2024
657996f
Merge branch 'brain-score:master' into master
YingtianDt Apr 3, 2024
bfbb470
change tests to have max_workers=1
YingtianDt Apr 4, 2024
a062a07
Merge branch 'master' of https://github.com/YingtianDt/brain-score
YingtianDt Apr 4, 2024
af3cbbb
revert screen.py
YingtianDt Apr 4, 2024
01fb289
not submit region_layer_map
YingtianDt Apr 4, 2024
cb18a88
remove torch dependency
YingtianDt Apr 4, 2024
3e47774
make fake modules in tests
YingtianDt Apr 4, 2024
64f2ec4
add torch to requirements; avoid torch in tests
YingtianDt Apr 4, 2024
20aca51
minor
YingtianDt Apr 4, 2024
2f7a3d8
minor
YingtianDt Apr 4, 2024
2d411de
Merge branch 'brain-score:master' into master
YingtianDt Apr 4, 2024
0dbf122
np.object changed to object
YingtianDt Apr 4, 2024
d19a633
Merge branch 'master' of https://github.com/YingtianDt/brain-score
YingtianDt Apr 4, 2024
4ac951c
remove return in tests
YingtianDt Apr 4, 2024
f0c6e39
fix insertion position bug
YingtianDt Apr 6, 2024
e2a2ce3
Merge branch 'master' into master
mschrimpf Apr 8, 2024
64079b8
Apply suggestions from code review
YingtianDt Apr 8, 2024
465fb07
add: more type hints and comments
YingtianDt Apr 8, 2024
d430141
minor
YingtianDt Apr 8, 2024
effb0f8
pr:only commit temporal model helpers
YingtianDt Apr 8, 2024
20e1b0a
pr: add one model for example
YingtianDt Apr 8, 2024
c0e7b13
Merge branch 'master' into master
mschrimpf Apr 9, 2024
95065a5
undo whole_brain in Brainodel.RecordingTarget
YingtianDt Apr 9, 2024
61737bd
Merge branch 'master' of https://github.com/YingtianDt/brain-score
YingtianDt Apr 9, 2024
0febc8e
Merge branch 'master' into master
mschrimpf Apr 11, 2024
28a5f40
use logger and fix newlines
mschrimpf Apr 11, 2024
b560af3
fix: video fps with copy was wrong
YingtianDt Apr 26, 2024
bea3d26
feat:fractional max_spatial_size
YingtianDt Apr 26, 2024
70b2370
downsample layers in VideoMAE
YingtianDt Apr 26, 2024
8b7a733
Merge branch 'master' of https://github.com/YingtianDt/brain-score
YingtianDt Apr 26, 2024
bd6f436
fix:video sampling wrong duration
YingtianDt Apr 26, 2024
2ed5123
add more tests
YingtianDt Apr 29, 2024
0ae615c
merge upstream
YingtianDt Apr 30, 2024
05fd380
fix merge
YingtianDt Apr 30, 2024
e4b11bb
fix merge
YingtianDt Apr 30, 2024
ebd3c0a
module refactor; add more input test
YingtianDt May 14, 2024
85f5217
add more temporal models
YingtianDt May 14, 2024
faf7fdd
Merge branch 'master' of https://github.com/brain-score/vision
YingtianDt May 14, 2024
3e14419
fix videomaev2 sha
YingtianDt May 15, 2024
427ae93
fix:temporal_modelmae_st
YingtianDt May 17, 2024
f3bd1fe
change:video conservative loading; rename:image to pil image
YingtianDt May 27, 2024
e204c66
fix:video last frame sampling; fix_time_naming
YingtianDt May 30, 2024
4343a73
Merge branch 'master' of https://github.com/brain-score/vision
YingtianDt May 30, 2024
7c7a23b
ignore pytest_cache
YingtianDt May 30, 2024
ccfdf87
Merge branch 'master' into master
mschrimpf Jun 7, 2024
a6ba086
Merge branch 'master' into master
YingtianDt Jun 17, 2024
7164de4
gerge branch 'master' of https://github.com/YingtianDt/brain-score
YingtianDt Jun 17, 2024
94bb305
re-trigger tests
YingtianDt Jun 18, 2024
342779c
Merge branch 'brain-score:master' into master
YingtianDt Jun 18, 2024
6acb243
add joblib pool error management; fix video/image path recognizer
YingtianDt Jun 18, 2024
ea732d7
Merge branch 'master' of https://github.com/YingtianDt/brain-score
YingtianDt Jun 18, 2024
96bc38b
Merge branch 'master' into master
YingtianDt Jun 20, 2024
fab8741
Merge branch 'master' into master
deirdre-k Jun 21, 2024
c39233b
Merge branch 'master' into master
YingtianDt Jun 24, 2024
91505cb
update: naming of failed to pickle func in joblibmapper
YingtianDt Jun 26, 2024
516492a
Merge branch 'master' into master
YingtianDt Jun 26, 2024
f87d9ac
Merge branch 'brain-score:master' into master
YingtianDt Jun 26, 2024
0f8fee4
add temporal metric helpers
YingtianDt Jul 30, 2024
e06853e
add temporal version of mamjajhong2015
YingtianDt Jul 31, 2024
b1dcaf7
Merge branch 'master' of https://github.com/YingtianDt/brain-score
YingtianDt Jul 31, 2024
57ce832
Merge branch 'master' into master
mike-ferguson Aug 7, 2024
e7dd0ef
Merge branch 'master' into master
YingtianDt Aug 15, 2024
f0243a0
Update benchmark.py
YingtianDt Sep 6, 2024
5542996
Update benchmark.py
YingtianDt Sep 6, 2024
149a6b0
Update brainscore_vision/metric_helpers/temporal.py
YingtianDt Sep 6, 2024
9cdebde
Update brainscore_vision/metrics/internal_consistency/__init__.py
YingtianDt Sep 6, 2024
790851b
Update benchmark.py
YingtianDt Sep 6, 2024
afe5c54
Merge branch 'brain-score:master' into master
YingtianDt Sep 13, 2024
e09eb5d
fix: version_id after file moving; missing dependency
YingtianDt Sep 17, 2024
cdd445f
Merge branch 'brain-score:master' into master
YingtianDt Sep 17, 2024
856f505
Update requirements.txt
YingtianDt Sep 18, 2024
dca4bc6
Update requirements.txt
YingtianDt Sep 18, 2024
797e216
Update requirements.txt
YingtianDt Sep 18, 2024
fe804b5
Merge branch 'brain-score:master' into master
YingtianDt Oct 1, 2024
243467f
Merge branch 'master' into master
mschrimpf Oct 9, 2024
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
14 changes: 7 additions & 7 deletions brainscore_vision/models/temporal_model_AVID_CMA/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,34 +21,34 @@ def get_model(identifier):
weight_path = load_weight_file(
bucket="brainscore-vision",
relative_path="temporal_model_AVID-CMA/AVID-CMA_Kinetics_InstX-N1024-PosW-N64-Top32_checkpoint.pth.tar",
version_id="yx9Pbq3SuNOOd4sX7csTolaHD1iTCx8y",
version_id="ZR41eKh6GYyJ61Kgwf1V4LShzse7A0yC",
sha1="6efe4464ca654a56affff766acf24e89e6f3ffbf"
)

elif identifier == 'AVID-CMA-Audioset':
cfg_path = os.path.join(HOME, "configs/main/avid-cma/audioset/InstX-N1024-PosW-N64-Top32.yaml")
weight_path = load_weight_file(
bucket="brainscore-vision",
relative_path="temporal_model_AVID_CMA/AVID-CMA_Audioset_InstX-N1024-PosW-N64-Top32_checkpoint.pth.tar",
version_id="jSaZgbUohM0ZeoEUUKZiLBo6iz_v8VvQ",
relative_path="temporal_model_AVID-CMA/AVID-CMA_Audioset_InstX-N1024-PosW-N64-Top32_checkpoint.pth.tar",
version_id="8r37ZPc0oD3N0ff4R8Y_S_eV1DNDFs8d",
sha1="9db5eba9aab6bdbb74025be57ab532df808fe3f6"
)

elif identifier == 'AVID-Kinetics400':
cfg_path = os.path.join(HOME, "configs/main/avid/kinetics/Cross-N1024.yaml")
weight_path = load_weight_file(
bucket="brainscore-vision",
relative_path="temporal_model_AVID_CMA/AVID_Kinetics_Cross-N1024_checkpoint.pth.tar",
version_id="XyKt0UOUFsuuyrl6ZREivK8FadRPx34u",
relative_path="temporal_model_AVID-CMA/AVID_Kinetics_Cross-N1024_checkpoint.pth.tar",
version_id="OjapKttPf.6dvZLO8L89GZddpcizDu_J",
sha1="d3a04f856d29421ba8de37808593a3fad4d4794f"
)

elif identifier == 'AVID-Audioset':
cfg_path = os.path.join(HOME, "configs/main/avid/audioset/Cross-N1024.yaml")
weight_path = load_weight_file(
bucket="brainscore-vision",
relative_path="temporal_model_AVID_CMA/AVID_Audioset_Cross-N1024_checkpoint.pth.tar",
version_id="0Sxuhn8LsYXQC4FnPfJ7rw7uU6kDlKgc",
relative_path="temporal_model_AVID-CMA/AVID_Audioset_Cross-N1024_checkpoint.pth.tar",
version_id="VoWZzJllTVFu8oVk7ocf_K7pk11Gbh19",
sha1="b48d8428a1a2526ccca070f810333df18bfce5fd"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
avid_cma @ git+https://github.com/YingtianDt/AVID-CMA.git
torch
torchvision
torchvision
pyav
6 changes: 3 additions & 3 deletions brainscore_vision/models/temporal_model_GDT/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@ def get_model(identifier):
pth = load_weight_file(
bucket="brainscore-vision",
relative_path="temporal_model_GDT/gdt_K400.pth",
version_id="JpU_tnCzrbTejn6sOrQMk8eRsJ97yFgt",
version_id="xdpDRV0gnRhULZGL7lwjGxGKqp2hnP1_",
sha1="7f12c60670346b1aab15194eb44c341906e1bca6"
)
elif dataset == "IG65M":
pth = load_weight_file(
bucket="brainscore-vision",
relative_path="temporal_model_GDT/gdt_IG65M.pth",
version_id="R.NoD6VAbFbJdf8tg5jnXIWB3hQ8GlSD",
version_id="S0_ZVFA2K96ZoVLx26edAxILPm7S.Gf6",
sha1="3dcee3af61691e1e7e47e4b115be6808f4ea8172"
)
elif dataset == "HowTo100M":
pth = load_weight_file(
bucket="brainscore-vision",
relative_path="temporal_model_GDT/gdt_HT100M.pth",
version_id="BVRl9t_134PoKZCn9W54cyfkImCW2ioq",
version_id=".fli2qSf6pWqbLyY413ZID578sJrC.L.",
sha1="a9a979c82e83b955794814923af736eb34e6f080"
)
else:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,14 +41,14 @@ def get_model(identifier="s3d-HowTo100M"):
model_pth = load_weight_file(
bucket="brainscore-vision",
relative_path="temporal_model_S3D_text_video/s3d_howto100m.pth",
version_id="hRp6I8bpwreIMUVL0H.zCdK0hqRggL7n",
version_id="3k_iwjSqYUwMRdri9IH2JZn5yMGCnayc",
sha1="31e99d2a1cd48f2259ca75e719ac82c8b751ea75"
)

dict_pth = load_weight_file(
bucket="brainscore-vision",
relative_path="temporal_model_S3D_text_video/s3d_dict.npy",
version_id="4NxVLe8DSL6Uue0F7e2rz8HZuOk.tkBI",
version_id="FWHuvz5CDjNJyG1IuzEqkHU9zzmPv62p",
sha1="d368ff7d397ec8240f1f963b5efe8ff245bac35f"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
torchvision
S3D_HowTo100M @ git+https://github.com/YingtianDt/S3D_HowTo100M
4 changes: 2 additions & 2 deletions brainscore_vision/models/temporal_model_VideoMAE/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def get_model(identifier, num_frames=16):
pth = load_weight_file(
bucket="brainscore-vision",
relative_path='temporal_model_VideoMAE/vit_b_k400_pt_1200e.pth',
version_id="Oi3VboRZujNyZAcwf5q7XZ2M8q1cPO6o",
version_id="YkdCqz8ywKAqAPMLv6iE9SfihuqExfcJ",
sha1="8faf42df13f619a8970d653695e98f0643760b54"
)
num_blocks = 12
Expand All @@ -48,7 +48,7 @@ def get_model(identifier, num_frames=16):
pth = load_weight_file(
bucket="brainscore-vision",
relative_path='temporal_model_VideoMAE/vit_l_k400_pt_1200e.pth',
version_id="MiPfczDaVponDGuUBrEPqmT.BiVvh_I1",
version_id="v8VsUKnAJQ23dyLiYOSYyjSrHI_zB60o",
sha1="7ff6acbba221f85d7148223ec932ad7c57f2f40c"
)
num_blocks = 24
Expand Down
4 changes: 2 additions & 2 deletions brainscore_vision/models/temporal_model_VideoMAEv2/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def get_model(identifier):
pth = load_weight_file(
bucket="brainscore-vision",
relative_path="temporal_model_VideoMAEv2/vit_g_hybrid_pt_1200e.pth",
version_id="TxtkfbeMV105dzpzTwi0Kn5glnvQvIrq",
version_id="0SPWwIlsWFhY98bKgo7ZRRNTXkcT.dBO",
sha1="9048f2bc0b0c7ba4d0e5228f3a7c0bef4dbaca69"
)
num_blocks = 40
Expand All @@ -63,7 +63,7 @@ def get_model(identifier):
pth = load_weight_file(
bucket="brainscore-vision",
relative_path="temporal_model_VideoMAEv2/vit_b_hybrid_pt_800e.pth",
version_id="rRjpYq21dAQ5KaCLbEHK.YaLZ_fbMPKw",
version_id="VLgKVXOX2XYJQvaIOqAAVDvd5xvjx3.d",
sha1="1e3602691964b1eb6f7c33529119243a5b235635"
)
num_blocks = 12
Expand Down
4 changes: 2 additions & 2 deletions brainscore_vision/models/temporal_model_mae_st/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def get_model(identifier):
load_path = load_weight_file(
bucket="brainscore-vision",
relative_path="temporal_model_mae_st/mae_pretrain_vit_large_k400.pth",
version_id="cPcP4AzpG95CimQ5Pn.CHKnGUJlLXM3m",
version_id="bHQ1XRM.a4NfgbP53TR5AsgvUsN40R_j",
sha1="c7fb91864a4ddf8b99309440121a3abe66b846bb"
)

Expand All @@ -64,7 +64,7 @@ def get_model(identifier):
load_path = load_weight_file(
bucket="brainscore-vision",
relative_path="temporal_model_mae_st/mae_pretrain_vit_huge_k400.pth",
version_id="IYKa8QiocgBzo3EhsBouS62HboK6iqYT",
version_id="ARS9kz2wQQ29iRsssyc7u_kfA4wLDAji",
sha1="177e48577142ca01949c08254834ffa1198b9eb4"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
mae_st @ git+https://github.com/YingtianDt/mae_st.git
torch
torchvision
torchvision
iopath
simplejson
timm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
importlib-metadata<5
mmaction2 @ git+https://github.com/YingtianDt/mmaction2.git@533edc3
mmengine
mmaction2 @ git+https://github.com/YingtianDt/mmaction2.git
mmengine==0.10.4
mmcv==2.1.0
torch
torchvision
torchvision
Loading