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

Changed naming convention of operating_system, makes it easier to create instance from dictionary just using name without the version attached. Object will stil display as name+version

Browse source
This commit is contained in:
Mario Melara 2016-02-25 11:48:43 -08:00
parent 550df4cdd6
commit 5e4d3e7b82
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/spack/spack/platforms/cray_xc.py
View file

@ -9,9 +9,9 @@ class CrayXc(Platform):
back_end = 'ivybridge' back_end = 'ivybridge'
default = 'ivybridge' default = 'ivybridge'
front_os = "SuSE11" front_os = "SuSE"
back_os = "CNL10" back_os = "CNL"
default_os = "CNL10" default_os = "CNL"
def __init__(self): def __init__(self):
''' Since cori doesn't have ivybridge as a front end it's better ''' Since cori doesn't have ivybridge as a front end it's better
@ -37,8 +37,8 @@ def __init__(self):
self.add_target('haswell', self.add_target('haswell',
Target('haswell', 'MODULES', 'craype-haswell')) Target('haswell', 'MODULES', 'craype-haswell'))
self.add_operating_system('SuSE11', LinuxDistro()) self.add_operating_system('SuSE', LinuxDistro())
self.add_operating_system('CNL10', Cnl()) self.add_operating_system('CNL', Cnl())
@classmethod @classmethod
def detect(self): def detect(self):

4
lib/spack/spack/platforms/linux.py
View file

@ -12,8 +12,8 @@ def __init__(self):
super(Linux, self).__init__('linux') super(Linux, self).__init__('linux')
self.add_target(self.default, Target(self.default, 'PATH')) self.add_target(self.default, Target(self.default, 'PATH'))
linux_dist = LinuxDistro() linux_dist = LinuxDistro()
self.default_os = str(linux_dist) self.default_os = linux_dist.name
self.add_operating_system(str(linux_dist), linux_dist) self.add_operating_system(linux_dist.name, linux_dist)
@classmethod @classmethod
def detect(self): def detect(self):