Merge pull request #71 from IntelPython/cleanup/setup

Cleanup/setup

Author: oleksandr-pavlyk

.github/workflows/conda-package.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: [3.8]
+        python: [3.9]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -59,7 +59,7 @@ jobs:
 
     strategy:
       matrix:
-        python: [3.8]
+        python: [3.9]
         experimental: [false]
         runner: [ubuntu-latest]
     continue-on-error: ${{ matrix.experimental }}

mkl_fft/_numpy_fft.py

@@ -1494,4 +1494,3 @@ def irfft2(a, s=None, axes=(-2, -1), norm=None):
     check_norm(norm)
     x = _float_utils.__downcast_float128_array(a)
     return irfftn(x, s, axes, norm)
-

mkl_fft/_pydfti.pyx

@@ -24,21 +24,20 @@
 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-from __future__ import absolute_import
+#cython: language_level=3
+
+# imports
 import numpy as np
-cimport numpy as cnp
-try:
-    from numpy.core.multiarray_tests import internal_overlap
-except ImportError:
-    # Module has been renamed in NumPy 1.15
-    from numpy.core._multiarray_tests import internal_overlap
+from numpy.core._multiarray_tests import internal_overlap
+from threading import local as threading_local
 
+# cimports
+cimport numpy as cnp
 from libc.string cimport memcpy
 cimport cpython.pycapsule
 from cpython.exc cimport (PyErr_Occurred, PyErr_Clear)
 from cpython.mem cimport (PyMem_Malloc, PyMem_Free)
 
-from threading import local as threading_local
 
 # thread-local storage
 _tls = threading_local()

mkl_fft/setup.py

@@ -25,7 +25,13 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import io
+import os
 import re
+from os.path import join
+from Cython.Build import cythonize
+from setuptools import setup, Extension
+import numpy as np
+from numpy.distutils.conv_template import process_file as process_c_file
 
 with io.open('mkl_fft/_version.py', 'rt', encoding='utf8') as f:
     version = re.search(r'__version__ = \'(.*?)\'', f.read()).group(1)
@@ -42,11 +48,11 @@
 License :: OSI Approved
 Programming Language :: C
 Programming Language :: Python
-Programming Language :: Python :: 2
-Programming Language :: Python :: 2.7
 Programming Language :: Python :: 3
-Programming Language :: Python :: 3.5
-Programming Language :: Python :: 3.6
+Programming Language :: Python :: 3.7
+Programming Language :: Python :: 3.8
+Programming Language :: Python :: 3.9
+Programming Language :: Python :: 3.10
 Programming Language :: Python :: Implementation :: CPython
 Topic :: Software Development
 Topic :: Scientific/Engineering
@@ -56,46 +62,73 @@
 Operating System :: MacOS
 """
 
-def configuration(parent_package='',top_path=None):
-    from numpy.distutils.misc_util import Configuration
+def extensions():
+    mkl_root = os.environ.get('MKLROOT', None)
+    if mkl_root:
+        mkl_info = {
+            'include_dirs': [join(mkl_root, 'include')],
+            'library_dirs': [join(mkl_root, 'lib'), join(mkl_root, 'lib', 'intel64')],
+            'libraries': ['mkl_rt']
+        }
+    else:
+        try:
+            mkl_info = get_info('mkl')
+        except:
+            mkl_info = dict()
 
-    config = Configuration(None, parent_package, top_path)
-    config.set_options(ignore_setup_xxx_py=True,
-                       assume_default_configuration=True,
-                       delegate_options_to_subpackages=True,
-                       quiet=True)
+    mkl_include_dirs = mkl_info.get('include_dirs', [])
+    mkl_library_dirs = mkl_info.get('library_dirs', [])
+    mkl_libraries = mkl_info.get('libraries', ['mkl_rt'])
 
-    config.add_subpackage('mkl_fft')
+    mklfft_templ = os.path.join("mkl_fft", "src", "mklfft.c.src")
+    processed_mklfft_fn = os.path.join("mkl_fft", "src", "mklfft.c")
+    src_processed = process_c_file(mklfft_templ)
 
-    config.version = VERSION
+    with open(processed_mklfft_fn, 'w') as fid:
+        fid.write(src_processed)
 
-    return config
+    return [
+        Extension(
+            "mkl_fft._pydfti",
+            [
+                os.path.join("mkl_fft", "_pydfti.pyx"),
+                os.path.join("mkl_fft", "src", "mklfft.c"),
+            ],
+            depends = [
+                os.path.join("mkl_fft", "src", 'mklfft.h'),
+                os.path.join("mkl_fft", "src", "multi_iter.h")
+            ],
+            include_dirs = [os.path.join("mkl_fft", "src"), np.get_include()] + mkl_include_dirs,
+            libraries = mkl_libraries,
+            library_dirs = mkl_library_dirs,
+            extra_compile_args = [
+                '-DNDEBUG',
+                # '-ggdb', '-O0', '-Wall', '-Wextra', '-DDEBUG',
+            ]
+        )
+    ]
 
 
-def setup_package():
-    from setuptools import setup
-    from numpy.distutils.core import setup
-    metadata = dict(
-        name = 'mkl_fft',
-        maintainer = "Intel Corp.",
-        maintainer_email = "scripting@intel.com",
-        description = "MKL-based FFT transforms for NumPy arrays",
-        long_description = long_description,
-        long_description_content_type="text/markdown",
-        url = "http://github.com/IntelPython/mkl_fft",
-        author = "Intel Corporation",
-        download_url = "http://github.com/IntelPython/mkl_fft",
-        license = 'BSD',
-        classifiers = [_f for _f in CLASSIFIERS.split('\n') if _f],
-        platforms = ["Windows", "Linux", "Mac OS-X"],
-        test_suite = 'nose.collector',
-        python_requires = '>=3.6',
-        install_requires = ['numpy >=1.16'],
-        configuration = configuration
-    )
-    setup(**metadata)
-
-    return None
-
-if __name__ == '__main__':
-    setup_package()
+setup(
+    name = "mkl_fft",
+    maintainer = "Intel Corp.",
+    maintainer_email = "scripting@intel.com",
+    description = "MKL-based FFT transforms for NumPy arrays",
+    version = version,
+    include_package_data=True,
+    ext_modules=extensions(),
+    zip_safe=False,
+    long_description = long_description,
+    long_description_content_type="text/markdown",
+    url = "http://github.com/IntelPython/mkl_fft",
+    author = "Intel Corporation",
+    download_url = "http://github.com/IntelPython/mkl_fft",
+    license = "BSD",
+    classifiers = [_f for _f in CLASSIFIERS.split('\n') if _f],
+    platforms = ["Windows", "Linux", "Mac OS-X"],
+    test_suite = "pytest",
+    python_requires = '>=3.7',
+    setup_requires=["Cython",],
+    install_requires = ["numpy >=1.16"],
+    keywords=["DFTI", "FFT", "Fourier", "MKL",],
+)