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
This commit is contained in:
Harmen Stoppels 2020-08-04 01:16:18 +02:00 committed by GitHub
parent a67a0e3181
commit 827ca72c26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions

View File

@ -1247,6 +1247,6 @@ environment variables may be propagated into containers that are not
using the Cray programming environment. using the Cray programming environment.
To ensure that Spack does not autodetect the Cray programming 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 will cause Spack to treat a linux container on a Cray system as a base
linux distro. linux distro.

View File

@ -111,14 +111,14 @@ def setup_platform_environment(cls, pkg, env):
@classmethod @classmethod
def detect(cls): 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` We detect the Cray platform based on the availability through `module`
of the cray programming environment. If this environment is available, of the Cray programming environment. If this environment is available,
we can use it to find compilers, target modules, etc. If the cray we can use it to find compilers, target modules, etc. If the Cray
programming environment is not available via modules, then we will programming environment is not available via modules, then we will
treat it as a standard linux system, as the cray compiler wrappers treat it as a standard linux system, as the Cray compiler wrappers
and other componenets of the cray programming environment are and other components of the Cray programming environment are
irrelevant without module support. irrelevant without module support.
""" """
return 'opt/cray' in os.environ.get('MODULEPATH', '') return 'opt/cray' in os.environ.get('MODULEPATH', '')