fix conflict in environment-linux-aarch64.yml

This commit is contained in:
mauwii 2022-11-09 02:01:42 +01:00 committed by Lincoln Stein
parent 6d9638ba31
commit 12a33f6e2d

View File

@ -2,15 +2,16 @@ name: invokeai
channels: channels:
- pytorch - pytorch
- conda-forge - conda-forge
- defaults
dependencies: dependencies:
- python=3.10 - python=3.10
- pip>=22.2.2 - pip>=22.2.2
- cudatoolkit - cudatoolkit
- pytorch - pytorch
- torchvision - torchvision
- numpy=1.19 - numpy=1.23
- imageio=2.9.0 - imageio=2.21
- opencv=4.6.0 - opencv=4.6
- pillow=8.* - pillow=8.*
- flask=2.1.* - flask=2.1.*
- flask_cors=3.0.10 - flask_cors=3.0.10
@ -25,7 +26,7 @@ dependencies:
- einops=0.3.0 - einops=0.3.0
- kornia=0.6 - kornia=0.6
- torchmetrics=0.7.0 - torchmetrics=0.7.0
- transformers=4.21.3 - transformers=4.23
- torch-fidelity=0.3.0 - torch-fidelity=0.3.0
- tokenizers>=0.11.1,!=0.11.3,<0.13 - tokenizers>=0.11.1,!=0.11.3,<0.13
- pip: - pip: