From c08eedf264bfa87b7f5c40199c00d61f05e8ac4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E4=B8=8D=E6=B8=B8?=
 <71683364+mefengl@users.noreply.github.com>
Date: Sun, 18 Sep 2022 13:21:43 +0800
Subject: [PATCH 1/3] Delete redundant backquotes

remove extra space
---
 docs/installation/INSTALL_MAC.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/installation/INSTALL_MAC.md b/docs/installation/INSTALL_MAC.md
index 71535980f5..315dfbd4c9 100644
--- a/docs/installation/INSTALL_MAC.md
+++ b/docs/installation/INSTALL_MAC.md
@@ -45,11 +45,11 @@ First get the weights checkpoint download started - it's big:
 # NOW EITHER DO
 # 1. Installing alongside pyenv
 
-  brew install pyenv-virtualenv # you might have this from before, no problem
-  pyenv install anaconda3-2022.05
-  pyenv virtualenv anaconda3-2022.05
-  eval "$(pyenv init -)"
-  pyenv activate anaconda3-2022.05
+brew install pyenv-virtualenv # you might have this from before, no problem
+pyenv install anaconda3-2022.05
+pyenv virtualenv anaconda3-2022.05
+eval "$(pyenv init -)"
+pyenv activate anaconda3-2022.05
 
 # OR,
 # 2. Installing standalone
@@ -69,19 +69,19 @@ curl https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh -o M
 # continue from here
 
 # clone the repo
-  git clone https://github.com/lstein/stable-diffusion.git
-  cd stable-diffusion
+git clone https://github.com/lstein/stable-diffusion.git
+cd stable-diffusion
 
 #
 # wait until the checkpoint file has downloaded, then proceed
 #
 
 # create symlink to checkpoint
-  mkdir -p models/ldm/stable-diffusion-v1/
+mkdir -p models/ldm/stable-diffusion-v1/
 
-  PATH_TO_CKPT="$HOME/Downloads"  # or wherever you saved sd-v1-4.ckpt
+PATH_TO_CKPT="$HOME/Downloads"  # or wherever you saved sd-v1-4.ckpt
 
-  ln -s "$PATH_TO_CKPT/sd-v1-4.ckpt" models/ldm/stable-diffusion-v1/model.ckpt
+ln -s "$PATH_TO_CKPT/sd-v1-4.ckpt" models/ldm/stable-diffusion-v1/model.ckpt
 
 # install packages for arm64
 PIP_EXISTS_ACTION=w CONDA_SUBDIR=osx-arm64 conda env create -f environment-mac.yaml
@@ -189,7 +189,7 @@ There are several causes of these errors.
 - Third, if it says you're missing taming you need to rebuild your virtual
   environment.
 
-````bash
+```bash
 conda deactivate
 
 conda env remove -n ldm

From cc0cf147c8cd27e75a5bf4d40cf115204517b1ef Mon Sep 17 00:00:00 2001
From: Andreas Rozek <A.Rozek@gmx.de>
Date: Sun, 18 Sep 2022 16:12:59 +0200
Subject: [PATCH 2/3] Update INSTALL_MAC.md

1. let users install Rust right at the beginning in order to avoid some troubleshooting later on
2. add "conda deactivate" for troubleshooting once ldm was activated

Fix conflict

Update INSTALL_MAC.md
---
 docs/installation/INSTALL_MAC.md | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/docs/installation/INSTALL_MAC.md b/docs/installation/INSTALL_MAC.md
index 71535980f5..220cd54fbf 100644
--- a/docs/installation/INSTALL_MAC.md
+++ b/docs/installation/INSTALL_MAC.md
@@ -36,6 +36,7 @@ First get the weights checkpoint download started - it's big:
 
 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 
+#
 # Now there are two different routes to get the Python (miniconda) environment up and running:
 # 1. Alongside pyenv
 # 2. No pyenv
@@ -45,16 +46,16 @@ First get the weights checkpoint download started - it's big:
 # NOW EITHER DO
 # 1. Installing alongside pyenv
 
-  brew install pyenv-virtualenv # you might have this from before, no problem
-  pyenv install anaconda3-2022.05
-  pyenv virtualenv anaconda3-2022.05
-  eval "$(pyenv init -)"
-  pyenv activate anaconda3-2022.05
+brew install rust pyenv-virtualenv # you might have this from before, no problem
+pyenv install anaconda3-2022.05
+pyenv virtualenv anaconda3-2022.05
+eval "$(pyenv init -)"
+pyenv activate anaconda3-2022.05
 
 # OR,
 # 2. Installing standalone
 # install python 3, git, cmake, protobuf:
-brew install cmake protobuf rust
+brew install cmake rust
 
 # install miniconda for M1 arm64:
 curl https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-arm64.sh -o Miniconda3-latest-MacOSX-arm64.sh
@@ -191,10 +192,8 @@ There are several causes of these errors.
 
 ````bash
 conda deactivate
-
 conda env remove -n ldm
-PIP_EXISTS_ACTION=w CONDA_SUBDIR=osx-arm64 conda env create -f environment-mac.yaml
-```
+conda env create -f environment-mac.yaml
 
 Fourth, If you have activated the ldm virtual environment and tried rebuilding
 it, maybe the problem could be that I have something installed that you don't

From 7a6587d3dd121efcbf733a55e625677f5b6e8083 Mon Sep 17 00:00:00 2001
From: Andreas Rozek <A.Rozek@gmx.de>
Date: Sun, 18 Sep 2022 16:25:17 +0200
Subject: [PATCH 3/3] Update environment-mac.yaml

---
 environment-mac.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/environment-mac.yaml b/environment-mac.yaml
index bf8e870d77..95f38438e2 100644
--- a/environment-mac.yaml
+++ b/environment-mac.yaml
@@ -32,6 +32,7 @@ dependencies:
   - omegaconf==2.1.1
   - onnx==1.12.0
   - onnxruntime==1.12.1
+  - protobuf==3.20.1
   - pudb==2022.1
   - pytorch-lightning==1.6.5
   - scipy==1.9.1