From 1c17f0553f76b23871b7089c9abfd91ec88fdb28 Mon Sep 17 00:00:00 2001 From: Kartik Pradeepan Date: Fri, 8 Nov 2024 08:58:08 -0500 Subject: [PATCH] Sync master into develop. Triggered by PR (#1442) * 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 Co-authored-by: Kartik Pradeepan * 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 Co-authored-by: Kartik Pradeepan * 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 Co-authored-by: KartikP Co-authored-by: Kartik Pradeepan * 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 Co-authored-by: KartikP --------- Co-authored-by: Katherine Fairchild Co-authored-by: Jenkins Co-authored-by: Sam Winebrake <85908068+samwinebrake@users.noreply.github.com> Co-authored-by: LucyV4 <51259433+LucyV4@users.noreply.github.com> Co-authored-by: KartikP --- brainscore_vision/models/alexnet/region_layer_map/alexnet.json | 1 + brainscore_vision/models/cvt_cvt_13_224_in1k_4/model.py | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 brainscore_vision/models/alexnet/region_layer_map/alexnet.json diff --git a/brainscore_vision/models/alexnet/region_layer_map/alexnet.json b/brainscore_vision/models/alexnet/region_layer_map/alexnet.json new file mode 100644 index 000000000..783aa7717 --- /dev/null +++ b/brainscore_vision/models/alexnet/region_layer_map/alexnet.json @@ -0,0 +1 @@ +{"IT": "features.12", "V4": "features.7", "V2": "features.7", "V1": "features.2"} \ No newline at end of file diff --git a/brainscore_vision/models/cvt_cvt_13_224_in1k_4/model.py b/brainscore_vision/models/cvt_cvt_13_224_in1k_4/model.py index 229b64c4d..2c6c58315 100644 --- a/brainscore_vision/models/cvt_cvt_13_224_in1k_4/model.py +++ b/brainscore_vision/models/cvt_cvt_13_224_in1k_4/model.py @@ -50,7 +50,6 @@ def get_bibtex(model_identifier): - def load_preprocess_images(image_filepaths, image_size, processor=None, **kwargs): images = load_images(image_filepaths) # images = [, ...]