diff options
| author | Gregory Becker <becker33@llnl.gov> | 2016-05-26 11:38:40 -0700 |
|---|---|---|
| committer | Gregory Becker <becker33@llnl.gov> | 2016-05-26 11:38:40 -0700 |
| commit | c0661744cccffc6ca11a82cea840e7be63736d37 (patch) | |
| tree | a32cd9e94299785333e4ed09f183b6b8ab738a67 | |
| parent | b968603a57a4085b05318c295443d370f4b4c270 (diff) | |
| download | spack-c0661744cccffc6ca11a82cea840e7be63736d37.tar.gz spack-c0661744cccffc6ca11a82cea840e7be63736d37.tar.bz2 spack-c0661744cccffc6ca11a82cea840e7be63736d37.tar.xz spack-c0661744cccffc6ca11a82cea840e7be63736d37.zip | |
fixed compatibility work
| -rw-r--r-- | lib/spack/spack/architecture.py | 5 | ||||
| -rw-r--r-- | lib/spack/spack/operating_systems/pre_v1.py | 17 | ||||
| -rw-r--r-- | lib/spack/spack/platforms/spack_compatibility.py | 23 |
3 files changed, 2 insertions, 43 deletions
diff --git a/lib/spack/spack/architecture.py b/lib/spack/spack/architecture.py index 86733ba418..a0ef4f14da 100644 --- a/lib/spack/spack/architecture.py +++ b/lib/spack/spack/architecture.py @@ -90,7 +90,6 @@ from spack.util.naming import mod_to_class from spack.util.environment import get_path from spack.util.multiproc import parmap import spack.error as serr -import spack.platforms class InvalidSysTypeError(serr.SpackError): def __init__(self, sys_type): @@ -464,8 +463,8 @@ def arch_from_dict(d): if isinstance(d, basestring): # We have an old spec using a string for the architecture - arch.platform = spack.platforms.spack_compatibility.SpackCompatibility() - arch.platform_os = arch.platform.operating_system('default') + arch.platform = Platform('spack_compatibility') + arch.platform_os = OperatingSystem('pre_version', '1.0') arch.target = Target(d) arch.os_string = None diff --git a/lib/spack/spack/operating_systems/pre_v1.py b/lib/spack/spack/operating_systems/pre_v1.py deleted file mode 100644 index 71ee557ac1..0000000000 --- a/lib/spack/spack/operating_systems/pre_v1.py +++ /dev/null @@ -1,17 +0,0 @@ -import re -import os - -from spack.architecture import OperatingSystem - - -class PreV1(OperatingSystem): - """ Compute Node Linux (CNL) is the operating system used for the Cray XC - series super computers. It is a very stripped down version of GNU/Linux. - Any compilers found through this operating system will be used with - modules. If updated, user must make sure that version and name are - updated to indicate that OS has been upgraded (or downgraded) - """ - def __init__(self): - name = 'PreVersion1.0' - version = '1.0' - super(PreV1, self).__init__(name, version) diff --git a/lib/spack/spack/platforms/spack_compatibility.py b/lib/spack/spack/platforms/spack_compatibility.py deleted file mode 100644 index 86cbfb3044..0000000000 --- a/lib/spack/spack/platforms/spack_compatibility.py +++ /dev/null @@ -1,23 +0,0 @@ -import subprocess -from spack.architecture import Platform -from spack.operating_systems.pre_v1 - -class SpackCompatibility(Platform): - priority = 9999 - - # We don't use the normal target getters for this platform - # Instead, targets are added directly when parsing the yaml - - # OS is the spack backwards compatibility os. - front_os = 'PreVersion1.0' - back_os = 'PreVersion1.0' - default_os = 'PreVersion1.0' - - def __init__(self): - super(SpackCompatibility, self).__init__('spack_compatibility') - sc_os = spack.operating_systems.pre_v1.PreV1() - self.add_operating_system(sc_os.name, sc_os) - - @classmethod - def detect(self): - return True |