basics section: update for ecp21 tutorial (#103)

* Update example output (changed in updating from v0.15 to v0.16.1) * Use updated docker image and mirror
spack · Apr 15, 2021 · 12316e4 · 12316e4
1 parent cf0ce18
commit 12316e4
Show file tree

Hide file tree

Showing 17 changed files with 1,060 additions and 2,717 deletions.
diff --git a/outputs/Makefile b/outputs/Makefile
@@ -17,10 +17,10 @@ all:
 run:
 	docker run --rm -it \
 		--mount type=bind,source=${PWD},target=/project \
-		spack/tutorial:aws20 \
+		spack/tutorial:ecp21-validation \
 		/project/basics.sh
 
 interactive:
 	docker run --rm -it \
 		--mount type=bind,source=${PWD},target=/project \
-		spack/tutorial:aws20
+		spack/tutorial:ecp21-validation
diff --git a/outputs/basics.sh b/outputs/basics.sh
@@ -15,7 +15,7 @@ example basics/clone         "git clone https://github.com/spack/spack ~/spack"
 
 example basics/checkout      "cd ~/spack"
 cd ~/spack
-example basics/checkout      "git checkout releases/v0.15"
+example basics/checkout      "git checkout releases/v0.16"
 
 example basics/source-setup  ". share/spack/setup-env.sh"
 
@@ -30,8 +30,8 @@ example basics/list-py         "spack list 'py-*'"
 # spack install
 example basics/zlib            "spack install zlib"
 
-example basics/mirror          "spack mirror add tutorial s3://spack-tutorial-container/mirror/"
-example basics/mirror          "spack gpg trust share/spack/keys/tutorial.pub"
+example basics/mirror          "spack mirror add tutorial s3://spack-binaries-prs/tutorial/ecp21/mirror"
+example basics/mirror          "spack buildcache keys -it"
 
 example basics/zlib-clang      "spack install zlib %clang"
 

diff --git a/outputs/basics/clone.out b/outputs/basics/clone.out
@@ -1,8 +1,8 @@
 $ git clone https://github.com/spack/spack ~/spack
 Cloning into '/home/spack/spack'...
-remote: Enumerating objects: 32, done.
-remote: Counting objects: 100% (32/32), done.
-remote: Compressing objects: 100% (22/22), done.
-remote: Total 220923 (delta 10), reused 14 (delta 5), pack-reused 220891
-Receiving objects: 100% (220923/220923), 87.99 MiB | 2.31 MiB/s, done.
-Resolving deltas: 100% (93872/93872), done.
+remote: Enumerating objects: 2, done.K
+remote: Counting objects: 100% (2/2), done.K
+remote: Compressing objects: 100% (2/2), done.K
+remote:nTotale2210149(delta80),/reused)03(deltaM0),|pack-reuseds221012K
+Receiving objects: 100% (221014/221014), 87.87 MiB | 18.19 MiB/s, done.
+Resolving deltas: 100% (93939/93939), done.
diff --git a/outputs/basics/find-d-tcl.out b/outputs/basics/find-d-tcl.out
@@ -7,8 +7,8 @@ tcl@8.6.8
 
 -- linux-ubuntu18.04-x86_64 / gcc@7.5.0 -------------------------
 tcl@8.6.8
-    zlib@1.2.8
+    zlib@1.2.11
 
 tcl@8.6.8
-    zlib@1.2.11
+    zlib@1.2.8
 
diff --git a/outputs/basics/find-d-trilinos.out b/outputs/basics/find-d-trilinos.out
@@ -7,12 +7,13 @@ trilinos@12.18.1
 	zlib@1.2.11
     glm@0.9.7.1
     hdf5@1.10.6
-	mpich@3.3.2
-	    hwloc@2.2.0
+	openmpi@3.1.6
+	    hwloc@1.11.11
 		libpciaccess@0.13.5
 		libxml2@2.9.10
 		    libiconv@1.16
 		    xz@5.2.5
+		numactl@2.0.12
     hypre@2.18.2
 	openblas@0.3.10
     matio@1.5.13
@@ -29,13 +30,12 @@ trilinos@12.18.1
 	zlib@1.2.11
     glm@0.9.7.1
     hdf5@1.10.6
