Skip to content
Snippets Groups Projects
Commit ed8250e0 authored by Greg Becker's avatar Greg Becker Committed by Gregory Becker
Browse files

cray: detect shasta os properly (#17467)

Fixes #17299

Cray Shasta systems appear to use an unmodified Sles or other Linux operating system on the backend (like Cray "Cluster" systems and unlike Cray "XC40" systems that use CNL).

This updates the CNL version detection to properly note that this is the underlying OS instead of CNL and delegate to LinuxDistro.
parent 40cd8454
No related branches found
No related tags found
No related merge requests found
...@@ -97,6 +97,9 @@ def __str__(self): ...@@ -97,6 +97,9 @@ def __str__(self):
def _detect_crayos_version(cls): def _detect_crayos_version(cls):
if os.path.isfile(_cle_release_file): if os.path.isfile(_cle_release_file):
release_attrs = read_cle_release_file() release_attrs = read_cle_release_file()
if 'RELEASE' not in release_attrs:
# This Cray system uses a base OS not CLE/CNL
return None
v = spack.version.Version(release_attrs['RELEASE']) v = spack.version.Version(release_attrs['RELEASE'])
return v[0] return v[0]
elif os.path.isfile(_clerelease_file): elif os.path.isfile(_clerelease_file):
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
_craype_name_to_target_name = { _craype_name_to_target_name = {
'x86-cascadelake': 'cascadelake', 'x86-cascadelake': 'cascadelake',
'x86-naples': 'zen', 'x86-naples': 'zen',
'x86-rome': 'zen', # Cheating because we have the wrong modules on rzcrayz 'x86-rome': 'zen2',
'x86-skylake': 'skylake_avx512', 'x86-skylake': 'skylake_avx512',
'mic-knl': 'mic_knl', 'mic-knl': 'mic_knl',
'interlagos': 'bulldozer', 'interlagos': 'bulldozer',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment