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

changed some potential syntax errors and added a way for target to recognize class

Browse Source
This commit is contained in:
Mario Melara 2015-11-04 12:57:29 -08:00
parent 058e72d29c
commit 37260962e5
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/spack/spack/architecture.py
View File

@ -48,20 +48,29 @@ def __init__(self):
class Target(object): class Target(object):
""" This is the processor type e.g. cray-ivybridge """ """ Target is the processor of the host machine. The host machine may have different front-end
and back-end targets, especially if it is a Cray machine. The target will have a name and
also the module_name (e.g craype-compiler). Targets will also recognize which architecture
they came from using the set_architecture method. Targets will have compiler finding strategies
"""
default_strategy = None # Can probably add a compiler path here
def __init__(self,name, module_name=None): def __init__(self,name, module_name=None):
self.name = name # case of cray "ivybridge" but if it's x86_64 self.name = name # case of cray "ivybridge" but if it's x86_64
self.module_name = module_name # craype-ivybridge self.module_name = module_name # craype-ivybridge
def set_architecture(self, architecture): # Target should get the architecture class.
self.architecture = architecture
@property @property
def compiler_strategy(self): def compiler_strategy(self):
if self.module_name: # If there is a module_name given then use MODULES if default_strategy:
return default_strategy
elif self.module_name: # If there is a module_name given then use MODULES
return "MODULES" return "MODULES"
else: else:
return "PATH" return "PATH"
class Architecture(object): class Architecture(object):
""" Abstract class that each type of Architecture will subclass. Will return a instance of it once it """ Abstract class that each type of Architecture will subclass. Will return a instance of it once it
is returned is returned
@ -77,8 +86,8 @@ def __init__(self, name):
self.name = name self.name = name
def add_target(self, name, target): def add_target(self, name, target):
self.targets[name] = target target.set_architecture(self)
self.targets[name] = target
def target(self, name): def target(self, name):
"""This is a getter method for the target dictionary that handles defaulting based """This is a getter method for the target dictionary that handles defaulting based
@ -163,7 +172,7 @@ def get_sys_type_from_config_file():
def all_architectures(): def all_architectures():
modules = [] modules = []
for name in list_modules(spack.arch_path): for name in list_modules(spack.arch_path):
mod_name = 'spack.architectures.' + name mod_name = 'spack.architectures' + name
path = join_path(spack.arch_path, name) + ".py" path = join_path(spack.arch_path, name) + ".py"
mod = imp.load_source(mod_name, path) mod = imp.load_source(mod_name, path)
class_name = mod_to_class(name) class_name = mod_to_class(name)