stacks tutorial updates (#107)

* Update example outputs (now using Spack v0.16.1) * Update wording in intro based on reordering of tutorial sections
spack · Apr 15, 2021 · b4488ce · b4488ce
1 parent 12316e4
commit b4488ce
Show file tree

Hide file tree

Showing 11 changed files with 1,386 additions and 955 deletions.
diff --git a/outputs/init_spack.sh b/outputs/init_spack.sh
@@ -10,6 +10,7 @@ fi
 
 . share/spack/setup-env.sh
 
+pip install boto3
 spack mirror add tutorial /mirror
 spack buildcache keys --install --trust
 spack config add 'config:suppress_gpg_warnings:true'

diff --git a/outputs/stacks.sh b/outputs/stacks.sh
@@ -6,13 +6,22 @@ project=$(dirname "$0")
 
 rm -rf $raw_outputs/stacks
 . $project/init_spack.sh
+. share/spack/setup-env.sh
+
+spack install zlib%clang
+spack install trilinos^mpich
+spack install openmpi
 
 mkdir -p ~/code
+example stacks/setup-0 "cd ~/code"
 cd ~/code
 
 cat $project/stacks/examples/0.spack.yaml.example > spack.yaml
+example stacks/setup-0 "spack env activate ."
 spack env activate .
 
+fake_example stacks/setup-0 "spack config edit" "/bin/true"
+
 example stacks/concretize-0 "spack concretize"
 example stacks/concretize-0 "spack find -c"
 

diff --git a/outputs/stacks/concretize-0.out b/outputs/stacks/concretize-0.out
diff --git a/outputs/stacks/concretize-1.out b/outputs/stacks/concretize-1.out
diff --git a/outputs/stacks/concretize-2.out b/outputs/stacks/concretize-2.out
diff --git a/outputs/stacks/concretize-3.out b/outputs/stacks/concretize-3.out
diff --git a/outputs/stacks/concretize-4.out b/outputs/stacks/concretize-4.out
diff --git a/outputs/stacks/setup-0.out b/outputs/stacks/setup-0.out
@@ -0,0 +1,3 @@
+$ cd ~/code
+$ spack env activate .
+$ spack config edit
diff --git a/outputs/stacks/view-0.out b/outputs/stacks/view-0.out
diff --git a/outputs/stacks/view-1.out b/outputs/stacks/view-1.out
diff --git a/tutorial_stacks.rst b/tutorial_stacks.rst
@@ -26,7 +26,12 @@ In a typical Spack environment for a single user, a simple list of
 specs is sufficient. For software deployment, however, we often have a
 set of packages we want to install across a wide range of
 compilers. The simplest way to express this in Spack is through a
-matrix. Let's edit our ``spack.yaml`` file again.
+matrix. Let's go back to our code directory from the environments
+tutorial, activate our environment, and edit our ``spack.yaml`` file
+again.
+
+.. literalinclude:: outputs/stacks/setup-0.out
+   :language: console
 
 .. literalinclude:: outputs/stacks/examples/0.spack.yaml.example
    :language: yaml