From a36be1c63eb7f3a1e5c1002b5ce8f670afcea422 Mon Sep 17 00:00:00 2001 From: Sam Winebrake <85908068+samwinebrake@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:34:48 -0400 Subject: [PATCH 1/5] add tong. to identifier --- brainscore_vision/benchmarks/coggan2024_behavior/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/brainscore_vision/benchmarks/coggan2024_behavior/__init__.py b/brainscore_vision/benchmarks/coggan2024_behavior/__init__.py index a6ca7c28c..467ed89f3 100644 --- a/brainscore_vision/benchmarks/coggan2024_behavior/__init__.py +++ b/brainscore_vision/benchmarks/coggan2024_behavior/__init__.py @@ -4,5 +4,5 @@ from .benchmark import ( Coggan2024_behavior_ConditionWiseAccuracySimilarity) -benchmark_registry['Coggan2024_behavior-ConditionWiseAccuracySimilarity'] = ( +benchmark_registry['tong.Coggan2024_behavior-ConditionWiseAccuracySimilarity'] = ( Coggan2024_behavior_ConditionWiseAccuracySimilarity) From 0335d424fb592f073fe9be3a5ed88011edcff2fa Mon Sep 17 00:00:00 2001 From: Sam Winebrake <85908068+samwinebrake@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:35:20 -0400 Subject: [PATCH 2/5] add tong. to benchmark identifiers --- brainscore_vision/benchmarks/coggan2024_fMRI/__init__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/brainscore_vision/benchmarks/coggan2024_fMRI/__init__.py b/brainscore_vision/benchmarks/coggan2024_fMRI/__init__.py index 20ece8608..3d25aae39 100644 --- 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 From 31c5ae1b298d321383ce728c648ad9d5c8e9d71c Mon Sep 17 00:00:00 2001 From: Sam Winebrake <85908068+samwinebrake@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:44:27 -0400 Subject: [PATCH 3/5] Update test.py w/ tong. --- brainscore_vision/benchmarks/coggan2024_behavior/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/brainscore_vision/benchmarks/coggan2024_behavior/test.py b/brainscore_vision/benchmarks/coggan2024_behavior/test.py index 218194684..712ac8b9e 100644 --- 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) From de6325a8eae6df2f4d3420e133aa417889ce5027 Mon Sep 17 00:00:00 2001 From: Sam Winebrake <85908068+samwinebrake@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:44:46 -0400 Subject: [PATCH 4/5] Update test.py with tong. --- brainscore_vision/benchmarks/coggan2024_fMRI/test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/brainscore_vision/benchmarks/coggan2024_fMRI/test.py b/brainscore_vision/benchmarks/coggan2024_fMRI/test.py index 6847cee5f..dfafab588 100644 --- 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) From 1b5835d027d545dfef094ef72b3285cd1bbc9f39 Mon Sep 17 00:00:00 2001 From: Sam Winebrake <85908068+samwinebrake@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:59:06 -0400 Subject: [PATCH 5/5] Update __init__.py --- brainscore_vision/benchmarks/coggan2024_behavior/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/brainscore_vision/benchmarks/coggan2024_behavior/__init__.py b/brainscore_vision/benchmarks/coggan2024_behavior/__init__.py index 467ed89f3..a1ba0a2e8 100644 --- a/brainscore_vision/benchmarks/coggan2024_behavior/__init__.py +++ b/brainscore_vision/benchmarks/coggan2024_behavior/__init__.py @@ -6,3 +6,4 @@ benchmark_registry['tong.Coggan2024_behavior-ConditionWiseAccuracySimilarity'] = ( Coggan2024_behavior_ConditionWiseAccuracySimilarity) +