zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename Mac OS X to macos

Browse Source
This commit is contained in:
Todd Gamblin 2016-06-16 10:43:12 -07:00
parent 6b03770602
commit c7dfa1699a
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/spack/spack/operating_systems/mac_osx.py → lib/spack/spack/operating_systems/mac_os.py
View File

@ -1,28 +1,29 @@
import platform as py_platform import platform as py_platform
from spack.architecture import OperatingSystem from spack.architecture import OperatingSystem
class MacOsx(OperatingSystem): class MacOs(OperatingSystem):
""" This class represents the MAC_OSX operating system. This will be auto """This class represents the macOS operating system. This will be
detected using the python platform.mac_ver. The MAC_OSX platform auto detected using the python platform.mac_ver. The macOS
will be represented using the major version operating system name, i.e platform will be represented using the major version operating
el capitan, yosemite...etc. system name, i.e el capitan, yosemite...etc.
""" """
def __init__(self): def __init__(self):
""" Autodetects the mac version from a dictionary. Goes back as """ Autodetects the mac version from a dictionary. Goes back as
far as 10.6 snowleopard. If the user has an older mac then far as 10.6 snowleopard. If the user has an older mac then
the version will just be a generic mac_os. the version will just be a generic mac_os.
""" """
mac_releases = {'10.6': "snowleopard", mac_releases = {'10.6': "snowleopard",
"10.7": "lion", "10.7": "lion",
"10.8": "mountainlion", "10.8": "mountainlion",
"10.9": "mavericks", "10.9": "mavericks",
"10.10": "yosemite", "10.10": "yosemite",
"10.11": "elcapitan"} "10.11": "elcapitan",
"10.12": "sierra"}
mac_ver = py_platform.mac_ver()[0][:-2] mac_ver = py_platform.mac_ver()[0][:-2]
name = mac_releases.get(mac_ver, "mac_osx") name = mac_releases.get(mac_ver, "macos")
super(MacOsx, self).__init__(name, mac_ver) super(MacOs, self).__init__(name, mac_ver)
def __str__(self): def __str__(self):
return self.name return self.name

6
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_systems.mac_osx import MacOsx from spack.operating_systems.mac_os import MacOs
class Darwin(Platform): class Darwin(Platform):
priority = 89 priority = 89
@ -11,8 +11,8 @@ 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)) self.add_target(self.default, Target(self.default))
mac_os = MacOsx() mac_os = MacOs()
self.default_os = str(mac_os) self.default_os = str(mac_os)
self.front_os = str(mac_os) self.front_os = str(mac_os)
self.back_os = str(mac_os) self.back_os = str(mac_os)

13
lib/spack/spack/test/operating_system.py
View File

@ -10,7 +10,7 @@
from spack.platforms.linux import Linux from spack.platforms.linux import Linux
from spack.platforms.darwin import Darwin from spack.platforms.darwin import Darwin
from spack.operating_system.linux_distro import LinuxDistro from spack.operating_system.linux_distro import LinuxDistro
from spack.operating_system.mac_osx import MacOSX from spack.operating_system.mac_os import MacOs
from spack.operating_system.cnl import ComputeNodeLinux from spack.operating_system.cnl import ComputeNodeLinux
class TestOperatingSystem(unittest.TestCase): class TestOperatingSystem(unittest.TestCase):
@ -27,12 +27,12 @@ def setUp(self):
def test_cray_front_end_operating_system(self): def test_cray_front_end_operating_system(self):
self.assertIsInstance(self.cray_operating_sys, LinuxDistro) self.assertIsInstance(self.cray_operating_sys, LinuxDistro)
def test_cray_front_end_compiler_strategy(self): def test_cray_front_end_compiler_strategy(self):
self.assertEquals(self.cray_operating_sys.compiler_strategy, "PATH") self.assertEquals(self.cray_operating_sys.compiler_strategy, "PATH")
def test_cray_back_end_operating_system(self): def test_cray_back_end_operating_system(self):
self.assertIsInstance(self.cray_back_os,ComputeNodeLinux) self.assertIsInstance(self.cray_back_os,ComputeNodeLinux)
def test_cray_back_end_compiler_strategy(self): def test_cray_back_end_compiler_strategy(self):
self.assertEquals(self.cray_back_os.compiler_strategy, "MODULES") self.assertEquals(self.cray_back_os.compiler_strategy, "MODULES")
@ -43,16 +43,13 @@ def test_linux_operating_system(self):
def test_linux_compiler_strategy(self): def test_linux_compiler_strategy(self):
self.assertEquals(self.linux_operating_sys.compiler_strategy, "PATH") self.assertEquals(self.linux_operating_sys.compiler_strategy, "PATH")
def test_cray_front_end_compiler_list(self): def test_cray_front_end_compiler_list(self):
""" Operating systems will now be in charge of finding compilers. """ Operating systems will now be in charge of finding compilers.
So, depending on which operating system you want to build for So, depending on which operating system you want to build for
or which operating system you are on, then you could detect or which operating system you are on, then you could detect
compilers in a certain way. Cray linux environment on the front compilers in a certain way. Cray linux environment on the front
end is just a regular linux distro whereas the Cray linux compute end is just a regular linux distro whereas the Cray linux compute
node is a stripped down version which modules are important node is a stripped down version which modules are important
""" """
self.assertEquals(True, False) self.assertEquals(True, False)