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

Cleaned up the file. Got rid of commented out sections of code since they weren't going to be used anyway

Browse source
This commit is contained in:
Mario Melara 2016-02-16 15:23:38 -08:00
parent 31ab238306
commit 62b0293963
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ def __init__(self):
if we use CRAY_CPU_TARGET as the default. This will ensure if we use CRAY_CPU_TARGET as the default. This will ensure
that if we're on a XC-40 or XC-30 then we can detect the target that if we're on a XC-40 or XC-30 then we can detect the target
''' '''
super(CrayXc, self).__init__('cray_xc') super(CrayXc, self).__init__('crayxc')
# Handle the default here so we can check for a key error # Handle the default here so we can check for a key error
if 'CRAY_CPU_TARGET' in os.environ: if 'CRAY_CPU_TARGET' in os.environ:
@ -28,23 +28,21 @@ def __init__(self):
self.front_end = self.default self.front_end = self.default
self.back_end = self.default self.back_end = self.default
# Could switch to use modules and fe targets for front end # Could switch to use modules and fe targets for front end
# Currently using compilers by path for front end. # Currently using compilers by path for front end.
self.add_target('sandybridge', Target('sandybridge', 'PATH')) self.add_target('sandybridge', Target('sandybridge', 'PATH'))
self.add_target('ivybridge', Target('ivybridge', 'MODULES', 'craype-ivybridge'))
self.add_target('haswell', Target('haswell', 'MODULES', 'craype-haswell'))
self.add_operating_system('SuSE11', OperatingSystem('SuSE11', '11'))
self.add_operating_system('GNU/Linux', OperatingSystem('GNU/Linux', '10'))
# self.add_target(self.front_end, Target(self.front_end, 'PATH')) self.add_target('ivybridge',
# Back End compiler needs the proper target module loaded. Target('ivybridge', 'MODULES', 'craype-ivybridge'))
# self.add_target(self.back_end, Target(self.front_end, 'MODULES', 'craype-'+ self.back_end))
# self.add_target(self.default, Target(self.default, 'MODULES', 'craype-' + self.default)) self.add_target('haswell',
# This is kludgy and the order matters when the targets are all haswell Target('haswell', 'MODULES', 'craype-haswell'))
# This is because the last one overwrites the others when they have the
# same name. self.add_operating_system('SuSE11',
OperatingSystem('SuSE11', '11'))
self.add_operating_system('GNU/Linux',
OperatingSystem('GNU/Linux', '10'))
@classmethod @classmethod
def detect(self): def detect(self):