Skip to content

Commit 47edf3a

Browse files
authored
Merge pull request #55 from espnet/notebooks/pin-released-espnet
Install the release the class needs, not whatever master is today
2 parents 9126d62 + fcc1f76 commit 47edf3a

7 files changed

Lines changed: 34 additions & 15 deletions

File tree

‎.github/workflows/run_notebooks.yml‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# These notebooks rot quietly: a Colab page still opens, the cells still look
22
# right, and the failure only appears when somebody runs them in class. So run
3-
# them here on a schedule instead, against the released espnet.
3+
# them here on a schedule instead, against the release the notebooks pin.
44
#
5-
# Only the inference notebooks run: the two fine-tuning ones need a GPU to
6-
# finish in reasonable time, and the TTS one needs a vocoder package that does
7-
# not build on every runner. Add more as they prove they fit.
5+
# One notebook runs. speaker_verification is the one that fits a free runner:
6+
# no GPU, no package that has to be built, and it finishes well inside the
7+
# timeout. The others are each blocked on something of their own - see this
8+
# directory's README - and adding one means finding that out first, not
9+
# putting it in the matrix and hoping.
810

911
name: run notebooks
1012

@@ -44,9 +46,10 @@ jobs:
4446
set -euo pipefail
4547
python -m pip install --upgrade pip
4648
# the runner skips the notebooks' install cells, so install what
47-
# they would have installed - from the same place they install it
48-
# from, or a break on master would pass here and fail in Colab
49-
python -m pip install "espnet[enh] @ git+https://github.com/espnet/espnet"
49+
# they would have installed, pinned to the same release they pin -
50+
# testing a different espnet from the one Colab gets would make a
51+
# pass here mean nothing
52+
python -m pip install "espnet[enh]==202610.post1"
5053
python -m pip install nbclient nbformat ipykernel \
5154
librosa scikit-learn matplotlib tqdm soundfile editdistance
5255

‎Courses/CMUSpeechTechnology26S/README.md‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,28 @@ the packages are already present, and replaces `wget` and `tar` with their
2828
Python equivalents.
2929

3030
```sh
31-
pip install espnet nbclient nbformat ipykernel librosa scikit-learn matplotlib
31+
pip install "espnet==202610.post1" nbclient nbformat ipykernel librosa \
32+
scikit-learn matplotlib
3233
python ../../tools/run_notebook.py speaker_verification.ipynb
3334
```
3435

35-
`.github/workflows/run_notebooks.yml` runs the inference notebooks weekly, so
36-
a notebook that stops working is noticed here rather than in class.
36+
The notebooks pin that release rather than installing espnet from git. A course
37+
notebook is worth having because it does the same thing in April that it does
38+
today, and installing from `master` gives neither that nor a fast install: it
39+
builds from source, and a break on `master` the night before class is a break
40+
in class. Each release, the pin moves and the notebooks are run again.
41+
42+
`.github/workflows/run_notebooks.yml` runs `speaker_verification.ipynb` every
43+
Sunday, so a notebook that stops working is noticed here rather than in class.
44+
45+
**One of the five, not all five.** It is the one that fits a free runner: no
46+
GPU, nothing that has to be built, and it finishes inside the timeout. The
47+
others are each blocked on something of their own — `text_to_speech` builds a
48+
vocoder from source, `neural_codec` and `speech_translation` pin an old numpy
49+
and TensorFlow against the rest of the environment, `speech_enhancement` runs
50+
VERSA over several models. Until one of those is sorted out, the other four are
51+
checked by running them by hand, which is a worse guarantee and should be said
52+
plainly rather than implied.
3753

3854
## What was changed
3955

‎Courses/CMUSpeechTechnology26S/neural_codec.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"metadata": {},
4545
"outputs": [],
4646
"source": [
47-
"%pip install -q git+https://github.com/espnet/espnet\n",
47+
"%pip install -q \"espnet==202610.post1\"\n",
4848
"!git clone https://github.com/wavlab-speech/versa\n",
4949
"!cd versa && pip install .\n",
5050
"!pip install espnet_model_zoo\n",

‎Courses/CMUSpeechTechnology26S/speaker_verification.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
"import locale\n",
6060
"locale.getpreferredencoding = lambda *a, **kw: \"UTF-8\"\n",
6161
"\n",
62-
"%pip install -q git+https://github.com/espnet/espnet\n",
62+
"%pip install -q \"espnet==202610.post1\"\n",
6363
"!pip install ffmpeg-python"
6464
]
6565
},

‎Courses/CMUSpeechTechnology26S/speech_enhancement.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"\n",
6262
"# [enh] brings fast_bss_eval, which the enhancement losses need at load time;\n",
6363
"# editdistance is used by the word error rate comparison further down\n",
64-
"%pip install -q \"espnet[enh] @ git+https://github.com/espnet/espnet\"\n",
64+
"%pip install -q \"espnet[enh]==202610.post1\"\n",
6565
"%pip install -q editdistance\n"
6666
],
6767
"execution_count": null,

‎Courses/CMUSpeechTechnology26S/speech_translation.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"metadata": {},
3636
"outputs": [],
3737
"source": [
38-
"%pip install -q git+https://github.com/espnet/espnet\n",
38+
"%pip install -q \"espnet==202610.post1\"\n",
3939
"!pip install -q espnet_model_zoo\n",
4040
"!pip install tensorflow jax jaxlib ml_dtypes transformers"
4141
]

‎Courses/CMUSpeechTechnology26S/text_to_speech.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"# Around 5-6 minutes\n",
4646
"\n",
4747
"# NOTE: pip shows imcompatible errors due to preinstalled libraries but you do not need to care\n",
48-
"%pip install -q \"espnet[tts,spk] @ git+https://github.com/espnet/espnet\"\n",
48+
"%pip install -q \"espnet[tts,spk]==202610.post1\"\n",
4949
"\n",
5050
"# Vocoder\n",
5151
"!git clone --depth 5 https://github.com/ftshijt/ParallelWaveGAN.git\n",

0 commit comments

Comments
 (0)