Skip to content

Commit ab0a18e

Browse files
committed
TEST: Purge get_data() from algorithms.tests.*
1 parent 4ceba42 commit ab0a18e

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

nipype/algorithms/tests/test_CompCor.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ def test_tcompcor_no_percentile(self):
124124
ccinterface = TCompCor(num_components=6, realigned_file=self.realigned_file)
125125
ccinterface.run()
126126

127-
mask = nb.load("mask_000.nii.gz").get_data()
127+
mask = nb.load("mask_000.nii.gz").dataobj
128128
num_nonmasked_voxels = np.count_nonzero(mask)
129129
assert num_nonmasked_voxels == 1
130130

@@ -153,7 +153,7 @@ def test_tcompcor_asymmetric_dim(self):
153153
)
154154

155155
TCompCor(realigned_file=asymmetric_data).run()
156-
assert nb.load("mask_000.nii.gz").get_data().shape == asymmetric_shape[:3]
156+
assert nb.load("mask_000.nii.gz").shape == asymmetric_shape[:3]
157157

158158
def test_compcor_bad_input_shapes(self):
159159
# dim 0 is < dim 0 of self.mask_files (2)
@@ -183,12 +183,12 @@ def test_tcompcor_merge_intersect_masks(self):
183183
).run()
184184
if method == "union":
185185
assert np.array_equal(
186-
nb.load("mask_000.nii.gz").get_data(),
186+
nb.load("mask_000.nii.gz").dataobj,
187187
([[[0, 0], [0, 0]], [[0, 0], [1, 0]]]),
188188
)
189189
if method == "intersect":
190190
assert np.array_equal(
191-
nb.load("mask_000.nii.gz").get_data(),
191+
nb.load("mask_000.nii.gz").dataobj,
192192
([[[0, 0], [0, 0]], [[0, 1], [0, 0]]]),
193193
)
194194

@@ -197,8 +197,7 @@ def test_tcompcor_index_mask(self):
197197
realigned_file=self.realigned_file, mask_files=self.mask_files, mask_index=1
198198
).run()
199199
assert np.array_equal(
200-
nb.load("mask_000.nii.gz").get_data(),
201-
([[[0, 0], [0, 0]], [[0, 1], [0, 0]]]),
200+
nb.load("mask_000.nii.gz").dataobj, ([[[0, 0], [0, 0]], [[0, 1], [0, 0]]])
202201
)
203202

204203
def test_tcompcor_multi_mask_no_index(self):

nipype/algorithms/tests/test_normalize_tpms.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
def test_normalize_tpms(tmpdir):
2020

2121
in_mask = example_data("tpms_msk.nii.gz")
22-
mskdata = nb.load(in_mask, mmap=NUMPY_MMAP).get_data()
22+
mskdata = np.asanyarray(nb.load(in_mask, mmap=NUMPY_MMAP).dataobj)
2323
mskdata[mskdata > 0.0] = 1.0
2424

2525
mapdata = []
@@ -32,8 +32,8 @@ def test_normalize_tpms(tmpdir):
3232
out_files.append(tmpdir.join("normtpm_%02d.nii.gz" % i).strpath)
3333

3434
im = nb.load(mapname, mmap=NUMPY_MMAP)
35-
data = im.get_data()
36-
mapdata.append(data.copy())
35+
data = im.get_fdata()
36+
mapdata.append(data)
3737

3838
nb.Nifti1Image(2.0 * (data * mskdata), im.affine, im.header).to_filename(
3939
filename
@@ -45,7 +45,7 @@ def test_normalize_tpms(tmpdir):
4545
sumdata = np.zeros_like(mskdata)
4646

4747
for i, tstfname in enumerate(out_files):
48-
normdata = nb.load(tstfname, mmap=NUMPY_MMAP).get_data()
48+
normdata = nb.load(tstfname, mmap=NUMPY_MMAP).get_fdata()
4949
sumdata += normdata
5050
assert np.all(normdata[mskdata == 0] == 0)
5151
assert np.allclose(normdata, mapdata[i])

nipype/algorithms/tests/test_splitmerge.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ def test_split_and_merge(tmpdir):
1515

1616
in_mask = example_data("tpms_msk.nii.gz")
1717
dwfile = tmpdir.join("dwi.nii.gz").strpath
18-
mskdata = nb.load(in_mask, mmap=NUMPY_MMAP).get_data()
19-
aff = nb.load(in_mask, mmap=NUMPY_MMAP).affine
18+
mask_img = nb.load(in_mask, mmap=NUMPY_MMAP)
19+
mskdata = np.asanyarray(mask_img.dataobj)
20+
aff = mask_img.affine
2021

2122
dwshape = (mskdata.shape[0], mskdata.shape[1], mskdata.shape[2], 6)
2223
dwdata = np.random.normal(size=dwshape)
@@ -25,7 +26,7 @@ def test_split_and_merge(tmpdir):
2526

2627
resdw, resmsk, resid = split_rois(dwfile, in_mask, roishape=(20, 20, 2))
2728
merged = merge_rois(resdw, resid, in_mask)
28-
dwmerged = nb.load(merged, mmap=NUMPY_MMAP).get_data()
29+
dwmerged = nb.load(merged, mmap=NUMPY_MMAP).get_fdata(dtype=np.float32)
2930

3031
dwmasked = dwdata * mskdata[:, :, :, np.newaxis]
3132

nipype/algorithms/tests/test_stats.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def test_ActivationCount(tmpdir):
1919
diff = nb.load(res.outputs.out_file)
2020
pos = nb.load(res.outputs.acm_pos)
2121
neg = nb.load(res.outputs.acm_neg)
22-
assert np.allclose(diff.get_data(), pos.get_data() - neg.get_data())
22+
assert np.allclose(diff.get_fdata(), pos.get_fdata() - neg.get_fdata())
2323

2424

2525
@pytest.mark.parametrize(
@@ -43,8 +43,8 @@ def test_ActivationCount_normaldistr(tmpdir, threshold, above_thresh):
4343
pos = nb.load(res.outputs.acm_pos)
4444
neg = nb.load(res.outputs.acm_neg)
4545
assert np.isclose(
46-
pos.get_data().mean(), above_thresh * 1.0e-2, rtol=0.1, atol=1.0e-4
46+
pos.get_fdata().mean(), above_thresh * 1.0e-2, rtol=0.1, atol=1.0e-4
4747
)
4848
assert np.isclose(
49-
neg.get_data().mean(), above_thresh * 1.0e-2, rtol=0.1, atol=1.0e-4
49+
neg.get_fdata().mean(), above_thresh * 1.0e-2, rtol=0.1, atol=1.0e-4
5050
)

0 commit comments

Comments
 (0)