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.

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

Updates benchmarks for new S3 bucket/versions #1636

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
20 changes: 10 additions & 10 deletions brainscore_vision/data/baker2022/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@
# normal distortion:
stimulus_set_registry['Baker2022_normal_distortion'] = lambda: load_stimulus_set_from_s3(
identifier='Baker2022_normal_distortion',
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1="17d4db7458a29a787d12bb29c34e91daef1872bf",
zip_sha1="2c726abaf081c8a9828269a559222f8c6eea0e4f",
csv_version_id="upenpJUf5t_sZpuqmQOkARfnDx1ITvi0",
zip_version_id="GO0K_jHqUMWVYcV2DoM4ka.HHv.KzrSf")
csv_version_id="null",
zip_version_id="null")

data_registry['Baker2022_normal_distortion'] = lambda: load_assembly_from_s3(
identifier='Baker2022_normal_distortion',
version_id="7HACUgvwlGp_mIWb62BFzh8JlMwtDxpo",
version_id="null",
sha1="46c79a48bf2dbd995a9305d8fbc03a134a852e17",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
cls=BehavioralAssembly,
stimulus_set_loader=lambda: load_stimulus_set('Baker2022_normal_distortion'),
)

# inverted distortion:
stimulus_set_registry['Baker2022_inverted_distortion'] = lambda: load_stimulus_set_from_s3(
identifier='Baker2022_inverted_distortion',
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1="91e452e4651024c2b382694edfcbc7bdc6c3189b",
zip_sha1="4740a096af994c2232350469c664e53796f17a05",
csv_version_id="yiKAKACwcvMygzX27DI3BSG5h599Eji_",
zip_version_id="ZAmZEaRp0S2txTdXjn3LBY_vcFXaALPr")
csv_version_id="null",
zip_version_id="null")

data_registry['Baker2022_inverted_distortion'] = lambda: load_assembly_from_s3(
identifier='Baker2022_inverted_distortion',
version_id="7MV4uklu3pL0I9LB2xlHWvlnOjG7Flbv",
version_id="null",
sha1="b76fb57b25a58ca68db78d188fd0a783e1dcaf73",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
cls=BehavioralAssembly,
stimulus_set_loader=lambda: load_stimulus_set('Baker2022_inverted_distortion'),
)
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@
assembly.name = 'Baker2022_inverted_distortion'

# upload to S3
package_data_assembly('brainio_brainscore', assembly, assembly_identifier=assembly.name,
package_data_assembly('brainscore-storage/brainio_brainscore', assembly, assembly_identifier=assembly.name,
stimulus_set_identifier='Baker2022_inverted_distortion',
assembly_class_name="BehavioralAssembly", bucket_name="brainio-brainscore")
assembly_class_name="BehavioralAssembly", bucket_name="brainscore-storage/brainio_brainscore")
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,5 @@
stimuli.name = 'Baker2022_inverted_distortion'

# upload to S3
package_stimulus_set("brainio_brainscore", stimuli, stimulus_set_identifier=stimuli.name,
bucket_name="brainio-brainscore")
package_stimulus_set("brainscore-storage/brainio_brainscore", stimuli, stimulus_set_identifier=stimuli.name,
bucket_name="brainscore-storage/brainio_brainscore")
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,6 @@


# upload to S3
package_data_assembly('brainio_brainscore', assembly, assembly_identifier=assembly.name,
package_data_assembly('brainscore-storage/brainio_brainscore', assembly, assembly_identifier=assembly.name,
stimulus_set_identifier='Baker2022_normal_distortion',
assembly_class_name="BehavioralAssembly", bucket_name="brainio-brainscore")
assembly_class_name="BehavioralAssembly", bucket_name="brainscore-storage/brainio_brainscore")
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,5 @@
stimuli.name = 'Baker2022_normal_distortion' # give the StimulusSet an identifier name

# upload to S3
package_stimulus_set("brainio_brainscore", stimuli, stimulus_set_identifier=stimuli.name,
bucket_name="brainio-brainscore")
package_stimulus_set("brainscore-storage/brainio_brainscore", stimuli, stimulus_set_identifier=stimuli.name,
bucket_name="brainscore-storage/brainio_brainscore")
6 changes: 3 additions & 3 deletions brainscore_vision/data/barbumayo2019/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
# stimulus set
stimulus_set_registry['BarbuMayo2019'] = lambda: load_stimulus_set_from_s3(
identifier="BarbuMayo2019",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1="e4d8888ccb6beca28636e6698e7beb130e278e12",
zip_sha1="1365eb2a7231516806127a7d2a908343a7ac9464",
csv_version_id="3H1nicJcmKZgqfPV.ouH5jZln3GlZ3Lr",
zip_version_id="sx9cN3NFBBnQCnUCa85ziyWJxTUaPJGf")
csv_version_id="null",
zip_version_id="null")
20 changes: 10 additions & 10 deletions brainscore_vision/data/bashivankar2019/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
# assemblies
data_registry['BashivanKar2019.naturalistic'] = lambda: load_assembly_from_s3(
identifier="dicarlo.BashivanKar2019.naturalistic",
version_id="jDlQnpuhORCtzITHfOFcJiogR7jg8ihJ",
version_id="null",
sha1="1ec2f32ef800f0c6e15879d883be1d55b51b8b67",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
cls=NeuronRecordingAssembly,
stimulus_set_loader=lambda: load_stimulus_set('BashivanKar2019.naturalistic'),
)

data_registry['BashivanKar2019.synthetic'] = lambda: load_assembly_from_s3(
identifier="dicarlo.BashivanKar2019.synthetic",
version_id="30CNHSBYS_HN5tEuM1aa5hDFlFKq6gbI",
version_id="null",
sha1="f687c8d26f8943dc379dbcbe94d3feb148400c6b",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
cls=NeuronRecordingAssembly,
stimulus_set_loader=lambda: load_stimulus_set('BashivanKar2019.synthetic'),
)
Expand All @@ -36,17 +36,17 @@
# naturalistic
stimulus_set_registry['BashivanKar2019.naturalistic'] = lambda: load_stimulus_set_from_s3(
identifier="BashivanKar2019.naturalistic",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1="48ef84282552b8796142ffe7d0d2c632f8ef061a",
zip_sha1="d7b71b431cf23d435395205f1e38036a9e10acca",
csv_version_id="oPBzXglOBfXhFIDiNYJ8veuPTGYRvThW",
zip_version_id="YaEhNEoCIMD.NCO6DN29U.BB.x.8_Qzl")
csv_version_id="null",
zip_version_id="null")

# synthetic
stimulus_set_registry['BashivanKar2019.synthetic'] = lambda: load_stimulus_set_from_s3(
identifier="BashivanKar2019.synthetic",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1="81da195e9b2a128b228fc4867e23ae6b21bd7abd",
zip_sha1="e2de33f25c5c19bcfb400055c1db399d553487e5",
csv_version_id="D6rXwY6tL76Dqb1MkNKxW_8j2DaSRT7M",
zip_version_id="LmHolJMPFb42uq9B8sOZui_LiWZdIpTA")
csv_version_id="null",
zip_version_id="null")
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@ def main():
assert responses_synth_concat.shape ==(21360, 233, 1)
package_data_assembly(
responses_synth_concat,
assembly_identifier="dicarlo.BashivanKar2019.synthetic",
assembly_identifier=None,
stimulus_set_identifier=stimuli_synth.identifier,
bucket_name='brainio-dicarlo'
bucket_name='brainscore-storage/'
)


