diff --git a/brainscore_vision/benchmarks/malania2007/benchmark.py b/brainscore_vision/benchmarks/malania2007/benchmark.py index 7ad587b4d..18bc9e7ee 100644 --- a/brainscore_vision/benchmarks/malania2007/benchmark.py +++ b/brainscore_vision/benchmarks/malania2007/benchmark.py @@ -110,7 +110,12 @@ def __init__(self, condition: str): def __call__(self, candidate: BrainModel): model_responses = {} - candidate.start_task(BrainModel.Task.probabilities, fitting_stimuli=self._fitting_stimuli, + fitting_stimulus_set = place_on_screen( + self._fitting_stimuli, + target_visual_degrees=candidate.visual_degrees(), + source_visual_degrees=self._visual_degrees + ) + candidate.start_task(BrainModel.Task.probabilities, fitting_stimuli=fitting_stimulus_set, number_of_trials=2, require_variance=True) for condition in (self.baseline_condition, self.condition): stimulus_set = place_on_screen( @@ -160,9 +165,15 @@ def __init__(self): def __call__(self, candidate: BrainModel): scores = [] + for condition in self.conditions: - candidate.start_task(BrainModel.Task.probabilities, fitting_stimuli=self._fitting_stimuli[condition], - number_of_trials=2, require_variance=True) + fitting_stimulus_set = place_on_screen( + self._fitting_stimuli[condition], + target_visual_degrees=candidate.visual_degrees(), + source_visual_degrees=self._visual_degrees + ) + candidate.start_task(BrainModel.Task.probabilities, fitting_stimuli=fitting_stimulus_set, + number_of_trials=2, require_variance=True) stimulus_set = place_on_screen( self._stimulus_set, target_visual_degrees=candidate.visual_degrees(), diff --git a/brainscore_vision/data/malania2007/__init__.py b/brainscore_vision/data/malania2007/__init__.py index e6ecbb5cd..d6cb25ea1 100644 --- a/brainscore_vision/data/malania2007/__init__.py +++ b/brainscore_vision/data/malania2007/__init__.py @@ -103,152 +103,152 @@ stimulus_set_registry['Malania2007.equal2'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_equal-2', bucket="brainio-brainscore", - csv_sha1="77e94b9b5122a83ebbaffb4a06fcab68ef652751", - zip_sha1="99826d459f6920dafab72eed69eb2a90492ce796", - csv_version_id="MlRpSz.4.jvVRFAZl8tGEum1P0Q0GtyS", - zip_version_id="vHbAM_FjTbjp5U12BkAelJu4KW6PLYFn" + csv_sha1="36f3c92a1335895b10c4150f5c25a68ab4576d4a", + zip_sha1="80be52e8701ecb8e7fbb81c0bff9c148ddc2b401", + csv_version_id="lkbpUNzhET3.hR.9StpSVvoxh05aWzoi", + zip_version_id="Wd7Fc3QVn1baC53Iy.E5ha4YqWvdybM3" ) stimulus_set_registry['Malania2007.equal2_fit'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_equal-2_fit', bucket="brainio-brainscore", - csv_sha1="bafdfc855c164d3e5443d67dcf9eb7762443f964", - zip_sha1="e52fec1a79ac8837e331b180c2a8a140840d6666", - csv_version_id="PIXEW.2vHvjIBP0Q2KHIpnxns7t9o8Cf", - zip_version_id="h7pp84CYFGLKlPhveD0L5ogePqisk_I7" + csv_sha1="b7105f44d5d781f5e06159008a3f63c9f774c2d1", + zip_sha1="ba5c1bacbb4afe40c5a19eddb07fc9f98312ec69", + csv_version_id="qhsx4_OM0FSCl7SU0hXhhmiJvLnDU6Dm", + zip_version_id="PzGnzHtpGghaHGK6MO4DeSy7w.rDUfRN" ) stimulus_set_registry['Malania2007.equal16'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_equal-16', bucket="brainio-brainscore", - csv_sha1="5fedcff56c302339c3451ae2edbcb846c39c3189", - zip_sha1="b30dc2dc90e4f3d88775622e558db963765f38e0", - csv_version_id="VmRGiQkhPALDwq74NpE2VpTiKTGn.30T", - zip_version_id="c.DOlVULXZingRJ9gVY_NbZwRrj_xs_i" + csv_sha1="14f9f7098831691811abf9953766951edc952203", + zip_sha1="5127e88eaed1ef64247c7cb4262868533fb4ebae", + csv_version_id="bgBDFK3666NPXwINqGcdouvtWy12yqyY", + zip_version_id="zlkMQOE9wfTQHPohmxol4uAR6y0zqwjI" ) stimulus_set_registry['Malania2007.equal16_fit'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_equal-16_fit', bucket="brainio-brainscore", - csv_sha1="3de3e5de19a638767a01ba68cb690dc746c29a77", - zip_sha1="1728920c5ea4fb7b3a3cf3c076165aca65c8b751", - csv_version_id="joAq8JBC_7axZDfLNFgoXFhTCLU_KKr_", - zip_version_id="77JRwdldaHDr6TLW1NnB5HucIrkUCVg." + csv_sha1="2ff7f2f97250b9bcce3d2753be6e5b98e083892b", + zip_sha1="db07ef4862fd9cb65c1e726cacc5914821296a5b", + csv_version_id="cVYkl_N7c36UfjbWqAffYrHVDbPhmiwa", + zip_version_id="azu8FTnJVmsou98co5iVE2G8OemMIl4H" ) stimulus_set_registry['Malania2007.long2'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_long-2', bucket="brainio-brainscore", - csv_sha1="ba65316a63dc688d8dfb410219a28fd02850b991", - zip_sha1="7fd431fbbd4a4dc0cd271624d3297c19a28a70b5", - csv_version_id="_0fqObn6k5KvXurHMsuD4IqtrqbNskyo", - zip_version_id="foL92ndVAAAETzMYHdmMtwIwKxXYhAB." + csv_sha1="153b987c4c6b8a22efb88be26aaa46bd36912c9b", + zip_sha1="07bb413d56ac77fc71823559780cdb16e4df563d", + csv_version_id="nKEYl_hb8tBKOg47O28iLY5.oYyimmAf", + zip_version_id="3BS.xmMHnND1C3bjDsut8qILlzMIJhHQ" ) stimulus_set_registry['Malania2007.long2_fit'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_long-2_fit', bucket="brainio-brainscore", - csv_sha1="b91dd9261c1d47bdd37f9b60eb8066b7b719709f", - zip_sha1="5be3e1cd57b59081103715b5d318505166e0045e", - csv_version_id="mATh8lcVisdsDnPnU6ACE23iBPfpkLZA", - zip_version_id="6nEviShTyCYQKrmxyjDyNov9Skc77eXT" + csv_sha1="8b6d1557879e6271554c0fcb67bf6b2941dad2c8", + zip_sha1="66205529af748ffd88579caef86b107838c0b0da", + csv_version_id="ut0_Zbq97vwzmkk9MY.0h5phJZqp_McX", + zip_version_id="qcGk5zy7KN.vEmLgtZKRYn0OXyWoER9G" ) stimulus_set_registry['Malania2007.long16'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_long-16', bucket="brainio-brainscore", - csv_sha1="1f1b03319b81698ba5e7db389dcd4248f94e45ca", - zip_sha1="97c70462a28905b58058c687880188d634d357f0", - csv_version_id="4RtywQ40hfQA4N80g8lxEScAmMXFRg7E", - zip_version_id="lJy2QosABzHtiA6BJaE4OqCn1w1Jhz2k" + csv_sha1="6c5d45b489bc290e41013d211d18570368012c9b", + zip_sha1="10944e5b65e8da9e52087d3cbbdc6575538c2847", + csv_version_id="sswWsVsgFbPU1psGfoIS.0Goi6b.9Dn2", + zip_version_id="5.gegdwQMNpqcP3FnW4DkTZ7s3bT0j75" ) stimulus_set_registry['Malania2007.long16_fit'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_long-16_fit', bucket="brainio-brainscore", - csv_sha1="d80a02c75b9908301c3c8dc9f7116fecf8e060ec", - zip_sha1="d8819b94d3f502d7a382c8a0db0a34627132e5e2", - csv_version_id="gOxY6tjnT7LO.FDeL1xkRmowl5wYeAia", - zip_version_id="71UAPTnZscIuqdx2dhuW9V0O0DO_TgTM" + csv_sha1="603dc8edb169f39e322f8980972eda1930c300ed", + zip_sha1="a67330e18f1e5d9ad3829d8d8c000487fe3e4d48", + csv_version_id=".qV8En95o4QR_jgvr145ww8xvgAnoIs5", + zip_version_id="h_IWMOSq4uJe91XgOEHFSVwa01vH74.H" ) stimulus_set_registry['Malania2007.short2'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_short-2', bucket="brainio-brainscore", - csv_sha1="bf0252056d2084e855646f624700ab03c19cfc3d", - zip_sha1="eee1270feb7443e7e315d8feb7fb0a6b6908f554", - csv_version_id="zcJqM.ZPwJyiMRWa3RBdvv401yPnLQAp", - zip_version_id="C8WZzAAQ0JGHAAKii4JpvlRhcUOhgSj." + csv_sha1="c8bb84c5468a43348149afe24d5c0ebda233d54e", + zip_sha1="1739226e7e32f60a7bb060fecc14c4a6353ca2ad", + csv_version_id="sGDRldX6CEbDguYsikFArt1P5aMMCueM", + zip_version_id="1RjSss5KIKKfK7UzeGRyQgBu.I47xcIQ" ) stimulus_set_registry['Malania2007.short2_fit'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_short-2_fit', bucket="brainio-brainscore", - csv_sha1="73127d279a2cd254ae4f07b0053580851e84b00c", - zip_sha1="918736349d714a4f784c29bf7e7d218b103e128d", - csv_version_id="iwGRp3_ktAHfJ6r7ktSK9gsthDjKek70", - zip_version_id="6RpplJ9UVXTlvhmFSXla0Qa20b44m8Ds" + csv_sha1="600c754811aa27d80a155c8ac643a81f2347ce3a", + zip_sha1="a1a121dbbbf761caea0a086c2a74ab511f296ed5", + csv_version_id="X7c1h_64KB18noSoG2uaGo2baYTvblKa", + zip_version_id="hx5Of92KkReH_GXPll4MnFrJ.yI3UQhH" ) stimulus_set_registry['Malania2007.short4'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_short-4', bucket="brainio-brainscore", - csv_sha1="816326d89d358f6592bd1f789e5c8d429fbca1cd", - zip_sha1="ff57d976ef75ede9148a4097e90d6cf6c8054d34", - csv_version_id="Waikk.bktXIncCUtCIAyB2EqynGk.H.F", - zip_version_id="rl_muxI4UEpwXVaXuhsqroG..COGILvR" + csv_sha1="181c912c03fdb3e4f89a737584a3a0816859f816", + zip_sha1="820019a7f68db60fac11a5c5f3e42037cf205248", + csv_version_id="pjGwais_x1SzlK9kOWzypnEjWOqIJejt", + zip_version_id="uHY9JlyoIKF7QY.7h2YnaMjoGMOLTS0Y" ) stimulus_set_registry['Malania2007.short4_fit'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_short-4_fit', bucket="brainio-brainscore", - csv_sha1="3512cfd029f4e4299bc41ede519e691d80cfc3d5", - zip_sha1="301386408dd1fb8556881f9a171be2d43dbfec6e", - csv_version_id="UhisdJqiEmkQ_4zsUtAmaxtle2kMZdcD", - zip_version_id="xt_v0xgCB8YUptyPB0yZFHIUcel5MF_x" + csv_sha1="65af7b5d3845a7ea284aefba21734e1d298742c8", + zip_sha1="5234b449c05a43e726543029137fe26930157b09", + csv_version_id=".HhdLMWwnSAJTeBICSys3fjbWpa9V3ee", + zip_version_id="M1eKvnklDoUFZ70K4x9EFiYycyIAybXY" ) stimulus_set_registry['Malania2007.short6'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_short-6', bucket="brainio-brainscore", - csv_sha1="3d5dd9b48a56ba0c31de94b6221b97df962b6f8a", - zip_sha1="120d90a143d1577d4745c3f69291d0db6c7e512e", - csv_version_id="GwGHPJkMDdg8N_.boyj8qJ3ChsEx4w._", - zip_version_id="gIN1O4yz.THvK0Ifm5M3AI58ZACE1QFh" + csv_sha1="57813230e337a09c4c423da927c1f33e62054547", + zip_sha1="dab58e8e996f91af643a0b61247e7ef87f35338d", + csv_version_id="4GLCXr_ii4r7jHsOoRbTZWgdQMrChMwy", + zip_version_id="WQ.jkGJuKabBAt9br9oAYB4wDstDVPer" ) stimulus_set_registry['Malania2007.short6_fit'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_short-6_fit', bucket="brainio-brainscore", - csv_sha1="27a5be4fca190837fc5b75ed2cdbbffbf6b41338", - zip_sha1="c88e05c6cadec88a2c9475b0735323a2b049bd75", - csv_version_id="oMlj7wV85s00hJFE84ym0AJHLCfYHVA6", - zip_version_id="oS.KrBTlcYAgr_lWyA_bIjVc2js_VeUe" + csv_sha1="ea7eb26b42fe9e4fc1ac2ed6e9bad439e8077ce1", + zip_sha1="895e69c835b22b07ee66a0f5f53e7a108ac8287c", + csv_version_id="agzJvrPzCyMsHVPuJeHnu.kWLqCOgTyv", + zip_version_id="6ArqgIEm9wZoihx6_swTilr.fBtd14Gw" ) stimulus_set_registry['Malania2007.short8'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_short-8', bucket="brainio-brainscore", - csv_sha1="8fc35f607196b4c0cdcebd8102d17e3a637e5988", - zip_sha1="a9215ed0cb0f0333582dda65f6afd7015c506ba5", - csv_version_id="gzys8s7j7euMEl7JJpqBFLFHMpFjwbA7", - zip_version_id="3fYb4Iruh3lRKUwC1APqFH4CNbE5DEuk" + csv_sha1="3df9a38605a4590eac8a1151779ba68c3cd54dc1", + zip_sha1="7626364e0776b2809ae36d9cb713c6ff9a0d0c05", + csv_version_id="8OV0COxeMrzgsJnm_vC3q9pEB44LSllC", + zip_version_id="YmcL0kN4_sDVMxegHdurephfduxWHFua" ) stimulus_set_registry['Malania2007.short8_fit'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_short-8_fit', bucket="brainio-brainscore", - csv_sha1="aa4133a9fe19a3c9004a9cb5e6eb5a72564e4883", - zip_sha1="beb9f068794708e41750202b78c438538a40a8fb", - csv_version_id="7N1Z.uiagqBknJUSBQ4mVfHKWgocM5aA", - zip_version_id="kcEOPOkvWymO0wX5j_QKxcNPl9sZsjFd" + csv_sha1="2782c818056b374e86195cbdb0ab1a52ef0d01da", + zip_sha1="ec2fa2a261d965455ffa81acdb0fddef447ad4ff", + csv_version_id="iInrw3cTlTQw0NxQ0bvpbar.jD64IkYh", + zip_version_id="hCWq6yFtO6LlDrAY46B0fhHVWaxJSDGY" ) stimulus_set_registry['Malania2007.short16'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_short-16', bucket="brainio-brainscore", - csv_sha1="addd260c9959f2f315db03c0a39c6c1b01fef685", - zip_sha1="cba4c2866ec692fb808471df7c2fed446d9fb3fe", - csv_version_id="Peu7WU5vanLoZNOFIAbuPzZNPDRgbCSX", - zip_version_id="wFkJkZMC8Fs_HfPJy32CMKcHJWeQIUDB" + csv_sha1="9f5f4e3597006c50530017ce769c8689d43b06f5", + zip_sha1="b67b1e70e8ba698907c95614bcb16eea6ff2f090", + csv_version_id="syxlZTsmHlr6eL8L4aI9ddWbKhr8tLUk", + zip_version_id="6kSKtajsISK6TTE6Ej3UG0oGblFzU9dk" ) stimulus_set_registry['Malania2007.short16_fit'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_short-16_fit', bucket="brainio-brainscore", - csv_sha1="9b340fe242117482f6992f48a805297215ba9924", - zip_sha1="4a90d511a3ceb3307a672177a3ad6b76521e65e5", - csv_version_id="sYBPEmXDgbWipuepciLirlorQE3L8BLc", - zip_version_id="pYvOkrLxadkQ67K3__wmciNwaCW.hyyN" + csv_sha1="5bc0314a6c16095a70049fa5e8df5e9b94345f30", + zip_sha1="0ca3930831ca926ea8b8c3600695b639ff05ddb5", + csv_version_id="HZWWB5vyyMoaTCyM7t.4RwfnNtP4e64I", + zip_version_id="aWy0F_It4iUGAgGJCECz6NOJ__JHr2ib" ) stimulus_set_registry['Malania2007.vernier_only'] = lambda: load_stimulus_set_from_s3( identifier='Malania2007_vernier-only', bucket="brainio-brainscore", - csv_sha1="b2cb0f2ed32426b739f90187ae24ad4adf84110d", - zip_sha1="0e177aea523adc320070196fbb777af4cdba2144", - csv_version_id="c8wpZpqoMqdATlqdoq3srPUi_8fYg6a.", - zip_version_id="28lHgxERhw32Ux6IBCxWWTtRwIaRrwo6" -) + csv_sha1="c71f654fccf1265a95dd0585c186232a2519e944", + zip_sha1="eadff359975c3ba250224ce1942544b091415095", + csv_version_id="PQoHljauNff1yWCMNKd5JEzR8Y38_j.0", + zip_version_id="6gE8TX1J89BnsHmdqb7rIGvRMw.sZdo6" +) \ No newline at end of file