From 1dfe029de26b1bea09711e576eeed4a20b81456b Mon Sep 17 00:00:00 2001
From: Michael Sarahan <msarahan@gmail.com>
Date: Thu, 26 Jul 2018 11:50:49 -0500
Subject: [PATCH 09/15] intel mkl_mem all

---
 numpy/core/include/numpy/ndarraytypes.h            |  40 +++---
 numpy/core/setup.py                                |  32 ++++-
 numpy/core/src/mkl_defs/aligned_alloc.c            | 146 +++++++++++++++++++++
 numpy/core/src/mkl_defs/aligned_alloc.h            |  11 ++
 numpy/core/src/mkl_defs/mkl_cpy.c                  |  86 ++++++++++++
 numpy/core/src/mkl_defs/mkl_cpy.h                  |  10 ++
 numpy/core/src/multiarray/alloc.c                  |  20 +++
 numpy/core/src/multiarray/array_assign_scalar.c    |   1 +
 numpy/core/src/multiarray/arrayobject.c            |   2 +
 numpy/core/src/multiarray/arraytypes.c.src         |   5 +
 numpy/core/src/multiarray/compiled_base.c          |   2 +
 numpy/core/src/multiarray/convert.c                |   1 +
 numpy/core/src/multiarray/convert_datatype.c       |   1 +
 numpy/core/src/multiarray/datetime.c               |   2 +
 numpy/core/src/multiarray/datetime_busday.c        |   1 +
 numpy/core/src/multiarray/datetime_busdaycal.c     |   2 +
 numpy/core/src/multiarray/datetime_strings.c       |   1 +
 numpy/core/src/multiarray/descriptor.c             |   2 +
 numpy/core/src/multiarray/dtype_transfer.c         |   2 +
 numpy/core/src/multiarray/einsum.c.src             |   2 +
 numpy/core/src/multiarray/flagsobject.c            |   1 +
 numpy/core/src/multiarray/getset.c                 |   2 +
 numpy/core/src/multiarray/item_selection.c         |   2 +
 numpy/core/src/multiarray/iterators.c              |   2 +
 .../src/multiarray/lowlevel_strided_loops.c.src    |   1 +
 numpy/core/src/multiarray/mapping.c                |   1 +
 numpy/core/src/multiarray/methods.c                |   1 +
 numpy/core/src/multiarray/multiarraymodule.c       |   1 +
 numpy/core/src/multiarray/nditer_api.c             |   2 +
 numpy/core/src/multiarray/nditer_constr.c          |   2 +
 numpy/core/src/multiarray/nditer_templ.c.src       |   1 +
 numpy/core/src/multiarray/numpyos.c                |   1 +
 numpy/core/src/multiarray/scalarapi.c              |   1 +
 numpy/core/src/multiarray/scalartypes.c.src        |   2 +
 numpy/core/src/multiarray/sequence.c               |   1 +
 numpy/core/src/multiarray/shape.c                  |   1 +
 numpy/core/src/multiarray/ucsnarrow.c              |   1 +
 numpy/core/src/npysort/npysort_common.h            |   1 +
 numpy/core/src/umath/_rational_tests.c.src         |   1 +
 numpy/core/src/umath/reduction.c                   |   1 +
 numpy/core/src/umath/simd.inc.src                  |   1 +
 numpy/core/src/umath/ufunc_object.c                |   2 +
 numpy/core/src/umath/ufunc_type_resolution.c       |   2 +
 numpy/core/src/umath/umathmodule.c                 |   2 +
 numpy/random/setup.py                              |   4 +-
 45 files changed, 383 insertions(+), 23 deletions(-)
 create mode 100644 numpy/core/src/mkl_defs/aligned_alloc.c
 create mode 100644 numpy/core/src/mkl_defs/aligned_alloc.h
 create mode 100644 numpy/core/src/mkl_defs/mkl_cpy.c
 create mode 100644 numpy/core/src/mkl_defs/mkl_cpy.h

diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h
index cf73cec..053ab42 100644
--- a/numpy/core/include/numpy/ndarraytypes.h
+++ b/numpy/core/include/numpy/ndarraytypes.h
@@ -345,25 +345,27 @@ struct NpyAuxData_tag {
 
 #define NPY_USE_PYMEM 1
 
-#if NPY_USE_PYMEM == 1
-   /* numpy sometimes calls PyArray_malloc() with the GIL released. On Python
-      3.3 and older, it was safe to call PyMem_Malloc() with the GIL released.
-      On Python 3.4 and newer, it's better to use PyMem_RawMalloc() to be able
-      to use tracemalloc. On Python 3.6, calling PyMem_Malloc() with the GIL
-      released is now a fatal error in debug mode. */
-#  if PY_VERSION_HEX >= 0x03040000
-#    define PyArray_malloc PyMem_RawMalloc
-#    define PyArray_free PyMem_RawFree
-#    define PyArray_realloc PyMem_RawRealloc
-#  else
-#    define PyArray_malloc PyMem_Malloc
-#    define PyArray_free PyMem_Free
-#    define PyArray_realloc PyMem_Realloc
-#  endif
-#else
-#define PyArray_malloc malloc
-#define PyArray_free free
-#define PyArray_realloc realloc
+#if !defined(PyArray_malloc)
+#    if NPY_USE_PYMEM == 1
+     /* numpy sometimes calls PyArray_malloc() with the GIL released. On Python
+        3.3 and older, it was safe to call PyMem_Malloc() with the GIL released.
+        On Python 3.4 and newer, it's better to use PyMem_RawMalloc() to be able
+        to use tracemalloc. On Python 3.6, calling PyMem_Malloc() with the GIL
+        released is now a fatal error in debug mode. */
+#       if PY_VERSION_HEX >= 0x03040000
+#          define PyArray_malloc PyMem_RawMalloc
+#          define PyArray_free PyMem_RawFree
+#          define PyArray_realloc PyMem_RawRealloc
+#       else
+#          define PyArray_malloc PyMem_Malloc
+#          define PyArray_free PyMem_Free
+#          define PyArray_realloc PyMem_Realloc
+#       endif
+#   else
+#      define PyArray_malloc malloc
+#      define PyArray_free free
+#      define PyArray_realloc realloc
+#   endif
 #endif
 
 /* Dimensions and strides */
diff --git a/numpy/core/setup.py b/numpy/core/setup.py
index 5feb851..2d35844 100644
--- a/numpy/core/setup.py
+++ b/numpy/core/setup.py
@@ -613,6 +613,7 @@ def configuration(parent_package='',top_path=None):
     config.add_include_dirs(join('src', 'multiarray'))
     config.add_include_dirs(join('src', 'umath'))
     config.add_include_dirs(join('src', 'npysort'))
+    config.add_include_dirs(join('src', 'mkl_defs'))
 
     config.add_define_macros([("NPY_INTERNAL_BUILD", "1")]) # this macro indicates that Numpy build is in process
     config.add_define_macros([("HAVE_NPY_CONFIG_H", "1")])
@@ -694,6 +695,17 @@ def configuration(parent_package='',top_path=None):
             subst_dict)
 
     #######################################################################
