Skip to content

Commit

Permalink
Sync master into develop. Triggered by PR (#1444)
Browse files Browse the repository at this point in the history
* Allow region_layer_map json to be loaded into BrainModel during commitment (#1314)

* Add load_region_layer_map_from_json

* Cleaned up load_region_layer_map_json function and added error handling.

* Replaced print with logging

* Recommended fix:
- logger
- Path instead of OS
- Avoid cwd

* Recommended fix:
- logger
- Path instead of OS
- Avoid cwd

* Layer Mapping Orchestrator (build:114) (#1399)

* Add region_layer_map directories with .gitkeep for models: resnet18_imagenet_full resnet34_imagenet_full resnet50_imagenet_full

* Add resnet18_imagenet_full.json to region_layer_map for model resnet18_imagenet_full

* Add resnet34_imagenet_full.json to region_layer_map for model resnet34_imagenet_full

* Add resnet50_imagenet_full.json to region_layer_map for model resnet50_imagenet_full

* Delete brainscore_vision/models/scaling_models/region_layer_map/.gitkeep

---------

Co-authored-by: Jenkins <[email protected]>
Co-authored-by: Kartik Pradeepan <[email protected]>

* Add layer-mapping workflow to trigger Jenkins (#1361)

* Create map_new_plugins workflow

* Create map_new_plugins workflow

* Change trigger and status checks (#1408)

* Add label change as trigger (#1410)

* Updating sha (#1412)

* Debug map_new_plugins.yml (#1414)

* Remove parsing of status/checks in loop (#1416)

* Quote mismatch fix (#1418)

Recommended by ChatGPT because I got tired of trying to deal with quotes

* Update imagenet paths (#1406)

* update stim path to mounted s3 bucket

* update imagenet csv paths

* Loosen map-new-plugins trigger (#1422)

* Update auto merge workflow to require mapping (#1424)

* Separate map_new_plugins into two jobs and allow re-run (#1426)

* Remove set and use GitHub_output (#1428)

* Update map_new_plugins.yml (#1430)

* remove ' from benchmark id (#1432)

* brain-score.org submission (user:538) | (public:False) (#1434)

* Layer Mapping Orchestrator (build:115) (#1400)

* Add region_layer_map directories with .gitkeep for models: resnet101_imagenet_full resnet152_imagenet_full resnet18_ecoset_full resnet34_ecoset_full resnet50_ecoset_full resnet101_ecoset_full resnet152_ecoset_full

* Add resnet18_ecoset_full.json to region_layer_map for model resnet18_ecoset_full

* Add resnet34_ecoset_full.json to region_layer_map for model resnet34_ecoset_full

* Add resnet50_ecoset_full.json to region_layer_map for model resnet50_ecoset_full

* Add resnet101_imagenet_full.json to region_layer_map for model resnet101_imagenet_full

* Add resnet101_ecoset_full.json to region_layer_map for model resnet101_ecoset_full

* Add resnet152_ecoset_full.json to region_layer_map for model resnet152_ecoset_full

* Add efficientnet_b2_imagenet_full.json to region_layer_map for model efficientnet_b2_imagenet_full

* Add efficientnet_b0_imagenet_full.json to region_layer_map for model efficientnet_b0_imagenet_full

* Add resnet50_imagenet_1_seed-0.json to region_layer_map for model resnet50_imagenet_1_seed-0

* Add resnet50_imagenet_100_seed-0.json to region_layer_map for model resnet50_imagenet_100_seed-0

* Add resnet50_imagenet_10_seed-0.json to region_layer_map for model resnet50_imagenet_10_seed-0

* Add deit_small_imagenet_10_seed-0.json to region_layer_map for model deit_small_imagenet_10_seed-0

* Add deit_small_imagenet_100_seed-0.json to region_layer_map for model deit_small_imagenet_100_seed-0

* Add deit_small_imagenet_full_seed-0.json to region_layer_map for model deit_small_imagenet_full_seed-0

* Add deit_small_imagenet_1_seed-0.json to region_layer_map for model deit_small_imagenet_1_seed-0

* Add deit_base_imagenet_full_seed-0.json to region_layer_map for model deit_base_imagenet_full_seed-0

* Add convnext_small_imagenet_100_seed-0.json to region_layer_map for model convnext_small_imagenet_100_seed-0

* Add efficientnet_b1_imagenet_full.json to region_layer_map for model efficientnet_b1_imagenet_full

* Add convnext_small_imagenet_1_seed-0.json to region_layer_map for model convnext_small_imagenet_1_seed-0

* Add convnext_small_imagenet_10_seed-0.json to region_layer_map for model convnext_small_imagenet_10_seed-0

* Add convnext_small_imagenet_full_seed-0.json to region_layer_map for model convnext_small_imagenet_full_seed-0

* Add convnext_base_imagenet_full_seed-0.json to region_layer_map for model convnext_base_imagenet_full_seed-0

* Add convnext_large_imagenet_full_seed-0.json to region_layer_map for model convnext_large_imagenet_full_seed-0

* Add deit_large_imagenet_full_seed-0.json to region_layer_map for model deit_large_imagenet_full_seed-0

* Delete brainscore_vision/models/scaling_models/region_layer_map/.gitkeep

---------

Co-authored-by: Jenkins <[email protected]>
Co-authored-by: Kartik Pradeepan <[email protected]>

* Adding CvTs (#1436)

* Added CvTs with identifiers and image sizes

* Adds the bibtex references to new and existing CvTs

* Fixed cvt_13 and cvt_21 init.py swaps

* Removed CvT W24 change

* Renamed model identifiers

* Layer Mapping Orchestrator (build:126) (#1437)

* Add region_layer_map directories with .gitkeep for models: cvt_cvt-13-224-in1k_4_LucyV4 cvt_cvt-13-384-in1k_4_LucyV4 cvt_cvt-13-384-in22k_finetuned-in1k_4_LucyV4 cvt_cvt-21-224-in1k_4_LucyV4 cvt_cvt-21-384-in1k_4_LucyV4 cvt_cvt-21-384-in22k_finetuned-in1k_4_LucyV4

* Add cvt_cvt-13-384-in22k_finetuned-in1k_4_LucyV4.json to region_layer_map for model cvt_cvt-13-384-in22k_finetuned-in1k_4_LucyV4

* Add cvt_cvt-13-224-in1k_4_LucyV4.json to region_layer_map for model cvt_cvt-13-224-in1k_4_LucyV4

* Add cvt_cvt-13-384-in1k_4_LucyV4.json to region_layer_map for model cvt_cvt-13-384-in1k_4_LucyV4

* Add cvt_cvt-21-224-in1k_4_LucyV4.json to region_layer_map for model cvt_cvt-21-224-in1k_4_LucyV4

* Add cvt_cvt-21-384-in1k_4_LucyV4.json to region_layer_map for model cvt_cvt-21-384-in1k_4_LucyV4

* Add cvt_cvt-21-384-in22k_finetuned-in1k_4_LucyV4.json to region_layer_map for model cvt_cvt-21-384-in22k_finetuned-in1k_4_LucyV4

* Delete brainscore_vision/models/cvt_cvt_13_384_in1k_4/region_layer_map/.gitkeep

* Delete brainscore_vision/models/cvt_cvt_13_384_in22k_finetuned_in1k_4/region_layer_map/.gitkeep

* Delete brainscore_vision/models/cvt_cvt_21_224_in1k_4/region_layer_map/.gitkeep

* Delete brainscore_vision/models/cvt_cvt_21_384_in1k_4/region_layer_map/.gitkeep

* Delete brainscore_vision/models/cvt_cvt_21_384_in22k_finetuned_in1k_4/region_layer_map/.gitkeep

---------

Co-authored-by: Jenkins <[email protected]>
Co-authored-by: KartikP <[email protected]>
Co-authored-by: Kartik Pradeepan <[email protected]>

* Layer Mapping Orchestrator (build:127) (#1441)

* Add region_layer_map directories with .gitkeep for models: alexnet

* Add alexnet.json to region_layer_map for model alexnet

---------

Co-authored-by: Jenkins <[email protected]>
Co-authored-by: KartikP <[email protected]>

* Layer Mapping Orchestrator (build:128) (#1443)

* Add region_layer_map directories with .gitkeep for models: resnet50_tutorial

* Add resnet50_tutorial.json to region_layer_map for model resnet50_tutorial

---------

Co-authored-by: Jenkins <[email protected]>
Co-authored-by: KartikP <[email protected]>

---------

Co-authored-by: Katherine Fairchild <[email protected]>
Co-authored-by: Jenkins <[email protected]>
Co-authored-by: Sam Winebrake <[email protected]>
Co-authored-by: LucyV4 <[email protected]>
Co-authored-by: KartikP <[email protected]>
  • Loading branch information
6 people authored Nov 8, 2024
1 parent 1c17f05 commit 9147d0e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion brainscore_vision/models/cvt_cvt_13_224_in1k_4/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
model_registry['cvt_cvt-13-224-in1k_4_LucyV4'] = \
lambda: ModelCommitment(identifier='cvt_cvt-13-224-in1k_4_LucyV4',
activations_model=get_model('cvt_cvt-13-224-in1k_4_LucyV4'),
layers=get_layers('cvt_cvt-13-224-in1k_4_LucyV4'))
layers=get_layers('cvt_cvt-13-224-in1k_4_LucyV4'))
3 changes: 1 addition & 2 deletions brainscore_vision/models/cvt_cvt_13_224_in1k_4/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ def get_bibtex(model_identifier):
}"""



def load_preprocess_images(image_filepaths, image_size, processor=None, **kwargs):
images = load_images(image_filepaths)
# images = [<PIL.Image.Image image mode=RGB size=400x400 at 0x7F8654B2AC10>, ...]
Expand Down Expand Up @@ -140,4 +139,4 @@ def create_static_video(image, num_frames, normalize_0to1=False, channel_dim=3):
# 'embeddings.patch_embeddings.projection',
https://github.com/search?q=repo%3Abrain-score%2Fmodel-tools%20channel_x&type=code
"""
"""
3 changes: 1 addition & 2 deletions brainscore_vision/models/cvt_cvt_13_224_in1k_4/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@
@pytest.mark.travis_slow
def test_has_identifier():
model = brainscore_vision.load_model('cvt_cvt-13-224-in1k_4_LucyV4')
assert model.identifier == 'cvt_cvt-13-224-in1k_4_LucyV4'

assert model.identifier == 'cvt_cvt-13-224-in1k_4_LucyV4'
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"IT": "layer3", "V2": "layer2", "V1": "layer2", "V4": "layer2"}

0 comments on commit 9147d0e

Please sign in to comment.