From 4245c9e0cdcad26083784d6c0b96cc7cf1c93055 Mon Sep 17 00:00:00 2001
From: mauwii <Mauwii@outlook.de>
Date: Sat, 29 Oct 2022 03:54:18 +0200
Subject: [PATCH] fix environment-mac.yml - tested on x64 and arm64 - using
 conda packages where possible according to conda docs

---
 environment-mac.yml | 80 ++++++++++++++++++++++-----------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/environment-mac.yml b/environment-mac.yml
index 16fcccb67f..ea083185a1 100644
--- a/environment-mac.yml
+++ b/environment-mac.yml
@@ -3,57 +3,57 @@ channels:
   - pytorch
   - conda-forge
 dependencies:
-  - python==3.9.13
-  - pip==22.2.2
+  - python=3.9.13
+  - pip=22.2.2
 
-  # pytorch left unpinned
-  - pytorch==1.12.1
-  - torchvision==0.13.1
+  - pytorch=1.12.1
+  - torchvision=0.13.1
 
   # I suggest to keep the other deps sorted for convenience.
   # To determine what the latest versions should be, run:
   #
   # ```shell
-  # sed -E 's/ldm/ldm-updated/;20,99s/- ([^=]+)==.+/- \1/' environment-mac.yml > environment-mac-updated.yml
-  # CONDA_SUBDIR=osx-arm64 conda env create -f environment-mac-updated.yml && conda list -n ldm-updated | awk ' {print "  - " $1 "==" $2;} '
+  # sed -E 's/invokeai/invokeai-updated/;20,99s/- ([^=]+)==.+/- \1/' environment-mac.yml > environment-mac-updated.yml
+  # CONDA_SUBDIR=osx-arm64 conda env create -f environment-mac-updated.yml && conda list -n invokeai-updated | awk ' {print "  - " $1 "==" $2;} '
   # ```
-  - albumentations==1.2.1
-  - coloredlogs==15.0.1
-  - diffusers==0.6.0
-  - einops==0.4.1
-  - grpcio==1.46.4
-  - humanfriendly==10.0
-  - imageio==2.21.2
-  - imageio-ffmpeg==0.4.7
-  - imgaug==0.4.0
-  - kornia==0.6.7
-  - mpmath==1.2.1
-  - nomkl=1.0
-  - numpy==1.23.2
-  - omegaconf==2.1.1
-  - openh264==2.3.0
-  - onnx==1.12.0
-  - onnxruntime==1.12.1
-  - pudb==2022.1
-  - pytorch-lightning==1.7.5
-  - scipy==1.9.1
-  - streamlit==1.12.2
-  - sympy==1.10.1
-  - tensorboard==2.10.0
-  - torchmetrics==0.9.3
+
+  - albumentations=1.2.1
+  - coloredlogs=15.0.1
+  - diffusers=0.6.0
+  - einops=0.4.1
+  - grpcio=1.46.4
+  - humanfriendly=10.0
+  - imageio=2.21.2
+  - imageio-ffmpeg=0.4.7
+  - imgaug=0.4.0
+  - kornia=0.6.7
+  - mpmath=1.2.1
+  - nomkl # arm64 has only 1.0 while x64 needs 3.0
+  - numpy=1.23.4
+  - omegaconf=2.1.1
+  - openh264=2.3.0
+  - onnx=1.12.0
+  - onnxruntime=1.12.1
+  - pudb=2022.1
+  - pytorch-lightning=1.7.7
+  - scipy=1.9.3
+  - streamlit=1.12.2
+  - sympy=1.10.1
+  - tensorboard=2.10.0
+  - torchmetrics=0.10.1
+  - py-opencv=4.6.0
+  - flask=2.1.3
+  - flask-socketio=5.3.0
+  - flask-cors=3.0.10
+  - eventlet=0.33.1
+  - protobuf=3.20.1
+  - send2trash=1.8.0
+  - transformers=4.23.1
+  - torch-fidelity=0.3.0
   - pip:
-      - flask==2.1.3
-      - flask_socketio==5.3.0
-      - flask_cors==3.0.10
       - dependency_injector==4.40.0
-      - eventlet==0.33.1
-      - opencv-python==4.6.0
-      - protobuf==3.19.6
       - realesrgan==0.2.5.0
-      - send2trash==1.8.0
       - test-tube==0.7.5
-      - transformers==4.21.3
-      - torch-fidelity==0.3.0
       - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers
       - -e git+https://github.com/openai/CLIP.git@main#egg=clip
       - -e git+https://github.com/Birch-san/k-diffusion.git@mps#egg=k_diffusion