Skip to content

Commit

Permalink
SC20 updates for Basics Tutorial (#81)
Browse files Browse the repository at this point in the history
* SC20 updates for Basics Tutorial
* No need to escape quotes
* Remove extra y's in output
  • Loading branch information
adamjstewart committed Nov 9, 2020
1 parent c61b605 commit 6709851
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 17 deletions.
4 changes: 1 addition & 3 deletions outputs/basics.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#!/bin/bash

pip3 install boto3

# Source definitions
project=$(dirname "$0")
. $project/defs.sh
Expand All @@ -27,7 +25,7 @@ spack config add "config:suppress_gpg_warnings:true"

# spack list
example basics/list "spack list"
example basics/list-py "spack list py-"
example basics/list-py "spack list 'py-*'"

# spack install
example basics/zlib "spack install zlib"
Expand Down
6 changes: 2 additions & 4 deletions outputs/basics/list-py.out
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
$ spack list py-
==> 984 packages.
lumpy-sv py-numba
perl-file-copy-recursive py-numcodecs
$ spack list 'py-*'
==> 982 packages.
py-3to2 py-numexpr
py-4suite-xml py-numexpr3
py-abipy py-numpy
Expand Down
4 changes: 2 additions & 2 deletions outputs/basics/uninstall-r-needed.out
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
$ spack uninstall -R zlib/pdf
y
==> The following packages will be uninstalled:

-- linux-ubuntu18.04-x86_64 / clang@6.0.0 -----------------------
4ef57sw tcl@8.6.8
pdfmc5x zlib@1.2.8

==> Do you want to proceed? [y/N] ==> Successfully uninstalled tcl@8.6.8%clang@6.0.0 arch=linux-ubuntu18.04-x86_64/4ef57sw
==> Do you want to proceed? [y/N]
==> Successfully uninstalled tcl@8.6.8%clang@6.0.0 arch=linux-ubuntu18.04-x86_64/4ef57sw
==> Successfully uninstalled zlib@1.2.8%clang@6.0.0+optimize+pic+shared arch=linux-ubuntu18.04-x86_64/pdfmc5x
4 changes: 2 additions & 2 deletions outputs/basics/uninstall-specific.out
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$ spack uninstall /j6d
y
==> The following packages will be uninstalled:

-- linux-ubuntu18.04-x86_64 / gcc@7.5.0 -------------------------
j6dav6k trilinos@12.18.1

==> Do you want to proceed? [y/N] ==> Successfully uninstalled trilinos@12.18.1%gcc@7.5.0~adios2~alloptpkgs+amesos+amesos2+anasazi+aztec+belos+boost~cgns~chaco~complex~debug~dtk+epetra+epetraext+exodus+explicit_template_instantiation~float+fortran~fortrilinos+glm+gtest+hdf5+hypre+ifpack+ifpack2~intrepid~intrepid2~isorropia+kokkos+matio~mesquite+metis~minitensor+ml+mpi+muelu+mumps+netcdf~nox~openmp~phalanx~piro~pnetcdf~python~rol~rythmos+sacado~shards+shared~shylu~stk~stratimikos+suite-sparse~superlu~superlu-dist~teko~tempus+teuchos+tpetra~x11~xsdkflags~zlib+zoltan+zoltan2 build_type=RelWithDebInfo gotype=long arch=linux-ubuntu18.04-x86_64/j6dav6k
==> Do you want to proceed? [y/N]
==> Successfully uninstalled trilinos@12.18.1%gcc@7.5.0~adios2~alloptpkgs+amesos+amesos2+anasazi+aztec+belos+boost~cgns~chaco~complex~debug~dtk+epetra+epetraext+exodus+explicit_template_instantiation~float+fortran~fortrilinos+glm+gtest+hdf5+hypre+ifpack+ifpack2~intrepid~intrepid2~isorropia+kokkos+matio~mesquite+metis~minitensor+ml+mpi+muelu+mumps+netcdf~nox~openmp~phalanx~piro~pnetcdf~python~rol~rythmos+sacado~shards+shared~shylu~stk~stratimikos+suite-sparse~superlu~superlu-dist~teko~tempus+teuchos+tpetra~x11~xsdkflags~zlib+zoltan+zoltan2 build_type=RelWithDebInfo gotype=long arch=linux-ubuntu18.04-x86_64/j6dav6k
4 changes: 2 additions & 2 deletions outputs/basics/uninstall-zlib.out
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
$ spack uninstall zlib %gcc@6.5.0
y
==> The following packages will be uninstalled:

-- linux-ubuntu18.04-x86_64 / gcc@6.5.0 -------------------------
qtrzwov zlib@1.2.11

==> Do you want to proceed? [y/N] ==> Successfully uninstalled zlib@1.2.11%gcc@6.5.0+optimize+pic+shared arch=linux-ubuntu18.04-x86_64/qtrzwov
==> Do you want to proceed? [y/N]
==> Successfully uninstalled zlib@1.2.11%gcc@6.5.0+optimize+pic+shared arch=linux-ubuntu18.04-x86_64/qtrzwov
9 changes: 5 additions & 4 deletions tutorial_basics.rst
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ clone Spack and immediately checkout the most recent release, v0.15.

Next add Spack to your path. Spack has some nice command line
integration tools, so instead of simply appending to your ``PATH``
variable, source the spack setup script. Then add Spack to your path.
variable, source the spack setup script.

.. code-block:: console
Expand Down Expand Up @@ -69,8 +69,9 @@ The ``spack list`` command shows available packages.


The ``spack list`` command can also take a query string. Spack
automatically adds wildcards to both ends of the string. For example,
we can view all available python packages.
automatically adds wildcards to both ends of the string, or you
can add your own wildcards. For example, we can view all available
python packages.

.. literalinclude:: outputs/basics/list-py.out
:language: console
Expand Down Expand Up @@ -388,7 +389,7 @@ added to the configuration.

We can add gcc to Spack as an available compiler using the ``spack
compiler add`` command. This will allow future packages to build with
gcc @8.3.0.
gcc@8.3.0.

.. literalinclude:: outputs/basics/compiler-add-location.out
:language: console
Expand Down

0 comments on commit 6709851

Please sign in to comment.