Update failing benchmarks to new s3 paths (#1648)

* update failing benchmarks to new s3 paths

* s3.py changes (will be made redundant)

* Delete brainscore_vision/data_helpers/s3.py

* Revert "Delete brainscore_vision/data_helpers/s3.py"

This reverts commit 45a2892.

* change problematic sha hashes

* Update s3.py remove spaces

* Update s3.py remove space again

* change coggan versions

* change bmd sha back

* change bmd and coggan hash

* change freeman version ids

* change freeman version ids

* change version and sha back

---------

Co-authored-by: Kartik Pradeepan <[email protected]>

brainscore_vision/data/bmd2024/__init__.py

@@ -5,65 +5,65 @@
 
 data_registry['BMD2024.texture_1'] = lambda: load_assembly_from_s3(
     identifier='BMD_2024_texture_1',
-    version_id='0WF1iCvgHZGDrCrkigGCfUy3iGTGS69M',
+    version_id='null',
     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_',
+    version_id='null',
     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',
+    version_id='null',
     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',
+    version_id='null',
     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')
+    csv_version_id='null',
+    zip_version_id='null')
 
 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')
+    csv_version_id='null',
+    zip_version_id='null')
 
 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')
+    csv_version_id='null',
+    zip_version_id='null')
 
 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',
-    zip_version_id='.a1HOsF9Q3uwfxY5NHZf2XNuj6brdiTK')
+    csv_version_id='null',
+    zip_version_id='dzELAKHsBx1DKkrWAR9uteJ7K1.FtlAm')

brainscore_vision/data/bmd2024/data_packaging/BMD_2024_data_assembly.py

@@ -86,6 +86,7 @@ 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)

brainscore_vision/data/bmd2024/data_packaging/BMD_2024_simulus_set.py

@@ -42,7 +42,8 @@ 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)
 
 

brainscore_vision/data/coggan2024_fMRI/__init__.py

@@ -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="kAS9zqRPf7zmLCN73I2VB5gBvhrZoU0p",
+    zip_version_id="jmiuKdlsh6.1suR_5FvLFDyg.PCzEZTn")
 
 # fMRI data
 data_registry['Coggan2024_fMRI'] = lambda: load_assembly_from_s3(
     identifier="tong.Coggan2024_fMRI",
-    version_id="6P898Mio3VBsFx_qbC9rJECMELNGRprH",
+    version_id="LRYpTHYG7IoNCexbzZdQM4_LjML_M3CS",
     sha1="da3adbca5247d0491d366f94e8431fb3e4e58db2",
-    bucket="brainio-brainscore",
+    bucket="brainscore-storage/brainio-brainscore",
     cls=NeuroidAssembly,
     stimulus_set_loader=lambda: load_stimulus_set('Coggan2024_fMRI'),
 )

brainscore_vision/data/coggan2024_fMRI/data_packaging.py

@@ -81,7 +81,7 @@
     catalog_name=None,
     proto_stimulus_set=stimuli,
     stimulus_set_identifier=stimuli.name,
