Skip to content

Commit 5edb096

Browse files
authored
1.0/stacks final fixes (#482)
* final fixes for views Signed-off-by: Gregory Becker <becker33@llnl.gov> * final fixes Signed-off-by: Gregory Becker <becker33@llnl.gov> * fix highlighting Signed-off-by: Gregory Becker <becker33@llnl.gov> --------- Signed-off-by: Gregory Becker <becker33@llnl.gov>
1 parent 271be6f commit 5edb096

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

outputs/stacks/examples/6.spack.stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ spack:
3939
^lapack: '{name}/{name}-{version}-{^c.name}-{^c.version}-{^lapack.name}-{^lapack.version}'
4040
'%c': '{name}/{name}-{version}-{^c.name}-{^c.version}'
4141
'%cxx': '{name}/{name}-{version}-{^cxx.name}-{^cxx.version}'
42-
'%c': '{name}/{name}-{version}-{^fortran.name}-{^fortran.version}'
42+
'%fortran': '{name}/{name}-{version}-{^fortran.name}-{^fortran.version}'
4343
all: '{name}/{name}-{version}'

outputs/stacks/examples/7.spack.stack.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ spack:
4040
^lapack: '{name}/{name}-{version}-{^c.name}-{^c.version}-{^lapack.name}-{^lapack.version}'
4141
'%c': '{name}/{name}-{version}-{^c.name}-{^c.version}'
4242
'%cxx': '{name}/{name}-{version}-{^cxx.name}-{^cxx.version}'
43-
'%c': '{name}/{name}-{version}-{^fortran.name}-{^fortran.version}'
43+
'%fortran': '{name}/{name}-{version}-{^fortran.name}-{^fortran.version}'
4444
all: '{name}/{name}-{version}'

tutorial_stacks.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ Edit our ``spack.yaml`` file again.
321321

322322
.. literalinclude:: outputs/stacks/examples/6.spack.stack.yaml
323323
:language: yaml
324-
:emphasize-lines: 30-40
324+
:emphasize-lines: 30-43
325325

326326
In the configuration above we created two views, named ``default`` and ``full``.
327327
The ``default`` view consists of all the packages that are compiled with ``gcc@12``, but do not depend on either ``mpich`` or ``netlib-lapack``.
@@ -383,7 +383,7 @@ The next step is to add some basic configuration to our ``spack.yaml`` to genera
383383

384384
.. literalinclude:: outputs/stacks/examples/8.spack.stack.yaml
385385
:language: yaml
386-
:emphasize-lines: 31-40
386+
:emphasize-lines: 31-42
387387

388388
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``.
389389
We've also configured it to place all specs built with our system compiler into the ``Core`` designation in the lmod hierarchy.
@@ -416,7 +416,7 @@ To address all these needs we can complicate our ``modules`` configuration a bit
416416

417417
.. literalinclude:: outputs/stacks/examples/9.spack.stack.yaml
418418
:language: yaml
419-
:emphasize-lines: 41-56
419+
:emphasize-lines: 41-58
420420

421421
Regenerate the modules again:
422422

0 commit comments

Comments
 (0)