diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-07-19 14:59:04 -0700 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-07-19 14:59:04 -0700 |
| commit | dd7bd4f320651411a1125268310b2b1f590ad213 (patch) | |
| tree | 7c57b3adc142f4d9784886ddd02d10dc1f5e99ed | |
| parent | a64a2e72cf361923b8a2e00a5b3ed87cb5d59bd2 (diff) | |
| download | spack-dd7bd4f320651411a1125268310b2b1f590ad213.tar.gz spack-dd7bd4f320651411a1125268310b2b1f590ad213.tar.bz2 spack-dd7bd4f320651411a1125268310b2b1f590ad213.tar.xz spack-dd7bd4f320651411a1125268310b2b1f590ad213.zip | |
Make frontend OS on Cray machines a proper linux distro.
| -rw-r--r-- | lib/spack/spack/platforms/cray_xc.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py index 8dc575bb71..0f6599ab30 100644 --- a/lib/spack/spack/platforms/cray_xc.py +++ b/lib/spack/spack/platforms/cray_xc.py @@ -10,9 +10,8 @@ class CrayXc(Platform): back_end = 'ivybridge' default = 'ivybridge' - front_os = "SuSE11" back_os = "CNL10" - default_os = "CNL10" + default_os = "CNL10" def __init__(self): ''' Since cori doesn't have ivybridge as a front end it's better @@ -33,12 +32,15 @@ class CrayXc(Platform): # Could switch to use modules and fe targets for front end # Currently using compilers by path for front end. self.add_target('sandybridge', Target('sandybridge')) - self.add_target('ivybridge', + self.add_target('ivybridge', Target('ivybridge', 'craype-ivybridge')) - self.add_target('haswell', - Target('haswell','craype-haswell')) + self.add_target('haswell', + Target('haswell','craype-haswell')) - self.add_operating_system('SuSE11', LinuxDistro()) + # Front end of the cray platform is a linux distro. + linux_dist = LinuxDistro() + self.front_os = str(linux_dist) + self.add_operating_system(str(linux_dist), linux_dist) self.add_operating_system('CNL10', Cnl()) @classmethod @@ -50,4 +52,3 @@ class CrayXc(Platform): if '-D__CRAYXC' in text: return True return False - |