+    #                         aligned_alloc library                       #
+    #######################################################################
+
+    # This library is created for the build but it is not installed
+    aligned_alloc_sources = [join('src', 'mkl_defs', 'aligned_alloc.h'),
+                       join('src', 'mkl_defs', 'aligned_alloc.c')]
+    config.add_library('aligned_alloc',
+                       sources=aligned_alloc_sources,
+                       include_dirs=[])
+
+    #######################################################################
     #                         npysort library                             #
     #######################################################################
 
@@ -711,6 +723,17 @@ def configuration(parent_package='',top_path=None):
                        include_dirs=[])
 
     #######################################################################
+    #                         mkl_cp library                              #
+    #######################################################################
+
+    # This library is created for the build but it is not installed
+    mkl_cp_sources = [join('src', 'mkl_defs', 'mkl_cpy.h'),
+                       join('src', 'mkl_defs', 'mkl_cpy.c')]
+    config.add_library('mkl_cp',
+                       sources=mkl_cp_sources,
+                       include_dirs=[])
+
+    #######################################################################
     #                        multiarray module                            #
     #######################################################################
 
@@ -851,7 +874,7 @@ def configuration(parent_package='',top_path=None):
                                   join('*.py')],
                          extra_compile_args=['/Qstd=c99' if platform.system() == "Windows" else ''],
                          depends=deps + multiarray_deps,
-                         libraries=['npymath', 'npysort'],
+                         libraries=['npymath', 'npysort', 'aligned_alloc', 'mkl_cp'],
                          extra_info=get_info('mkl'))
 
     #######################################################################
@@ -927,7 +950,7 @@ def configuration(parent_package='',top_path=None):
                                  generate_ufunc_api],
                          include_dirs=[npymathc_path],
                          depends=deps + umath_deps + loops_src,
-                         libraries=['loops', 'npymath'],
+                         libraries=['loops', 'npymath', 'aligned_alloc', 'mkl_cp'],
                          extra_info=mkl_info
                          )
 
@@ -943,7 +966,10 @@ def configuration(parent_package='',top_path=None):
     #######################################################################
 
     config.add_extension('_rational_tests',
-                    sources=[join('src', 'umath', '_rational_tests.c.src')])
+                    sources=[join('src', 'umath', '_rational_tests.c.src')],
+                    libraries=['mkl_cp'],
+                    extra_info=mkl_info
+                    )
 
     #######################################################################
     #                        struct_ufunc_test module                     #
diff --git a/numpy/core/src/mkl_defs/aligned_alloc.c b/numpy/core/src/mkl_defs/aligned_alloc.c
new file mode 100644
index 0000000..667432d
--- /dev/null
+++ b/numpy/core/src/mkl_defs/aligned_alloc.c
@@ -0,0 +1,146 @@
+#include "mkl.h"
+#include <stdlib.h>
+#include <stddef.h>
+#ifndef Py_PYTHON_H
+#   include "Python.h"
+#endif
+#include "numpy/npy_common.h"
+
+#define ALIGNMENT 64
+#define __THRESHOLD 524288
+#define __UNIT_STRIDE 1
+#define __NULL_STRIDE 0
+#define __8BYTES_ALIGNMENT_OFFSET(ptr) (((size_t) (ptr)) & 0x7)
+#define MKL_INT_MAX ((size_t) (~((MKL_UINT) 0) >> 1))
+
+static int is_tbb_enabled(void) {
+    static int TBB_ENABLED = -1;
+    if (TBB_ENABLED == -1) {
+            char* mkl_threading = getenv("MKL_THREADING_LAYER");
+            TBB_ENABLED = (!mkl_threading || strncmp(mkl_threading, "TBB", 3) != 0 || strncmp(mkl_threading, "tbb", 3) != 0 ) ? 0 : 1;
+    }
+    return TBB_ENABLED;
+}
+
+static NPY_INLINE void call_dcopy_chunked(size_t size, double* src, double* dest) {
+   while (size > MKL_INT_MAX) {
+       cblas_dcopy(MKL_INT_MAX, src , __NULL_STRIDE, dest, __UNIT_STRIDE);
+       size -= MKL_INT_MAX;
+       dest += MKL_INT_MAX;
+   }
+   if (size > 0) {
+       if (size >= __THRESHOLD) {
+            cblas_dcopy(size, src , __NULL_STRIDE, dest, __UNIT_STRIDE);
+       } else {
+            memset(dest, 0, size * sizeof(double));
+       }
+   }
+}
+
+inline void *_aligned_alloc(size_t size) {
+    /* Only available for Linux and OSX (has been explicitly disabled on Windows : see aligned_alloc.h)
+     * With Windows, we would run into composability issues with modules like h5py which allocate
+     * memory using libc functions in another library, like hdf5 for instance
+     */
+    size = (size > 0) ? size : 1;
+    void* data = NULL;
+    int ret_code = posix_memalign(&data, ALIGNMENT, size);
+    if (ret_code == 0) {
+        return data;
+    }
+    return NULL;
+}
+
+
+#ifdef WITH_ALIGNED_CALLOC
+inline void *_aligned_calloc(size_t nelem, size_t elsize)
+{
+    size_t size = nelem * elsize;
+    void *data = _aligned_alloc(size);
+    char *memory = NULL;
+
+    if (data != NULL) {
+        memory = (char*) data;
+        if((size > __THRESHOLD) && !is_tbb_enabled()) {
+            size_t offset = __8BYTES_ALIGNMENT_OFFSET(8 - __8BYTES_ALIGNMENT_OFFSET(memory));
+            size_t rem_size, ch_size, n_ch = (size - offset) / sizeof(double);
+            double init = 0;
+            if (offset) {
+                memset(memory, 0, offset);
+            }
+
+            call_dcopy_chunked(n_ch, &init, (double*) (memory+offset));
+
+            ch_size = offset + n_ch * sizeof(double);
+            rem_size = size - ch_size;
+            if(rem_size > 0) {
+                memset(memory + ch_size, 0, rem_size);
+            }
+        } else {
+                memset(memory, 0, size);
+        }
+    }
+    return data;
+}
+#endif
+
+#if PY_VERSION_HEX >= 0x03040000
+static int is_tracemalloc_enabled(void) {
+    static int TRACEMALLOC_PRESENT = -1;
+    if (TRACEMALLOC_PRESENT == -1) {
+        TRACEMALLOC_PRESENT = (getenv("PYTHONTRACEMALLOC")) ? 1 : 0;
+    }
+    return TRACEMALLOC_PRESENT;
+}
+#endif
+
+inline void* call_aligned_malloc(size_t size) {
+#if PY_VERSION_HEX >= 0x03040000
+    if(is_tracemalloc_enabled()){
+        return PyMem_RawMalloc(size);
+    } else
+#endif
+    {
+        return _aligned_alloc(size);
+    }
+}
+
+inline void* call_aligned_realloc(void* input, size_t size) {
+#if PY_VERSION_HEX >= 0x03040000
+    if(is_tracemalloc_enabled()){
+        return PyMem_RawRealloc(input, size);
+    } else
+#endif
+    {
+        if (input) {
+          return realloc(input, size ? size : 1);
+        }
+        return _aligned_alloc(size);
+    }
+}
+
+inline void* call_aligned_calloc(size_t num, size_t size) {
+#if PY_VERSION_HEX >= 0x03040000
+    if(is_tracemalloc_enabled()){
+        return PyMem_RawCalloc(num, size);
+    } else
+#endif
+    {
+#ifdef WITH_ALIGNED_CALLOC
+        return _aligned_calloc(num, size);
+#else
+        return calloc(num, size);
+#endif
+    }
+}
+
+inline void call_free(void* ptr) {
+#if PY_VERSION_HEX >= 0x03040000
+    if(is_tracemalloc_enabled()){
+        PyMem_RawFree(ptr);
+    } else
+#endif
+    {
+        free(ptr);
+    }
+}
diff --git a/numpy/core/src/mkl_defs/aligned_alloc.h b/numpy/core/src/mkl_defs/aligned_alloc.h
new file mode 100644
index 0000000..edd0080
--- /dev/null
+++ b/numpy/core/src/mkl_defs/aligned_alloc.h
@@ -0,0 +1,11 @@
+#if !defined(ALIGNED_ALLOC_H) && !defined(_MSC_VER)
+#   define ALIGNED_ALLOC_H
+#   include <stddef.h>
+    inline void* call_aligned_malloc(size_t);
+    inline void* call_aligned_realloc(void*, size_t);
+    inline void* call_aligned_calloc(size_t, size_t);
+    inline void call_free(void*);
+#   define PyArray_malloc call_aligned_malloc 
+#   define PyArray_free call_free
+#   define PyArray_realloc call_aligned_realloc 
+#endif
diff --git a/numpy/core/src/mkl_defs/mkl_cpy.c b/numpy/core/src/mkl_defs/mkl_cpy.c
new file mode 100644
index 0000000..93c4fa0
--- /dev/null
+++ b/numpy/core/src/mkl_defs/mkl_cpy.c
@@ -0,0 +1,86 @@
+#include "mkl.h"
+#include <stddef.h>
+
+#define __THRESHOLD 262144
+#define __UNIT_STRIDE 1
+#define __8BYTES_ALIGNMENT_OFFSET(ptr) (((size_t) (ptr)) & 0x7)
+#define MKL_INT_MAX ((size_t) (~((MKL_UINT) 0) >> 1))
+#include "numpy/npy_common.h"
+
+static int is_tbb_enabled(void) {
+        static int TBB_ENABLED = -1;
+        if (TBB_ENABLED == -1) {
+                char* mkl_threading = getenv("MKL_THREADING_LAYER");
+                TBB_ENABLED = (!mkl_threading || strncmp(mkl_threading, "TBB", 3) != 0 || strncmp(mkl_threading, "tbb", 3) != 0 ) ? 0 : 1;
+        }
+        return TBB_ENABLED;
+}
+
+
+static NPY_INLINE void call_dcopy_chunked(size_t size, double* src, double* dest) {
+   while (size > MKL_INT_MAX) {
+       cblas_dcopy(MKL_INT_MAX, src , __UNIT_STRIDE, dest, __UNIT_STRIDE);
+       size -= MKL_INT_MAX;
+       src += MKL_INT_MAX;
+       dest += MKL_INT_MAX;
+   }
+   if (size > 0) {
+        if (size >= __THRESHOLD) {
+            cblas_dcopy(size, src , __UNIT_STRIDE, dest, __UNIT_STRIDE);
+        } else {
+            memmove(dest, src, size * sizeof(double));
+        }
+   }
+}
+
+//#define __DEBUG
+void call_mkl_mv(void* destination, const void* source, size_t size, const char* file_name, const char* func_name, const int line_num) {
+        char* dst = (char*) destination;
+        const char* src = (const char*) source;
+        if((size > __THRESHOLD) && (__8BYTES_ALIGNMENT_OFFSET(src) == __8BYTES_ALIGNMENT_OFFSET(dst)) && ((dst + size < src) || (src + size < dst)) && !is_tbb_enabled()) {
+            // memory segments do not intersect, use threaded MKL BLAS copying functions
+            size_t offset = __8BYTES_ALIGNMENT_OFFSET(8 - __8BYTES_ALIGNMENT_OFFSET(src));
+            size_t rem_size, ch_size, n_ch = (size - offset) / sizeof(double);
+            if (offset) {
+                memmove(dst, src, offset);
+            }
+
+#           ifdef __DEBUG
+            printf("%zu bytes to mkl-mv : %s (%s:%d)\n", size, func_name, file_name, line_num);
+#           endif
+            call_dcopy_chunked(n_ch, (double *) (src + offset), (double*) (dst + offset));
+
+            ch_size = offset + n_ch * sizeof(double);
+            rem_size = size - ch_size;
+            if(rem_size > 0) {
+                memmove(dst + ch_size, src + ch_size, rem_size);
+            }
+        } else {
+                memmove(dst, src, size);
+        }
+}
+
+void call_mkl_cpy(void* destination, const void* source, size_t size, const char* file_name, const char* func_name, const int line_num) {
+        char* dst = (char*) destination;
+        const char* src = (const char*) source;
+        if((size > __THRESHOLD) && (__8BYTES_ALIGNMENT_OFFSET(src) == __8BYTES_ALIGNMENT_OFFSET(dst)) && !is_tbb_enabled()) {
+            size_t offset = __8BYTES_ALIGNMENT_OFFSET(8 - __8BYTES_ALIGNMENT_OFFSET(src));
+            size_t rem_size, ch_size, n_ch = (size - offset) / sizeof(double);
+            if (offset) {
+                memcpy(dst, src, offset);
+            }
+
+#           ifdef __DEBUG
+            printf("%zu bytes to mkl-cp : %s (%s:%d)\n", size, func_name, file_name, line_num);
+#           endif
+            call_dcopy_chunked(n_ch, (double *) (src + offset), (double*) (dst + offset));
+
+            ch_size = offset + n_ch * sizeof(double);
+            rem_size = size - ch_size;
+            if(rem_size > 0) {
+                memmove(dst + ch_size, src + ch_size, rem_size);
+            }
+        } else {
+                memcpy(dst, src, size);
+        }
+}
diff --git a/numpy/core/src/mkl_defs/mkl_cpy.h b/numpy/core/src/mkl_defs/mkl_cpy.h
new file mode 100644
index 0000000..74af118
--- /dev/null
+++ b/numpy/core/src/mkl_defs/mkl_cpy.h
@@ -0,0 +1,10 @@
+#ifdef __has_include
+#   if __has_include("mkl.h") && !defined(MKL_CPY_H)
+#       define MKL_CPY_H
+#       include <stddef.h>
+        void call_mkl_mv(void*, const void*, size_t, const char*, const char*, const int); 
+        void call_mkl_cpy(void*, const void*, size_t, const char*, const char*, const int);
+#       define memcpy(src, dst, size) call_mkl_cpy(src, dst, size, __FILE__, __func__, __LINE__)
+#       define memmove(src, dst, size) call_mkl_mv(src, dst, size, __FILE__, __func__, __LINE__)
+#   endif
+#endif
diff --git a/numpy/core/src/multiarray/alloc.c b/numpy/core/src/multiarray/alloc.c
index fe957bf..88d1135 100644
--- a/numpy/core/src/multiarray/alloc.c
+++ b/numpy/core/src/multiarray/alloc.c
@@ -1,6 +1,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include "structmember.h"
+#include "aligned_alloc.h"
 
 #if PY_VERSION_HEX >= 0x03060000
 #include <pymem.h>
