include Python.h in mkl_distributions.cpp to fix build break in conda-forge on Azure cloud, update copyright headers, adding .travis.yml

updated to conda-build 3

Author: Oleksandr Pavlyk

.travis.yml

@@ -0,0 +1,44 @@
+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
+          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 intel -c conda-forge $PYVER conda-recipe

LICENSE.txt

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

conda-recipe/bld.bat

@@ -1,7 +1,4 @@
-@rem Remember to source Intel (R) Compiler
+@rem Remember to source the compiler
 
-set CC=icl
-set LD=xilink
-
-%PYTHON% setup.py config --compiler=intelemw install --old-and-unmanageable
+%PYTHON% setup.py install --old-and-unmanageable
 if errorlevel 1 exit 1

conda-recipe/build.sh

@@ -1,11 +1,4 @@
 #!/bin/bash -x
 
-if [ `uname` == Darwin ]; then
-    export MACOSX_DEPLOYMENT_TARGET=10.10
-fi
-
 export CFLAGS="-I$PREFIX/include $CFLAGS"
-export CC=icc
-export LDSHARED="icc -shared"
-
-$PYTHON setup.py config --compiler=intelem --fcompiler=intelem build install --old-and-unmanageable
+$PYTHON setup.py install --old-and-unmanageable

conda-recipe/meta.yaml

@@ -1,5 +1,5 @@
-{% set version = "1.0.0" %}
-{% set buildnumber = 5 %}
+{% set version = "1.0.2" %}
+{% set buildnumber = 0 %}
 
 ### If you change the iccver here, you must also set the path correctly in build.sh / bld.bat!!!
 {% set iccver = "16.0.3" %}    [unix or py3k]
@@ -10,13 +10,11 @@ package:
     version: {{ version }}
 
 source:
-    git_url: http://github.com/IntelPython/mkl_random
-    git_branch: v{{version}}
+    path: ..
 
 build:
     number: {{buildnumber}}
-    features:
-      - intel
+    skip: True  # [win and py27]
     always_include_files:
       - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_random/__init__.py
       - {{ SP_DIR.replace('\\', '/') if win else SP_DIR }}/mkl_random/mklrand.*
@@ -28,31 +26,32 @@ build:
 
 requirements:
     build:
+      - {{ compiler('c') }}
+      - {{ compiler('cxx') }}
+    host:
       - python
       - setuptools
-      - intelpython
-      - mkl-devel               [not nomkl]
-      - icc_rt {{iccver}}
+      - mkl-devel
       - cython
-      - numpy x.x
+      - numpy
     run:
       - python
-      - mkl                     [not nomkl]
-      - icc_rt >={{iccver}}
-      - intelpython
-      - numpy x.x
+      - mkl
+      - {{ pin_compatible('numpy') }}
 
 test:
     commands:
       - nosetests -v mkl_random
     requires:
       - nose
+      - numpy >=1.14
     imports:
       - mkl_random
       - mkl_random.mklrand
 
 about:
     home: http://github.com/IntelPython/mkl_random
-    license: BSD
+    license: BSD-3-Clause
+    license_family: BSD
     license_file: LICENSE.txt
     summary: NumPy-based implementation of random number generation sampling using Intel (R) Math Kernel Library, mirroring numpy.random, but exposing all choices of sampling algorithms available in MKL.

mkl_random/__init__.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2017, Intel Corporation
+# Copyright (c) 2017-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_random/mklrand.pyx

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2017, Intel Corporation
+# Copyright (c) 2017-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_random/setup.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-# Copyright (c) 2017, Intel Corporation
+# Copyright (c) 2017-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_random/src/mkl_distributions.cpp

@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2017, Intel Corporation
+ Copyright (c) 2017-2019, Intel Corporation
 
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -35,6 +35,7 @@
 #include "mkl.h"
 #include "mkl_vml.h"
 #include "mkl_distributions.h"
+#include "Python.h"
 #include "numpy/npy_common.h" /* npy_intp */
 
 #define MKL_INT_MAX ((npy_intp) (~((MKL_UINT) 0) >> 1))

mkl_random/src/mkl_distributions.h

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