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

Improved target cmp_key and to/from yaml functions

Browse Source
This commit is contained in:
Gregory Becker 2016-01-06 14:50:31 -08:00
parent 51bd91edc0
commit b4a0004f44
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,22 +60,17 @@ def __init__(self, name, compiler_strategy, module_name=None):
self.compiler_strategy = compiler_strategy self.compiler_strategy = compiler_strategy
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. # Sets only the architecture name to avoid recursiveness
self.architecture = architecture def set_architecture(self, architecture):
self.architecture_name = architecture.name
# @property
# def compiler_strategy(self):
# if self.module_name: # If there is a module_name given then use MODULES
# return "MODULES"
# else:
# return "PATH"
def to_dict(self): def to_dict(self):
d = {} d = {}
d['name'] = self.name d['name'] = self.name
d['compiler_strategy'] = self.compiler_strategy
d['module_name'] = self.module_name d['module_name'] = self.module_name
# if self.architecture: if self.architecture_name:
# d['architecture'] = self.architecture d['architecture'] = self.architecture_name
return d return d
@staticmethod @staticmethod
@ -84,14 +79,15 @@ def from_dict(d):
return None return None
target = Target.__new__(Target) target = Target.__new__(Target)
target.name = d['name'] target.name = d['name']
target.compiler_strategy = d['compiler_strategy']
target.module_name = d['module_name'] target.module_name = d['module_name']
# if 'architecture' in d: if 'architecture' in d:
# target.architecture = d['architecture'] target.architecture_name = d['architecture']
return target return target
def _cmp_key(self): def _cmp_key(self):
return (self.name, self.module_name) return (self.name, self.compiler_strategy, self.module_name)
def __repr__(self): def __repr__(self):
return self.__str__() return self.__str__()