Skip to content

Commit 67e068f

Browse files
committed
update scipy.fftpack file
1 parent 8b63b0e commit 67e068f

File tree

3 files changed

+19
-16
lines changed

3 files changed

+19
-16
lines changed

mkl_fft/_numpy_fft.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@
7575

7676
import numpy as np
7777

78-
from . import _pydfti as mkl_fft # pylint: disable=no-name-in-module
78+
import mkl_fft
79+
7980
from ._fft_utils import check_norm, compute_fwd_scale
8081
from ._float_utils import __downcast_float128_array
8182

mkl_fft/_scipy_fft.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
import mkl
3333
import numpy as np
3434

35-
from . import _pydfti as mkl_fft # pylint: disable=no-name-in-module
35+
import mkl_fft
36+
3637
from ._fft_utils import compute_fwd_scale
3738
from ._float_utils import __supported_array_or_not_implemented
3839

mkl_fft/_scipy_fftpack.py

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,47 +24,48 @@
2424
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2525
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2626

27-
from . import _float_utils
28-
from . import _pydfti as mkl_fft # pylint: disable=no-name-in-module
27+
import mkl_fft
28+
29+
from ._float_utils import __upcast_float16_array
2930

3031
__all__ = ["fft", "ifft", "fftn", "ifftn", "fft2", "ifft2", "rfft", "irfft"]
3132

3233

3334
def fft(a, n=None, axis=-1, overwrite_x=False):
34-
x = _float_utils.__upcast_float16_array(a)
35+
x = __upcast_float16_array(a)
3536
return mkl_fft.fft(x, n=n, axis=axis, overwrite_x=overwrite_x)
3637

3738

3839
def ifft(a, n=None, axis=-1, overwrite_x=False):
39-
x = _float_utils.__upcast_float16_array(a)
40+
x = __upcast_float16_array(a)
4041
return mkl_fft.ifft(x, n=n, axis=axis, overwrite_x=overwrite_x)
4142

4243

4344
def fftn(a, shape=None, axes=None, overwrite_x=False):
44-
x = _float_utils.__upcast_float16_array(a)
45-
return mkl_fft.fftn(x, shape=shape, axes=axes, overwrite_x=overwrite_x)
45+
x = __upcast_float16_array(a)
46+
return mkl_fft.fftn(x, s=shape, axes=axes, overwrite_x=overwrite_x)
4647

4748

4849
def ifftn(a, shape=None, axes=None, overwrite_x=False):
49-
x = _float_utils.__upcast_float16_array(a)
50-
return mkl_fft.ifftn(x, shape=shape, axes=axes, overwrite_x=overwrite_x)
50+
x = __upcast_float16_array(a)
51+
return mkl_fft.ifftn(x, s=shape, axes=axes, overwrite_x=overwrite_x)
5152

5253

5354
def fft2(a, shape=None, axes=(-2, -1), overwrite_x=False):
54-
x = _float_utils.__upcast_float16_array(a)
55-
return mkl_fft.fftn(x, shape=shape, axes=axes, overwrite_x=overwrite_x)
55+
x = __upcast_float16_array(a)
56+
return mkl_fft.fftn(x, s=shape, axes=axes, overwrite_x=overwrite_x)
5657

5758

5859
def ifft2(a, shape=None, axes=(-2, -1), overwrite_x=False):
59-
x = _float_utils.__upcast_float16_array(a)
60-
return mkl_fft.ifftn(x, shape=shape, axes=axes, overwrite_x=overwrite_x)
60+
x = __upcast_float16_array(a)
61+
return mkl_fft.ifftn(x, s=shape, axes=axes, overwrite_x=overwrite_x)
6162

6263

6364
def rfft(a, n=None, axis=-1, overwrite_x=False):
64-
x = _float_utils.__upcast_float16_array(a)
65+
x = __upcast_float16_array(a)
6566
return mkl_fft.rfftpack(x, n=n, axis=axis, overwrite_x=overwrite_x)
6667

6768

6869
def irfft(a, n=None, axis=-1, overwrite_x=False):
69-
x = _float_utils.__upcast_float16_array(a)
70+
x = __upcast_float16_array(a)
7071
return mkl_fft.irfftpack(x, n=n, axis=axis, overwrite_x=overwrite_x)

0 commit comments

Comments
 (0)