Fix: Mixed TOSS3 / TOSS4 paths

TOSS4 never arrived.

Author: ax3l

Docs/source/install/hpc/lassen.rst

@@ -40,23 +40,23 @@ Use the following commands to download the WarpX source code:
 
    git clone https://github.com/BLAST-WarpX/warpx.git /usr/workspace/${USER}/lassen/src/warpx
 
-We use system software modules, add environment hints and further dependencies via the file ``$HOME/lassen_v100_warpx_toss3.profile``.
+We use system software modules, add environment hints and further dependencies via the file ``$HOME/lassen_v100_warpx.profile``.
 Create it now:
 
 .. code-block:: bash
 
-   cp /usr/workspace/${USER}/lassen/src/warpx/Tools/machines/lassen-llnl/lassen_v100_warpx_toss3.profile.example $HOME/lassen_v100_warpx_toss3.profile
+   cp /usr/workspace/${USER}/lassen/src/warpx/Tools/machines/lassen-llnl/lassen_v100_warpx.profile.example $HOME/lassen_v100_warpx.profile
 
 .. dropdown:: Script Details
    :color: light
    :icon: info
    :animate: fade-in-slide-down
 
-   .. literalinclude:: ../../../../Tools/machines/lassen-llnl/lassen_v100_warpx_toss3.profile.example
+   .. literalinclude:: ../../../../Tools/machines/lassen-llnl/lassen_v100_warpx.profile.example
       :language: bash
 
 Edit the 2nd line of this script, which sets the ``export proj=""`` variable.
-For example, if you are member of the project ``nsldt``, then run ``vi $HOME/lassen_v100_warpx_toss3.profile``.
+For example, if you are member of the project ``nsldt``, then run ``vi $HOME/lassen_v100_warpx.profile``.
 Enter the edit mode by typing ``i`` and edit line 2 to read:
 
 .. code-block:: bash
@@ -71,21 +71,21 @@ Exit the ``vi`` editor with ``Esc`` and then type ``:wq`` (write & quit).
 
    .. code-block:: bash
 
-      source $HOME/lassen_v100_warpx_toss3.profile
+      source $HOME/lassen_v100_warpx.profile
 
 Finally, since lassen does not yet provide software modules for some of our dependencies, install them once:
 
 .. code-block:: bash
 
-   bash /usr/workspace/${USER}/lassen/src/warpx/Tools/machines/lassen-llnl/install_v100_dependencies_toss3.sh
-   source /usr/workspace/${USER}/lassen-toss3/gpu/venvs/warpx-lassen-toss3/bin/activate
+   bash /usr/workspace/${USER}/lassen/src/warpx/Tools/machines/lassen-llnl/install_v100_dependencies.sh
+   source /usr/workspace/${USER}/lassen/gpu/venvs/warpx-lassen/bin/activate
 
 .. dropdown:: Script Details
    :color: light
    :icon: info
    :animate: fade-in-slide-down
 
-   .. literalinclude:: ../../../../Tools/machines/lassen-llnl/install_v100_dependencies_toss3.sh
+   .. literalinclude:: ../../../../Tools/machines/lassen-llnl/install_v100_dependencies.sh
       :language: bash
 
 

Tools/machines/lassen-llnl/install_v100_dependencies_toss3.sh renamed to Tools/machines/lassen-llnl/install_v100_dependencies.sh

@@ -15,13 +15,13 @@ set -eu -o pipefail
 # Check: ######################################################################
 #
 #   Was lassen_v100_warpx.profile sourced and configured correctly?
-if [ -z ${proj-} ]; then echo "WARNING: The 'proj' variable is not yet set in your lassen_v100_warpx_toss3.profile file! Please edit its line 2 to continue!"; exit 1; fi
+if [ -z ${proj-} ]; then echo "WARNING: The 'proj' variable is not yet set in your lassen_v100_warpx.profile file! Please edit its line 2 to continue!"; exit 1; fi
 
 
 # Remove old dependencies #####################################################
 #
-SRC_DIR="/usr/workspace/${USER}/lassen-toss3/src"
-SW_DIR="/usr/workspace/${USER}/lassen-toss3/gpu"
+SRC_DIR="/usr/workspace/${USER}/lassen/src"
+SW_DIR="/usr/workspace/${USER}/lassen/gpu"
 rm -rf ${SW_DIR}
 mkdir -p ${SW_DIR}
 mkdir -p ${SRC_DIR}
@@ -110,9 +110,9 @@ cmake --build ${build_dir}/lapackpp-lassen-build --target install --parallel 10
 export PIP_EXTRA_INDEX_URL="https://pypi.org/simple"
 
 python3 -m pip install --upgrade --user virtualenv
-rm -rf ${SW_DIR}/venvs/warpx-lassen-toss3
-python3 -m venv ${SW_DIR}/venvs/warpx-lassen-toss3
-source ${SW_DIR}/venvs/warpx-lassen-toss3/bin/activate
+rm -rf ${SW_DIR}/venvs/warpx-lassen
+python3 -m venv ${SW_DIR}/venvs/warpx-lassen
+source ${SW_DIR}/venvs/warpx-lassen/bin/activate
 python3 -m pip install --upgrade pip
 # python3 -m pip cache purge  # error: pip cache commands can not function since cache is disabled
 python3 -m pip install --upgrade build

Tools/machines/lassen-llnl/lassen_v100_warpx_toss3.profile.example renamed to Tools/machines/lassen-llnl/lassen_v100_warpx.profile.example

@@ -11,7 +11,7 @@ module load boost/1.70.0
 
 # optional: for openPMD support
 SRC_DIR="/usr/workspace/${USER}/lassen/src"
-SW_DIR="/usr/workspace/${USER}/lassen-toss3/gpu"
+SW_DIR="/usr/workspace/${USER}/lassen/gpu"
 export CMAKE_PREFIX_PATH=${SW_DIR}/c-blosc-1.21.1:$CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH=${SW_DIR}/hdf5-1.14.1.2:$CMAKE_PREFIX_PATH
 export CMAKE_PREFIX_PATH=${SW_DIR}/adios2-2.10.2:$CMAKE_PREFIX_PATH
@@ -30,9 +30,9 @@ export LD_LIBRARY_PATH=${SW_DIR}/lapackpp-2024.05.31/lib64:$LD_LIBRARY_PATH
 # optional: for Python bindings
 module load python/3.11.5
 
-if [ -d "${SW_DIR}/venvs/warpx-lassen-toss3" ]
+if [ -d "${SW_DIR}/venvs/warpx-lassen" ]
 then
-    source ${SW_DIR}/venvs/warpx-lassen-toss3/bin/activate
+    source ${SW_DIR}/venvs/warpx-lassen/bin/activate
 fi
 
 # optional: an alias to request an interactive node for two hours