-    bucket_name="brainio-brainscore")
+    bucket_name="brainscore-storage/brainio-brainscore")
 pkl.dump(packaged_stimulus_metadata, open('packaged_stimulus_metadata.pkl', 'wb'))
 print(packaged_stimulus_metadata)
 """
@@ -115,7 +115,7 @@
     assembly_identifier=assembly.name,
     stimulus_set_identifier=stimuli.name,
     assembly_class_name="NeuroidAssembly",
-    bucket_name="brainio-brainscore",
+    bucket_name="brainscore-storage/brainio-brainscore",
     catalog_identifier=None)
 
 # save the packaged metadata

brainscore_vision/data/freemanziemba2013/__init__.py

@@ -17,117 +17,118 @@
 # assembly: movshon.FreemanZiemba2013.public
 data_registry['FreemanZiemba2013.public'] = lambda: load_assembly_from_s3(
     identifier="movshon.FreemanZiemba2013.public",
-    version_id=None,  # "Ff3BssTYdRYSXv2hO8ByirYIxsbW1__s",
+    version_id="W2vx7jdh9utZdVumHHarXa4L1zOrA8Fd",
     sha1="761c08f796db4e342555cdb60eef23a4f19ead43",
-    bucket="brainio.contrib",
+    bucket="brainscore-storage/brainio-brainscore",
     cls=NeuronRecordingAssembly,
     stimulus_set_loader=lambda: load_stimulus_set('FreemanZiemba2013.aperture-public'),
 )
 
 # assembly: movshon.FreemanZiemba2013.private
 data_registry['FreemanZiemba2013.private'] = lambda: load_assembly_from_s3(
     identifier="movshon.FreemanZiemba2013.private",
-    version_id=None,  # "3t5ehf.WHJWKX2vUuESVI3PY7ZIUDBkY",
+    version_id="wx5LB7Nq42SV74RQ8Cw6EtyabywsnSyG",
     sha1="63f636fa2e2b51b47a676768a69b06ce95efdd8f",
-    bucket="brainio.contrib",
+    bucket="brainscore-storage/brainio-brainscore",
     cls=NeuronRecordingAssembly,
     stimulus_set_loader=lambda: load_stimulus_set('FreemanZiemba2013.aperture-private'),
 )
 
 # stimulus set: FreemanZiemba2013.aperture-public
 stimulus_set_registry['FreemanZiemba2013.aperture-public'] = lambda: load_stimulus_set_from_s3(
     identifier="FreemanZiemba2013.aperture-public",
-    bucket="brainio-brainscore",
+    bucket="brainscore-storage/brainio-brainscore",
     csv_sha1="194c9b301a4e3e9cff02481d4c19b39331d52660",
     zip_sha1="3a6fec1fc28c212882d6833e267ea8654d289611",
-    csv_version_id="vpWysN7O7LyA9k9PBbrawXauOcqf2LoY",
-    zip_version_id="BQmourU.zS4hvTXs.LBIi.yVunyjZNE.",
+    csv_version_id="null",
+    zip_version_id="null",
 )
 
 # stimulus set: FreemanZiemba2013.aperture-private
 stimulus_set_registry['FreemanZiemba2013.aperture-private'] = lambda: load_stimulus_set_from_s3(
     identifier="FreemanZiemba2013.aperture-private",
-    bucket="brainio-brainscore",
+    bucket="brainscore-storage/brainio-brainscore",
     csv_sha1="65bee31483dd743ae2a19c6af03b9abe5f4d5a41",
     zip_sha1="daa724a4797b23929df59c18744923790edf71cb",
-    csv_version_id="aNkWLYtttATXQ8GUD8zXIRnWq9mEsdHz",
-    zip_version_id="S9eCKFK5b_NcgfnkK2CcddILmkAF8cwP",
+    csv_version_id="Klo0lMygUX0IZPkLoypccXH55a1hZjf2",
+    zip_version_id="nZES.el0vF3KXuRrB2ELQOqzCcxumFMY",
 )
 
 ### secondary assemblies and stimulus sets
 
 # assembly: movshon.FreemanZiemba2013
 data_registry['FreemanZiemba2013'] = lambda: load_assembly_from_s3(
     identifier="movshon.FreemanZiemba2013",
-    version_id="knfzP5wWG3BRWgD0PGy1CXCadExElV0f",
+    version_id="null",
     sha1="f03f1630f0ab1e2dbd51816b47fbf2916876134e",
-    bucket="brainio-brainscore",
+    bucket="brainscore-storage/brainio-brainscore",
     cls=NeuronRecordingAssembly,
     stimulus_set_loader=lambda: load_stimulus_set('FreemanZiemba2013.aperture'),
 )
 
 # assembly: movshon.FreemanZiemba2013.noaperture
 data_registry['FreemanZiemba2013.noaperture'] = lambda: load_assembly_from_s3(
     identifier="movshon.FreemanZiemba2013.noaperture",
-    version_id="3Icsm_HjYeVfzfvsaUJ5qdUT94EaXa5A",
+    version_id="null",
     sha1="6176fd435ab840d284c2c426742c8211622739b5",
-    bucket="brainio-brainscore",
+    bucket="brainscore-storage/brainio-brainscore",
     cls=NeuronRecordingAssembly,
     stimulus_set_loader=lambda: load_stimulus_set('FreemanZiemba2013'),
 )
 
 # assembly: movshon.FreemanZiemba2013.noaperture.public
 data_registry['FreemanZiemba2013.noaperture.public'] = lambda: load_assembly_from_s3(
     identifier="movshon.FreemanZiemba2013.noaperture.public",
-    version_id="ggkwDaFLsKesxL0MZY7fMpHuw3gwaEjs",
+    version_id="null",
     sha1="68dd9e1da7207dc2ae17dbbb1adf628e922d15fa",
-    bucket="brainio-brainscore",
+    bucket="brainscore-storage/brainio-brainscore",
     cls=NeuronRecordingAssembly,
     stimulus_set_loader=lambda: load_stimulus_set('FreemanZiemba2013.public'),
 )
 
 # assembly: movshon.FreemanZiemba2013.noaperture.private
 data_registry['FreemanZiemba2013.noaperture.private'] = lambda: load_assembly_from_s3(
     identifier="movshon.FreemanZiemba2013.noaperture.private",
-    version_id="SBtg_vxBS_7VsFOy5lBs_.6K_pQnyM40",
+    version_id="null",
     sha1="9ffa772ce61754f6f5b7b391436680ebc25bb8dd",
-    bucket="brainio-brainscore",
+    bucket="brainscore-storage/brainio-brainscore",
     cls=NeuronRecordingAssembly,
     stimulus_set_loader=lambda: load_stimulus_set('FreemanZiemba2013.private'),
 )
 
 # stimulus set: FreemanZiemba2013
 stimulus_set_registry['FreemanZiemba2013'] = lambda: load_stimulus_set_from_s3(
     identifier="FreemanZiemba2013",
-    bucket="brainio-brainscore",
+    bucket="brainscore-storage/brainio-brainscore",
     csv_sha1="de0e65a25c7de4c1740f48ac9b1ff513dcfa5caf",
     zip_sha1="bdfc3ba2d878d6aeaa842f9de6abeae50922f2f2",
-    csv_version_id="mWuK8gDwe9IC0bdPNPCo1XldIVM_7cdF",
-    zip_version_id="IxjtDWqHNtPwByvvSbSueXhrrurY1wjr")
+    csv_version_id="null",
+    zip_version_id="null")
 
 # stimulus set: FreemanZiemba2013.public
 stimulus_set_registry['FreemanZiemba2013.public'] = lambda: load_stimulus_set_from_s3(
     identifier="FreemanZiemba2013.public",
-    bucket="brainio-brainscore",
+    bucket="brainscore-storage/brainio-brainscore",
     csv_sha1="b4fee824f361fa0b78d7247ed4192b04cd675d4f",
     zip_sha1="3a5e2cb347eb97d02ff9f7294abc11c1b45a78dc",
-    csv_version_id="js9ggbU.g0bbRLwpbIs6CEQ2JgQIGaRR",
-    zip_version_id="nb6oXpiKafGLNK0Ke6z9kEJNdZK4cOjw")
+    csv_version_id="null",
+    zip_version_id="null")
 
 # stimulus set: FreemanZiemba2013.private
 stimulus_set_registry['FreemanZiemba2013.private'] = lambda: load_stimulus_set_from_s3(
     identifier="FreemanZiemba2013.private",
-    bucket="brainio-brainscore",
+    bucket="brainscore-storage/brainio-brainscore",
     csv_sha1="91bab3340410ff5171490a337c5931545f29da82",
     zip_sha1="e973cf0f98eac3d9673b00b314deb3b85e76c23c",
-    csv_version_id="91GuIJT87Gw5qxv3EfvFD0jf7pmr_XKI",
-    zip_version_id="noTN92.53oxESqpZb79dJPl3EjQa41Sd")
+    csv_version_id="null",
+    zip_version_id="null")
 
 # stimulus set: FreemanZiemba2013.aperture
 stimulus_set_registry['FreemanZiemba2013.aperture'] = lambda: load_stimulus_set_from_s3(
     identifier="FreemanZiemba2013.aperture",
-    bucket="brainio-brainscore",
+    bucket="brainscore-storage/brainio-brainscore",
     csv_sha1="4205eca54974da46accba7812fce25c1b6df58e0",
     zip_sha1="3eacddfecd825b18026da3e4c749d5d1bc9213ed",
-    csv_version_id="AyDAcEdwVToN_rsCuW2OHj7EZNkOu_we",
-    zip_version_id="APXK9Qlgn9PSRCiaWNpBaRla70HW.91h")
+    csv_version_id="null",
+    zip_version_id="null")
+