From 2f917f89d610a5a72a2344df7dfd4f64646ab71c Mon Sep 17 00:00:00 2001 From: caubet_m Date: Fri, 13 Feb 2026 16:14:03 +0100 Subject: [PATCH] Remove old login. Fix ANSYS docs --- .../hardware-and-software-description.md | 15 +++-- .../how-to-use-merlin/connect-from-linux.md | 2 - .../how-to-use-merlin/connect-from-macos.md | 2 - .../how-to-use-merlin/transfer-data.md | 4 +- docs/merlin6/software-support/ansys-cfx.md | 4 +- docs/merlin6/software-support/ansys-fluent.md | 20 ++++-- docs/merlin6/software-support/ansys-hfss.md | 6 +- docs/merlin6/software-support/ansys-mapdl.md | 18 +++-- docs/merlin6/software-support/ansys-rsm.md | 1 - docs/merlin6/software-support/ansys.md | 67 +++++++++++++------ 10 files changed, 87 insertions(+), 52 deletions(-) diff --git a/docs/merlin6/hardware-and-software-description.md b/docs/merlin6/hardware-and-software-description.md index 597d320..218e0c0 100644 --- a/docs/merlin6/hardware-and-software-description.md +++ b/docs/merlin6/hardware-and-software-description.md @@ -87,11 +87,14 @@ Each blade contains a NVMe disk, where up to 300TB are dedicated to the O.S., an ### Login Nodes -*One old login node* (``merlin-l-01.psi.ch``) is inherit from the previous Merlin5 cluster. Its mainly use is for running some BIO services (`cryosparc`) and for submitting jobs. -*Two new login nodes* (``merlin-l-001.psi.ch``,``merlin-l-002.psi.ch``) with similar configuration to the Merlin6 computing nodes are available for the users. The mainly use -is for compiling software and submitting jobs. +Two login nodes (`merlin-l-001.psi.ch`, `merlin-l-002.psi.ch`) are available to users. They are configured similarly to the Merlin6 compute nodes and are intended primarily for software compilation, job submission, lightweight preprocessing, and visualization tasks. -The connectivity is based on **ConnectX-5 EDR-100Gbps** for the new login nodes, and **ConnectIB FDR-56Gbps** for the old one. +Each login node is equipped with an NVIDIA Quadro P2000 GPU. These GPUs are not intended for large-scale or long-running compute workloads, +but rather to support interactive and lightweight GPU-accelerated tasks such as OpenGL-based visualization, remote desktop sessions, +debugging, testing GPU-enabled applications, and validating CUDA or graphics workflows before running them at scale on the compute nodes. +This allows users to develop and debug GPU-aware software without consuming compute-partition resources, while still keeping heavy production workloads confined to the batch system. + +The connectivity is based on **ConnectX-5 EDR-100Gbps**. @@ -109,7 +112,7 @@ The connectivity is based on **ConnectX-5 EDR-100Gbps** for the new login nodes, - + diff --git a/docs/merlin6/how-to-use-merlin/connect-from-linux.md b/docs/merlin6/how-to-use-merlin/connect-from-linux.md index b3bf55a..51ff849 100644 --- a/docs/merlin6/how-to-use-merlin/connect-from-linux.md +++ b/docs/merlin6/how-to-use-merlin/connect-from-linux.md @@ -6,7 +6,6 @@ This is the standard method. Official X11 support is provided through [NoMachine For normal SSH sessions, use your SSH client as follows: ```bash -ssh $username@merlin-l-01.psi.ch ssh $username@merlin-l-001.psi.ch ssh $username@merlin-l-002.psi.ch ``` @@ -29,7 +28,6 @@ to implicitly add `-X` to all ssh connections: * Alternatively, you can add the option `-Y` to the `ssh` command. In example: ```bash - ssh -X $username@merlin-l-01.psi.ch ssh -X $username@merlin-l-001.psi.ch ssh -X $username@merlin-l-002.psi.ch ``` diff --git a/docs/merlin6/how-to-use-merlin/connect-from-macos.md b/docs/merlin6/how-to-use-merlin/connect-from-macos.md index d02e5d3..cd184b5 100644 --- a/docs/merlin6/how-to-use-merlin/connect-from-macos.md +++ b/docs/merlin6/how-to-use-merlin/connect-from-macos.md @@ -6,7 +6,6 @@ This is the standard method. Official X11 support is provided through [NoMachine For normal SSH sessions, use your SSH client as follows: ```bash -ssh $username@merlin-l-01.psi.ch ssh $username@merlin-l-001.psi.ch ssh $username@merlin-l-002.psi.ch ``` @@ -39,7 +38,6 @@ to implicitly add ``-X`` to all ssh connections: * Alternatively, you can add the option ``-Y`` to the ``ssh`` command. In example: ```bash - ssh -X $username@merlin-l-01.psi.ch ssh -X $username@merlin-l-001.psi.ch ssh -X $username@merlin-l-002.psi.ch ``` diff --git a/docs/merlin6/how-to-use-merlin/transfer-data.md b/docs/merlin6/how-to-use-merlin/transfer-data.md index c8eb6ba..19bf1fc 100644 --- a/docs/merlin6/how-to-use-merlin/transfer-data.md +++ b/docs/merlin6/how-to-use-merlin/transfer-data.md @@ -35,7 +35,7 @@ For example, to transfer files from your local computer to a merlin project directory: ```bash -rsync -avAHXS ~/localdata user@merlin-l-01.psi.ch:/data/project/general/myproject/ +rsync -avAHXS ~/localdata user@merlin-l-001.psi.ch:/data/project/general/myproject/ ``` You can resume interrupted transfers by simply rerunning the command. Previously @@ -44,7 +44,7 @@ transferred files will be skipped. ### WinSCP The WinSCP tool can be used for remote file transfer on Windows. It is available -from the Software Kiosk on PSI machines. Add `merlin-l-01.psi.ch` as a host and +from the Software Kiosk on PSI machines. Add `merlin-l-001.psi.ch` as a host and connect with your PSI credentials. You can then drag-and-drop files between your local computer and merlin. diff --git a/docs/merlin6/software-support/ansys-cfx.md b/docs/merlin6/software-support/ansys-cfx.md index 00b7a95..977de5a 100644 --- a/docs/merlin6/software-support/ansys-cfx.md +++ b/docs/merlin6/software-support/ansys-cfx.md @@ -11,8 +11,8 @@ Is strongly recommended the use of the latest ANSYS software available in PModul ```bash module use unstable -module load Pmodules/1.1.6 -module use overlay_merlin +module load Pmodules/2.0.4 +module use merlin module load ANSYS/2022R1 ``` diff --git a/docs/merlin6/software-support/ansys-fluent.md b/docs/merlin6/software-support/ansys-fluent.md index d779800..b27ebf1 100644 --- a/docs/merlin6/software-support/ansys-fluent.md +++ b/docs/merlin6/software-support/ansys-fluent.md @@ -17,9 +17,9 @@ Is strongly recommended the use of the latest ANSYS software available in PModul ```bash module use unstable -module load Pmodules/1.1.6 -module use overlay_merlin -module load ANSYS/2022R1 +module load Pmodules/2.0.4 +module use merlin +module load ANSYS/2024R2 ``` ### Interactive: RSM from remote PSI Workstations @@ -50,7 +50,9 @@ This example shows a very basic serial job. #SBATCH --error=slurm-%j.err # Define your error file module use unstable -module load ANSYS/2020R1-1 +module load Pmodules/2.0.4 +module use merlin +module load ANSYS/2024R2 # [Optional:BEGIN] Specify your license server if this is not 'lic-ansys.psi.ch' LICENSE_SERVER= @@ -83,7 +85,9 @@ An example for running Fluent using a Slurm batch script is the following: ##SBATCH --exclusive # Uncomment if you want exclusive usage of the nodes module use unstable -module load ANSYS/2020R1-1 +module load Pmodules/2.0.4 +module use merlin +module load ANSYS/2024R2 # [Optional:BEGIN] Specify your license server if this is not 'lic-ansys.psi.ch' LICENSE_SERVER= @@ -149,8 +153,10 @@ running `fluent`, as follows: salloc: Granted job allocation 135030174 $ module use unstable - $ module load ANSYS/2020R1-1 - module load: unstable module has been loaded -- ANSYS/2020R1-1 + $ module load Pmodules/2.0.4 + $ module use merlin + $ module load ANSYS/2024R2 + module load: unstable module has been loaded -- ANSYS/2024R2 $ fluent 3ddp -t$SLURM_NPROCS -cnf=$(scontrol show hostname | tr '\n' ',') diff --git a/docs/merlin6/software-support/ansys-hfss.md b/docs/merlin6/software-support/ansys-hfss.md index 9126162..4fba6b8 100644 --- a/docs/merlin6/software-support/ansys-hfss.md +++ b/docs/merlin6/software-support/ansys-hfss.md @@ -11,9 +11,9 @@ Is necessary to run at least ANSYS software **ANSYS/2022R1**, which is available ```bash module use unstable -module load Pmodules/1.1.6 -module use overlay_merlin -module load ANSYS/2022R1 +module load Pmodules/2.0.4 +module use merlin +module load ANSYS/2024R2 ``` ## Remote job submission: HFSS RSM and SLURM diff --git a/docs/merlin6/software-support/ansys-mapdl.md b/docs/merlin6/software-support/ansys-mapdl.md index caa7b21..93f00c8 100644 --- a/docs/merlin6/software-support/ansys-mapdl.md +++ b/docs/merlin6/software-support/ansys-mapdl.md @@ -13,9 +13,9 @@ Is strongly recommended the use of the latest ANSYS software available in PModul ```bash module use unstable -module load Pmodules/1.1.6 -module use overlay_merlin -module load ANSYS/2022R1 +module load Pmodules/2.0.4 +module use merlin +module load ANSYS/2024R2 ``` ### Interactive: RSM from remote PSI Workstations @@ -47,7 +47,9 @@ This example shows a very basic serial job. #SBATCH --error=slurm-%j.err # Define your error file module use unstable -module load ANSYS/2020R1-1 +module load Pmodules/2.0.4 +module use merlin +module load ANSYS/2024R2 # [Optional:BEGIN] Specify your license server if this is not 'lic-ansys.psi.ch' LICENSE_SERVER= @@ -82,7 +84,9 @@ example below, we use a node by using all his cores and the whole memory. #SBATCH --exclusive # Uncomment if you want exclusive usage of the nodes module use unstable -module load ANSYS/2020R1-1 +module load Pmodules/2.0.4 +module use merlin +module load ANSYS/2024R2 # [Optional:BEGIN] Specify your license server if this is not 'lic-ansys.psi.ch' LICENSE_SERVER= @@ -122,7 +126,9 @@ This example enables Distributed ANSYS for running Mechanical APDL using a Slurm ##SBATCH --exclusive # Uncomment if you want exclusive usage of the nodes module use unstable -module load ANSYS/2020R1-1 +module load Pmodules/2.0.4 +module use merlin +module load ANSYS/2024R2 # [Optional:BEGIN] Specify your license server if this is not 'lic-ansys.psi.ch' LICENSE_SERVER= diff --git a/docs/merlin6/software-support/ansys-rsm.md b/docs/merlin6/software-support/ansys-rsm.md index ab37d88..71e8939 100644 --- a/docs/merlin6/software-support/ansys-rsm.md +++ b/docs/merlin6/software-support/ansys-rsm.md @@ -24,7 +24,6 @@ specific port and will process any request using RSM (in example, from ANSYS users workstations). The following login nodes are configured with such services: -* `merlin-l-01.psi.ch` * `merlin-l-001.psi.ch` * `merlin-l-002.psi.ch` diff --git a/docs/merlin6/software-support/ansys.md b/docs/merlin6/software-support/ansys.md index 590eda0..6cc0f62 100644 --- a/docs/merlin6/software-support/ansys.md +++ b/docs/merlin6/software-support/ansys.md @@ -17,8 +17,10 @@ For loading the Merlin6 ANSYS software, one needs to run Pmodules v1.1.4 or newe (called **`overlay_merlin`**) which is ***only available from the Merlin cluster***: ```bash -module load Pmodules/1.1.6 -module use overlay_merlin +module use unstable +module load Pmodules/2.0.4 +module use merlin +module load ANSYS/2024R2 ``` Once `overlay_merlin` is invoked, it will disable central ANSYS installations with the same version, which will be replaced @@ -31,27 +33,50 @@ option. This will show the location of the different ANSYS releases as follows: ??? note "[Example] Loading ANSYS from the Merlin6 PModules repository" ```console - # module load Pmodules/1.1.6 - module load: unstable module has been loaded -- Pmodules/1.1.6 + (base) ❄ [caubet_m@merlin-l-001:/data/user/caubet_m]# module use unstable + (base) ❄ [caubet_m@merlin-l-001:/data/user/caubet_m]# module load Pmodules/2.0.4 + (base) ❄ [caubet_m@merlin-l-001:/data/user/caubet_m]# module use merlin - # module use merlin_overlay + (base) ❄ [caubet_m@merlin-l-001:/data/user/caubet_m]# module search ANSYS - # module search ANSYS --verbose - - Module Rel.stage Group Dependencies/Modulefile - ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- - ANSYS/2019R3 stable Tools dependencies: - modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2019R3 - ANSYS/2020R1 stable Tools dependencies: - modulefile: /opt/psi/Tools/modulefiles/ANSYS/2020R1 - ANSYS/2020R1-1 stable Tools dependencies: - modulefile: /opt/psi/Tools/modulefiles/ANSYS/2020R1-1 - ANSYS/2020R2 stable Tools dependencies: - modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2020R2 - ANSYS/2021R1 stable Tools dependencies: - modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2021R1 - ANSYS/2021R2 stable Tools dependencies: - modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2021R2 + Module Rel.stage Group Overlay Requires + -------------------------------------------------------------------------------- + ANSYS/2022R1 stable Tools merlin + ANSYS/2022R2 stable Tools merlin + ANSYS/2023R2 unstable Tools merlin + ANSYS/2024R1 unstable Tools merlin + ANSYS/2024R2 unstable Tools merlin + (base) ❄ [caubet_m@merlin-l-001:/data/user/caubet_m]# module search ANSYS --verbose + ANSYS/2022R1: + release stage: stable + group: Tools + overlay: merlin + modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2022R1 + dependencies: (none) + ANSYS/2022R2: + release stage: stable + group: Tools + overlay: merlin + modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2022R2 + dependencies: (none) + ANSYS/2023R2: + release stage: unstable + group: Tools + overlay: merlin + modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2023R2 + dependencies: (none) + ANSYS/2024R1: + release stage: unstable + group: Tools + overlay: merlin + modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2024R1 + dependencies: (none) + ANSYS/2024R2: + release stage: unstable + group: Tools + overlay: merlin + modulefile: /data/software/pmodules/Tools/modulefiles/ANSYS/2024R2 + dependencies: (none) ``` !!! tip
Memory
New merlin-l-00[1,2]