@@ -75,6 +76,7 @@ _npy_alloc_cache(npy_uintp nelem, npy_uintp esz, npy_uint msz,
 #endif
 }
 
+
 /*
  * return pointer p to cache, nelem is number of elements of the cache bucket
  * size (1 or sizeof(npy_intp)) of the block pointed too
@@ -142,6 +144,7 @@ npy_alloc_cache_dim(npy_uintp sz)
     if (sz < 2) {
         sz = 2;
     }
+
     return _npy_alloc_cache(sz, sizeof(npy_intp), NBUCKETS_DIM, dimcache,
                             &PyArray_malloc);
 }
@@ -153,6 +156,7 @@ npy_free_cache_dim(void * p, npy_uintp sz)
     if (sz < 2) {
         sz = 2;
     }
+
     _npy_free_cache(p, sz, NBUCKETS_DIM, dimcache,
                     &PyArray_free);
 }
@@ -207,7 +211,11 @@ PyDataMem_NEW(size_t size)
 {
     void *result;
 
+#ifdef ALIGNED_ALLOC_H
+    result = call_aligned_malloc(size);
+#else
     result = malloc(size);
+#endif
     if (_PyDataMem_eventhook != NULL) {
         NPY_ALLOW_C_API_DEF
         NPY_ALLOW_C_API
@@ -229,7 +237,11 @@ PyDataMem_NEW_ZEROED(size_t size, size_t elsize)
 {
     void *result;
 
+#ifdef ALIGNED_ALLOC_H
+    result = call_aligned_calloc(size, elsize);
+#else
     result = calloc(size, elsize);
+#endif
     if (_PyDataMem_eventhook != NULL) {
         NPY_ALLOW_C_API_DEF
         NPY_ALLOW_C_API
@@ -250,7 +262,11 @@ NPY_NO_EXPORT void
 PyDataMem_FREE(void *ptr)
 {
     PyTraceMalloc_Untrack(NPY_TRACE_DOMAIN, (npy_uintp)ptr);
+#ifdef ALIGNED_ALLOC_H
+    call_free(ptr);
+#else
     free(ptr);
+#endif
     if (_PyDataMem_eventhook != NULL) {
         NPY_ALLOW_C_API_DEF
         NPY_ALLOW_C_API
@@ -270,7 +286,11 @@ PyDataMem_RENEW(void *ptr, size_t size)
 {
     void *result;
 
+#ifdef ALIGNED_ALLOC_H
+    result = call_aligned_realloc(ptr, size);
+#else
     result = realloc(ptr, size);
+#endif
     if (result != ptr) {
         PyTraceMalloc_Untrack(NPY_TRACE_DOMAIN, (npy_uintp)ptr);
     }
diff --git a/numpy/core/src/multiarray/array_assign_scalar.c b/numpy/core/src/multiarray/array_assign_scalar.c
index 17de99c..3fd57e1 100644
--- a/numpy/core/src/multiarray/array_assign_scalar.c
+++ b/numpy/core/src/multiarray/array_assign_scalar.c
@@ -9,6 +9,7 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
+#include "aligned_alloc.h"
 
 #define NPY_NO_DEPRECATED_API NPY_API_VERSION
 #define _MULTIARRAYMODULE
diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c
index 41748c7..9eeec13 100644
--- a/numpy/core/src/multiarray/arrayobject.c
+++ b/numpy/core/src/multiarray/arrayobject.c
@@ -23,6 +23,7 @@ maintainer email:  oliphant.travis@ieee.org
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include "structmember.h"
+#include "aligned_alloc.h"
 
 /*#include <stdio.h>*/
 #define NPY_NO_DEPRECATED_API NPY_API_VERSION
