commit f45973583e167ca206c84853358d3a2053c18b1c
parent 64ebab66e1539d66896bd484c4ba2d4e7f560316
Author: Steven Atkinson <steven@atkinson.mn>
Date: Tue, 13 Dec 2022 21:56:01 -0600
New input signal for easy_colab.ipynb (#57)
* Add v1.1.0 to list of buggy inputs that can't be used, add v1.1.1
* Update easy colab script with new link, fix bug in colab.py
Diffstat:
2 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/bin/train/easy_colab.ipynb b/bin/train/easy_colab.ipynb
@@ -29,6 +29,7 @@
]
},
{
+ "attachments": {},
"cell_type": "markdown",
"metadata": {
"id": "5CQleTk7GJV8"
@@ -39,7 +40,7 @@
"\n",
"### Step 1.1: Download the capture signal\n",
"\"Easy mode\" uses a pre-crafted \"capture signal\".\n",
- "Download it [here](https://drive.google.com/file/d/12GVN9FXtzcAZnmflhKysEcfvq37h2wOk/view?usp=share_link).\n",
+ "Download it here: [v1_1_1.wav](https://drive.google.com/file/d/1v2xFXeQ9W2Ks05XrqsMCs2viQcKPAwBk/view?usp=share_link).\n",
"\n",
"### Step 1.2 Reamp your gear\n",
"Then reamp the gear you want to model using it. Save that reamp as \"output.wav\".\n",
@@ -131,7 +132,7 @@
},
"gpuClass": "standard",
"kernelspec": {
- "display_name": "Python 3.10.8 ('nam-dev2')",
+ "display_name": "nam",
"language": "python",
"name": "python3"
},
@@ -145,12 +146,12 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
- "version": "3.10.8"
+ "version": "3.10.6"
},
"orig_nbformat": 4,
"vscode": {
"interpreter": {
- "hash": "82a9c8b64c0a2249409bc87c9822fa417e572ef85eb751a16b8174dc9eba53bb"
+ "hash": "920df60c69944ba95f8c12adb41fedfdc8090c370a20d39253c7705973dd37db"
}
},
"widgets": {
diff --git a/nam/train/colab.py b/nam/train/colab.py
@@ -38,12 +38,21 @@ class _Version:
return f"{self.major}.{self.minor}.{self.patch}"
-_INPUT_BASENAMES = ((_Version(1, 1, 0), "v1_1_0.wav"), (_Version(1, 0, 0), "v1.wav"))
+_INPUT_BASENAMES = ((_Version(1, 1, 1), "v1_1_1.wav"), (_Version(1, 0, 0), "v1.wav"))
+_BUGGY_INPUT_BASENAMES = {
+ # 1.1.0 has the spikes at the wrong spots.
+ "v1_1_0.wav"
+}
_OUTPUT_BASENAME = "output.wav"
def _check_for_files() -> Tuple[_Version, str]:
print("Checking that we have all of the required audio files...")
+ for name in _BUGGY_INPUT_BASENAMES:
+ if Path(name).exists():
+ raise RuntimeError(
+ f"Detected input signal {name} that has known bugs. Please download the latest input signal, {_INPUT_BASENAMES[0][1]}"
+ )
for i, (input_version, input_basename) in enumerate(_INPUT_BASENAMES):
if Path(input_basename).exists():
if i > 0:
