environments: move environments tutorial to be *before* configuration (…

…#113)

* rework environments tutorial to be *before* configuration
* move environments earlier in toctree
* add new environments outputs
* DRY: only set the branch to check out in one place

index.rst

@@ -56,10 +56,10 @@ following methods to run through the scripts:
 You should now be ready to run through our demo scripts:
 
   #. :ref:`basics-tutorial`
+  #. :ref:`environments-tutorial`
   #. :ref:`configs-tutorial`
   #. :ref:`packaging-tutorial`
   #. :ref:`developer-workflows-tutorial`
-  #. :ref:`environments-tutorial`
   #. :ref:`stacks-tutorial`
   #. :ref:`modules-tutorial`
   #. :ref:`build-systems-tutorial`
@@ -79,10 +79,10 @@ Full contents:
    :caption: Tutorial
 
    tutorial_basics
+   tutorial_environments
    tutorial_configuration
    tutorial_packaging
    tutorial_developer_workflows
-   tutorial_environments
    tutorial_stacks
    tutorial_modules
    tutorial_buildsystems

outputs/Makefile

@@ -1,7 +1,9 @@
 .PHONY: all replay
 
+# name of the container we'll generate the tutorial outputs with
+container = spack/tutorial:ecp21-validation
 raw_output = raw/*/*.out
-subdirs = basics packaging environments stacks dev scripting
+subdirs = basics environments packaging environments stacks dev scripting
 
 all:
 	echo "Filtering raw outputs though col"
@@ -17,10 +19,10 @@ all:
 run:
 	docker run --rm -it \
 		--mount type=bind,source=${PWD},target=/project \
-		spack/tutorial:ecp21-validation \
+		${container} \
 		/project/basics.sh
 
 interactive:
 	docker run --rm -it \
 		--mount type=bind,source=${PWD},target=/project \
-		spack/tutorial:ecp21-validation
+		${container}

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.16"
+example basics/checkout      "git checkout ${tutorial_branch}"
 
 example basics/source-setup  ". share/spack/setup-env.sh"
 

outputs/defs.sh

@@ -10,6 +10,9 @@ fi
 
 raw_outputs="${PROJECT}/raw"
 
+# used by scripts
+tutorial_branch=releases/v0.16
+
 example() {
     if [[ "$1" == "-tee" ]]; then
         # tee option allows us to use bash function; only use when necessary

outputs/env.sh

@@ -74,7 +74,7 @@ spack config add packages:all:providers:mpi:[mpich]
 
 example environments/spec-2          "spack spec hypre"
 
-example environments/concretize-f-1 "spack concretize -f"
+example environments/concretize-f-1 "spack concretize --force"
 
 example environments/show-mpicc-1    "spack env status"
 example environments/show-mpicc-1    "which mpicc"

outputs/environments/add-1.out

@@ -9,12 +9,14 @@ $ spack find
 ==> Root specs
 gmp   hdf5 +hl	tcl   trilinos
 
-==> 37 installed packages
+==> 41 installed packages
 -- linux-ubuntu18.04-x86_64 / gcc@7.5.0 -------------------------
-autoconf@2.69	 glm@0.9.7.1	      libtool@2.4.6   netcdf-c@4.7.3	      perl@5.30.3	  xz@5.2.5
-automake@1.16.2  hdf5@1.10.6	      libxml2@2.9.10  netlib-scalapack@2.1.0  pkgconf@1.7.3	  zlib@1.2.11
-boost@1.73.0	 hwloc@1.11.11	      m4@1.4.18       numactl@2.0.12	      readline@8.0
-bzip2@1.0.8	 hypre@2.18.2	      matio@1.5.13    openblas@0.3.10	      suite-sparse@5.7.2
-cmake@3.17.3	 libiconv@1.16	      metis@5.1.0     openmpi@3.1.6	      tcl@8.6.8
-diffutils@3.7	 libpciaccess@0.13.5  mumps@5.3.3     openssl@1.1.1g	      trilinos@12.18.1
-gdbm@1.18.1	 libsigsegv@2.12      ncurses@6.2     parmetis@4.0.3	      util-macros@1.19.1
+autoconf@2.69		     glm@0.9.7.1	libxml2@2.9.10		numactl@2.0.14	    tcl@8.6.10
+autoconf-archive@2019.01.06  gmp@6.1.2		m4@1.4.18		openblas@0.3.12     trilinos@13.0.1
+automake@1.16.2 	     hdf5@1.10.7	matio@1.5.17		openmpi@3.1.6	    util-macros@1.19.1
+berkeley-db@18.1.40	     hwloc@1.11.11	metis@5.1.0		openssl@1.1.1h	    xz@5.2.5
+boost@1.74.0		     hypre@2.20.0	mpfr@4.0.2		parmetis@4.0.3	    zlib@1.2.11
+bzip2@1.0.8		     libiconv@1.16	mumps@5.3.3		perl@5.32.0
+cmake@3.18.4		     libpciaccess@0.16	ncurses@6.2		pkgconf@1.7.3
+diffutils@3.7		     libsigsegv@2.12	netcdf-c@4.7.4		readline@8.0
+gdbm@1.18.1		     libtool@2.4.6	netlib-scalapack@2.1.0	suite-sparse@5.8.1

outputs/environments/add-2.out

@@ -1,38 +1,41 @@
 $ spack install
 ==> Concretized hdf5+hl
-[+]  7r2lztq  hdf5@1.10.6%gcc@7.5.0~cxx~debug~fortran+hl+mpi+pic+shared~szip~threadsafe api=none arch=linux-ubuntu18.04-x86_64
-[+]  wudo6ky	  ^openmpi@3.1.6%gcc@7.5.0~atomics~cuda~cxx~cxx_exceptions+gpfs~java~legacylaunchers~memchecker~pmi~sqlite3+static~thread_multiple+vt+wrapper-rpath fabrics=none schedulers=none arch=linux-ubuntu18.04-x86_64
-[+]  ckxpgsn	      ^hwloc@1.11.11%gcc@7.5.0~cairo~cuda~gl~libudev+libxml2~netloc~nvml+pci+shared arch=linux-ubuntu18.04-x86_64
-[+]  cmn6yii		  ^libpciaccess@0.13.5%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
+[+]  ejanivx  hdf5@1.10.7%gcc@7.5.0~cxx~debug~fortran+hl~java+mpi+pic+shared~szip~threadsafe api=none arch=linux-ubuntu18.04-x86_64
+[+]  pmsyupw	  ^openmpi@3.1.6%gcc@7.5.0~atomics~cuda~cxx~cxx_exceptions+gpfs~java~legacylaunchers~lustre~memchecker~pmi~singularity~sqlite3+static~thread_multiple+vt+wrapper-rpath fabrics=none schedulers=none arch=linux-ubuntu18.04-x86_64
+[+]  zqwfzhw	      ^hwloc@1.11.11%gcc@7.5.0~cairo~cuda~gl~libudev+libxml2~netloc~nvml+pci+shared arch=linux-ubuntu18.04-x86_64
+[+]  bob4o5m		  ^libpciaccess@0.16%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 [+]  jdxbjft		      ^libtool@2.4.6%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 [+]  mkc3u4x			  ^m4@1.4.18%gcc@7.5.0+sigsegv patches=3877ab548f88597ab2327a2230ee048d2d07ace1062efe81fc92e91b7f39cd00,fc9b61654a3ba1a8d6cd78ce087e7c96366c290bc8d2c299f09828d793b853c8 arch=linux-ubuntu18.04-x86_64
 [+]  lbrx7ln			      ^libsigsegv@2.12%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 [+]  4sh6pym		      ^pkgconf@1.7.3%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 [+]  gs6ag7k		      ^util-macros@1.19.1%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
-[+]  m3l53bh		  ^libxml2@2.9.10%gcc@7.5.0~python arch=linux-ubuntu18.04-x86_64
+[+]  yn2r3wf		  ^libxml2@2.9.10%gcc@7.5.0~python arch=linux-ubuntu18.04-x86_64
 [+]  jearpk4		      ^libiconv@1.16%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
-[+]  6nxes4r		      ^xz@5.2.5%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
+[+]  komekkm		      ^xz@5.2.5%gcc@7.5.0~pic arch=linux-ubuntu18.04-x86_64
 [+]  smoyzzo		      ^zlib@1.2.11%gcc@7.5.0+optimize+pic+shared arch=linux-ubuntu18.04-x86_64
-[+]  yvxocdy		  ^numactl@2.0.12%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
-[+]  nwb3bf5		      ^autoconf@2.69%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
-[+]  hyrsxn4			  ^perl@5.30.3%gcc@7.5.0+cpanm+shared+threads arch=linux-ubuntu18.04-x86_64
+[+]  wbqbc5v		  ^numactl@2.0.14%gcc@7.5.0 patches=4e1d78cbbb85de625bad28705e748856033eaafab92a66dffd383a3d7e00cc94 arch=linux-ubuntu18.04-x86_64
+[+]  mm33a3o		      ^autoconf@2.69%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
+[+]  zfdvt2j			  ^perl@5.32.0%gcc@7.5.0+cpanm+shared+threads arch=linux-ubuntu18.04-x86_64
+[+]  4ihuiaz			      ^berkeley-db@18.1.40%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 [+]  4av4gyw			      ^gdbm@1.18.1%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 [+]  t54jzdy				  ^readline@8.0%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 [+]  crhlefo				      ^ncurses@6.2%gcc@7.5.0~symlinks+termlib arch=linux-ubuntu18.04-x86_64
-[+]  wdflovn		      ^automake@1.16.2%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
+[+]  d2krmb5		      ^automake@1.16.2%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 
 ==> Concretized gmp
 [+]  3ol3tld  gmp@6.1.2%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
-[+]  nwb3bf5	  ^autoconf@2.69%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
+[+]  mm33a3o	  ^autoconf@2.69%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 [+]  mkc3u4x	      ^m4@1.4.18%gcc@7.5.0+sigsegv patches=3877ab548f88597ab2327a2230ee048d2d07ace1062efe81fc92e91b7f39cd00,fc9b61654a3ba1a8d6cd78ce087e7c96366c290bc8d2c299f09828d793b853c8 arch=linux-ubuntu18.04-x86_64
 [+]  lbrx7ln		  ^libsigsegv@2.12%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
-[+]  hyrsxn4	      ^perl@5.30.3%gcc@7.5.0+cpanm+shared+threads arch=linux-ubuntu18.04-x86_64
+[+]  zfdvt2j	      ^perl@5.32.0%gcc@7.5.0+cpanm+shared+threads arch=linux-ubuntu18.04-x86_64
+[+]  4ihuiaz		  ^berkeley-db@18.1.40%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 [+]  4av4gyw		  ^gdbm@1.18.1%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 [+]  t54jzdy		      ^readline@8.0%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 [+]  crhlefo			  ^ncurses@6.2%gcc@7.5.0~symlinks+termlib arch=linux-ubuntu18.04-x86_64
 [+]  4sh6pym			      ^pkgconf@1.7.3%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
-[+]  wdflovn	  ^automake@1.16.2%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
+[+]  d2krmb5	  ^automake@1.16.2%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 [+]  jdxbjft	  ^libtool@2.4.6%gcc@7.5.0 arch=linux-ubuntu18.04-x86_64
 
 ==> Installing environment myproject
+==> All of the packages are already installed
 ==> Updating view at /home/spack/spack/var/spack/environments/myproject/.spack-env/view

outputs/environments/add-3.out

@@ -3,13 +3,14 @@ $ spack find
 ==> Root specs
 gmp   hdf5 +hl	tcl   trilinos
 
-==> 38 installed packages
+==> 41 installed packages
 -- linux-ubuntu18.04-x86_64 / gcc@7.5.0 -------------------------
-autoconf@2.69	 gmp@6.1.2	      libxml2@2.9.10	      numactl@2.0.12   suite-sparse@5.7.2
-automake@1.16.2  hdf5@1.10.6	      m4@1.4.18 	      openblas@0.3.10  tcl@8.6.8
-boost@1.73.0	 hwloc@1.11.11	      matio@1.5.13	      openmpi@3.1.6    trilinos@12.18.1
-bzip2@1.0.8	 hypre@2.18.2	      metis@5.1.0	      openssl@1.1.1g   util-macros@1.19.1
-cmake@3.17.3	 libiconv@1.16	      mumps@5.3.3	      parmetis@4.0.3   xz@5.2.5
-diffutils@3.7	 libpciaccess@0.13.5  ncurses@6.2	      perl@5.30.3      zlib@1.2.11
-gdbm@1.18.1	 libsigsegv@2.12      netcdf-c@4.7.3	      pkgconf@1.7.3
-glm@0.9.7.1	 libtool@2.4.6	      netlib-scalapack@2.1.0  readline@8.0
+autoconf@2.69		     glm@0.9.7.1	libxml2@2.9.10		numactl@2.0.14	    tcl@8.6.10
+autoconf-archive@2019.01.06  gmp@6.1.2		m4@1.4.18		openblas@0.3.12     trilinos@13.0.1
+automake@1.16.2 	     hdf5@1.10.7	matio@1.5.17		openmpi@3.1.6	    util-macros@1.19.1
+berkeley-db@18.1.40	     hwloc@1.11.11	metis@5.1.0		openssl@1.1.1h	    xz@5.2.5
+boost@1.74.0		     hypre@2.20.0	mpfr@4.0.2		parmetis@4.0.3	    zlib@1.2.11
+bzip2@1.0.8		     libiconv@1.16	mumps@5.3.3		perl@5.32.0
+cmake@3.18.4		     libpciaccess@0.16	ncurses@6.2		pkgconf@1.7.3
+diffutils@3.7		     libsigsegv@2.12	netcdf-c@4.7.4		readline@8.0
+gdbm@1.18.1		     libtool@2.4.6	netlib-scalapack@2.1.0	suite-sparse@5.8.1