Merge pull request #76 from IntelPython/add-interfaces

Add interfaces

Author: oleksandr-pavlyk

.github/workflows/conda-package.yml

@@ -8,20 +8,20 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         python: [3.9]
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set pkgs_dirs
         run: |
           echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
       - name: Cache conda packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         env:
           CACHE_NUMBER: 0  # Increase to reset cache
         with:
@@ -38,7 +38,7 @@ jobs:
         run: conda install conda-build
       - name: Build conda package
         run: |
-          CHANNELS="-c intel -c defaults --override-channels"
+          CHANNELS="-c intel -c main --override-channels"
           VERSIONS="--python ${{ matrix.python }}"
           TEST="--no-test"
 
@@ -48,7 +48,7 @@ jobs:
             $CHANNELS \
             conda-recipe
       - name: Upload artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
           path: /usr/share/miniconda/conda-bld/linux-64/${{ env.PACKAGE_NAME }}-*.tar.bz2
@@ -61,14 +61,14 @@ jobs:
       matrix:
         python: [3.9]
         experimental: [false]
-        runner: [ubuntu-latest]
+        runner: [ubuntu-20.04]
     continue-on-error: ${{ matrix.experimental }}
     env:
-      CHANNELS: -c intel -c defaults --override-channels
+      CHANNELS: -c intel -c main --override-channels
 
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: ${{ env.PACKAGE_NAME }} ${{ runner.os }} Python ${{ matrix.python }}
       - name: Add conda to system path
@@ -86,12 +86,14 @@ jobs:
       - name: Collect dependencies
         run: |
           CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
-          conda install $PACKAGE_NAME python=${{ matrix.python }} $CHANNELS --only-deps --dry-run > lockfile
+          conda create -n test_mkl_fft $PACKAGE_NAME python=${{ matrix.python }} $CHANNELS --only-deps --dry-run > lockfile
+      - name: Display lockfile
+        run: cat lockfile
       - name: Set pkgs_dirs
         run: |
           echo "pkgs_dirs: [~/.conda/pkgs]" >> ~/.condarc
       - name: Cache conda packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         env:
           CACHE_NUMBER: 0  # Increase to reset cache
         with:
@@ -105,9 +107,11 @@ jobs:
       - name: Install mkl_fft
         run: |
           CHANNELS="-c $GITHUB_WORKSPACE/channel ${{ env.CHANNELS }}"
-          conda install $PACKAGE_NAME pytest python=${{ matrix.python }} $CHANNELS
+          conda create -n test_mkl_fft python=${{ matrix.python }} $PACKAGE_NAME pytest $CHANNELS
           # Test installed packages
-          conda list
+          conda list -n test_mkl_fft
       - name: Run tests
         run: |
-          python -m pytest --pyargs $MODULE_NAME
+          source $CONDA/etc/profile.d/conda.sh
+          conda activate test_mkl_fft
+          pytest -v --pyargs $MODULE_NAME

conda-recipe/meta.yaml

@@ -1,5 +1,5 @@
-{% set version = "1.3.0" %}
-{% set buildnumber = 1 %}
+{% set version = "1.3.1" %}
+{% set buildnumber = 0 %}
 
 package:
     name: mkl_fft
@@ -21,7 +21,6 @@ requirements:
       - setuptools
       - mkl-devel
       - cython
-      - blas=*=mkl
       - numpy-base
     run:
       - python
@@ -31,13 +30,14 @@ requirements:
 
 test:
     commands:
-      - nosetests -v mkl_fft
+      - pytest -v --args mkl_fft
     requires:
-      - nose
+      - pytest
     imports:
       - mkl_fft
-      - mkl_fft._numpy_fft
-      - mkl_fft._scipy_fft
+      - mkl_fft.interface
+      - mkl_fft.interface.numpy_fft
+      - mkl_fft.interface.scipy_fft
 
 about:
     home: http://github.com/IntelPython/mkl_fft

mkl_fft/__init__.py

@@ -28,6 +28,7 @@
                       rfft_numpy, irfft_numpy, rfftn_numpy, irfftn_numpy)
 
 from ._version import __version__
+import mkl_fft.interfaces
 
 __all__ = ['fft', 'ifft', 'fft2', 'ifft2', 'fftn', 'ifftn', 'rfft', 'irfft',
-           'rfft_numpy', 'irfft_numpy', 'rfftn_numpy', 'irfftn_numpy']
+           'rfft_numpy', 'irfft_numpy', 'rfftn_numpy', 'irfftn_numpy', 'interfaces']

mkl_fft/_float_utils.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2017-2019, Intel Corporation
+# Copyright (c) 2017-2023, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -25,9 +25,9 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 from numpy import (half, float32, asarray, ndarray,
-                   longdouble, float64, longcomplex, complex_)
+                   longdouble, float64, longcomplex, complex_, float128, complex256)
 
-__all__ = ['__upcast_float16_array', '__downcast_float128_array']
+__all__ = ['__upcast_float16_array', '__downcast_float128_array', '__supported_array_or_not_implemented']
 
 def __upcast_float16_array(x):
     """
@@ -71,3 +71,14 @@ def __downcast_float128_array(x):
             return asarray(x, dtype=complex_)
         return __x
     return x
+
+
+def __supported_array_or_not_implemented(x):
+    """
+    Used in _scipy_fft_backend to convert array to float32,
+    float64, complex64, or complex128 type or return NotImplemented
+    """
+    __x = asarray(x)
+    if __x.dtype in [half, float128, complex256]:
+        return NotImplemented
+    return __x

mkl_fft/_numpy_fft.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2017-2019, Intel Corporation
+# Copyright (c) 2017-2023, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -88,11 +88,6 @@ def ortho_sc_1d(n, s):
     return sqrt(frwd_sc_1d(n, s))
 
 
-def _unitary(norm):
-    check_norm(norm)
-    return norm is not None
-
-
 def trycall(func, args, kwrds):
     try:
         res = func(*args, **kwrds)
@@ -735,13 +730,6 @@ def _cook_nd_args(a, s=None, axes=None, invreal=0):
     return s, axes
 
 
-def _tot_size(x, axes):
-    s = x.shape
-    if axes is None:
-        return x.size
-    return prod([s[ai] for ai in axes])
-
-
 def fftn(a, s=None, axes=None, norm=None):
     """
     Compute the N-dimensional discrete Fourier Transform.
@@ -1265,7 +1253,6 @@ def rfftn(a, s=None, axes=None, norm=None):
 
     """
     check_norm(norm)
-    unitary = _unitary(norm)
     x = _float_utils.__downcast_float128_array(a)
     if (norm in (None, "backward")):
         output = trycall(

mkl_fft/_pydfti.pyx

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2017-2019, Intel Corporation
+# Copyright (c) 2017-2023, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

mkl_fft/_scipy_fft.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2017-2019, Intel Corporation
+# Copyright (c) 2017-2023, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met: