From 67c2c80cf4f17c31962d71623108176af55e04fb Mon Sep 17 00:00:00 2001 From: Tim Wickberg Date: Thu, 16 Nov 2023 15:40:54 -0700 Subject: Use preferred capitalization of "Slurm" (#41109) https://slurm.schedmd.com/faq.html#acronym --- lib/spack/docs/packaging_guide.rst | 2 +- lib/spack/spack/test/llnl/util/lock.py | 2 +- var/spack/repos/builtin/packages/mpich/package.py | 2 +- var/spack/repos/builtin/packages/openmpi/package.py | 2 +- var/spack/repos/builtin/packages/slurm-drmaa/package.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/spack/docs/packaging_guide.rst b/lib/spack/docs/packaging_guide.rst index 3dd1c7952d..84046a654e 100644 --- a/lib/spack/docs/packaging_guide.rst +++ b/lib/spack/docs/packaging_guide.rst @@ -2337,7 +2337,7 @@ window while a batch job is running ``spack install`` on the same or overlapping dependencies without any process trying to re-do the work of another. -For example, if you are using SLURM, you could launch an installation +For example, if you are using Slurm, you could launch an installation of ``mpich`` using the following command: .. code-block:: console diff --git a/lib/spack/spack/test/llnl/util/lock.py b/lib/spack/spack/test/llnl/util/lock.py index 9e7f3a3bde..a17e5c94d9 100644 --- a/lib/spack/spack/test/llnl/util/lock.py +++ b/lib/spack/spack/test/llnl/util/lock.py @@ -18,7 +18,7 @@ across nodes. So, e.g., you can run the test like this:: mpirun -n 7 spack test lock And it will test locking correctness among MPI processes. Ideally, you -want the MPI processes to span across multiple nodes, so, e.g., for SLURM +want the MPI processes to span across multiple nodes, so, e.g., for Slurm you might do this:: srun -N 7 -n 7 -m cyclic spack test lock diff --git a/var/spack/repos/builtin/packages/mpich/package.py b/var/spack/repos/builtin/packages/mpich/package.py index b66c0b8fd4..984f2a89a7 100644 --- a/var/spack/repos/builtin/packages/mpich/package.py +++ b/var/spack/repos/builtin/packages/mpich/package.py @@ -55,7 +55,7 @@ class Mpich(AutotoolsPackage, CudaPackage, ROCmPackage): variant("hydra", default=True, description="Build the hydra process manager") variant("romio", default=True, description="Enable ROMIO MPI I/O implementation") variant("verbs", default=False, description="Build support for OpenFabrics verbs.") - variant("slurm", default=False, description="Enable SLURM support") + variant("slurm", default=False, description="Enable Slurm support") variant("wrapperrpath", default=True, description="Enable wrapper rpath") variant( "pmi", diff --git a/var/spack/repos/builtin/packages/openmpi/package.py b/var/spack/repos/builtin/packages/openmpi/package.py index 5325235612..f2347d01ec 100644 --- a/var/spack/repos/builtin/packages/openmpi/package.py +++ b/var/spack/repos/builtin/packages/openmpi/package.py @@ -595,7 +595,7 @@ class Openmpi(AutotoolsPackage, CudaPackage): conflicts( "schedulers=slurm ~pmi", when="@1.5.4", - msg="+pmi is required for openmpi to work with SLURM.", + msg="+pmi is required for openmpi to work with Slurm.", ) conflicts( "schedulers=loadleveler", diff --git a/var/spack/repos/builtin/packages/slurm-drmaa/package.py b/var/spack/repos/builtin/packages/slurm-drmaa/package.py index 100b328b9a..012fc6dcd1 100644 --- a/var/spack/repos/builtin/packages/slurm-drmaa/package.py +++ b/var/spack/repos/builtin/packages/slurm-drmaa/package.py @@ -10,7 +10,7 @@ class SlurmDrmaa(AutotoolsPackage): """ DRMAA for Slurm is an implementation of Open Grid Forum DRMAA 1.0 (Distributed Resource Management Application API) specification for submission and control of - jobs to SLURM. Using DRMAA, grid applications builders, portal developers and + jobs to Slurm. Using DRMAA, grid applications builders, portal developers and ISVs can use the same high-level API to link their software with different cluster/resource management systems. """ -- cgit v1.2.3-70-g09d2