Merge pull request #52 from IntelPython/updates-for-coming-mkl-changes

Prepare for upcoming changes in Intel(R) MKL

Author: oleksandr-pavlyk

.travis.yml

@@ -1,23 +1,10 @@
 matrix:
     include:
-        - name: "Linux-Py2"
-          os: linux
-          env:
-            - MINICONDA=Miniconda2-latest-Linux-x86_64.sh
-            - PYVER="--python=27"
         - name: "Linux-Py3"
           os: linux
           env:
             - MINICONDA=Miniconda3-latest-Linux-x86_64.sh
             - PYVER=""
-        - name: "OsX-Py2"
-          os: osx
-          osx_image: xcode8
-          env:
-            - MATRIX_EVAL="brew install gcc && CC=gcc-7 && CXX=g++-7"
-            - MINICONDA=Miniconda3-latest-MacOSX-x86_64.sh
-            - MACOSX_DEPLOYMENT_TARGET="10.9"
-            - PYVER="--python=27"
         - name: "OsX-Py3"
           os: osx
           osx_image: xcode8
@@ -41,4 +28,4 @@ install:
   - g++ -v
 
 script:
-  - conda build -c intel -c conda-forge $PYVER conda-recipe
+  - conda build -c intel -c conda-forge --override-channels --numpy=1.17 $PYVER conda-recipe

conda-recipe/bld.bat

@@ -1,4 +1,5 @@
 @rem Remember to activate Intel Compiler, or remoe these two lines to ise Microsoft Visual Studio compiler
 
+set MKLROOT=%PREFIX%
 %PYTHON% setup.py build --force install --old-and-unmanageable
 if errorlevel 1 exit 1

conda-recipe/build.sh

@@ -6,4 +6,4 @@ if [ `uname` == Darwin ]; then
     export MACOSX_DEPLOYMENT_TARGET=10.9
 fi
 
-CFLAGS="-I$PREFIX/include $CFLAGS" $PYTHON setup.py build --force install --old-and-unmanageable
+MKLROOT=$PREFIX CFLAGS="-I$PREFIX/include $CFLAGS" $PYTHON setup.py build --force install --old-and-unmanageable

conda-recipe/meta.yaml

@@ -1,7 +1,6 @@
 {% set version = "1.1.0" %}
 {% set buildnumber = 0 %}
 
-
 package:
     name: mkl_fft
     version: {{ version }}
@@ -10,42 +9,25 @@ source:
     path: ../
 
 build:
-    number: {{buildnumber}}
-    features:
-      - intel
-    always_include_files:
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/__init__.py
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/_float16_utils.py
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/_pydfti.*
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/_numpy_fft.py
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/_scipy_fft.py
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/_scipy_fft_backend.py
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/setup.py
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/tests/test_fft1d.py
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/__init__.pyc         [py27]
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/_float16_utils.pyc   [py27]
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/_numpy_fft.pyc       [py27]
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/_scipy_fft.pyc       [py27]
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/setup.pyc            [py27]
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/tests/test_fft1d.pyc [py27]
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/__pycache__/*        [py3k]
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/tests/__pycache__/*  [py3k]
-      - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_fft/
+    number: {{ buildnumber }}
+    ignore_run_exports:
+      - blas
 
 requirements:
     build:
+      - {{ compiler('c') }}
+    host:
       - python
       - setuptools
-      - intelpython
       - mkl-devel
       - cython
-      - numpy x.x
+      - blas=*=mkl
+      - numpy-base
     run:
       - python
       - mkl
       - mkl-service
-      - intelpython
-      - numpy x.x
+      - {{ pin_compatible('numpy') }}
 
 test:
     commands: