diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2017-06-21 09:55:26 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2017-06-26 10:20:41 -0600 |
| commit | bb21232753efea0b2af0aee458d52c694ad6959a (patch) | |
| tree | 3ce43f593881b64a01ae9e52f50969cbe5a90c32 /numpy/distutils/intelccompiler.py | |
| parent | cfb909f35de8ad238066eb176bc408d86f15c9c8 (diff) | |
| download | numpy-bb21232753efea0b2af0aee458d52c694ad6959a.tar.gz | |
BUG: Fix Intel compilation on Unix.
Fixes two problems:
* c compilers do not have a find_executables method.
* get_version return a LooseVersion instance, not string.
Closes #9278.
[ci skip]
Diffstat (limited to 'numpy/distutils/intelccompiler.py')
| -rw-r--r-- | numpy/distutils/intelccompiler.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/distutils/intelccompiler.py b/numpy/distutils/intelccompiler.py index 3b7756b59..3386775ee 100644 --- a/numpy/distutils/intelccompiler.py +++ b/numpy/distutils/intelccompiler.py @@ -19,7 +19,7 @@ class IntelCCompiler(UnixCCompiler): UnixCCompiler.__init__(self, verbose, dry_run, force) v = self.get_version() - mpopt = 'openmp' if v and int(v.split('.')[0]) < 15 else 'qopenmp' + mpopt = 'openmp' if v and v < '15' else 'qopenmp' self.cc_exe = ('icc -fPIC -fp-model strict -O3 ' '-fomit-frame-pointer -{}').format(mpopt) compiler = self.cc_exe @@ -59,7 +59,7 @@ class IntelEM64TCCompiler(UnixCCompiler): UnixCCompiler.__init__(self, verbose, dry_run, force) v = self.get_version() - mpopt = 'openmp' if v and int(v.split('.')[0]) < 15 else 'qopenmp' + mpopt = 'openmp' if v and v < '15' else 'qopenmp' self.cc_exe = ('icc -m64 -fPIC -fp-model strict -O3 ' '-fomit-frame-pointer -{}').format(mpopt) compiler = self.cc_exe |