-	openmpi@3.1.6
-	    hwloc@1.11.11
+	mpich@3.3.2
+	    hwloc@2.2.0
 		libpciaccess@0.13.5
 		libxml2@2.9.10
 		    libiconv@1.16
 		    xz@5.2.5
-		numactl@2.0.12
     hypre@2.18.2
 	openblas@0.3.10
     matio@1.5.13

diff --git a/outputs/basics/find-dep-mpich.out b/outputs/basics/find-dep-mpich.out
@@ -1,5 +1,4 @@
 $ spack find ^mpich
 ==> 8 installed packages
 -- linux-ubuntu18.04-x86_64 / gcc@7.5.0 -------------------------
-hdf5@1.10.6   matio@1.5.13  netcdf-c@4.7.3	    parmetis@4.0.3
-hypre@2.18.2  mumps@5.3.3   netlib-scalapack@2.1.0  trilinos@12.18.1
+hdf5@1.10.6  hypre@2.18.2  matio@1.5.13  mumps@5.3.3  netcdf-c@4.7.3  netlib-scalapack@2.1.0  parmetis@4.0.3  trilinos@12.18.1
diff --git a/outputs/basics/find-ldf-2.out b/outputs/basics/find-ldf-2.out
@@ -120,12 +120,12 @@ crhlefo 	    ncurses@6.2%gcc
 t54jzdy readline@8.0%gcc
 crhlefo     ncurses@6.2%gcc
 
-xthyjrq tcl@8.6.8%gcc
-h6i53if     zlib@1.2.8%gcc  cppflags="-O3"
-
 aszidzn tcl@8.6.8%gcc
 smoyzzo     zlib@1.2.11%gcc
 
+xthyjrq tcl@8.6.8%gcc
+h6i53if     zlib@1.2.8%gcc  cppflags="-O3"
+
 cr3i7es texinfo@6.5%gcc
 hyrsxn4     perl@5.30.3%gcc
 4av4gyw 	gdbm@1.18.1%gcc

diff --git a/outputs/basics/find-lf.out b/outputs/basics/find-lf.out
@@ -7,5 +7,4 @@ $ spack find -lf
 qtrzwov zlib@1.2.11%gcc
 
 -- linux-ubuntu18.04-x86_64 / gcc@7.5.0 -------------------------
-2nj3vxx patchelf@0.10%gcc   h6i53if zlib@1.2.8%gcc  cppflags="-O3"
-t4p5jnm zlib@1.2.8%gcc	    smoyzzo zlib@1.2.11%gcc
+2nj3vxx patchelf@0.10%gcc   t4p5jnm zlib@1.2.8%gcc   h6i53if zlib@1.2.8%gcc  cppflags="-O3"   smoyzzo zlib@1.2.11%gcc
diff --git a/outputs/basics/install-gcc-8.3.0.out b/outputs/basics/install-gcc-8.3.0.out
@@ -13,12 +13,12 @@ $ spack install gcc @8.3.0
 ==> Installing gmp
 ==> Extracting gmp from binary cache
 [+] /home/spack/spack/opt/spack/linux-ubuntu18.04-x86_64/gcc-7.5.0/gmp-6.1.2-3ol3tldmm3oqflzrqonh6p2jmhgwsr4t
-==> Installing isl
-==> Extracting isl from binary cache
-[+] /home/spack/spack/opt/spack/linux-ubuntu18.04-x86_64/gcc-7.5.0/isl-0.18-4lkvfkviv45b2htxuyfxbivafx4wajud
 ==> Installing mpfr
 ==> Extracting mpfr from binary cache
 [+] /home/spack/spack/opt/spack/linux-ubuntu18.04-x86_64/gcc-7.5.0/mpfr-3.1.6-nwsubswuytvvsjtu3nuyuxquwyxyfebj
+==> Installing isl
+==> Extracting isl from binary cache
+[+] /home/spack/spack/opt/spack/linux-ubuntu18.04-x86_64/gcc-7.5.0/isl-0.18-4lkvfkviv45b2htxuyfxbivafx4wajud
 ==> Installing mpc
 ==> Extracting mpc from binary cache
 [+] /home/spack/spack/opt/spack/linux-ubuntu18.04-x86_64/gcc-7.5.0/mpc-1.1.0-uur2dd6aco22hxagwzxco23rvtyvqd7t