|
60 | 60 |
|
61 | 61 |
|
62 | 62 | def get_extensions():
|
63 |
| - try: |
64 |
| - from numpy.distutils.system_info import get_info |
65 |
| - mkl_info = get_info('mkl') |
66 |
| - except ImportError: |
67 |
| - mkl_root = os.environ['MKLROOT'] |
68 |
| - mkl_info = { |
69 |
| - 'include_dirs': [join(mkl_root, 'include')], |
70 |
| - 'library_dirs': [join(mkl_root, 'lib'), join(mkl_root, 'lib', 'intel64')], |
71 |
| - 'libraries': ['mkl_rt'] |
72 |
| - } |
| 63 | + mkl_root = os.environ['MKLROOT'] |
| 64 | + mkl_info = { |
| 65 | + 'include_dirs': [join(mkl_root, 'include')], |
| 66 | + 'library_dirs': [join(mkl_root, 'lib'), join(mkl_root, 'lib', 'intel64')], |
| 67 | + 'libraries': ['mkl_rt'] |
| 68 | + } |
73 | 69 |
|
74 | 70 | mkl_include_dirs = mkl_info.get('include_dirs', [])
|
75 | 71 | mkl_library_dirs = mkl_info.get('library_dirs', [])
|
@@ -99,7 +95,7 @@ def get_extensions():
|
99 | 95 | sources=['mkl/_mklinitmodule.c'],
|
100 | 96 | define_macros=defs,
|
101 | 97 | include_dirs=mkl_include_dirs,
|
102 |
| - libraries=mkl_libraries, |
| 98 | + libraries=mkl_libraries + ["pthread"], |
103 | 99 | library_dirs=mkl_library_dirs,
|
104 | 100 | extra_compile_args=[
|
105 | 101 | '-DNDEBUG'
|
@@ -155,7 +151,7 @@ def setup_package():
|
155 | 151 | test_suite='nose.collector',
|
156 | 152 | python_requires='>=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*',
|
157 | 153 | setup_requires=['setuptools', 'cython'],
|
158 |
| - install_requires=['six'], |
| 154 | + install_requires=[], |
159 | 155 | packages=setuptools.find_packages(),
|
160 | 156 | ext_modules=get_extensions()
|
161 | 157 | )
|
|
0 commit comments