commit ce5804e2845898989b5bb99e47da8dee777c037a
parent 1f11c8a73039ca36cb96add0412f21c89b87e7b7
Author: Steven Atkinson <steven@atkinson.mn>
Date: Mon, 19 Dec 2022 00:37:34 -0800
Update environment definition (#67)
Diffstat:
5 files changed, 73 insertions(+), 27 deletions(-)
diff --git a/README.md b/README.md
@@ -34,10 +34,22 @@ Alternatively, you can clone this repo to your computer and use it locally.
### Installation
+For computers with a CUDA-capable GPU (recommended):
+
+```bash
+conda env create -f environment_gpu.yml
+```
+
+Otherwise, for a CPU-only install (will train much more slowly):
+
+```bash
+conda env create -f environment_cpu.yml
+```
+
+Then activate the environment you've created with
+
```bash
-conda env create -f environment.yml
conda activate nam
-pip install .
```
### Things you can do
diff --git a/environment.yml b/environment.yml
@@ -1,25 +0,0 @@
-# File: environment.yml
-# Created Date: Saturday February 13th 2021
-# Author: Steven Atkinson (steven@atkinson.mn)
-
-name: nam
-channels:
- - pytorch
-dependencies:
- - black
- - flake8
- - h5py
- - jupyter
- - matplotlib
- - numpy
- - pip
- - pytest
- - pytorch
- - scipy
- - tqdm
- - wheel
- - pip:
- - pre-commit
- - pytorch_lightning
- - sounddevice
- - wavio
diff --git a/environment_cpu.yml b/environment_cpu.yml
@@ -0,0 +1,28 @@
+# File: environment.yml
+# Created Date: Saturday February 13th 2021
+# Author: Steven Atkinson (steven@atkinson.mn)
+
+name: nam
+channels:
+ - pytorch
+dependencies:
+ - black
+ - flake8
+ - h5py
+ - jupyter
+ - matplotlib
+ - numpy
+ - pip
+ - pytest
+ - pytorch
+ - scipy
+ - semver
+ - tensorboard
+ - tqdm
+ - wheel
+ - pip:
+ - pre-commit
+ - pytorch_lightning
+ - sounddevice
+ - wavio
+ - -e .
diff --git a/environment_gpu.yml b/environment_gpu.yml
@@ -0,0 +1,30 @@
+# File: environment.yml
+# Created Date: Saturday February 13th 2021
+# Author: Steven Atkinson (steven@atkinson.mn)
+
+name: nam-test
+channels:
+ - pytorch
+ - nvidia
+dependencies:
+ - black
+ - flake8
+ - h5py
+ - jupyter
+ - matplotlib
+ - numpy
+ - pip
+ - pytest
+ - pytorch
+ - pytorch-cuda=11.7
+ - scipy
+ - semver
+ - tensorboard
+ - tqdm
+ - wheel
+ - pip:
+ - pre-commit
+ - pytorch_lightning
+ - sounddevice
+ - wavio
+ - -e .
diff --git a/setup.py b/setup.py
@@ -16,6 +16,7 @@ requirements = [
"pytorch_lightning",
"scipy",
"sounddevice",
+ "tensorboard",
"torch",
"tqdm",
"wavio<=0.0.4", # Breaking change in 0.0.5
