diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2019-04-20 17:52:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-20 17:52:55 -0500 |
| commit | 7255d5ee3c980a95dc1690df8b292e0252f29845 (patch) | |
| tree | 2a12c2be1fae6d82fbc6e92b06d283fe2f814895 /lib | |
| parent | a40492172f76a8867ccca82d7dbefee34a0d9b8b (diff) | |
| download | spack-7255d5ee3c980a95dc1690df8b292e0252f29845.tar.gz spack-7255d5ee3c980a95dc1690df8b292e0252f29845.tar.bz2 spack-7255d5ee3c980a95dc1690df8b292e0252f29845.tar.xz spack-7255d5ee3c980a95dc1690df8b292e0252f29845.zip | |
Fix detection of LLVM-enabled PGI compilers (#10704)
* Fix detection of LLVM-enabled PGI compilers
* Add unit tests for LLVM-enabled PGI compiler version detection
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/compilers/pgi.py | 6 | ||||
| -rw-r--r-- | lib/spack/spack/test/compilers.py | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib/spack/spack/compilers/pgi.py b/lib/spack/spack/compilers/pgi.py index af636a8f81..fdd7748b57 100644 --- a/lib/spack/spack/compilers/pgi.py +++ b/lib/spack/spack/compilers/pgi.py @@ -19,6 +19,10 @@ class Pgi(spack.compiler.Compiler): # Subclasses use possible names of Fortran 90 compiler fc_names = ['pgfortran', 'pgf95', 'pgf90'] + # LLVM-enabled PGI compilers add a '-llvm' suffix: + # pgcc-llvm, pgc++llvm, pgfortran-llvm + suffixes = ['-?llvm'] + # Named wrapper links within build_env_path link_paths = {'cc': 'pgi/pgcc', 'cxx': 'pgi/pgc++', @@ -29,7 +33,7 @@ class Pgi(spack.compiler.Compiler): PrgEnv_compiler = 'pgi' version_argument = '-V' - version_regex = r'pg[^ ]* ([0-9.]+)-[0-9]+ [^ ]+ target on ' + version_regex = r'pg[^ ]* ([0-9.]+)-[0-9]+ (LLVM )?[^ ]+ target on ' @property def openmp_flag(self): diff --git a/lib/spack/spack/test/compilers.py b/lib/spack/spack/test/compilers.py index 2d3b05a7fa..27ddc8068b 100644 --- a/lib/spack/spack/test/compilers.py +++ b/lib/spack/spack/test/compilers.py @@ -317,7 +317,13 @@ def test_nag_version_detection(version_str, expected_version): # Output on PowerPC ('pgcc 17.4-0 linuxpower target on Linuxpower\n' 'PGI Compilers and Tools\n' - 'Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved.\n', '17.4') + 'Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved.\n', + '17.4'), + # Output when LLVM-enabled + ('pgcc-llvm 18.4-0 LLVM 64-bit target on x86-64 Linux -tp haswell\n' + 'PGI Compilers and Tools\n' + 'Copyright (c) 2018, NVIDIA CORPORATION. All rights reserved.\n', + '18.4') ]) def test_pgi_version_detection(version_str, expected_version): version = spack.compilers.pgi.Pgi.extract_version_from_output(version_str) |