Expand Down
16 changes: 8 additions & 8 deletions brainscore_vision/data/bmd2024/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,62 +7,62 @@
identifier='BMD_2024_texture_1',
version_id='0WF1iCvgHZGDrCrkigGCfUy3iGTGS69M',
sha1='050cef2bd38fe0e0c6d55c9a4ba0b1c57550a072',
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
cls=BehavioralAssembly,
stimulus_set_loader=lambda: load_stimulus_set('BMD2024.texture_1'))

data_registry['BMD2024.texture_2'] = lambda: load_assembly_from_s3(
identifier='BMD_2024_texture_2',
version_id='Exn4klT3qUYC6aQIanUox7MSjgHLn.t_',
sha1='1f9f4ee938df509c0cbeaec7fdfe0f40997da331',
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
cls=BehavioralAssembly,
stimulus_set_loader=lambda: load_stimulus_set('BMD2024.texture_2'))

data_registry['BMD2024.dotted_1'] = lambda: load_assembly_from_s3(
identifier='BMD_2024_dotted_1',
version_id='tMtSvkgphUn_C9a1WtoAWHmcgrA9oH5o',
sha1='eb16feffe392087b4c40ef249850825f702e7911',
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
cls=BehavioralAssembly,
stimulus_set_loader=lambda: load_stimulus_set('BMD2024.dotted_1'))

data_registry['BMD2024.dotted_2'] = lambda: load_assembly_from_s3(
identifier='BMD_2024_dotted_2',
version_id='JF_vla60eynLMfgqCyjjkn_u8Bb.HQOV',
sha1='297833a094513b99ae434e581df09ac64cd6582f',
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
cls=BehavioralAssembly,
stimulus_set_loader=lambda: load_stimulus_set('BMD2024.dotted_2'))


stimulus_set_registry['BMD2024.texture_1'] = lambda: load_stimulus_set_from_s3(
identifier='BMD_2024_texture_1',
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1='395911b2933d675b98dda7bae422f11648d8e86d',
zip_sha1='cfde36c93dc9070ef5dfaa0a992c9d2420af3460',
csv_version_id='2815L7UhBfYYCyZ7MgNdPsOXXcRLT1YZ',
zip_version_id='EelSX0uvmm.B6LzTPtQgWbrauUmPHmjl')

stimulus_set_registry['BMD2024.texture_2'] = lambda: load_stimulus_set_from_s3(
identifier='BMD_2024_texture_2',
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1='98ff8e3a1ca6f632ebc2daa909804314bc1b7e31',
zip_sha1='31c9d8449b25da8ad3cb034eee04db9193027fcb',
csv_version_id='gFqcLlA6xcmv1rpUoADKNsgyNYSV.G6T',
zip_version_id='c6B88cKdrD7YmUA1BXJoUeCMmAUbFzZw')

stimulus_set_registry['BMD2024.dotted_1'] = lambda: load_stimulus_set_from_s3(
identifier='BMD_2024_dotted_1',
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1='de4214666237a0be39810ec4fefd6ec8d2a2e881',
zip_sha1='b4ab1355665b5bf3bf81b7aa6eccfd396c96bda2',
csv_version_id='8OuzqjMhNuFDu41iEjGPeNBz4I1kxlCV',
zip_version_id='ue19A9hVTDzTKaXkfnJCrKaes.JLTLtv')

stimulus_set_registry['BMD2024.dotted_2'] = lambda: load_stimulus_set_from_s3(
identifier='BMD_2024_dotted_2',
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1='4555daa5257dee10c6c6a5625d3bb2d94452e294',
zip_sha1='20337c1fac66ed0eec16410c6801cca830e6c20c',
csv_version_id='l4E.CZVizNrwprRZHIjHEppBQK8LpBHM',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,6 @@ def collect_BMD2024_behavioral_assembly(data_path,condition):
assembly_identifier=assembly.name,
stimulus_set_identifier=assembly.name,
assembly_class_name="BehavioralAssembly",
bucket_name="brainio-brainscore")
bucket_name="brainscore-storage/brainio_brainscore")