@@ -53,6 +54,7 @@ maintainer email:  oliphant.travis@ieee.org
 #include "alloc.h"
 #include "mem_overlap.h"
 #include "numpyos.h"
+#include "mkl_cpy.h"
 #include "strfuncs.h"
 
 #include "binop_override.h"
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src
index 1055f6a..ebc4561 100644
--- a/numpy/core/src/multiarray/arraytypes.c.src
+++ b/numpy/core/src/multiarray/arraytypes.c.src
@@ -8,6 +8,7 @@
 #define _MULTIARRAYMODULE
 #define _NPY_NO_DEPRECATIONS /* for NPY_CHAR */
 
+#include "aligned_alloc.h"
 #include "numpy/npy_common.h"
 #include "numpy/arrayobject.h"
 #include "numpy/arrayscalars.h"
@@ -34,6 +35,7 @@
 
 #include "cblasfuncs.h"
 #include "npy_cblas.h"
+
 #include <limits.h>
 #include <assert.h>
 
@@ -1996,6 +1998,7 @@ static void
 
 /**end repeat**/
 
+
 /**begin repeat
  *
  * #fname = BOOL,
@@ -4592,8 +4595,10 @@ initialize_builtin_datetime_metadata(void)
     /* Initialize the base aux data */
     memset(data1, 0, sizeof(PyArray_DatetimeDTypeMetaData));
     memset(data2, 0, sizeof(PyArray_DatetimeDTypeMetaData));
+
     data1->base.free = (NpyAuxData_FreeFunc *)PyArray_free;
     data2->base.free = (NpyAuxData_FreeFunc *)PyArray_free;
+
     data1->base.clone = datetime_dtype_metadata_clone;
     data2->base.clone = datetime_dtype_metadata_clone;
 
diff --git a/numpy/core/src/multiarray/compiled_base.c b/numpy/core/src/multiarray/compiled_base.c
index bcb44f6..7b8390a 100644
--- a/numpy/core/src/multiarray/compiled_base.c
+++ b/numpy/core/src/multiarray/compiled_base.c
@@ -2,12 +2,14 @@
 #include <Python.h>
 #include <structmember.h>
 #include <string.h>
+#include "aligned_alloc.h"
 
 #define _MULTIARRAYMODULE
 #include "numpy/arrayobject.h"
 #include "numpy/npy_3kcompat.h"
 #include "numpy/npy_math.h"
 #include "npy_config.h"
+#include "mkl_cpy.h"
 #include "templ_common.h" /* for npy_mul_with_overflow_intp */
 #include "lowlevel_strided_loops.h" /* for npy_bswap8 */
 #include "alloc.h"
diff --git a/numpy/core/src/multiarray/convert.c b/numpy/core/src/multiarray/convert.c
index e88582a..6c66a51 100644
--- a/numpy/core/src/multiarray/convert.c
+++ b/numpy/core/src/multiarray/convert.c
@@ -22,6 +22,7 @@
 #include "array_assign.h"
 
 #include "convert.h"
+#include "mkl_cpy.h"
 
 int
 fallocate(int fd, int mode, off_t offset, off_t len);
diff --git a/numpy/core/src/multiarray/convert_datatype.c b/numpy/core/src/multiarray/convert_datatype.c
index 3df764a..818b1cc 100644
--- a/numpy/core/src/multiarray/convert_datatype.c
+++ b/numpy/core/src/multiarray/convert_datatype.c
@@ -19,6 +19,7 @@
 #include "convert_datatype.h"
 #include "_datetime.h"
 #include "datetime_strings.h"
+#include "mkl_cpy.h"
 
 
 /*
diff --git a/numpy/core/src/multiarray/datetime.c b/numpy/core/src/multiarray/datetime.c
index df9b9ce..56d474b 100644
--- a/numpy/core/src/multiarray/datetime.c
+++ b/numpy/core/src/multiarray/datetime.c
@@ -15,6 +15,7 @@
 
 #define NPY_NO_DEPRECATED_API NPY_API_VERSION
 #define _MULTIARRAYMODULE
+#include "aligned_alloc.h"
 #include <numpy/arrayobject.h>
 
 #include "npy_config.h"
@@ -25,6 +26,7 @@
 #include "methods.h"
 #include "_datetime.h"
 #include "datetime_strings.h"
+#include "mkl_cpy.h"
 
 /*
  * Imports the PyDateTime functions so we can create these objects.
diff --git a/numpy/core/src/multiarray/datetime_busday.c b/numpy/core/src/multiarray/datetime_busday.c
index c04a6c1..df58067 100644
--- a/numpy/core/src/multiarray/datetime_busday.c
+++ b/numpy/core/src/multiarray/datetime_busday.c
@@ -22,6 +22,7 @@
 #include "_datetime.h"
 #include "datetime_busday.h"
 #include "datetime_busdaycal.h"
+#include "mkl_cpy.h"
 
 /* Gets the day of the week for a datetime64[D] value */
 static int
diff --git a/numpy/core/src/multiarray/datetime_busdaycal.c b/numpy/core/src/multiarray/datetime_busdaycal.c
index 7a26868..561133c 100644
--- a/numpy/core/src/multiarray/datetime_busdaycal.c
+++ b/numpy/core/src/multiarray/datetime_busdaycal.c
@@ -13,6 +13,7 @@
 
 #define NPY_NO_DEPRECATED_API NPY_API_VERSION
 #define _MULTIARRAYMODULE
