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 +) 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