print(prints)
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def collect_BMD_2024_stimulus_set(condition, stimuli_directory, meta_filepath):
prints = package_stimulus_set(catalog_name=None,
proto_stimulus_set=assembly,
stimulus_set_identifier=assembly.name,
bucket_name="brainio-brainscore")
bucket_name="brainscore-storage/brainio_brainscore")
print(prints)


10 changes: 5 additions & 5 deletions brainscore_vision/data/bracci2019/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@
# Human Stimulus Set
stimulus_set_registry["Bracci2019"] = lambda: load_stimulus_set_from_s3(
identifier="Bracci2019",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1="05b1af9b8e6ed478ea49339e11b0024c2da8c35f",
zip_sha1="a79b249e758421f46ec781301cd4b498f64853ce",
csv_version_id="0B6H2003B.aOml25nlWsxSTkQib1ndZP",
zip_version_id="DCqvGpnGL7J0JbQ6T6uAax5M5jbe_O8Q",
csv_version_id="null",
zip_version_id="null",
)

# Human Data Assembly (brain)
data_registry["Bracci2019"] = lambda: load_assembly_from_s3(
identifier="Bracci2019",
version_id="0w_eqBDiwxlSkuqSGK0sqUz1YhsgvY3C",
version_id="null",
sha1="cbec165bb20f09d0527fddba7cfbf115a396a2f3",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
cls=NeuroidAssembly,
)
2 changes: 1 addition & 1 deletion brainscore_vision/data/bracci2019/data_packaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ def main():
data_assembly.name,
human_stimulus_set.name,
"NeuroidAssembly",
"brainio-brainscore",
"brainscore-storage/brainio-brainscore",
)

print(human_stimulus_meta)
Expand Down
10 changes: 5 additions & 5 deletions brainscore_vision/data/cadena2017/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
# assembly
data_registry['Cadena2017'] = lambda: reindex(load_assembly_from_s3(
identifier="tolias.Cadena2017",
version_id="94KHymrNxUzoF6q56DYWg6n0vCdkLUEU",
version_id="null",
sha1="69bcaaa9370dceb0027beaa06235ef418c3d7063",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
cls=NeuronRecordingAssembly,
stimulus_set_loader=lambda: load_stimulus_set('Cadena2017'),
))
Expand All @@ -45,8 +45,8 @@ def reindex(assembly: DataAssembly) -> DataAssembly: # make sure we have the ex
# stimulus set
stimulus_set_registry['Cadena2017'] = lambda: load_stimulus_set_from_s3(
identifier="Cadena2017",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1="f55b174cc4540e5612cfba5e695324328064b051",
zip_sha1="88cc2ce3ef5e197ffd1477144a2e6a68d424ef6c",
csv_version_id="sHOpsR5jhCIPA4EwpqAhH3fLQX4L3sxM",
zip_version_id="HJVbo4DimkTtP5uS5zxA1rzMTUE6qU1B")
csv_version_id="null",
zip_version_id="null")
10 changes: 5 additions & 5 deletions brainscore_vision/data/cichy2019/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
# assembly
data_registry['Cichy2019'] = lambda: load_assembly_from_s3(
identifier="aru.Cichy2019",
version_id="83yFgsx5rc6pgpra4UiMxDDvgaV6ytU8",
version_id="null",
sha1="701e63be62b642082d476244d0d91d510b3ff05d",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
cls=DataAssembly,
stimulus_set_loader=lambda: load_stimulus_set('Cichy2019'),
)
Expand All @@ -31,8 +31,8 @@
# stimulus set
stimulus_set_registry['Cichy2019'] = lambda: load_stimulus_set_from_s3(
identifier="Cichy2019",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1="281c4d9d0dd91a2916674638098fe94afb87d29a",
zip_sha1="d2166dd9c2720cb24bc520f5041e6830779c0240",
csv_version_id="NXC3IR_XZG9QuMtxL7QFtDIcmGJrMKz4",
zip_version_id="5lAaoRzViKRDRyqiTYXm2PB3ADaV2Szo")
csv_version_id="null",
zip_version_id="null")
16 changes: 8 additions & 8 deletions brainscore_vision/data/coggan2024_behavior/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,28 @@
# stimulus set
stimulus_set_registry['Coggan2024_behavior'] = lambda: load_stimulus_set_from_s3(
identifier="tong.Coggan2024_behavior",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1="01c312c4c16f7acc5afddaafcf826e5af58b13e2",
zip_sha1="1c070b88fa45e9e69d58f95466cb6406a45a4873",
csv_version_id="oyBtiZLEnNnCOHGzH5e12uzO9FrQ.ja_",
zip_version_id="sgPkAllzqOgP6KZcuGenFdAecBmRYApo")
csv_version_id="null",
zip_version_id="null")