+#include "aligned_alloc.h"
 #include <numpy/arrayobject.h>
 
 #include "npy_config.h"
@@ -24,6 +25,7 @@
 #include "_datetime.h"
 #include "datetime_busday.h"
 #include "datetime_busdaycal.h"
+#include "mkl_cpy.h"
 
 NPY_NO_EXPORT int
 PyArray_WeekMaskConverter(PyObject *weekmask_in, npy_bool *weekmask)
diff --git a/numpy/core/src/multiarray/datetime_strings.c b/numpy/core/src/multiarray/datetime_strings.c
index 4f9d8fa..948ab21 100644
--- a/numpy/core/src/multiarray/datetime_strings.c
+++ b/numpy/core/src/multiarray/datetime_strings.c
@@ -23,6 +23,7 @@
 #include "methods.h"
 #include "_datetime.h"
 #include "datetime_strings.h"
+#include "mkl_cpy.h"
 
 /*
  * Platform-specific time_t typedef. Some platforms use 32 bit, some use 64 bit
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c
index a0dc98f..fb2a5ec 100644
--- a/numpy/core/src/multiarray/descriptor.c
+++ b/numpy/core/src/multiarray/descriptor.c
@@ -6,6 +6,7 @@
 
 #define NPY_NO_DEPRECATED_API NPY_API_VERSION
 #define _MULTIARRAYMODULE
+#include "aligned_alloc.h"
 #include "numpy/arrayobject.h"
 #include "numpy/arrayscalars.h"
 
@@ -17,6 +18,7 @@
 #include "common.h"
 #include "templ_common.h" /* for npy_mul_with_overflow_intp */
 #include "descriptor.h"
+#include "mkl_cpy.h"
 #include "alloc.h"
 #include "assert.h"
 
diff --git a/numpy/core/src/multiarray/dtype_transfer.c b/numpy/core/src/multiarray/dtype_transfer.c
index 2cb1e0a..13d636f 100644
--- a/numpy/core/src/multiarray/dtype_transfer.c
+++ b/numpy/core/src/multiarray/dtype_transfer.c
@@ -13,6 +13,7 @@
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "structmember.h"
+#include "aligned_alloc.h"
 
 #define NPY_NO_DEPRECATED_API NPY_API_VERSION
 #define _MULTIARRAYMODULE
@@ -29,6 +30,7 @@
 
 #include "shape.h"
 #include "lowlevel_strided_loops.h"
+#include "mkl_cpy.h"
 #include "alloc.h"
 
 #define NPY_LOWLEVEL_BUFFER_BLOCKSIZE  128
diff --git a/numpy/core/src/multiarray/einsum.c.src b/numpy/core/src/multiarray/einsum.c.src
index 1765982..d8bf721 100644
--- a/numpy/core/src/multiarray/einsum.c.src
+++ b/numpy/core/src/multiarray/einsum.c.src
@@ -48,6 +48,8 @@
 #include <emmintrin.h>
 #endif
 
+#include "mkl_cpy.h"
+
 #define EINSUM_IS_SSE_ALIGNED(x) ((((npy_intp)x)&0xf) == 0)
 
 /********** PRINTF DEBUG TRACING **************/
diff --git a/numpy/core/src/multiarray/flagsobject.c b/numpy/core/src/multiarray/flagsobject.c
index a78bedc..4b19255 100644
--- a/numpy/core/src/multiarray/flagsobject.c
+++ b/numpy/core/src/multiarray/flagsobject.c
@@ -14,6 +14,7 @@
 #include "npy_pycompat.h"
 
 #include "common.h"
+#include "mkl_cpy.h"
 
 static void
 _UpdateContiguousFlags(PyArrayObject *ap);
diff --git a/numpy/core/src/multiarray/getset.c b/numpy/core/src/multiarray/getset.c
index cae4273..cefdfe7 100644
--- a/numpy/core/src/multiarray/getset.c
+++ b/numpy/core/src/multiarray/getset.c
@@ -6,6 +6,7 @@
 
 #define NPY_NO_DEPRECATED_API NPY_API_VERSION
 #define _MULTIARRAYMODULE
+#include "aligned_alloc.h"
 #include "numpy/arrayobject.h"
 
 #include "npy_config.h"
@@ -19,6 +20,7 @@
 #include "getset.h"
 #include "arrayobject.h"
 #include "mem_overlap.h"
+#include "mkl_cpy.h"
 #include "alloc.h"
 
 /*******************  array attribute get and set routines ******************/
diff --git a/numpy/core/src/multiarray/item_selection.c b/numpy/core/src/multiarray/item_selection.c
index 9255857..fe9d4c5 100644
--- a/numpy/core/src/multiarray/item_selection.c
+++ b/numpy/core/src/multiarray/item_selection.c
@@ -4,6 +4,7 @@
 
 #define NPY_NO_DEPRECATED_API NPY_API_VERSION
 #define _MULTIARRAYMODULE
+#include "aligned_alloc.h"
 #include "numpy/arrayobject.h"
 #include "numpy/arrayscalars.h"
 
@@ -24,6 +25,7 @@
 #include "npy_sort.h"
 #include "npy_partition.h"
 #include "npy_binsearch.h"
+#include "mkl_cpy.h"
 #include "alloc.h"
 
 /*NUMPY_API
diff --git a/numpy/core/src/multiarray/iterators.c b/numpy/core/src/multiarray/iterators.c
index 3e3248f..dc1b839 100644
--- a/numpy/core/src/multiarray/iterators.c
+++ b/numpy/core/src/multiarray/iterators.c
@@ -4,6 +4,7 @@
 
 #define NPY_NO_DEPRECATED_API NPY_API_VERSION
 #define _MULTIARRAYMODULE
+#include "aligned_alloc.h"
 #include "numpy/arrayobject.h"
 #include "numpy/arrayscalars.h"
 
@@ -15,6 +16,7 @@
 #include "iterators.h"
 #include "ctors.h"
 #include "common.h"
+#include "mkl_cpy.h"
 
 #define NEWAXIS_INDEX -1
 #define ELLIPSIS_INDEX -2
diff --git a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src
index fa68af1..78d98d5 100644
--- a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src
+++ b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src
@@ -17,6 +17,7 @@
 #include <numpy/arrayobject.h>
 #include <numpy/npy_cpu.h>
 #include <numpy/halffloat.h>
+#include "mkl_cpy.h"
 
 #include "lowlevel_strided_loops.h"
 
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c
index 57b8f15..391502f 100644
--- a/numpy/core/src/multiarray/mapping.c
+++ b/numpy/core/src/multiarray/mapping.c
@@ -1,6 +1,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include "structmember.h"
+#include "aligned_alloc.h"
 
 /*#include <stdio.h>*/
 #define NPY_NO_DEPRECATED_API NPY_API_VERSION
diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c
index d6f2577..5f8db62 100644
--- a/numpy/core/src/multiarray/methods.c
+++ b/numpy/core/src/multiarray/methods.c
@@ -23,6 +23,7 @@
 #include "strfuncs.h"
 
 #include "methods.h"
+#include "mkl_cpy.h"
 #include "alloc.h"
 
 
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
index fe19cc9..27a4765 100644
--- a/numpy/core/src/multiarray/multiarraymodule.c
+++ b/numpy/core/src/multiarray/multiarraymodule.c
@@ -17,6 +17,7 @@
 #define PY_SSIZE_T_CLEAN
 #include "Python.h"
 #include "structmember.h"
+#include "aligned_alloc.h"
 
 #define NPY_NO_DEPRECATED_API NPY_API_VERSION
 #define _MULTIARRAYMODULE
diff --git a/numpy/core/src/multiarray/nditer_api.c b/numpy/core/src/multiarray/nditer_api.c
index 7a33ac0..ce0090f 100644
--- a/numpy/core/src/multiarray/nditer_api.c
+++ b/numpy/core/src/multiarray/nditer_api.c
@@ -13,9 +13,11 @@
 
 /* Indicate that this .c file is allowed to include the header */
 #define NPY_ITERATOR_IMPLEMENTATION_CODE
+#include "aligned_alloc.h"
 #include "nditer_impl.h"
 #include "templ_common.h"
 #include "ctors.h"
+#include "mkl_cpy.h"
 
 /* Internal helper functions private to this file */
 static npy_intp
diff --git a/numpy/core/src/multiarray/nditer_constr.c b/numpy/core/src/multiarray/nditer_constr.c
index c56376f..599faee 100644
--- a/numpy/core/src/multiarray/nditer_constr.c
+++ b/numpy/core/src/multiarray/nditer_constr.c
@@ -13,11 +13,13 @@
 
 /* Indicate that this .c file is allowed to include the header */
 #define NPY_ITERATOR_IMPLEMENTATION_CODE
+#include "aligned_alloc.h"
 #include "nditer_impl.h"
 
 #include "arrayobject.h"
 #include "templ_common.h"
 #include "mem_overlap.h"
+#include "mkl_cpy.h"
 
 
 /* Internal helper functions private to this file */
diff --git a/numpy/core/src/multiarray/nditer_templ.c.src b/numpy/core/src/multiarray/nditer_templ.c.src
index 0f0d599..e143fd6 100644
--- a/numpy/core/src/multiarray/nditer_templ.c.src
+++ b/numpy/core/src/multiarray/nditer_templ.c.src
@@ -11,6 +11,7 @@
 /* Indicate that this .c file is allowed to include the header */
 #define NPY_ITERATOR_IMPLEMENTATION_CODE
 #include "nditer_impl.h"
+#include "mkl_cpy.h"
 
 /* SPECIALIZED iternext functions that handle the non-buffering part */
 
diff --git a/numpy/core/src/multiarray/numpyos.c b/numpy/core/src/multiarray/numpyos.c
index 52dcbf3..b097d77 100644
--- a/numpy/core/src/multiarray/numpyos.c
+++ b/numpy/core/src/multiarray/numpyos.c
@@ -25,6 +25,7 @@
 #endif
 
 
+#include "mkl_cpy.h"
 
 /*
  * From the C99 standard, section 7.19.6: The exponent always contains at least
diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c
index 5ef6c0b..f073919 100644
--- a/numpy/core/src/multiarray/scalarapi.c
+++ b/numpy/core/src/multiarray/scalarapi.c
@@ -18,6 +18,7 @@
 #include "scalartypes.h"
 
 #include "common.h"
+#include "mkl_cpy.h"
 
 static PyArray_Descr *
 _descr_from_subtype(PyObject *type)
diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
index a32aa47..8541008 100644
--- a/numpy/core/src/multiarray/scalartypes.c.src
+++ b/numpy/core/src/multiarray/scalartypes.c.src
@@ -8,6 +8,7 @@
 #define _MULTIARRAYMODULE
 #endif
 
+#include "aligned_alloc.h"
 #include "numpy/arrayobject.h"
 #include "numpy/npy_math.h"
 #include "numpy/halffloat.h"
@@ -31,6 +32,7 @@
 #include "buffer.h"
 
 #include <stdlib.h>
+#include "mkl_cpy.h"
 
 #include "binop_override.h"
 
diff --git a/numpy/core/src/multiarray/sequence.c b/numpy/core/src/multiarray/sequence.c
index 4769bda..e5415e3 100644
--- a/numpy/core/src/multiarray/sequence.c
+++ b/numpy/core/src/multiarray/sequence.c
@@ -16,6 +16,7 @@
 
 #include "sequence.h"
 #include "calculation.h"
+#include "mkl_cpy.h"
 
 /*************************************************************************
  ****************   Implement Sequence Protocol **************************
diff --git a/numpy/core/src/multiarray/shape.c b/numpy/core/src/multiarray/shape.c
index 3ac71e2..779b598 100644
--- a/numpy/core/src/multiarray/shape.c
+++ b/numpy/core/src/multiarray/shape.c
@@ -16,6 +16,7 @@
 #include "ctors.h"
 
 #include "shape.h"
+#include "mkl_cpy.h"
 
 #include "multiarraymodule.h" /* for interned strings */
 #include "templ_common.h" /* for npy_mul_with_overflow_intp */
