diff --git a/deepcell_toolbox/utils.py b/deepcell_toolbox/utils.py index 37cbef1..fea748c 100644 --- a/deepcell_toolbox/utils.py +++ b/deepcell_toolbox/utils.py @@ -30,7 +30,7 @@ import numpy as np import cv2 -import scipy.signal +import scipy as sp from skimage import transform from skimage.measure import regionprops @@ -281,10 +281,10 @@ def spline_window(window_size, overlap_left, overlap_right, power=2): def _spline_window(w_size): intersection = int(w_size / 4) - wind_outer = (abs(2 * (scipy.signal.triang(w_size))) ** power) / 2 + wind_outer = (abs(2 * (sp.signal.windows.triang(w_size))) ** power) / 2 wind_outer[intersection:-intersection] = 0 - wind_inner = 1 - (abs(2 * (scipy.signal.triang(w_size) - 1)) ** power) / 2 + wind_inner = 1 - (abs(2 * (sp.signal.windows.triang(w_size) - 1)) ** power) / 2 wind_inner[:intersection] = 0 wind_inner[-intersection:] = 0 diff --git a/setup.py b/setup.py index 4326b1f..4904f50 100644 --- a/setup.py +++ b/setup.py @@ -101,8 +101,8 @@ def run(self, *args, **kwargs): 'pandas', 'networkx>=2.1', 'numpy>=1.16.6', - 'scipy>=1.3.0', - 'scikit-image>=0.15.0', + 'scipy>=1.9.0', + 'scikit-image>=0.19', 'scikit-learn', 'tqdm'], extras_require={