Merge pull request #3 from IntelPython/remove-dependency-on-numpy

Remove dependency on numpy

Author: oleksandr-pavlyk

.travis.yml

@@ -34,13 +34,12 @@ install:
   - bash miniconda.sh -b -p $HOME/miniconda
   - export PATH="$HOME/miniconda/bin:$PATH"
   - hash -r
-  - conda config --set always_yes yes --set changeps1 no
-  - conda update -q conda
-  - conda install conda-build
+  - conda update --yes -q conda
+  - conda install --yes conda-build
   # Useful for debugging any issues with conda
   - conda info -a
   - gcc -v
   - g++ -v
 
 script:
-  - conda build -c defaults -c intel $PYVER conda-recipe
+  - conda build -c conda-forge $PYVER --override-channels conda-recipe

conda-recipe/bld.bat

@@ -1,5 +1,6 @@
 
 @rem Remember to activate compiler, if needed
 
+set MKLROOT=%CONDA_PREFIX%
 %PYTHON% setup.py build --force install --old-and-unmanageable
 if errorlevel 1 exit 1

conda-recipe/build.sh

@@ -2,4 +2,4 @@
 
 # make sure that compiler has been sourced, if necessary
 
-CFLAGS="-I${PREFIX}/include ${CFLAGS}" $PYTHON setup.py build --force install --old-and-unmanageable
+MKLROOT=$CONDA_PREFIX $PYTHON setup.py build --force install --old-and-unmanageable

conda-recipe/meta.yaml

@@ -1,4 +1,4 @@
-{% set version = "2.0.0" %}
+{% set version = "2.0.2" %}
 {% set buildnumber = 0 %}
 
 package:
@@ -10,6 +10,9 @@ source:
 
 build:
     number: {{ buildnumber }}
+    ignore_run_exports:
+      - blas
+      - mkl-service
 
 requirements:
     build:
@@ -19,12 +22,10 @@ requirements:
       - setuptools
       - mkl-devel
       - cython
-      - numpy 1.11.*
     run:
       - python
       - mkl
       - six
-      - {{ pin_compatible('numpy') }}
 
 test:
     commands:

mkl/setup.py

@@ -28,12 +28,14 @@
 from __future__ import division, print_function, absolute_import
 import io
 import re
-
+import os
+from os.path import join, exists, dirname
+import setuptools
+import setuptools.extension
 
 with io.open('mkl/__init__.py', 'rt', encoding='utf8') as file:
     VERSION = re.search(r'__version__ = \'(.*?)\'', file.read()).group(1)
 
-
 CLASSIFIERS = """\
 Development Status :: 5 - Production/Stable
 Intended Audience :: Science/Research
@@ -57,27 +59,80 @@
 """
 
 
-def configuration(parent_package='', top_path=None):
-    from numpy.distutils.misc_util import Configuration
-
-    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)
+def get_extensions():
+    try:
+        from numpy.distutils.system_info import get_info
+        mkl_info = get_info('mkl')
+    except ImportError:
+        mkl_root = os.environ['MKLROOT']
+        mkl_info = {
+            'include_dirs': [join(mkl_root, 'include')],
+            'library_dirs': [join(mkl_root, 'lib'), join(mkl_root, 'lib', 'intel64')],
+            'libraries': ['mkl_rt']
+        }
+
+    mkl_include_dirs = mkl_info.get('include_dirs', [])
+    mkl_library_dirs = mkl_info.get('library_dirs', [])
+    mkl_libraries = mkl_info.get('libraries', ['mkl_rt'])
+
+    defs = []
+    if any(['mkl_rt' in li for li in mkl_libraries]):
+        #libs += ['dl'] - by default on Linux
+        defs += [('USING_MKL_RT', None)]
+
+    pdir = 'mkl'
+    try:
+        from Cython.Build import cythonize
+        sources = [join(pdir, '_mkl_service.pyx')]
+        have_cython = True
+    except ImportError as e:
+        have_cython = False
+        sources = [join(pdir, '_mkl_service.c')]
+        if not exists(sources[0]):
+            raise ValueError(str(e) + '. ' +
+                             'Cython is required to build the initial .c file.')
+
+    extensions = []
+    extensions.append(
+        setuptools.extension.Extension(
+            'mkl._mklinit',
+            sources=['mkl/_mklinitmodule.c'],
+            define_macros=defs,
+            include_dirs=mkl_include_dirs,
+            libraries=mkl_libraries,
+            library_dirs=mkl_library_dirs,
+            extra_compile_args=[
+                '-DNDEBUG'
+                # '-g', '-O2', '-Wall',
+            ]
+        )
+    )
 
-    config.add_subpackage('mkl')
+    extensions.append(
+        setuptools.extension.Extension(
+            'mkl._py_mkl_service',
+            sources=sources,
+            include_dirs=mkl_include_dirs,
+            library_dirs=mkl_library_dirs,
+            libraries=mkl_libraries,
+            extra_compile_args=[
+                '-DNDEBUG'
+                # '-g', '-O2', '-Wall',
+            ]
+        )
+    )
 
-    config.version = VERSION
+    if have_cython:
+        extensions = cythonize(extensions, include_path=[join(__file__, pdir)])
 
-    return config
+    return extensions
 
 
 def setup_package():
     from setuptools import setup
-    from numpy.distutils.core import setup
     metadata = dict(
         name='mkl-service',
+        version=VERSION,
         maintainer="Intel",
         maintainer_email="[email protected]",
         description="MKL Support Functions",
@@ -99,9 +154,10 @@ def setup_package():
         platforms=["Windows", "Linux", "Mac OS-X"],
         test_suite='nose.collector',
         python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
-        setup_requires=['numpy', 'cython'],
+        setup_requires=['setuptools', 'cython'],
         install_requires=['six'],
-        configuration=configuration,
+        packages=setuptools.find_packages(),
+        ext_modules=get_extensions()
     )
     setup(**metadata)