Removed references to BlueGene/Q in core Spack
This commit is contained in:
parent
1920d125e8
commit
98701279df
@ -6,7 +6,7 @@
|
|||||||
"""
|
"""
|
||||||
This module contains all the elements that are required to create an
|
This module contains all the elements that are required to create an
|
||||||
architecture object. These include, the target processor, the operating system,
|
architecture object. These include, the target processor, the operating system,
|
||||||
and the architecture platform (i.e. cray, darwin, linux, bgq, etc) classes.
|
and the architecture platform (i.e. cray, darwin, linux, etc) classes.
|
||||||
|
|
||||||
On a multiple architecture machine, the architecture spec field can be set to
|
On a multiple architecture machine, the architecture spec field can be set to
|
||||||
build a package against any target and operating system that is present on the
|
build a package against any target and operating system that is present on the
|
||||||
|
@ -46,7 +46,7 @@
|
|||||||
@B{variant=value1,value2,value3} set multi-value <variant> values
|
@B{variant=value1,value2,value3} set multi-value <variant> values
|
||||||
|
|
||||||
architecture variants:
|
architecture variants:
|
||||||
@m{platform=platform} linux, darwin, cray, bgq, etc.
|
@m{platform=platform} linux, darwin, cray, etc.
|
||||||
@m{os=operating_system} specific <operating_system>
|
@m{os=operating_system} specific <operating_system>
|
||||||
@m{target=target} specific <target> processor
|
@m{target=target} specific <target> processor
|
||||||
@m{arch=platform-os-target} shortcut for all three above
|
@m{arch=platform-os-target} shortcut for all three above
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
|
|
||||||
# Spack Project Developers. See the top-level COPYRIGHT file for details.
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
|
||||||
|
|
||||||
from spack.architecture import OperatingSystem
|
|
||||||
|
|
||||||
|
|
||||||
class Cnk(OperatingSystem):
|
|
||||||
""" Compute Node Kernel (CNK) is the node level operating system for
|
|
||||||
the IBM Blue Gene series of supercomputers. The compute nodes of the
|
|
||||||
Blue Gene family of supercomputers run CNK, a lightweight kernel that
|
|
||||||
runs on each node and supports one application running for one user
|
|
||||||
on that node."""
|
|
||||||
|
|
||||||
def __init__(self):
|
|
||||||
name = 'cnk'
|
|
||||||
version = '1'
|
|
||||||
super(Cnk, self).__init__(name, version)
|
|
||||||
|
|
||||||
def __str__(self):
|
|
||||||
return self.name
|
|
@ -1,38 +0,0 @@
|
|||||||
# Copyright 2013-2020 Lawrence Livermore National Security, LLC and other
|
|
||||||
# Spack Project Developers. See the top-level COPYRIGHT file for details.
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
|
||||||
|
|
||||||
import os
|
|
||||||
from spack.architecture import Platform, Target
|
|
||||||
from spack.operating_systems.linux_distro import LinuxDistro
|
|
||||||
from spack.operating_systems.cnk import Cnk
|
|
||||||
|
|
||||||
|
|
||||||
class Bgq(Platform):
|
|
||||||
priority = 30
|
|
||||||
front_end = 'power7'
|
|
||||||
back_end = 'ppc64'
|
|
||||||
default = 'ppc64'
|
|
||||||
|
|
||||||
def __init__(self):
|
|
||||||
''' IBM Blue Gene/Q system platform.'''
|
|
||||||
|
|
||||||
super(Bgq, self).__init__('bgq')
|
|
||||||
|
|
||||||
self.add_target(self.front_end, Target(self.front_end))
|
|
||||||
self.add_target(self.back_end, Target(self.back_end))
|
|
||||||
|
|
||||||
front_distro = LinuxDistro()
|
|
||||||
back_distro = Cnk()
|
|
||||||
|
|
||||||
self.front_os = str(front_distro)
|
|
||||||
self.back_os = str(back_distro)
|
|
||||||
self.default_os = self.back_os
|
|
||||||
|
|
||||||
self.add_operating_system(str(front_distro), front_distro)
|
|
||||||
self.add_operating_system(str(back_distro), back_distro)
|
|
||||||
|
|
||||||
@classmethod
|
|
||||||
def detect(cls):
|
|
||||||
return os.path.exists('/bgsys')
|
|
@ -15,7 +15,6 @@
|
|||||||
from spack.spec import Spec
|
from spack.spec import Spec
|
||||||
from spack.platforms.cray import Cray
|
from spack.platforms.cray import Cray
|
||||||
from spack.platforms.linux import Linux
|
from spack.platforms.linux import Linux
|
||||||
from spack.platforms.bgq import Bgq
|
|
||||||
from spack.platforms.darwin import Darwin
|
from spack.platforms.darwin import Darwin
|
||||||
|
|
||||||
|
|
||||||
@ -42,8 +41,6 @@ def test_platform():
|
|||||||
output_platform_class = spack.architecture.real_platform()
|
output_platform_class = spack.architecture.real_platform()
|
||||||
if os.path.exists('/opt/cray/pe'):
|
if os.path.exists('/opt/cray/pe'):
|
||||||
my_platform_class = Cray()
|
my_platform_class = Cray()
|
||||||
elif os.path.exists('/bgsys'):
|
|
||||||
my_platform_class = Bgq()
|
|
||||||
elif 'Linux' in py_platform.system():
|
elif 'Linux' in py_platform.system():
|
||||||
my_platform_class = Linux()
|
my_platform_class = Linux()
|
||||||
elif 'Darwin' in py_platform.system():
|
elif 'Darwin' in py_platform.system():
|
||||||
|
@ -1,4 +0,0 @@
|
|||||||
processor : 0
|
|
||||||
cpu : POWER7 (architected), altivec supported
|
|
||||||
clock : 3720.000000MHz
|
|
||||||
revision : 2.1 (pvr 003f 0201)
|
|
@ -37,7 +37,6 @@
|
|||||||
'darwin-mojave-ivybridge',
|
'darwin-mojave-ivybridge',
|
||||||
'darwin-mojave-haswell',
|
'darwin-mojave-haswell',
|
||||||
'darwin-mojave-skylake',
|
'darwin-mojave-skylake',
|
||||||
'bgq-rhel6-power7'
|
|
||||||
])
|
])
|
||||||
def expected_target(request, monkeypatch):
|
def expected_target(request, monkeypatch):
|
||||||
cpu = llnl.util.cpu
|
cpu = llnl.util.cpu
|
||||||
@ -49,7 +48,7 @@ def expected_target(request, monkeypatch):
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Monkeypatch for linux
|
# Monkeypatch for linux
|
||||||
if platform in ('linux', 'bgq'):
|
if platform == 'linux':
|
||||||
monkeypatch.setattr(cpu.detect.platform, 'system', lambda: 'Linux')
|
monkeypatch.setattr(cpu.detect.platform, 'system', lambda: 'Linux')
|
||||||
|
|
||||||
@contextlib.contextmanager
|
@contextlib.contextmanager
|
||||||
|
Loading…
Reference in New Issue
Block a user