# fitting stimuli
stimulus_set_registry['Coggan2024_behavior_fitting'] = lambda: (
load_stimulus_set_from_s3(
identifier="tong.Coggan2024_behavior_fitting",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1="136e48992305ea78a4fb77e9dfc75dcf01e885d0",
zip_sha1="24e68f5ba2f8f2105daf706307642637118e7d36",
csv_version_id="wq1GTpsTqB9ODddVSWpd4HMOllY7Q08_",
zip_version_id="IU.vvRmzBBhxErneMgQHoB1OKaeyen17"))
csv_version_id="null",
zip_version_id="null"))

# behavioral data
data_registry['Coggan2024_behavior'] = lambda: load_assembly_from_s3(
identifier="tong.Coggan2024_behavior",
version_id="Xuov.DxZnqSD1.Ia.ZySbSu8IW7cFigT",
version_id="null",
sha1="c1ac4a268476c35bbe40081358667a03d3544631",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
cls=BehavioralAssembly,
stimulus_set_loader=lambda: load_stimulus_set('Coggan2024_behavior'),
)
4 changes: 2 additions & 2 deletions brainscore_vision/data/coggan2024_behavior/data_packaging.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
catalog_name=None,
proto_stimulus_set=stimuli,
stimulus_set_identifier=stimuli.name,
bucket_name="brainio-brainscore")
bucket_name="brainscore-storage/brainio-brainscore")
print(packaged_stimulus_metadata)


Expand All @@ -161,6 +161,6 @@
assembly_identifier=assembly.name,
stimulus_set_identifier=stimuli.name,
assembly_class_name="BehavioralAssembly",
bucket_name="brainio-brainscore",
bucket_name="brainscore-storage/brainio-brainscore",
catalog_identifier=None)
print(packaged_behavioral_metadata)
10 changes: 5 additions & 5 deletions brainscore_vision/data/coggan2024_fMRI/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@
# stimulus set
stimulus_set_registry['Coggan2024_fMRI'] = lambda: load_stimulus_set_from_s3(
identifier="tong.Coggan2024_fMRI",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
csv_sha1="0089f5f8fd3f2de14de12ed736a0f88575f8e1ee",
zip_sha1="e26fdea4d866799526dea183f5bfb9792718822a",
csv_version_id="q0kxLCC8m6LSaLEQzB26sfyoKgJJwkAs",
zip_version_id="SZwyN4ZgEmpW22YlcbqIbL9c0QudlMAp")
csv_version_id="null",
zip_version_id="null")

# fMRI data
data_registry['Coggan2024_fMRI'] = lambda: load_assembly_from_s3(
identifier="tong.Coggan2024_fMRI",
version_id="6P898Mio3VBsFx_qbC9rJECMELNGRprH",
version_id="null",
sha1="da3adbca5247d0491d366f94e8431fb3e4e58db2",
bucket="brainio-brainscore",
bucket="brainscore-storage/brainio-brainscore",
cls=NeuroidAssembly,
stimulus_set_loader=lambda: load_stimulus_set('Coggan2024_fMRI'),
)
Expand Down
Loading
Loading