From 39132d61a42a17557c39f12bc3e25b238dddf319 Mon Sep 17 00:00:00 2001 From: Evert de Man Date: Fri, 22 Nov 2024 13:16:21 +0100 Subject: [PATCH 1/3] Fix scipy.ndimage import paths --- batchgenerators/augmentations/utils.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/batchgenerators/augmentations/utils.py b/batchgenerators/augmentations/utils.py index 0baec46..6b0900c 100755 --- a/batchgenerators/augmentations/utils.py +++ b/batchgenerators/augmentations/utils.py @@ -16,11 +16,10 @@ import random import numpy as np from copy import deepcopy -from scipy.ndimage import map_coordinates, fourier_gaussian -from scipy.ndimage.filters import gaussian_filter, gaussian_gradient_magnitude -from scipy.ndimage.morphology import grey_dilation +from scipy.ndimage import (map_coordinates, fourier_gaussian, gaussian_filter, + gaussian_gradient_magnitude, grey_dilation) +from scipy.ndimage import label as lb from skimage.transform import resize -from scipy.ndimage.measurements import label as lb import pandas as pd From c77a9156715607a9f77cc2184b8b4bb1c1d161d6 Mon Sep 17 00:00:00 2001 From: Evert de Man Date: Fri, 22 Nov 2024 13:29:41 +0100 Subject: [PATCH 2/3] Pin scipy --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f4e40a2..75e6b80 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ pillow>=7.1.2 threadpoolctl scikit-learn numpy>=1.10.2 -scipy +scipy>=1.0.0 scikit-image scikit-learn unittest2 \ No newline at end of file From 9cc51396a38aa325aee133253306dd9f4af35dd1 Mon Sep 17 00:00:00 2001 From: Evert de Man Date: Fri, 22 Nov 2024 20:37:54 +0100 Subject: [PATCH 3/3] Also pin scipy in setup --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6c0a50e..448e8af 100755 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ install_requires=[ "pillow>=7.1.2", "numpy>=1.10.2", - "scipy", + "scipy>=1.0.0", "scikit-image", "scikit-learn", "future",