zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct env vars for modulecmd; Fixes #1481 (#2745)

Browse Source 
Don't override MODULEPATH with PATH, PATH has no modulefiles

PEP8 compliance
This commit is contained in:
Mario Melara 2017-01-05 11:15:38 -08:00 committed by becker33
parent 9271c69b5d
commit 3d54c3c689
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/spack/spack/operating_systems/cnl.py
View File

@ -23,7 +23,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
import re import re
import os
from spack.architecture import OperatingSystem from spack.architecture import OperatingSystem
from spack.util.executable import * from spack.util.executable import *
@ -67,17 +66,10 @@ def find_compiler(self, cmp_cls, *paths):
modulecmd = which('modulecmd') modulecmd = which('modulecmd')
modulecmd.add_default_arg('python') modulecmd.add_default_arg('python')
# Save the environment variable to restore later
old_modulepath = os.environ['MODULEPATH']
# if given any explicit paths, search them for module files too
if paths:
module_paths = ':' + ':'.join(p for p in paths)
os.environ['MODULEPATH'] = module_paths
output = modulecmd( output = modulecmd(
'avail', cmp_cls.PrgEnv_compiler, output=str, error=str) 'avail', cmp_cls.PrgEnv_compiler, output=str, error=str)
matches = re.findall( version_regex = r'(%s)/([\d\.]+[\d])' % cmp_cls.PrgEnv_compiler
r'(%s)/([\d\.]+[\d])' % cmp_cls.PrgEnv_compiler, output) matches = re.findall(version_regex, output)
for name, version in matches: for name, version in matches:
v = version v = version
comp = cmp_cls( comp = cmp_cls(
@ -87,8 +79,4 @@ def find_compiler(self, cmp_cls, *paths):
compilers.append(comp) compilers.append(comp)
# Restore modulepath environment variable
if paths:
os.environ['MODULEPATH'] = old_modulepath
return compilers return compilers