Skip to content

Bugfix preprocessing resampling to initial_resolution #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TMartinot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bugfix preprocessing resampling to initial_resolution #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions deeperhistreg/dhr_preprocessing/general_preprocessing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,10 @@ def basic_preprocessing(
initial_resolution = params['initial_resolution']
source_y_size, source_x_size, target_y_size, target_x_size = u.get_combined_size(source, target)
initial_resample_ratio = u.calculate_resampling_ratio((source_x_size, target_x_size), (source_y_size, target_y_size), initial_resolution)
resample_dim = (round(target_y_size * (1 / initial_resample_ratio)), round(target_x_size * (1 / initial_resample_ratio)))
initial_smoothing = max(initial_resample_ratio - 1, 0.1)
source = u.resample(u.gaussian_smoothing(source, initial_smoothing), initial_resample_ratio)
target = u.resample(u.gaussian_smoothing(target, initial_smoothing), initial_resample_ratio)
source = u.resample_tensor_to_size(u.gaussian_smoothing(source, initial_smoothing), resample_dim)
target = u.resample_tensor_to_size(u.gaussian_smoothing(target, initial_smoothing), resample_dim)
postprocessing_params['initial_resample_ratio'] = initial_resample_ratio
if source_landmarks is not None:
source_landmarks = source_landmarks / initial_resample_ratio
Expand Down
4 changes: 2 additions & 2 deletions deeperhistreg/dhr_utils/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ def resample(tensor : tc.Tensor, resample_ratio : float, mode: str="bilinear") -
"""
return F.interpolate(tensor, scale_factor = 1 / resample_ratio, mode=mode, recompute_scale_factor=False, align_corners=False)

def resample_tensor_to_size(tensor: tc.Tensor, new_size: tc.Tensor, mode: str='bilinear') -> tc.Tensor:
def resample_tensor_to_size(tensor: tc.Tensor, new_size: Union[int, Tuple[int, ...], tc.Tensor], mode: str='bilinear') -> tc.Tensor:
"""
TODO
"""
Expand All @@ -75,7 +75,7 @@ def resample_displacement_field(displacement_field : tc.Tensor, resample_ratio :
"""
return F.interpolate(displacement_field.permute(0, 3, 1, 2), scale_factor = 1 / resample_ratio, mode=mode, recompute_scale_factor=False, align_corners=False).permute(0, 2, 3, 1)

def resample_displacement_field_to_size(displacement_field: tc.Tensor, new_size: tc.Tensor, mode: str='bilinear') -> tc.Tensor:
def resample_displacement_field_to_size(displacement_field: tc.Tensor, new_size: Union[int, Tuple[int, ...], tc.Tensor], mode: str='bilinear') -> tc.Tensor:
"""
TODO
"""
Expand Down