From fe9e4e38da68d86800cf2e452cb3290228a49fbf Mon Sep 17 00:00:00 2001 From: vdutell Date: Tue, 5 Apr 2022 16:53:47 -0400 Subject: [PATCH 1/2] fix in setup.py --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index abf0d9e..5746195 100644 --- a/setup.py +++ b/setup.py @@ -10,6 +10,6 @@ description='Complex Steerable Pyramids in PyTorch', long_description='Fast CPU/CUDA implementation of the Complex Steerable Pyramid in PyTorch.', license='MIT', - packages=['steerable_pytorch'], + packages=['steerable'], scripts=[] -) \ No newline at end of file +) From 9a8fc2ed28c31fe99d7e50ea2c40f05a5d60c1d9 Mon Sep 17 00:00:00 2001 From: vdutell Date: Thu, 7 Apr 2022 16:55:00 -0400 Subject: [PATCH 2/2] fixed import to support newer versions of scipy --- steerable/SCFpyr_PyTorch.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/steerable/SCFpyr_PyTorch.py b/steerable/SCFpyr_PyTorch.py index ec46e63..26eb843 100644 --- a/steerable/SCFpyr_PyTorch.py +++ b/steerable/SCFpyr_PyTorch.py @@ -18,7 +18,12 @@ import numpy as np import torch -from scipy.misc import factorial + +#support for mulitple versions of scipy +try: + from scipy.misc import factorial +except ImportError: + from scipy.special import factorial import steerable.math_utils as math_utils pointOp = math_utils.pointOp