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

Better regular expression searching. Tested on edison was finding test compilers and then spack was giving multiple compiler match errors

Browse source
This commit is contained in:
Mario Melara 2016-01-20 10:32:56 -08:00
parent aab1a67d05
commit 15713219e5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/spack/spack/compiler.py
View file

@ -283,7 +283,7 @@ def find_in_modules(cls):
modulecmd = which('modulecmd') modulecmd = which('modulecmd')
modulecmd.add_default_arg('python') modulecmd.add_default_arg('python')
output = modulecmd('avail', cls.PrgEnv_compiler, return_oe=True) output = modulecmd('avail', cls.PrgEnv_compiler, return_oe=True)
matches = re.findall(r'(%s)/(\d+[\.\d]+)' % cls.PrgEnv_compiler, output) matches = re.findall(r'(%s)/([\d\.]+[\d$])' % cls.PrgEnv_compiler, output)
for name, version in matches: for name, version in matches:
v = version v = version