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

adding module find to find command

Browse source
This commit is contained in:
Gregory Becker 2015-11-11 10:31:37 -08:00
parent 51b69ef00b
commit 5347f460b4
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,7 +106,7 @@ class Compiler(object):
PrgEnv_compiler = None
def __init__(self, cspec, cc, cxx, f77, fc, module=None):
def __init__(self, cspec, cc, cxx, f77, fc, modules=None):
def check(exe):
if exe is None:
return None
@ -119,7 +119,7 @@ def check(exe):
self.fc = check(fc)
self.spec = cspec
self.modules = modules.split()
self.modules = modules
@ -216,6 +216,10 @@ def check(key):
@classmethod
def find(cls, *path):
return cls.find_in_path(*path) + cls.find_in_modules()
@classmethod
def find_in_path(cls, *path):
"""Try to find this type of compiler in the user's
environment. For each set of compilers found, this returns
compiler objects with the cc, cxx, f77, fc paths and the
@ -273,7 +277,9 @@ def find_in_modules(cls):
if not cls.PrgEnv_compiler:
tty.die('Must supply PrgEnv_compiler with PrgEnv')
output = _shell('module avail %s' % cls.PrgEnv_compiler)
# output = _shell('module avail %s' % cls.PrgEnv_compiler)
modulecmd = which('modulecmd')
modulecmd
matches = re.findall(r'(%s)/([^\s(]*)' % cls.PrgEnv_compiler, output)
for name, version in matches: