From dbc8fc79008795875eb22ebf0c57927061af86bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20Gulldahl?= Date: Tue, 6 Sep 2022 13:07:10 +0200 Subject: [PATCH 1/2] Add instructions on how to install alongside pyenv (#393) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Like probably many others, I have a lot of different virtualenvs, one for each project. Most of them are handled by `pyenv`. After installing according to these instructions I had issues with ´pyenv`and `miniconda` fighting over the $PATH of my system. But then I stumbled upon this nice solution on SO: https://stackoverflow.com/a/73139031 , upon which I have based my suggested changes. It runs perfectly on my M1 setup, with the anaconda setup as a virtual environment handled by pyenv. Feel free to incorporate these instructions as you see fit. Thanks a million for all your hard work. --- README-Mac-MPS.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/README-Mac-MPS.md b/README-Mac-MPS.md index 04d513cf8c2..ef103d6b45a 100644 --- a/README-Mac-MPS.md +++ b/README-Mac-MPS.md @@ -32,6 +32,23 @@ While that is downloading, open Terminal and run the following commands one at a # install brew (and Xcode command line tools): /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 +# +# If you don't know what we are talking about, choose 2. +# +# NOW EITHER DO +# 1. Installing alongside pyenv + +brew install pyenv-virtualenv # you might have this from before, no problem +pyenv install anaconda3-latest +pyenv virtualenv anaconda3-latest lstein-stable-diffusion +pyenv activate lstein-stable-diffusion + +# OR, +# 2. Installing standalone # install python 3, git, cmake, protobuf: brew install cmake protobuf rust @@ -39,6 +56,10 @@ brew install cmake protobuf rust curl https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-arm64.sh -o Miniconda3-latest-MacOSX-arm64.sh /bin/bash Miniconda3-latest-MacOSX-arm64.sh + +# EITHER WAY, +# continue from here + # clone the repo git clone https://github.com/lstein/stable-diffusion.git cd stable-diffusion From 1f655b176aee89775e97b94428971b0b2609efe6 Mon Sep 17 00:00:00 2001 From: elliotsayes Date: Thu, 8 Sep 2022 10:00:17 +1200 Subject: [PATCH 2/2] .gitignore WebUI temp files --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index fd75e65a48d..df1e55ee6d8 100644 --- a/.gitignore +++ b/.gitignore @@ -77,6 +77,9 @@ db.sqlite3-journal instance/ .webassets-cache +# WebUI temp files: +img2img-tmp.png + # Scrapy stuff: .scrapy