From 2076db7a29d6a7961036fed2ba4055b085d4fe6b Mon Sep 17 00:00:00 2001 From: Thomas Roeblitz Date: Tue, 16 Jan 2024 21:51:59 +0100 Subject: [PATCH] subtle changes to make clear this is for NESSI --- init/Magic_Castle/bash | 2 +- init/Magic_Castle/eessi_python3 | 2 +- init/README.md | 10 +++++----- init/bash | 4 ++-- init/eessi_archdetect.sh | 2 +- init/eessi_environment_variables | 8 ++++---- init/eessi_software_subdir_for_host.py | 2 +- init/minimal_eessi_env | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/init/Magic_Castle/bash b/init/Magic_Castle/bash index fa53aec73b..0fb2f670a3 100644 --- a/init/Magic_Castle/bash +++ b/init/Magic_Castle/bash @@ -36,4 +36,4 @@ else module reload fi -echo "Environment set up to use EESSI (${EESSI_VERSION}), have fun!" +echo "Environment set up to use NESSI (${EESSI_VERSION}), have fun!" diff --git a/init/Magic_Castle/eessi_python3 b/init/Magic_Castle/eessi_python3 index b2f7fd4d66..c76c7a2671 100755 --- a/init/Magic_Castle/eessi_python3 +++ b/init/Magic_Castle/eessi_python3 @@ -16,6 +16,6 @@ eessi_python=$(ls ${EESSI_SOFTWARE_PATH}/software/Python/3*GCCcore*/bin/python | if [ -f "$eessi_python" ]; then $eessi_python "$@" else - echo "ERROR: No EESSI Python 3 available." + echo "ERROR: No NESSI Python 3 available." false fi diff --git a/init/README.md b/init/README.md index c253dc4ce1..05baffd5c6 100644 --- a/init/README.md +++ b/init/README.md @@ -1,7 +1,7 @@ -# Bash initialisation for EESSI +# Bash initialisation for NESSI This directory contains the default initialisation script for a bash shell used to -configure Lmod and use the EESSI software modules. The (bash) +configure Lmod and use the NESSI software modules. The (bash) file `eessi_environment_variables` is used to set and export the full set of EESSI environment variables: @@ -9,12 +9,12 @@ environment variables: - `EESSI_EPREFIX`: The location of Gentoo Prefix compatability layer (for the architecture). - `EESSI_EPREFIX_PYTHON`: Path to `python3` in the Gentoo Prefix layer. - `EESSI_SOFTWARE_SUBDIR`: Hardware specific software subdirectory. -- `EESSI_SOFTWARE_PATH`: Full path to EESSI software stack. +- `EESSI_SOFTWARE_PATH`: Full path to NESSI software stack. - `EESSI_MODULEPATH`: Path to be added to the `MODULEPATH`. This can be influenced by two externally defined environment varialbes: - `EESSI_CUSTOM_MODULEPATH`: defines a fully custom directory to be added to `MODULEPATH`, the end user is entirely responsible for what this directory contains. - - `EESSI_MODULE_SUBDIR`: EESSI may ship with a number of possible module naming schemes. + - `EESSI_MODULE_SUBDIR`: NESSI may ship with a number of possible module naming schemes. This variable can be used to point to a non-default module naming scheme. All scripts respect the environment variable `EESSI_SILENT` which, if defined to any @@ -25,5 +25,5 @@ value, will make them produce no (non-error) output. The `Magic_Castle` subdirectory is home to the bash initialisation that we use for [Magic Castle](https://github.com/ComputeCanada/magic_castle). -It also contains a wrapper for a hardware optimised EESSI Python 3 installation that is used +It also contains a wrapper for a hardware optimised NESSI Python 3 installation that is used by Magic Castle to properly configure JupyterHub. diff --git a/init/bash b/init/bash index cd977b3c8e..2fddc0641c 100644 --- a/init/bash +++ b/init/bash @@ -13,7 +13,7 @@ source $(dirname "$BASH_SOURCE")/eessi_environment_variables # only continue if setting EESSI environment variables worked fine if [ $? -eq 0 ]; then - export PS1="{EESSI $EESSI_VERSION} $PS1" + export PS1="{NESSI $EESSI_VERSION} $PS1" # add location of commands provided by compat layer to $PATH; # see https://github.com/EESSI/software-layer/issues/52 @@ -34,6 +34,6 @@ if [ $? -eq 0 ]; then #echo >> $output #echo >> $output - echo "Environment set up to use EESSI (${EESSI_VERSION}), have fun!" + echo "Environment set up to use NESSI (${EESSI_VERSION}), have fun!" fi diff --git a/init/eessi_archdetect.sh b/init/eessi_archdetect.sh index d2b6dacf04..ebbf5bc64e 100755 --- a/init/eessi_archdetect.sh +++ b/init/eessi_archdetect.sh @@ -71,7 +71,7 @@ cpupath(){ [ $EESI_SOFTWARE_SUBDIR_OVERRIDE ] && echo ${EESI_SOFTWARE_SUBDIR_OVERRIDE} && exit # Identify the best matching CPU architecture from a list of supported specifications for the host CPU - # Return the path to the installation files in EESSI of the best matching architecture + # Return the path to the installation files in NESSI of the best matching architecture local cpu_arch_spec=() # Identify the host CPU architecture diff --git a/init/eessi_environment_variables b/init/eessi_environment_variables index 42f4b6b76a..845f20db5b 100644 --- a/init/eessi_environment_variables +++ b/init/eessi_environment_variables @@ -19,7 +19,7 @@ function error() { source $EESSI_INIT_DIR_PATH/minimal_eessi_env if [ -d $EESSI_PREFIX ]; then - echo "Found EESSI repo @ $EESSI_PREFIX!" >> $output + echo "Found NESSI repo @ $EESSI_PREFIX!" >> $output export EESSI_EPREFIX=$EPREFIX if [ -d $EESSI_EPREFIX ]; then @@ -63,7 +63,7 @@ if [ -d $EESSI_PREFIX ]; then export EESSI_MODULEPATH=$EESSI_MODULEPATH echo "Using ${EESSI_MODULEPATH} as the directory to be added to MODULEPATH." >> $output else - error "EESSI module path at $EESSI_MODULEPATH not found!" + error "NESSI module path at $EESSI_MODULEPATH not found!" false fi @@ -75,7 +75,7 @@ if [ -d $EESSI_PREFIX ]; then fi else - error "EESSI software layer at $EESSI_SOFTWARE_PATH not found!" + error "NESSI software layer at $EESSI_SOFTWARE_PATH not found!" fi else error "no value set for \$EESSI_SOFTWARE_SUBDIR" @@ -84,5 +84,5 @@ if [ -d $EESSI_PREFIX ]; then error "Compatibility layer directory $EESSI_EPREFIX not found!" fi else - error "EESSI repository at $EESSI_PREFIX not found!" + error "NESSI repository at $EESSI_PREFIX not found!" fi diff --git a/init/eessi_software_subdir_for_host.py b/init/eessi_software_subdir_for_host.py index 58e9cfd2e6..e8f1a7109d 100755 --- a/init/eessi_software_subdir_for_host.py +++ b/init/eessi_software_subdir_for_host.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Determine EESSI software subdirectory to use for current build host, using archspec +# Determine NESSI software subdirectory to use for current build host, using archspec # import glob import os diff --git a/init/minimal_eessi_env b/init/minimal_eessi_env index 5b3562068d..f938d1dd10 100644 --- a/init/minimal_eessi_env +++ b/init/minimal_eessi_env @@ -1,4 +1,4 @@ -# define minimal EESSI environment, without relying on external scripts +# define minimal NESSI environment, without relying on external scripts # # this script is *sourced*, not executed, so can't rely on $0 to determine path to self # $BASH_SOURCE points to correct path, see also http://mywiki.wooledge.org/BashFAQ/028