Merge pull request #1 from IntelPython/update/2.0

bumping version to 2.0.0 to avoid package version clashes

Author: oleksandr-pavlyk

.travis.yml

@@ -0,0 +1,46 @@
+matrix:
+    include:
+        - name: "Linux-Py2"
+          os: linux
+          dist: xenial
+          env:
+            - MINICONDA=Miniconda2-latest-Linux-x86_64.sh
+            - PYVER="--python=27"
+        - name: "Linux-Py3"
+          os: linux
+          dist: xenial
+          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
+          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=""
+
+install:
+  - wget https://repo.continuum.io/miniconda/$MINICONDA -O miniconda.sh;
+  - 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
+  # Useful for debugging any issues with conda
+  - conda info -a
+  - gcc -v
+  - g++ -v
+
+script:
+  - conda build -c defaults -c intel $PYVER conda-recipe

CHANGES.rst

@@ -7,3 +7,8 @@ mkl-service changelog
 =====
 
 Initial release of `mkl-service` package.
+
+2.0.0
+====
+
+Rerelease of `mkl-service` package with version bumped to 2.0.0 to avoid version clash with `mkl-service` package from Anaconda.

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2018, Intel Corporation
+Copyright (c) 2018-2019, Intel Corporation
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

README.md

@@ -11,5 +11,5 @@ A short example, illustrating it use:
 ```python
 import tomopy
 import mkl
-mkl.domain_set_num_threads(1, domain='fft') # Intel (R) MKL FFT functions to run sequentially
+mkl.domain_set_num_threads(1, domain='fft') # Intel(R) MKL FFT functions to run sequentially
 ```

conda-recipe/bld.bat

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

conda-recipe/build.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -x
+
+# make sure that compiler has been sourced, if necessary
+
+CFLAGS="-I${PREFIX}/include ${CFLAGS}" $PYTHON setup.py build --force install --old-and-unmanageable

conda-recipe/meta.yaml

@@ -0,0 +1,56 @@
+{% set version = "2.0.0" %}
+{% set buildnumber = 0 %}
+
+package:
+    name: mkl-service
+    version: {{ version }}
+
+source:
+    path: ..
+
+build:
+    number: {{ buildnumber }}
+
+requirements:
+    build:
+      - {{ compiler('c') }}
+    host:
+      - python
+      - setuptools
+      - mkl-devel
+      - cython
+      - numpy 1.11.*
+      - six
+    run:
+      - python
+      - mkl
+      - six
+      - {{ pin_compatible('numpy') }}
+
+test:
+    commands:
+      - nosetests -v mkl
+    requires:
+      - nose
+    imports:
+      - mkl
+
+about:
+    home: http://github.com/IntelPython/mkl-service
+    license: BSD 3-Clause
+    license_file: LICENSE.txt
+    description:
+        Intel(R) Math Kernel Library (Intel(R) MKL) support functions are
+        subdivided into the following groups according to their purpose, such as
+            Version Information
+            Threading Control
+            Timing
+            Memory Management
+            Conditional Numerical Reproducibility Control
+            Miscellaneous
+    summary: Python hooks for Intel(R) Math Kernel Library runtime control settings.
+
+extra:
+  recipe-maintainers:
+     - oleksandr-pavlyk
+     - dmitrii-zagornyi

mkl-service/examples/example.py renamed to examples/example.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Intel Corporation
+# Copyright (c) 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:

mkl-service/__init__.py renamed to mkl/__init__.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Intel Corporation
+# Copyright (c) 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -23,8 +23,35 @@
 # 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.
 
+import sys
+
+class RTLD_for_MKL():
+    def __init__(self):
+        self.saved_rtld = None
+
+    def __enter__(self):
+        import ctypes
+        try:
+            self.saved_rtld = sys.getdlopenflags()
+            # python loads libraries with RTLD_LOCAL, but MKL requires RTLD_GLOBAL
+            # pre-load MKL with RTLD_GLOBAL before loading the native extension
+            sys.setdlopenflags(self.saved_rtld | ctypes.RTLD_GLOBAL)
+        except AttributeError:
+            pass
+        del ctypes
+
+    def __exit__(self, *args):
+        if self.saved_rtld:
+            sys.setdlopenflags(self.saved_rtld)
+            self.saved_rtld = None
+
+with RTLD_for_MKL():
+    from . import _mklinit
+
+del RTLD_for_MKL
+del sys
 
 from ._py_mkl_service import *
 
 
-__version__ = '1.0.0'
+__version__ = '2.0.0'

mkl-service/_mkl_service.pxd renamed to mkl/_mkl_service.pxd

@@ -1,4 +1,4 @@
-# Copyright (c) 2018, Intel Corporation
+# Copyright (c) 2018-2019, Intel Corporation
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met: