diff options
| author | Mario Melara <maamelara@gmail.com> | 2016-02-22 14:52:09 -0800 |
|---|---|---|
| committer | Mario Melara <maamelara@gmail.com> | 2016-02-22 14:52:09 -0800 |
| commit | 725d6d5fce56aa7d0ae401ec71d1565835248250 (patch) | |
| tree | dbcf7a4f280e7dc6d5c0e4ef56b69b5562cb7bda /lib | |
| parent | a8de45ce28b8277c0ca1740aa53e1e4e334596d1 (diff) | |
| download | spack-725d6d5fce56aa7d0ae401ec71d1565835248250.tar.gz spack-725d6d5fce56aa7d0ae401ec71d1565835248250.tar.bz2 spack-725d6d5fce56aa7d0ae401ec71d1565835248250.tar.xz spack-725d6d5fce56aa7d0ae401ec71d1565835248250.zip | |
import linux distro operating system subclass, set front-end os to LinuxDistro()
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/platforms/cray_xc.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py index d48b6ffcfa..b58c84d3eb 100644 --- a/lib/spack/spack/platforms/cray_xc.py +++ b/lib/spack/spack/platforms/cray_xc.py @@ -1,6 +1,7 @@ import os -from spack.architecture import Platform, Target, OperatingSystem +from spack.architecture import Platform, Target +from spack.operating_system.linux_distro import LinuxDistro class CrayXc(Platform): priority = 20 @@ -9,8 +10,8 @@ class CrayXc(Platform): default = 'ivybridge' front_os = "SuSE11" - back_os = "GNU/Linux" - default_os = "GNU/Linux" + back_os = "CNL" + default_os = "CNL" def __init__(self): ''' Since cori doesn't have ivybridge as a front end it's better @@ -31,18 +32,12 @@ 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', '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')) + Target('haswell', 'MODULES', 'craype-haswell')) - self.add_operating_system('GNU/Linux', - OperatingSystem('GNU/Linux', '10')) + self.add_operating_system('SuSE11', LinuxDistro()) @classmethod def detect(self): |