Skip to content

Commit

Permalink
Terminal width 94 everywhere (#291)
Browse files Browse the repository at this point in the history
  • Loading branch information
haampie committed Nov 9, 2023
1 parent 90a61ed commit ed169e0
Show file tree
Hide file tree
Showing 70 changed files with 6,210 additions and 9,592 deletions.
15 changes: 12 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,23 @@ The tutorial image builds on top of the container image that runs in Spack CI, w
## Automatically generating command ouputs

The tutorial `rst` files include output from Spack commands. This process is automated, and it is
recommended to use this instead of running commands manually. To regenerate the outputs, run:
recommended not to run commands manually.

**Note:** as a preliminary step, check your terminal width. All current outputs
are generated on a fixed terminal width **94**; deviating from that can cause
unnecessarily large diffs:

```console
$ tput cols
94
```

To regenerate the outputs, run:

```shell
make -C outputs -j <N>
```

**NOTE**: to avoid large diffs, stick to a fixed terminal width of **80x24**.

This runs each `outputs/<section>.sh` script in parallel in a container, and collects outputs in
`outputs/raw/*`. When all complete succesfully, the outputs are post-processed and put in
`outputs/`.
Expand Down
12 changes: 6 additions & 6 deletions outputs/basics/clone.out
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
$ git clone --depth=100 --branch=backports/v0.21.0 https://github.com/spack/spack.git ~/spack
Cloning into '/home/spack/spack'...
remote: Enumerating objects: 20044, done.K
remote: Counting objects: 100% (20044/20044), done.K
remote: Compressing objects: 100% (11120/11120), done.K
remote:nTotale20044 (delta92169),0reused113163i(delta.1566),/pack-reused 0K
Receiving objects: 100% (20044/20044), 13.36 MiB | 10.47 MiB/s, done.
Resolving deltas: 100% (2169/2169), done.
remote: Enumerating objects: 20043, done.K
remote: Counting objects: 100% (20043/20043), done.K
remote: Compressing objects: 100% (11095/11095), done.K
Receiving objects: 100% (20043/20043), 13.36MMiB||116.50MMiB/s, done.
remote: Total 20043 (delta 2173), reused 13168 (delta 1591), pack-reused 0K
Resolving deltas: 100% (2173/2173), done.
Updating files: 100% (10996/10996), done.
$ cd ~/spack
2 changes: 1 addition & 1 deletion outputs/basics/gmake-4.3.out
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ $ spack install zlib-ng@2.0.7
==> Fetching file:///mirror/build_cache/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/zlib-ng-2.0.7/linux-ubuntu22.04-x86_64_v3-gcc-11.4.0-zlib-ng-2.0.7-ffnsgi66pitfl3r6drsojucl66osakje.spack
==> Extracting zlib-ng-2.0.7-ffnsgi66pitfl3r6drsojucl66osakje from binary cache
==> zlib-ng: Successfully installed zlib-ng-2.0.7-ffnsgi66pitfl3r6drsojucl66osakje
Search: 0.00s. Fetch: 0.10s. Install: 0.05s. Extract: 0.03s. Relocate: 0.01s. Total: 0.15s
Search: 0.00s. Fetch: 0.11s. Install: 0.07s. Extract: 0.06s. Relocate: 0.01s. Total: 0.18s
[+] /home/spack/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/zlib-ng-2.0.7-ffnsgi66pitfl3r6drsojucl66osakje
2 changes: 1 addition & 1 deletion outputs/basics/gmake-O3.out
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ $ spack install zlib-ng@2.0.7 cflags=-O3
==> Fetching file:///mirror/build_cache/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/zlib-ng-2.0.7/linux-ubuntu22.04-x86_64_v3-gcc-11.4.0-zlib-ng-2.0.7-npuw4upl6iiyuihnlv4qxnw4fjatcg4h.spack
==> Extracting zlib-ng-2.0.7-npuw4upl6iiyuihnlv4qxnw4fjatcg4h from binary cache
==> zlib-ng: Successfully installed zlib-ng-2.0.7-npuw4upl6iiyuihnlv4qxnw4fjatcg4h
Search: 0.00s. Fetch: 0.11s. Install: 0.06s. Extract: 0.04s. Relocate: 0.01s. Total: 0.18s
Search: 0.00s. Fetch: 0.14s. Install: 0.07s. Extract: 0.05s. Relocate: 0.01s. Total: 0.21s
[+] /home/spack/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/zlib-ng-2.0.7-npuw4upl6iiyuihnlv4qxnw4fjatcg4h
2 changes: 1 addition & 1 deletion outputs/basics/gmake-clang.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ $ spack install zlib-ng %clang
==> Fetching file:///mirror/build_cache/linux-ubuntu22.04-x86_64_v3/clang-14.0.0/gmake-4.4.1/linux-ubuntu22.04-x86_64_v3-clang-14.0.0-gmake-4.4.1-d54pflh3qlovydzjgff55nvzxtqedobt.spack
==> Extracting gmake-4.4.1-d54pflh3qlovydzjgff55nvzxtqedobt from binary cache
==> gmake: Successfully installed gmake-4.4.1-d54pflh3qlovydzjgff55nvzxtqedobt
Search: 0.00s. Fetch: 0.09s. Install: 0.05s. Extract: 0.04s. Relocate: 0.01s. Total: 0.15s
Search: 0.00s. Fetch: 0.09s. Install: 0.05s. Extract: 0.04s. Relocate: 0.01s. Total: 0.14s
[+] /home/spack/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/clang-14.0.0/gmake-4.4.1-d54pflh3qlovydzjgff55nvzxtqedobt
==> Installing zlib-ng-2.1.4-hywknaoywohnvaldqch2ly74svzezfrw [2/2]
==> Fetching file:///mirror/build_cache/linux-ubuntu22.04-x86_64_v3-clang-14.0.0-zlib-ng-2.1.4-hywknaoywohnvaldqch2ly74svzezfrw.spec.json.sig
Expand Down
4 changes: 2 additions & 2 deletions outputs/basics/gmake-gcc-10.out
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ $ spack install zlib-ng %gcc@10
==> Fetching file:///mirror/build_cache/linux-ubuntu22.04-x86_64_v3/gcc-10.5.0/gmake-4.4.1/linux-ubuntu22.04-x86_64_v3-gcc-10.5.0-gmake-4.4.1-gexmwfhpiumjrmlkqrsusomjc5cpa2ka.spack
==> Extracting gmake-4.4.1-gexmwfhpiumjrmlkqrsusomjc5cpa2ka from binary cache
==> gmake: Successfully installed gmake-4.4.1-gexmwfhpiumjrmlkqrsusomjc5cpa2ka
Search: 0.00s. Fetch: 0.10s. Install: 0.06s. Extract: 0.04s. Relocate: 0.01s. Total: 0.15s
Search: 0.00s. Fetch: 0.09s. Install: 0.05s. Extract: 0.04s. Relocate: 0.01s. Total: 0.14s
[+] /home/spack/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-10.5.0/gmake-4.4.1-gexmwfhpiumjrmlkqrsusomjc5cpa2ka
==> Installing zlib-ng-2.1.4-tm2or5eemtuselxphhipremogmszohrv [2/2]
==> Fetching file:///mirror/build_cache/linux-ubuntu22.04-x86_64_v3-gcc-10.5.0-zlib-ng-2.1.4-tm2or5eemtuselxphhipremogmszohrv.spec.json.sig
==> Fetching file:///mirror/build_cache/linux-ubuntu22.04-x86_64_v3/gcc-10.5.0/zlib-ng-2.1.4/linux-ubuntu22.04-x86_64_v3-gcc-10.5.0-zlib-ng-2.1.4-tm2or5eemtuselxphhipremogmszohrv.spack
==> Extracting zlib-ng-2.1.4-tm2or5eemtuselxphhipremogmszohrv from binary cache
==> zlib-ng: Successfully installed zlib-ng-2.1.4-tm2or5eemtuselxphhipremogmszohrv
Search: 0.00s. Fetch: 0.01s. Install: 0.03s. Extract: 0.01s. Relocate: 0.01s. Total: 0.04s
Search: 0.00s. Fetch: 0.01s. Install: 0.02s. Extract: 0.01s. Relocate: 0.01s. Total: 0.04s
[+] /home/spack/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-10.5.0/zlib-ng-2.1.4-tm2or5eemtuselxphhipremogmszohrv
6 changes: 3 additions & 3 deletions outputs/basics/gmake.out
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ $ spack install zlib-ng
==> No patches needed for gmake
==> gmake: Executing phase: 'install'
==> gmake: Successfully installed gmake-4.4.1-znvoaniggvauzxv4yobchqt4g7tyjuc7
Stage: 0.15s. Install: 11.85s. Post-install: 0.02s. Total: 12.05s
Stage: 0.18s. Install: 11.94s. Post-install: 0.02s. Total: 12.16s
[+] /home/spack/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/gmake-4.4.1-znvoaniggvauzxv4yobchqt4g7tyjuc7
==> Installing zlib-ng-2.1.4-5xcetrvs3fzd7k27dw5duyxitnsy4uvh [2/2]
==> No binary for zlib-ng-2.1.4-5xcetrvs3fzd7k27dw5duyxitnsy4uvh found: installing from source
==> Fetching https://github.com/zlib-ng/zlib-ng/archive/2.1.4.tar.gz
==> Fetching https://mirror.spack.io/_source-cache/archive/a0/a0293475e6a44a3f6c045229fe50f69dc0eebc62a42405a51f19d46a5541e77a.tar.gz
==> No patches needed for zlib-ng
==> zlib-ng: Executing phase: 'autoreconf'
==> zlib-ng: Executing phase: 'configure'
==> zlib-ng: Executing phase: 'build'
==> zlib-ng: Executing phase: 'install'
==> zlib-ng: Successfully installed zlib-ng-2.1.4-5xcetrvs3fzd7k27dw5duyxitnsy4uvh
Stage: 2.13s. Autoreconf: 0.00s. Configure: 3.43s. Build: 2.01s. Install: 0.06s. Post-install: 0.03s. Total: 7.75s
Stage: 0.17s. Autoreconf: 0.00s. Configure: 4.01s. Build: 2.36s. Install: 0.16s. Post-install: 0.03s. Total: 6.82s
[+] /home/spack/spack/opt/spack/linux-ubuntu22.04-x86_64_v3/gcc-11.4.0/zlib-ng-2.1.4-5xcetrvs3fzd7k27dw5duyxitnsy4uvh

0 comments on commit ed169e0

Please sign in to comment.