From 1dc94f387ad18591c4e4653213d4679d99cc98bf Mon Sep 17 00:00:00 2001 From: Fabio Hernandez Date: Mon, 30 Jun 2025 11:42:13 +0200 Subject: [PATCH 1/2] Update mentions of cvmfs to almalinux-x86_64 instead of linux-x86_64 --- usdf/batch.rst | 7 ++++++- usdf/stack.rst | 16 ++++++++++------ 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/usdf/batch.rst b/usdf/batch.rst index 02053f6d..2587374e 100644 --- a/usdf/batch.rst +++ b/usdf/batch.rst @@ -321,6 +321,11 @@ to the desired ``site`` subsection. The ``monitorFilename`` field specifies the The ``pip uninstall sqlalchemy`` command is needed since the ``pip install 'parsl[monitoring]'`` command installs an earlier version of ``sqlalchemy`` that's incompatible with ``lsst_distrib``. + +.. tip:: + + Weekly releases ``w_2025_11`` and later are exclusively built on AlmaLinux instead of CentOS 7. They can be found under ``/cvmfs/sw.lsst.eu/almalinux-x86_64/lsst_distrib/`` (note the ``almalinux-x86_64`` instead of ``linux-x86_64`` in the path). + Notes on each of the example configurations follow (Each class listed below lives in the ``lsst.ctrl.bps.parsl.sites`` namespace): Local @@ -363,7 +368,7 @@ In this class, a Parsl `LocalProvider - source /cvmfs/sw.lsst.eu/linux-x86_64/lsst_distrib/w_2022_38/loadLSST-ext.bash + source /cvmfs/sw.lsst.eu/almalinux-x86_64/lsst_distrib/w_2025_26/loadLSST-ext.bash setup lsst_distrib bps submit diff --git a/usdf/stack.rst b/usdf/stack.rst index 83f1cd98..e09d222b 100644 --- a/usdf/stack.rst +++ b/usdf/stack.rst @@ -8,33 +8,37 @@ LSST Science Pipelines "stack" available at the USDF. Release and Weekly ================== -Access to self-contained release and weekly versions is available via cvmfs (e.g. ``v24.0.0`` or ``w_2023_01``). +Access to self-contained release and weekly versions is available via cvmfs (e.g. ``v29.1.1`` or ``w_2025_26``). Each version is available in three variants: a Conda environment with minimal dependencies for processing data, an extended Conda environment with packages appropriate for code developers, and an Apptainer container with the minimal environment. Minimal processing Conda environment: .. code-block:: bash - source /cvmfs/sw.lsst.eu/linux-x86_64/lsst_distrib/w_2023_01/loadLSST.bash + source /cvmfs/sw.lsst.eu/almalinux-x86_64/lsst_distrib/w_2025_26/loadLSST.bash Developer-friendly Conda environment: .. code-block:: bash - source /cvmfs/sw.lsst.eu/linux-x86_64/lsst_distrib/w_2023_01/loadLSST-ext.bash + source /cvmfs/sw.lsst.eu/almalinux-x86_64/lsst_distrib/w_2025_26/loadLSST-ext.bash Minimal processing Apptainer: .. code-block:: bash - apptainer run-help /cvmfs/sw.lsst.eu/containers/apptainer/lsst_distrib/w_2023_01.sif + apptainer run-help /cvmfs/sw.lsst.eu/containers/apptainer/x86_64/almalinux/lsst_distrib/w_2025_26 provides more information. You can see which versions are available by: -``ls /cvmfs/sw.lsst.eu/linux-x86_64/lsst_distrib/`` +``ls /cvmfs/sw.lsst.eu/almalinux-x86_64/lsst_distrib/`` and -``ls /cvmfs/sw.lsst.eu/containers/apptainer/lsst_distrib/`` +``ls /cvmfs/sw.lsst.eu/containers/apptainer/x86_64/almalinux/lsst_distrib/`` + +.. note:: + + Stable and select weekly releases older than ``w_2025_11``, were built on the CentOS 7 Linux distribution (the previous reference platform). They are available under ``/cvmfs/sw.lsst.eu/linux-x86_64/lsst_distrib`` (note the ``linux-x86_64`` instead of ``almalinux-x86_64`` in the path). Shared Stack ============ From 66705e1f8a8d7e1c5dc137b6112829ba26711186 Mon Sep 17 00:00:00 2001 From: Fabio Hernandez Date: Tue, 1 Jul 2025 09:09:54 +0200 Subject: [PATCH 2/2] Further improvements to address reviewer's comments --- usdf/batch.rst | 2 +- usdf/stack.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usdf/batch.rst b/usdf/batch.rst index 2587374e..fda55c0b 100644 --- a/usdf/batch.rst +++ b/usdf/batch.rst @@ -312,7 +312,7 @@ to the desired ``site`` subsection. The ``monitorFilename`` field specifies the .. note:: - As of 2022-09-27, the ``parsl`` module and its dependencies are only available at S3DF via the CVMFS distributions of ``lsst_distrib`` for weekly ``w_2022_37`` and later. However, the modules needed for Parsl *monitoring* are not available in the CVMFS distributions. They can be installed in ``~/.local`` with the following commands:: + The ``parsl`` module and its dependencies are available at S3DF via the CVMFS distributions of ``lsst_distrib`` for weekly ``w_2022_37`` and later. However, the modules needed for Parsl *monitoring* are not available in the CVMFS distributions. They can be installed in ``~/.local`` with the following commands:: $ source /cvmfs/sw.lsst.eu/linux-x86_64/lsst_distrib/w_2022_39/loadLSST-ext.bash $ setup lsst_distrib diff --git a/usdf/stack.rst b/usdf/stack.rst index e09d222b..5c6bccd0 100644 --- a/usdf/stack.rst +++ b/usdf/stack.rst @@ -38,7 +38,7 @@ and .. note:: - Stable and select weekly releases older than ``w_2025_11``, were built on the CentOS 7 Linux distribution (the previous reference platform). They are available under ``/cvmfs/sw.lsst.eu/linux-x86_64/lsst_distrib`` (note the ``linux-x86_64`` instead of ``almalinux-x86_64`` in the path). + Stable and select weekly releases older than ``w_2025_11`` were built on the CentOS 7 Linux distribution (the previous reference platform). They are available under ``/cvmfs/sw.lsst.eu/linux-x86_64/lsst_distrib`` (note the ``linux-x86_64`` instead of ``almalinux-x86_64`` in the path). Shared Stack ============