From 81c0dc33b1be6c5bc6df9136943d7568aa041e11 Mon Sep 17 00:00:00 2001 From: Gregory Becker Date: Wed, 6 Aug 2025 16:56:35 +0100 Subject: [PATCH 1/3] final fixes for views Signed-off-by: Gregory Becker --- outputs/stacks/examples/6.spack.stack.yaml | 2 +- outputs/stacks/examples/7.spack.stack.yaml | 2 +- tutorial_stacks.rst | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/outputs/stacks/examples/6.spack.stack.yaml b/outputs/stacks/examples/6.spack.stack.yaml index dd0781cf81..7260eb8d0e 100644 --- a/outputs/stacks/examples/6.spack.stack.yaml +++ b/outputs/stacks/examples/6.spack.stack.yaml @@ -39,5 +39,5 @@ spack: ^lapack: '{name}/{name}-{version}-{^c.name}-{^c.version}-{^lapack.name}-{^lapack.version}' '%c': '{name}/{name}-{version}-{^c.name}-{^c.version}' '%cxx': '{name}/{name}-{version}-{^cxx.name}-{^cxx.version}' - '%c': '{name}/{name}-{version}-{^fortran.name}-{^fortran.version}' + '%fortran': '{name}/{name}-{version}-{^fortran.name}-{^fortran.version}' all: '{name}/{name}-{version}' diff --git a/outputs/stacks/examples/7.spack.stack.yaml b/outputs/stacks/examples/7.spack.stack.yaml index f87cc0bd9f..ea8763bbb0 100644 --- a/outputs/stacks/examples/7.spack.stack.yaml +++ b/outputs/stacks/examples/7.spack.stack.yaml @@ -40,5 +40,5 @@ spack: ^lapack: '{name}/{name}-{version}-{^c.name}-{^c.version}-{^lapack.name}-{^lapack.version}' '%c': '{name}/{name}-{version}-{^c.name}-{^c.version}' '%cxx': '{name}/{name}-{version}-{^cxx.name}-{^cxx.version}' - '%c': '{name}/{name}-{version}-{^fortran.name}-{^fortran.version}' + '%fortran': '{name}/{name}-{version}-{^fortran.name}-{^fortran.version}' all: '{name}/{name}-{version}' diff --git a/tutorial_stacks.rst b/tutorial_stacks.rst index 26d3ce375f..a26e85e1c9 100644 --- a/tutorial_stacks.rst +++ b/tutorial_stacks.rst @@ -321,7 +321,7 @@ Edit our ``spack.yaml`` file again. .. literalinclude:: outputs/stacks/examples/6.spack.stack.yaml :language: yaml - :emphasize-lines: 30-40 + :emphasize-lines: 30-43 In the configuration above we created two views, named ``default`` and ``full``. The ``default`` view consists of all the packages that are compiled with ``gcc@12``, but do not depend on either ``mpich`` or ``netlib-lapack``. From 94ba64e28b5483355fe75d8bf9fad0ed69fbb41c Mon Sep 17 00:00:00 2001 From: Gregory Becker Date: Wed, 6 Aug 2025 17:01:39 +0100 Subject: [PATCH 2/3] final fixes Signed-off-by: Gregory Becker --- tutorial_stacks.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorial_stacks.rst b/tutorial_stacks.rst index a26e85e1c9..fcde75d182 100644 --- a/tutorial_stacks.rst +++ b/tutorial_stacks.rst @@ -383,7 +383,7 @@ The next step is to add some basic configuration to our ``spack.yaml`` to genera .. literalinclude:: outputs/stacks/examples/8.spack.stack.yaml :language: yaml - :emphasize-lines: 31-40 + :emphasize-lines: 31-42 In these few lines of additional configuration we told Spack to generate ``lmod`` module files in a subdirectory named ``modules``, using a hierarchy comprising both ``lapack`` and ``mpi``. We've also configured it to place all specs built with our system compiler into the ``Core`` designation in the lmod hierarchy. From d29029d10be935f61af0e22ecf2e3d93110609e3 Mon Sep 17 00:00:00 2001 From: Gregory Becker Date: Wed, 6 Aug 2025 17:04:14 +0100 Subject: [PATCH 3/3] fix highlighting Signed-off-by: Gregory Becker --- tutorial_stacks.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutorial_stacks.rst b/tutorial_stacks.rst index fcde75d182..387ba8e445 100644 --- a/tutorial_stacks.rst +++ b/tutorial_stacks.rst @@ -416,7 +416,7 @@ To address all these needs we can complicate our ``modules`` configuration a bit .. literalinclude:: outputs/stacks/examples/9.spack.stack.yaml :language: yaml - :emphasize-lines: 41-56 + :emphasize-lines: 41-58 Regenerate the modules again: