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

Created a control flow logic that will loop through the strategies and find compilers using that. TODO: Need to find a way to locate their executables

Browse source
This commit is contained in:
Mario Melara 2015-10-22 12:02:26 -07:00
parent a89abb435f
commit 38508c5a3f
1 changed files with 29 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
lib/spack/spack/cmd/compiler.py
View file

@ -29,6 +29,8 @@
from llnl.util.tty.colify import colify from llnl.util.tty.colify import colify
from llnl.util.lang import index_by from llnl.util.lang import index_by
import spack.architecture
import spack.compiler
import spack.compilers import spack.compilers
import spack.spec import spack.spec
import spack.config import spack.config
@ -36,13 +38,12 @@
from spack.spec import CompilerSpec from spack.spec import CompilerSpec
description = "Manage compilers" description = "Manage compilers"
ARCHITECTURE = spack.architecture.sys_type()
def setup_parser(subparser): def setup_parser(subparser):
sp = subparser.add_subparsers( sp = subparser.add_subparsers(metavar='SUBCOMMAND', dest='compiler_command')
metavar='SUBCOMMAND', dest='compiler_command')
update_parser = sp.add_parser( update_parser = sp.add_parser('add', help='Add compilers to the Spack configuration.')
'add', help='Add compilers to the Spack configuration.')
update_parser.add_argument('add_paths', nargs=argparse.REMAINDER) update_parser.add_argument('add_paths', nargs=argparse.REMAINDER)
remove_parser = sp.add_parser('remove', help='remove compiler') remove_parser = sp.add_parser('remove', help='remove compiler')
@ -55,23 +56,33 @@ def setup_parser(subparser):
def compiler_add(args): def compiler_add(args):
"""Search either $PATH or a list of paths for compilers and add them """Search either $PATH or a list of paths OR MODULES for compilers and add them
to Spack's configuration.""" to Spack's configuration."""
paths = args.add_paths
if not paths:
paths = get_path('PATH')
compilers = [c for c in spack.compilers.find_compilers(*args.add_paths) strategies = ARCHITECTURE.strategy()
if c.spec not in spack.compilers.all_compilers()]
if compilers: for strategy in strategies:
spack.compilers.add_compilers_to_config('user', *compilers) if strategy == 'PATH':
n = len(compilers) paths = args.add_paths # This might be a parser method. Parsing method to add_paths
tty.msg("Added %d new compiler%s to %s" % ( if not paths:
n, 's' if n > 1 else '', spack.config.get_config_scope_filename('user', 'compilers'))) paths = get_path('PATH')
colify(reversed(sorted(c.spec for c in compilers)), indent=4)
else: compilers = [c for c in spack.compilers.find_compilers(*args.add_paths)
tty.msg("Found no new compilers") if c.spec not in spack.compilers.all_compilers()]
elif strategy == "MODULES":
from spack.compilers.cray import Cray
compilers = Cray.find_in_modules()
#TODO: Find a way to locate the executables
if compilers:
spack.compilers.add_compilers_to_config('user', *compilers)
n = len(compilers)
tty.msg("Added %d new compiler%s to %s" % (
n, 's' if n > 1 else '', spack.config.get_config_scope_filename('user', 'compilers')))
colify(reversed(sorted(c.spec for c in compilers)), indent=4)
else:
tty.msg("Found no new compilers")
def compiler_remove(args): def compiler_remove(args):