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

Changed to appropriate class names for operating system

Browse source
This commit is contained in:
Mario Melara 2016-02-24 15:32:23 -08:00
parent 2de81cfc62
commit 234681306c
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,8 +1,7 @@
import os import os
from spack.architecture import Platform, Target from spack.architecture import Platform, Target
from spack.operating_system.linux_distro import LinuxDistro from spack.operating_system.linux_distro import LinuxDistro
from spack.operating_system.cnl import ComputeNodeLinux from spack.operating_system.cnl import Cnl
class CrayXc(Platform): class CrayXc(Platform):
priority = 20 priority = 20
@ -39,7 +38,7 @@ def __init__(self):
Target('haswell', 'MODULES', 'craype-haswell')) Target('haswell', 'MODULES', 'craype-haswell'))
self.add_operating_system('SuSE11', LinuxDistro()) self.add_operating_system('SuSE11', LinuxDistro())
self.add_operating_system('CNL10', ComputeNodeLinux()) self.add_operating_system('CNL10', Cnl())
@classmethod @classmethod
def detect(self): def detect(self):

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

@ -1,6 +1,6 @@
import subprocess import subprocess
from spack.architecture import Platform, Target from spack.architecture import Platform, Target
from spack.operating_system.mac_osx import MacOSX from spack.operating_system.mac_osx import MacOsx
class Darwin(Platform): class Darwin(Platform):
priority = 89 priority = 89
@ -11,7 +11,7 @@ class Darwin(Platform):
def __init__(self): def __init__(self):
super(Darwin, self).__init__('darwin') super(Darwin, self).__init__('darwin')
self.add_target(self.default, Target(self.default, 'PATH')) self.add_target(self.default, Target(self.default, 'PATH'))
mac_os = MacOSX() mac_os = MacOsx()
self.default_os = mac_os.name self.default_os = mac_os.name
self.add_operating_system(mac_os.name, mac_os) self.add_operating_system(mac_os.name, mac_os)