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.

Sign up for GitHub

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

Coggan benchmark identifiers fix #1370

Merged
merged 5 commits into from
Oct 23, 2024
Merged

Coggan benchmark identifiers fix #1370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a36be1c
add tong. to identifier
samwinebrake Oct 22, 2024
0335d42
add tong. to benchmark identifiers
samwinebrake Oct 22, 2024
31c5ae1
Update test.py w/ tong.
samwinebrake Oct 22, 2024
de6325a
Update test.py with tong.
samwinebrake Oct 22, 2024
1b5835d
Update __init__.py
samwinebrake Oct 22, 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
3 changes: 2 additions & 1 deletion brainscore_vision/benchmarks/coggan2024_behavior/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@
from .benchmark import (
Coggan2024_behavior_ConditionWiseAccuracySimilarity)

benchmark_registry['Coggan2024_behavior-ConditionWiseAccuracySimilarity'] = (
benchmark_registry['tong.Coggan2024_behavior-ConditionWiseAccuracySimilarity'] = (
Coggan2024_behavior_ConditionWiseAccuracySimilarity)

4 changes: 2 additions & 2 deletions brainscore_vision/benchmarks/coggan2024_behavior/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions brainscore_vision/benchmarks/coggan2024_fMRI/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

4 changes: 2 additions & 2 deletions brainscore_vision/benchmarks/coggan2024_fMRI/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand All @@ -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)

Loading