neural-amp-modeler

commit 62a8f7e47582cc0137831eaa494d99e1659ae0f7
parent 288d69ce3948b8d0f35a861279ba13144d8eb5fe
Author: Steven Atkinson <steven@atkinson.mn>
Date:   Tue, 24 Oct 2023 07:41:51 -0700

[BUGFIX] Update environment specs (#324)


Diffstat:
M
environment_cpu.yml
 | 
8
++++----
M
environment_gpu.yml
 | 
12
++++++------
M
requirements.txt
 | 
2
+-

3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/environment_cpu.yml b/environment_cpu.yml
@@ -4,7 +4,7 @@
 
 name: nam
 channels:
-  - conda-forge # pytest-mock
+  - conda-forge # pytest-mock, onnxruntime
   - pytorch
 dependencies:
   - python<3.11 # onnxruntime
@@ -14,7 +14,10 @@ dependencies:
   - jupyter
   - matplotlib
   - numpy
+  - onnx
+  - onnxruntime!=1.16.0
   - pip
+  - pre-commit
   - pydantic
   - pytest
   - pytest-mock
@@ -26,9 +29,6 @@ dependencies:
   - wheel
   - pip:
       - auraloss==0.3.0
-      - onnx
-      - onnxruntime<1.16
-      - pre-commit
       - pytorch_lightning
       - sounddevice
       - transformers>=4  # See requirements.txt
diff --git a/environment_gpu.yml b/environment_gpu.yml
@@ -4,9 +4,9 @@
 
 name: nam
 channels:
-  - conda-forge # pytest-mock
+  - conda-forge # pytest-mock, onnxruntime
   - pytorch
-  - nvidia
+  - nvidia  # GPU
 dependencies:
   - python<3.11 # onnxruntime
   - black
@@ -15,12 +15,15 @@ dependencies:
   - jupyter
   - matplotlib
   - numpy
+  - onnx
+  - onnxruntime!=1.16.0
   - pip
+  - pre-commit
   - pydantic
   - pytest
   - pytest-mock
   - pytorch
-  - pytorch-cuda=11.7
+  - pytorch-cuda=11.7  # GPU
   - scipy
   - semver
   - tensorboard
@@ -28,9 +31,6 @@ dependencies:
   - wheel
   - pip:
       - auraloss==0.3.0
-      - onnx
-      - onnxruntime<1.16 # TODO GPU...
-      - pre-commit
       - pytorch_lightning
       - sounddevice
       - transformers>=4  # See requirements.txt
diff --git a/requirements.txt b/requirements.txt
@@ -8,7 +8,7 @@ flake8
 matplotlib
 numpy
 onnx
-onnxruntime<1.16
+onnxruntime!=1.16.0  # 1.16.0 has a bug to avoid!
 pip
 pre-commit
 pydantic