Skip to content

Commit 5d1d44d

Browse files
committed
ENH add parameter dataset in get_data_home
1 parent fc2580a commit 5d1d44d

22 files changed

Lines changed: 74 additions & 67 deletions

tutorials/movies/00_download_vim5.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@
3030
# --------
3131

3232
# path of the data directory
33-
import os
3433
from voxelwise_tutorials.io import get_data_home
35-
directory = os.path.join(get_data_home(), "vim-5")
34+
directory = get_data_home(dataset="vim-5")
3635
print(directory)
3736

3837
###############################################################################

tutorials/movies/01_plot_explainable_variance.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@
4040
###############################################################################
4141
# Path of the data directory
4242
# --------------------------
43-
import os
4443
from voxelwise_tutorials.io import get_data_home
45-
directory = os.path.join(get_data_home(), "vim-5")
44+
directory = get_data_home(dataset="vim-5")
4645
print(directory)
4746

4847
###############################################################################
@@ -59,6 +58,7 @@
5958
###############################################################################
6059
# First, we load the fMRI responses on the test set, which contains brain
6160
# responses to ten (10) repeats of the same stimulus.
61+
import os
6262
file_name = os.path.join(directory, 'responses', f'{subject}_responses.hdf')
6363
Y_test = load_hdf5_array(file_name, key="Y_test")
6464
print("(n_repeats, n_samples_test, n_voxels) =", Y_test.shape)

tutorials/movies/02_plot_wordnet_model.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@
3232
###############################################################################
3333
# Path of the data directory
3434
# --------------------------
35-
import os
3635
from voxelwise_tutorials.io import get_data_home
37-
directory = os.path.join(get_data_home(), "vim-5")
36+
directory = get_data_home(dataset="vim-5")
3837
print(directory)
3938

4039
###############################################################################
@@ -53,6 +52,7 @@
5352
# to estimate the generalization performance of the selected model. The
5453
# test set contains multiple repetitions of the same experiment to estimate
5554
# an upper bound of the model prediction accuracy (cf. previous example).
55+
import os
5656
import numpy as np
5757
from voxelwise_tutorials.io import load_hdf5_array
5858

tutorials/movies/03_plot_hemodynamic_response.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828
###############################################################################
2929
# Path of the data directory
3030
# --------------------------
31-
import os
3231
from voxelwise_tutorials.io import get_data_home
33-
directory = os.path.join(get_data_home(), "vim-5")
32+
directory = get_data_home(dataset="vim-5")
3433
print(directory)
3534

3635
###############################################################################
@@ -43,6 +42,7 @@
4342
# -------------
4443
#
4544
# We first load the fMRI responses.
45+
import os
4646
import numpy as np
4747
from voxelwise_tutorials.io import load_hdf5_array
4848

tutorials/movies/04_plot_motion_energy_model.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@
2929
###############################################################################
3030
# Path of the data directory
3131
# --------------------------
32-
import os
3332
from voxelwise_tutorials.io import get_data_home
34-
directory = os.path.join(get_data_home(), "vim-5")
33+
directory = get_data_home(dataset="vim-5")
3534
print(directory)
3635

3736
###############################################################################
@@ -44,8 +43,8 @@
4443
# -------------
4544
#
4645
# We first load the fMRI responses.
46+
import os
4747
import numpy as np
48-
4948
from voxelwise_tutorials.io import load_hdf5_array
5049

5150
file_name = os.path.join(directory, "responses", f"{subject}_responses.hdf")

tutorials/movies/05_plot_banded_ridge_model.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
###############################################################################
2222
# Path of the data directory
2323
# --------------------------
24-
import os
2524
from voxelwise_tutorials.io import get_data_home
26-
directory = os.path.join(get_data_home(), "vim-5")
25+
directory = get_data_home(dataset="vim-5")
2726
print(directory)
2827

