Skip to content

Commit 6fa87eb

Browse files
Update imio dependency (#181)
* update imio -> brainglobe_utils.image_io everywhere * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
1 parent 89101e7 commit 6fa87eb

File tree

9 files changed

+36
-38
lines changed

9 files changed

+36
-38
lines changed

brainreg/core/backend/niftyreg/run.py

+18-20
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
from pathlib import Path
44

55
import brainglobe_space as bg
6-
import imio
76
import numpy as np
87
from bg_atlasapi import BrainGlobeAtlas
98
from brainglobe_utils.general.system import delete_directory_contents
109
from brainglobe_utils.image.scale import scale_and_convert_to_16_bits
10+
from brainglobe_utils.image_io import load_any, to_tiff
1111

1212
from brainreg.core.backend.niftyreg.parameters import RegistrationParams
1313
from brainreg.core.backend.niftyreg.paths import NiftyRegPaths
@@ -72,7 +72,7 @@ def run_niftyreg(
7272
save_nii(reference, atlas.resolution, niftyreg_paths.brain_filtered)
7373
save_nii(target_brain, atlas.resolution, niftyreg_paths.downsampled_brain)
7474

75-
imio.to_tiff(
75+
to_tiff(
7676
scale_and_convert_to_16_bits(target_brain),
7777
paths.downsampled_brain_path,
7878
)
@@ -125,32 +125,30 @@ def run_niftyreg(
125125
brain_reg.generate_deformation_field(niftyreg_paths.deformation_field)
126126

127127
logging.info("Exporting images as tiff")
128-
imio.to_tiff(
129-
imio.load_any(niftyreg_paths.registered_atlas_path).astype(
128+
to_tiff(
129+
load_any(niftyreg_paths.registered_atlas_path).astype(
130130
np.uint32, copy=False
131131
),
132132
paths.registered_atlas,
133133
)
134134

135135
if save_original_orientation:
136-
registered_atlas = imio.load_any(
136+
registered_atlas = load_any(
137137
niftyreg_paths.registered_atlas_path
138138
).astype(np.uint32, copy=False)
139139
atlas_remapped = bg.map_stack_to(
140140
ATLAS_ORIENTATION, DATA_ORIENTATION, registered_atlas
141141
).astype(np.uint32, copy=False)
142-
imio.to_tiff(
143-
atlas_remapped, paths.registered_atlas_original_orientation
144-
)
142+
to_tiff(atlas_remapped, paths.registered_atlas_original_orientation)
145143

146-
imio.to_tiff(
147-
imio.load_any(niftyreg_paths.registered_hemispheres_img_path).astype(
144+
to_tiff(
145+
load_any(niftyreg_paths.registered_hemispheres_img_path).astype(
148146
np.uint8, copy=False
149147
),
150148
paths.registered_hemispheres,
151149
)
152-
imio.to_tiff(
153-
imio.load_any(niftyreg_paths.downsampled_brain_standard_space).astype(
150+
to_tiff(
151+
load_any(niftyreg_paths.downsampled_brain_standard_space).astype(
154152
np.uint16, copy=False
155153
),
156154
paths.downsampled_brain_standard_space,
@@ -159,16 +157,16 @@ def run_niftyreg(
159157
del reference
160158
del target_brain
161159

162-
deformation_image = imio.load_any(niftyreg_paths.deformation_field)
163-
imio.to_tiff(
160+
deformation_image = load_any(niftyreg_paths.deformation_field)
161+
to_tiff(
164162
deformation_image[..., 0, 0].astype(np.float32, copy=False),
165163
paths.deformation_field_0,
166164
)
167-
imio.to_tiff(
165+
to_tiff(
168166
deformation_image[..., 0, 1].astype(np.float32, copy=False),
169167
paths.deformation_field_1,
170168
)
171-
imio.to_tiff(
169+
to_tiff(
172170
deformation_image[..., 0, 2].astype(np.float32, copy=False),
173171
paths.deformation_field_2,
174172
)
@@ -201,7 +199,7 @@ def run_niftyreg(
201199
)
202200

203201
# do the tiff part at the beginning
204-
downsampled_brain = imio.load_any(
202+
downsampled_brain = load_any(
205203
filename,
206204
scaling[1],
207205
scaling[2],
@@ -219,16 +217,16 @@ def run_niftyreg(
219217
downsampled_brain, atlas.resolution, tmp_downsampled_brain_path
220218
)
221219

222-
imio.to_tiff(downsampled_brain, downsampled_brain_path)
220+
to_tiff(downsampled_brain, downsampled_brain_path)
223221

224222
logging.info("Transforming to standard space")
225223

226224
brain_reg.transform_to_standard_space(
227225
tmp_downsampled_brain_path, tmp_downsampled_brain_standard_path
228226
)
229227

230-
imio.to_tiff(
231-
imio.load_any(tmp_downsampled_brain_standard_path).astype(
228+
to_tiff(
229+
load_any(tmp_downsampled_brain_standard_path).astype(
232230
np.uint16, copy=False
233231
),
234232
downsampled_brain_standard_path,

brainreg/core/backend/niftyreg/utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import imio
21
import numpy as np
2+
from brainglobe_utils.image_io import to_nii
33

44

55
def save_nii(stack, atlas_pixel_sizes, dest_path):
@@ -11,7 +11,7 @@ def save_nii(stack, atlas_pixel_sizes, dest_path):
1111
:param str dest_path: Where to save the image on the filesystem
1212
"""
1313
transformation_matrix = get_transf_matrix_from_res(atlas_pixel_sizes)
14-
imio.to_nii(
14+
to_nii(
1515
stack,
1616
dest_path,
1717
scale=(

brainreg/core/exceptions.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def search_dir_for_image_files(target_brain_path):
3232
class LoadFileException(Exception):
3333
"""
3434
Custom exception class for errors found loading image with
35-
imio.load_any (in main.py).
35+
brainglobe_utils.image_io.load_any (in main.py).
3636
3737
If the passed target brain directory contains only a single
3838
.tiff, alert the user.
@@ -58,8 +58,9 @@ def __init__(self, error_type=None, base_error=None):
5858
)
5959
self.message = (
6060
f"{origional_traceback}\nFile failed to load with "
61-
f"imio. Ensure all image files contain the "
62-
f"same number of pixels. Full traceback above."
61+
"brainglobe_utils.image_io. "
62+
"Ensure all image files contain the "
63+
"same number of pixels. Full traceback above."
6364
)
6465

6566
super().__init__(self.message)

brainreg/core/main.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import logging
22

33
import brainglobe_space as bg
4-
import imio
54
from bg_atlasapi import BrainGlobeAtlas
65
from brainglobe_utils.general.system import get_num_processes
6+
from brainglobe_utils.image_io import load_any
77

88
from brainreg.core.backend.niftyreg.run import run_niftyreg
99
from brainreg.core.exceptions import (
@@ -55,7 +55,7 @@ def main(
5555
logging.info("Loading raw image data")
5656

5757
try:
58-
target_brain = imio.load_any(
58+
target_brain = load_any(
5959
target_brain_path,
6060
scaling[1],
6161
scaling[2],

brainreg/core/utils/boundaries.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import logging
22

3-
import imio
43
import numpy as np
4+
from brainglobe_utils.image_io import load_any, to_tiff
55
from skimage.segmentation import find_boundaries
66

77

@@ -14,9 +14,9 @@ def boundaries(registered_atlas, boundaries_out_path):
1414
:param registered_atlas: The registered atlas
1515
:param boundaries_out_path: Path to save the boundary image
1616
"""
17-
atlas_img = imio.load_any(registered_atlas)
17+
atlas_img = load_any(registered_atlas)
1818
boundaries_image = find_boundaries(atlas_img, mode="inner").astype(
1919
np.int8, copy=False
2020
)
2121
logging.debug("Saving segmentation boundary image")
22-
imio.to_tiff(boundaries_image, boundaries_out_path)
22+
to_tiff(boundaries_image, boundaries_out_path)

brainreg/core/utils/volume.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
import logging
99

10-
import imio
1110
import numpy as np
1211
import pandas as pd
12+
from brainglobe_utils.image_io import load_any
1313
from brainglobe_utils.pandas.misc import initialise_df, safe_pandas_concat
1414

1515

@@ -41,8 +41,8 @@ def get_lateralised_atlas(
4141
left_hemisphere_value=2,
4242
right_hemisphere_value=1,
4343
):
44-
atlas = imio.load_any(atlas_path)
45-
hemispheres = imio.load_any(hemispheres_path)
44+
atlas = load_any(atlas_path)
45+
hemispheres = load_any(hemispheres_path)
4646

4747
atlas_left, atlas_right = lateralise_atlas(
4848
atlas,

pyproject.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ requires-python = ">=3.9"
2121
dependencies = [
2222
"bg-atlasapi",
2323
"brainglobe-space>=1.0.0",
24-
"brainglobe-utils>=0.2.7",
24+
"brainglobe-utils>=0.4.0",
2525
"fancylog",
26-
"imio",
2726
"numpy",
2827
"scikit-image",
2928
]

tests/tests/test_integration/utils.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import numpy as np
44
import pandas as pd
5-
from imio.load import load_any
5+
from brainglobe_utils.image_io import load_any
66

77
relative_tolerance = 0.01
88
absolute_tolerance = 10

tests/tests/test_unit/test_exceptions.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ def test_mismatched_dims_error(test_output_dir):
4949
brainreg_run()
5050

5151
assert (
52-
"File failed to load with "
53-
"imio. Ensure all image files contain the "
52+
"File failed to load with brainglobe_utils.image_io. "
53+
"Ensure all image files contain the "
5454
"same number of pixels. Full traceback above." in e.value.message
5555
)
5656

0 commit comments

Comments
 (0)