Changed structure of class, add compiler strategy is a method and can create a dict
This commit is contained in:
parent
9b387e7682
commit
a89abb435f
1 changed files with 18 additions and 17 deletions
|
@ -48,6 +48,21 @@ class Architecture(object):
|
||||||
If it is on a Cray architecture it should look in modules. If it is anything else search $PATH.
|
If it is on a Cray architecture it should look in modules. If it is anything else search $PATH.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
def add_compiler_strategy(self, front,back):
|
||||||
|
names = []
|
||||||
|
names.append(front)
|
||||||
|
names.append(back)
|
||||||
|
d = {}
|
||||||
|
for n in names:
|
||||||
|
if n:
|
||||||
|
if 'cray' in n.lower():
|
||||||
|
d[n] = "MODULES"
|
||||||
|
elif 'linux' in n.lower():
|
||||||
|
d[n] = "PATH"
|
||||||
|
else:
|
||||||
|
d[n] = 'No Strategy'
|
||||||
|
return d
|
||||||
|
|
||||||
def __init__(self, front=None, back=None):
|
def __init__(self, front=None, back=None):
|
||||||
""" Constructor for the architecture class. It will create a list from the given arguments and iterate
|
""" Constructor for the architecture class. It will create a list from the given arguments and iterate
|
||||||
through that list. It will then create a dictionary of {arch_name : strategy}
|
through that list. It will then create a dictionary of {arch_name : strategy}
|
||||||
|
@ -59,23 +74,9 @@ def __init__(self, front=None, back=None):
|
||||||
If no arguments are given it will return an empty dictionary
|
If no arguments are given it will return an empty dictionary
|
||||||
Uses the _add_compiler_strategy(front, back) to create the dictionary
|
Uses the _add_compiler_strategy(front, back) to create the dictionary
|
||||||
"""
|
"""
|
||||||
|
self.front = front
|
||||||
def _add_compiler_strategy(front,back):
|
self.back = back
|
||||||
names = []
|
self.arch_dict = self.add_compiler_strategy(front, back)
|
||||||
names.append(front)
|
|
||||||
names.append(back)
|
|
||||||
d = {}
|
|
||||||
for n in names:
|
|
||||||
if n:
|
|
||||||
if 'cray' in n.lower():
|
|
||||||
d[n] = "MODULES"
|
|
||||||
elif 'linux' in n.lower():
|
|
||||||
d[n] = "PATH"
|
|
||||||
else:
|
|
||||||
d[n] = 'No Strategy'
|
|
||||||
return d
|
|
||||||
|
|
||||||
self.arch_dict = _add_compiler_strategy(front, back)
|
|
||||||
|
|
||||||
|
|
||||||
def get_sys_type_from_spack_globals():
|
def get_sys_type_from_spack_globals():
|
||||||
|
|
Loading…
Reference in a new issue