2928
###############################################################################
@@ -37,8 +36,8 @@
3736
#
3837
# As in the previous examples, we first load the fMRI responses, which are our
3938
# regression targets.
39+
import os
4040
import numpy as np
41-
4241
from voxelwise_tutorials.io import load_hdf5_array
4342

4443
file_name = os.path.join(directory, "responses", f"{subject}_responses.hdf")

tutorials/movies/06_extract_motion_energy.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,16 @@
2828
###############################################################################
2929

3030
# path of the data directory
31-
import os
3231
from voxelwise_tutorials.io import get_data_home
33-
directory = os.path.join(get_data_home(), "vim-5")
32+
directory = get_data_home(dataset="vim-5")
3433
print(directory)
3534

3635
###############################################################################
3736
# Load the stimuli images
3837
# -----------------------
3938
#
4039
# Here the data is not loaded in memory, we only take a peek at the data shape.
41-
40+
import os
4241
import h5py
4342

4443
first_file_name = os.path.join(directory, 'stimuli', 'train_00.hdf')

tutorials/movies_deprecated/00_download_vim2.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
# --------
2121

2222
# path of the data directory
23-
import os
2423
from voxelwise_tutorials.io import get_data_home
25-
directory = os.path.join(get_data_home(), "vim-2")
24+
directory = get_data_home(dataset="vim-2")
2625
print(directory)
2726

2827
###############################################################################

tutorials/movies_deprecated/01_extract_motion_energy.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,14 @@
2727
# (We downloaded the files in the previous script.)
2828

2929
# path of the data directory
30-
import os
3130
from voxelwise_tutorials.io import get_data_home
32-
directory = os.path.join(get_data_home(), "vim-2")
31+
directory = get_data_home(dataset="vim-2")
3332
print(directory)
3433

3534
###############################################################################
3635
# Here the data is not loaded in memory, we only take a peak at the data shape.
37-
38-
import h5py
3936
import os
37+
import h5py
4038

4139
with h5py.File(os.path.join(directory, 'Stimuli.mat'), 'r') as f:
4240
print(f.keys()) # Show all variables

tutorials/movies_deprecated/02_plot_ridge_model.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,20 +32,20 @@
3232
# -------------
3333

3434
# path of the data directory
35-
import os
3635
from voxelwise_tutorials.io import get_data_home
37-
directory = os.path.join(get_data_home(), "vim-2")
36+
directory = get_data_home(dataset="vim-2")
3837
print(directory)
3938

4039
# modify to use another subject
4140
subject = "subject1"
4241

4342
###############################################################################
4443
# Here the data is not loaded in memory, we only take a peek at the data shape.
44+
import os
4545
import h5py
46-
import os.path as op
4746

48-
with h5py.File(op.join(directory, f'VoxelResponses_{subject}.mat'), 'r') as f:
47+
file_name = os.path.join(directory, f'VoxelResponses_{subject}.mat')
48+
with h5py.File(file_name, 'r') as f:
4949
print(f.keys()) # Show all variables
5050
for key in f.keys():
5151
print(f[key])
@@ -57,7 +57,7 @@
5757

5858
from voxelwise_tutorials.io import load_hdf5_array
5959

60-
file_name = op.join(directory, f'VoxelResponses_{subject}.mat')
60+
file_name = os.path.join(directory, f'VoxelResponses_{subject}.mat')
6161
Y_train = load_hdf5_array(file_name, key='rt')
6262
Y_test_repeats = load_hdf5_array(file_name, key='rva')
6363

@@ -90,7 +90,7 @@
9090
# Here we load the motion-energy features, that are going to be used for the
9191
# linear regression model.
9292

93-
file_name = op.join(directory, "features", "motion_energy.hdf")
93+
file_name = os.path.join(directory, "features", "motion_energy.hdf")
9494
X_train = load_hdf5_array(file_name, key='X_train')
9595
X_test = load_hdf5_array(file_name, key='X_test')
9696

0 commit comments

Comments
 (0)