Sync master into develop. Triggered by PR (#1377)

* Revert "add sam_test_resnet_3 to models (#1309)" (#1310) This reverts commit 85ed01e. * add sam_test_resnet_4 to models (#1313) Co-authored-by: Jenkins <[email protected]> * add mvimgnet_rf to models (#1339) Co-authored-by: Jenkins <[email protected]> * add mvimgnet_ss_00 to models (#1340) Co-authored-by: Jenkins <[email protected]> * add mvimgnet_ss_03 to models (#1342) Co-authored-by: Jenkins <[email protected]> * add mvimgnet_ss_05 to models (#1343) Co-authored-by: Jenkins <[email protected]> * add mvimgnet_ss_03 to models (#1345) Co-authored-by: Jenkins <[email protected]> * add mvimgnet_ms_05 to models (#1346) Co-authored-by: Jenkins <[email protected]> * add mvimgnet_ss_02 to models (#1347) Co-authored-by: Jenkins <[email protected]> * add mvimgnet_ss_04 to models (#1348) Co-authored-by: Jenkins <[email protected]> * Remove brainscore vision from env lock to make env updates easier (#1351) * Coggan benchmark identifiers fix (#1370) * add tong. to identifier * add tong. to benchmark identifiers * Update test.py w/ tong. * Update test.py with tong. * Update __init__.py --------- Co-authored-by: Sam Winebrake <[email protected]> Co-authored-by: Katherine Fairchild <[email protected]> Co-authored-by: Jenkins <[email protected]>
brain-score · Oct 25, 2024 · fd0ada4 · fd0ada4
1 parent df550ad
commit fd0ada4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/brainscore_vision/benchmarks/coggan2024_behavior/__init__.py b/brainscore_vision/benchmarks/coggan2024_behavior/__init__.py
@@ -4,5 +4,6 @@
 from .benchmark import (
     Coggan2024_behavior_ConditionWiseAccuracySimilarity)
 
-benchmark_registry['Coggan2024_behavior-ConditionWiseAccuracySimilarity'] = (
+benchmark_registry['tong.Coggan2024_behavior-ConditionWiseAccuracySimilarity'] = (
     Coggan2024_behavior_ConditionWiseAccuracySimilarity)
+
diff --git a/brainscore_vision/benchmarks/coggan2024_behavior/test.py b/brainscore_vision/benchmarks/coggan2024_behavior/test.py
@@ -7,13 +7,13 @@
 
 
 def test_benchmark_registry():
-    assert ('Coggan2024_behavior-ConditionWiseAccuracySimilarity' in
+    assert ('tong.Coggan2024_behavior-ConditionWiseAccuracySimilarity' in
             benchmark_registry)
 
 @pytest.mark.private_access
 def test_benchmarks():
     benchmark = load_benchmark(
-        'Coggan2024_behavior-ConditionWiseAccuracySimilarity')
+        'tong.Coggan2024_behavior-ConditionWiseAccuracySimilarity')
     model = load_model('alexnet')
     result = benchmark(model)
     assert result.values == approx(0.1318, abs=.001)

diff --git a/brainscore_vision/benchmarks/coggan2024_fMRI/__init__.py b/brainscore_vision/benchmarks/coggan2024_fMRI/__init__.py
@@ -8,8 +8,8 @@
     Coggan2024_IT,
 )
 
-benchmark_registry['Coggan2024_fMRI.V1-rdm'] = Coggan2024_V1
-benchmark_registry['Coggan2024_fMRI.V2-rdm'] = Coggan2024_V2
-benchmark_registry['Coggan2024_fMRI.V4-rdm'] = Coggan2024_V4
-benchmark_registry['Coggan2024_fMRI.IT-rdm'] = Coggan2024_IT
+benchmark_registry['tong.Coggan2024_fMRI.V1-rdm'] = Coggan2024_V1
+benchmark_registry['tong.Coggan2024_fMRI.V2-rdm'] = Coggan2024_V2
+benchmark_registry['tong.Coggan2024_fMRI.V4-rdm'] = Coggan2024_V4
+benchmark_registry['tong.Coggan2024_fMRI.IT-rdm'] = Coggan2024_IT
 
diff --git a/brainscore_vision/benchmarks/coggan2024_fMRI/test.py b/brainscore_vision/benchmarks/coggan2024_fMRI/test.py
@@ -8,7 +8,7 @@
 
 @pytest.mark.parametrize('region', ['V1', 'V2', 'V4', 'IT'])
 def test_benchmark_registry(region):
-    assert f'Coggan2024_fMRI.{region}-rdm' in benchmark_registry
+    assert f'tong.Coggan2024_fMRI.{region}-rdm' in benchmark_registry
 
 
 @pytest.mark.parametrize('region', ['V1', 'V2', 'V4', 'IT'])
@@ -19,7 +19,7 @@ def test_benchmarks(region):
         V4=0.3008136,
         IT=0.4486508)[region]
     model = load_model('alexnet')
-    benchmark = load_benchmark(f'Coggan2024_fMRI.{region}-rdm')
+    benchmark = load_benchmark(f'tong.Coggan2024_fMRI.{region}-rdm')
     score = benchmark(model)
     assert score.values == approx(expected_score, abs=.005)