hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fujitsu compiler: Accept alphabet as version. (#17890)

Browse source 
* Fujitsu compiler: Accept alphabet as version.

* Fujitsu copiler: Updated test pattern.
This commit is contained in:
Tomoki, Karatsu 2020-08-07 23:06:22 +09:00 committed by GitHub
parent c1efa09928
commit c83236d3a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/spack/spack/compilers/fj.py
View file

@ -26,7 +26,7 @@ class Fj(spack.compiler.Compiler):
'fc': 'fj/frt'} 'fc': 'fj/frt'}
version_argument = '--version' version_argument = '--version'
version_regex = r'\((?:FCC|FRT)\) ([\d.]+)' version_regex = r'\((?:FCC|FRT)\) ([a-z\d.]+)'
required_libs = ['libfj90i', 'libfj90f', 'libfjsrcinfo'] required_libs = ['libfj90i', 'libfj90f', 'libfjsrcinfo']

12
lib/spack/spack/test/compilers/detection.py
View file

@ -104,19 +104,19 @@ def test_clang_version_detection(version_str, expected_version):
@pytest.mark.parametrize('version_str,expected_version', [ @pytest.mark.parametrize('version_str,expected_version', [
# C compiler # C compiler
('fcc (FCC) 4.0.0 20190314\n' ('fcc (FCC) 4.0.0a 20190314\n'
'simulating gcc version 6.1\n' 'simulating gcc version 6.1\n'
'Copyright FUJITSU LIMITED 2019', 'Copyright FUJITSU LIMITED 2019',
'4.0.0'), '4.0.0a'),
# C++ compiler # C++ compiler
('FCC (FCC) 4.0.0 20190314\n' ('FCC (FCC) 4.0.0a 20190314\n'
'simulating gcc version 6.1\n' 'simulating gcc version 6.1\n'
'Copyright FUJITSU LIMITED 2019', 'Copyright FUJITSU LIMITED 2019',
'4.0.0'), '4.0.0a'),
# Fortran compiler # Fortran compiler
('frt (FRT) 4.0.0 20190314\n' ('frt (FRT) 4.0.0a 20190314\n'
'Copyright FUJITSU LIMITED 2019', 'Copyright FUJITSU LIMITED 2019',
'4.0.0') '4.0.0a')
]) ])
def test_fj_version_detection(version_str, expected_version): def test_fj_version_detection(version_str, expected_version):
version = spack.compilers.fj.Fj.extract_version_from_output(version_str) version = spack.compilers.fj.Fj.extract_version_from_output(version_str)