diff --git a/numpy/core/src/multiarray/ucsnarrow.c b/numpy/core/src/multiarray/ucsnarrow.c
index 8e293e9..0d902b9 100644
--- a/numpy/core/src/multiarray/ucsnarrow.c
+++ b/numpy/core/src/multiarray/ucsnarrow.c
@@ -14,6 +14,7 @@
 
 #include "npy_pycompat.h"
 #include "ctors.h"
+#include "mkl_cpy.h"
 
 /*
  * Functions only needed on narrow builds of Python for converting back and
diff --git a/numpy/core/src/npysort/npysort_common.h b/numpy/core/src/npysort/npysort_common.h
index a22045b..17c649a 100644
--- a/numpy/core/src/npysort/npysort_common.h
+++ b/numpy/core/src/npysort/npysort_common.h
@@ -3,6 +3,7 @@
 
 #include <stdlib.h>
 #include <numpy/ndarraytypes.h>
+#include "mkl_cpy.h"
 
 /*
  *****************************************************************************
diff --git a/numpy/core/src/umath/_rational_tests.c.src b/numpy/core/src/umath/_rational_tests.c.src
index 9e74845..f98a0ad 100644
--- a/numpy/core/src/umath/_rational_tests.c.src
+++ b/numpy/core/src/umath/_rational_tests.c.src
@@ -8,6 +8,7 @@
 #include <numpy/ufuncobject.h>
 #include <numpy/npy_3kcompat.h>
 #include <math.h>
+#include "mkl_cpy.h"
 
 #include "common.h"  /* for error_converting */
 
diff --git a/numpy/core/src/umath/reduction.c b/numpy/core/src/umath/reduction.c
index 8136d7b..45c6c20 100644
--- a/numpy/core/src/umath/reduction.c
+++ b/numpy/core/src/umath/reduction.c
@@ -25,6 +25,7 @@
 #include "lowlevel_strided_loops.h"
 #include "reduction.h"
 #include "extobj.h"  /* for _check_ufunc_fperr */
+#include "mkl_cpy.h"
 
 /*
  * Allocates a result array for a reduction operation, with
diff --git a/numpy/core/src/umath/simd.inc.src b/numpy/core/src/umath/simd.inc.src
index 5c0568c..4e1af70 100644
--- a/numpy/core/src/umath/simd.inc.src
+++ b/numpy/core/src/umath/simd.inc.src
@@ -33,6 +33,7 @@
 #include <stdlib.h>
 #include <float.h>
 #include <string.h> /* for memcpy */
+#include "mkl_cpy.h"
 
 static NPY_INLINE npy_uintp
 abs_ptrdiff(char *a, char *b)
diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c
index 59fc5aa..e9ab22e 100644
--- a/numpy/core/src/umath/ufunc_object.c
+++ b/numpy/core/src/umath/ufunc_object.c
@@ -27,6 +27,7 @@
 #define NPY_NO_DEPRECATED_API NPY_API_VERSION
 
 #include "Python.h"
+#include "aligned_alloc.h"
 
 #include "npy_config.h"
 
@@ -48,6 +49,7 @@
 #include "npy_import.h"
 #include "extobj.h"
 #include "common.h"
+#include "mkl_cpy.h"
 
 /********** PRINTF DEBUG TRACING **************/
 #define NPY_UF_DBG_TRACING 0
diff --git a/numpy/core/src/umath/ufunc_type_resolution.c b/numpy/core/src/umath/ufunc_type_resolution.c
index 1766ba5..2ad0fb2 100644
--- a/numpy/core/src/umath/ufunc_type_resolution.c
+++ b/numpy/core/src/umath/ufunc_type_resolution.c
@@ -12,6 +12,7 @@
 #define NPY_NO_DEPRECATED_API NPY_API_VERSION
 
 #include "Python.h"
+#include "aligned_alloc.h"
 
 #include "npy_config.h"
 #define PY_ARRAY_UNIQUE_SYMBOL _npy_umathmodule_ARRAY_API
@@ -23,6 +24,7 @@
 #include "ufunc_type_resolution.h"
 #include "ufunc_object.h"
 #include "common.h"
+#include "mkl_cpy.h"
 
 static const char *
 npy_casting_to_string(NPY_CASTING casting)
diff --git a/numpy/core/src/umath/umathmodule.c b/numpy/core/src/umath/umathmodule.c
index 5567b9b..2eb71cb 100644
--- a/numpy/core/src/umath/umathmodule.c
+++ b/numpy/core/src/umath/umathmodule.c
@@ -20,6 +20,7 @@
 
 #include "Python.h"
 
+#include "aligned_alloc.h"
 #include "npy_config.h"
 #define PY_ARRAY_UNIQUE_SYMBOL _npy_umathmodule_ARRAY_API
 
@@ -285,6 +286,7 @@ static struct PyModuleDef moduledef = {
 #endif
 
 #include <stdio.h>
+#include "mkl_cpy.h"
 
 #if defined(NPY_PY3K)
 #define RETVAL(x) x
diff --git a/numpy/random/setup.py b/numpy/random/setup.py
index a8d82b1..d38f1e0 100644
--- a/numpy/random/setup.py
+++ b/numpy/random/setup.py
@@ -5,6 +5,7 @@ import os
 import sys
 from distutils.dep_util import newer
 from distutils.msvccompiler import get_build_version as get_msvc_build_version
+from numpy.distutils.system_info import get_info
 
 def needs_mingw_ftime_workaround():
     # We need the mingw workaround for _ftime if the msvc runtime version is
@@ -43,7 +44,7 @@ def configuration(parent_package='',top_path=None):
     # see https://github.com/cython/cython/issues/2494
     defs.append(('CYTHON_SMALL_CODE', ''))
 
-    libs = []
+    libs = ['mkl_cp']
     # Configure mtrand
     config.add_extension('mtrand',
                          sources=[join('mtrand', x) for x in
@@ -54,6 +55,7 @@ def configuration(parent_package='',top_path=None):
                                   join('mtrand', '*.pyx'),
                                   join('mtrand', '*.pxi'),],
                          define_macros=defs,
+                         extra_info=get_info('mkl')
                          )
 
     config.add_data_files(('.', join('mtrand', 'randomkit.h')))
-- 
2.7.4

