diff options
| author | Gregory Lee <lee218@llnl.gov> | 2021-02-26 14:57:40 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-26 14:57:40 -0800 |
| commit | b56d65fce5f4743a23399f0cde006bed1b52d53d (patch) | |
| tree | 6f99218f6250bfa7f8a9286248df4ced78228f2b | |
| parent | 590457cf7fa82ac09d13e1fd7ae91d39a80cffc9 (diff) | |
| download | spack-e4s-21.02.tar.gz spack-e4s-21.02.tar.bz2 spack-e4s-21.02.tar.xz spack-e4s-21.02.zip | |
Compilers: make oneapi ifx version_regex tolerant to wrappers (#21742)e4s-21.02
If a user creates a wrapper for the ifx binary called ifx_orig,
this causes the ifx --version command to produce:
$ ifx --version
ifx_orig (IFORT) 2021.1 Beta 20201113
Copyright (C) 1985-2020 Intel Corporation. All rights reserved.
The regex for ifx currently expects the output to begin with
"ifx (IFORT)..." so the wrapper would not be detected as ifx. This
PR removes the need for the static "ifx" string which allows wrappers
to be detected as ifx.
In general, the Intel compiler regexes do not include the invoked
executable name (i.e., ifort, icc, icx, etc.), so this is not
expected to cause any issues.
| -rw-r--r-- | lib/spack/spack/compilers/oneapi.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/spack/spack/compilers/oneapi.py b/lib/spack/spack/compilers/oneapi.py index 5b3a81b454..0289d266b8 100644 --- a/lib/spack/spack/compilers/oneapi.py +++ b/lib/spack/spack/compilers/oneapi.py @@ -29,7 +29,7 @@ class Oneapi(Compiler): PrgEnv_compiler = 'oneapi' version_argument = '--version' - version_regex = r'(?:(?:oneAPI DPC\+\+ Compiler)|(?:ifx \(IFORT\))) (\S+)' + version_regex = r'(?:(?:oneAPI DPC\+\+ Compiler)|(?:\(IFORT\))) (\S+)' @property def verbose_flag(self): |