From 827ca72c2691622326d262f364448b8a715cd85b Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Tue, 4 Aug 2020 01:16:18 +0200 Subject: Fix docs about containers on cray (#17431) * For detecting Cray: CRAYPE_VERSION is not used, but MODULEPATH * Fix typo and write Cray with a capital --- lib/spack/docs/getting_started.rst | 2 +- lib/spack/spack/platforms/cray.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/spack/docs/getting_started.rst b/lib/spack/docs/getting_started.rst index 7b908465f5..550f2509e6 100644 --- a/lib/spack/docs/getting_started.rst +++ b/lib/spack/docs/getting_started.rst @@ -1247,6 +1247,6 @@ environment variables may be propagated into containers that are not using the Cray programming environment. To ensure that Spack does not autodetect the Cray programming -environment, unset the environment variable ``CRAYPE_VERSION``. This +environment, unset the environment variable ``MODULEPATH``. This will cause Spack to treat a linux container on a Cray system as a base linux distro. diff --git a/lib/spack/spack/platforms/cray.py b/lib/spack/spack/platforms/cray.py index c6d367e9a6..684109f3e0 100644 --- a/lib/spack/spack/platforms/cray.py +++ b/lib/spack/spack/platforms/cray.py @@ -111,14 +111,14 @@ class Cray(Platform): @classmethod def detect(cls): """ - Detect whether this system is a cray machine. + Detect whether this system is a Cray machine. - We detect the cray platform based on the availability through `module` - of the cray programming environment. If this environment is available, - we can use it to find compilers, target modules, etc. If the cray + We detect the Cray platform based on the availability through `module` + of the Cray programming environment. If this environment is available, + we can use it to find compilers, target modules, etc. If the Cray programming environment is not available via modules, then we will - treat it as a standard linux system, as the cray compiler wrappers - and other componenets of the cray programming environment are + treat it as a standard linux system, as the Cray compiler wrappers + and other components of the Cray programming environment are irrelevant without module support. """ return 'opt/cray' in os.environ.get('MODULEPATH', '') -- cgit v1.2.3-60-g2f50