diff --git a/.gitmodules b/.gitmodules index 8f74f1180..81737430e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ [submodule "_spack_root"] path = _spack_root url = https://github.com/spack/spack.git - branch = releases/v1.0 + branch = releases/v1.2 [submodule "_spack_packages"] path = _spack_packages url = https://github.com/spack/spack-packages - branch = releases/v2025.07 \ No newline at end of file + branch = releases/v2026.06 diff --git a/_spack_root b/_spack_root index 73eaea13f..3e19345b6 160000 --- a/_spack_root +++ b/_spack_root @@ -1 +1 @@ -Subproject commit 73eaea13f381e3495299284856fd02a64e1d154c +Subproject commit 3e19345b6e12f5ff1b874f4059622fc6a1fd804a diff --git a/tutorial_configuration.rst b/tutorial_configuration.rst index 42b4d74eb..8035a7f65 100644 --- a/tutorial_configuration.rst +++ b/tutorial_configuration.rst @@ -142,13 +142,13 @@ For example, look at high-level config: --- config: /etc/spack/config.yaml:2 suppress_gpg_warnings: True - /home/spack/spack/etc/spack/defaults/config.yaml:19 install_tree: - /home/spack/spack/etc/spack/defaults/config.yaml:20 root: $spack/opt/spack + /home/spack/spack/etc/spack/defaults/base/config.yaml:19 install_tree: + /home/spack/spack/etc/spack/defaults/base/config.yaml:20 root: $spack/opt/spack ... - /home/spack/spack/etc/spack/defaults/config.yaml:238 aliases: - /home/spack/spack/etc/spack/defaults/config.yaml:239 concretise: concretize - /home/spack/spack/etc/spack/defaults/config.yaml:240 containerise: containerize - /home/spack/spack/etc/spack/defaults/config.yaml:241 rm: remove + /home/spack/spack/etc/spack/defaults/base/config.yaml:238 aliases: + /home/spack/spack/etc/spack/defaults/base/config.yaml:239 concretise: concretize + /home/spack/spack/etc/spack/defaults/base/config.yaml:240 containerise: containerize + /home/spack/spack/etc/spack/defaults/base/config.yaml:241 rm: remove We can see overrides in action with: @@ -601,10 +601,10 @@ You can see the default settings by running: .. code-block:: console - $ spack config --scope defaults edit config + $ spack config --scope defaults:base edit config -.. literalinclude:: _spack_root/etc/spack/defaults/config.yaml +.. literalinclude:: _spack_root/etc/spack/defaults/base/config.yaml :language: yaml @@ -627,18 +627,15 @@ If you have a fast scratch file system, you can run builds from this file system See `Basic Settings `_ for details. -On systems with compilers that absolutely *require* environment variables like ``LD_LIBRARY_PATH``, it is possible to prevent Spack from cleaning the build environment with the ``dirty`` setting: - -.. code-block:: yaml +One last setting that may be of interest to many users is the ability to customize the parallelism of Spack builds. +By default, Spack installs all packages in parallel with the number of jobs equal to the number of cores on the node. - config: - dirty: true +This is easier to demonstrate using the old installer's output, so we'll switch to that for this example. +.. code-block:: console -However, this is strongly discouraged, as it can pull unwanted libraries into the build. + $ spack config add config:installer:old -One last setting that may be of interest to many users is the ability to customize the parallelism of Spack builds. -By default, Spack installs all packages in parallel with the number of jobs equal to the number of cores on the node. For example, on a node with 16 cores, this will look like: .. code-block:: spec @@ -689,15 +686,16 @@ If we uninstall and reinstall zlib, we see that it now uses only 2 cores: Obviously, if you want to build everything in serial for whatever reason, you would set ``build_jobs`` to 1. -Last, we'll unset ``concretizer:reuse:false`` since we'll want to enable concretizer reuse for the rest of this tutorial. +Last, we'll unset ``concretizer:reuse:false`` and ``config:installer:old`` since we'll want to enable concretizer reuse and the terminal user interface for the rest of this tutorial. .. code-block:: console $ spack config rm concretizer:reuse + $ spack config rm config:installer .. warning:: - If you do not do this step, the rest of the tutorial will not reuse binaries! + If you do not do this step, the rest of the tutorial will not reuse binaries or use the TUI! ---------- Conclusion diff --git a/tutorial_modules.rst b/tutorial_modules.rst index 83bc1f399..24625b0bb 100644 --- a/tutorial_modules.rst +++ b/tutorial_modules.rst @@ -848,7 +848,7 @@ The rest of the file is then divided into `blocks