summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMassimiliano Culpo <massimiliano.culpo@gmail.com>2020-07-28 10:26:12 +0200
committerTodd Gamblin <tgamblin@llnl.gov>2020-08-10 17:09:09 -0700
commit98701279dfa4d59c588413ec4f89a65996b7fe0b (patch)
tree2b2cb1e9269765435f089a45ed141e19cc3b63b9 /lib
parent1920d125e851847a43dc2af70a8d1a5d839c84f1 (diff)
downloadspack-98701279dfa4d59c588413ec4f89a65996b7fe0b.tar.gz
spack-98701279dfa4d59c588413ec4f89a65996b7fe0b.tar.bz2
spack-98701279dfa4d59c588413ec4f89a65996b7fe0b.tar.xz
spack-98701279dfa4d59c588413ec4f89a65996b7fe0b.zip
Removed references to BlueGene/Q in core Spack
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/architecture.py2
-rw-r--r--lib/spack/spack/cmd/help.py2
-rw-r--r--lib/spack/spack/operating_systems/cnk.py22
-rw-r--r--lib/spack/spack/platforms/bgq.py38
-rw-r--r--lib/spack/spack/test/architecture.py3
-rw-r--r--lib/spack/spack/test/data/targets/bgq-rhel6-power74
-rw-r--r--lib/spack/spack/test/llnl/util/cpu.py3
7 files changed, 3 insertions, 71 deletions
diff --git a/lib/spack/spack/architecture.py b/lib/spack/spack/architecture.py
index a7c8062fad..975cb9e56d 100644
--- a/lib/spack/spack/architecture.py
+++ b/lib/spack/spack/architecture.py
@@ -6,7 +6,7 @@
"""
This module contains all the elements that are required to create an
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
build a package against any target and operating system that is present on the
diff --git a/lib/spack/spack/cmd/help.py b/lib/spack/spack/cmd/help.py
index 1a5caddc64..d730d4f0fe 100644
--- a/lib/spack/spack/cmd/help.py
+++ b/lib/spack/spack/cmd/help.py
@@ -46,7 +46,7 @@ spec expression syntax:
@B{variant=value1,value2,value3} set multi-value <variant> values
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{target=target} specific <target> processor
@m{arch=platform-os-target} shortcut for all three above
diff --git a/lib/spack/spack/operating_systems/cnk.py b/lib/spack/spack/operating_systems/cnk.py
deleted file mode 100644
index 53a12785da..0000000000
--- a/lib/spack/spack/operating_systems/cnk.py
+++ /dev/null
@@ -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
diff --git a/lib/spack/spack/platforms/bgq.py b/lib/spack/spack/platforms/bgq.py
deleted file mode 100644
index 64d71743c4..0000000000
--- a/lib/spack/spack/platforms/bgq.py
+++ /dev/null
@@ -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')
diff --git a/lib/spack/spack/test/architecture.py b/lib/spack/spack/test/architecture.py
index 80d3fc72c0..7af5a8d150 100644
--- a/lib/spack/spack/test/architecture.py
+++ b/lib/spack/spack/test/architecture.py
@@ -15,7 +15,6 @@ import spack.architecture
from spack.spec import Spec
from spack.platforms.cray import Cray
from spack.platforms.linux import Linux
-from spack.platforms.bgq import Bgq
from spack.platforms.darwin import Darwin
@@ -42,8 +41,6 @@ def test_platform():
output_platform_class = spack.architecture.real_platform()
if os.path.exists('/opt/cray/pe'):
my_platform_class = Cray()
- elif os.path.exists('/bgsys'):
- my_platform_class = Bgq()
elif 'Linux' in py_platform.system():
my_platform_class = Linux()
elif 'Darwin' in py_platform.system():
diff --git a/lib/spack/spack/test/data/targets/bgq-rhel6-power7 b/lib/spack/spack/test/data/targets/bgq-rhel6-power7
deleted file mode 100644
index 39da8a49fe..0000000000
--- a/lib/spack/spack/test/data/targets/bgq-rhel6-power7
+++ /dev/null
@@ -1,4 +0,0 @@
-processor : 0
-cpu : POWER7 (architected), altivec supported
-clock : 3720.000000MHz
-revision : 2.1 (pvr 003f 0201)
diff --git a/lib/spack/spack/test/llnl/util/cpu.py b/lib/spack/spack/test/llnl/util/cpu.py
index 319d9e684e..db2beadaf1 100644
--- a/lib/spack/spack/test/llnl/util/cpu.py
+++ b/lib/spack/spack/test/llnl/util/cpu.py
@@ -37,7 +37,6 @@ from llnl.util.cpu import Microarchitecture # noqa
'darwin-mojave-ivybridge',
'darwin-mojave-haswell',
'darwin-mojave-skylake',
- 'bgq-rhel6-power7'
])
def expected_target(request, monkeypatch):
cpu = llnl.util.cpu
@@ -49,7 +48,7 @@ def expected_target(request, monkeypatch):
)
# Monkeypatch for linux
- if platform in ('linux', 'bgq'):
+ if platform == 'linux':
monkeypatch.setattr(cpu.detect.platform, 'system', lambda: 'Linux')
@contextlib.contextmanager