Merge branch 'development' into development

This commit is contained in:
Peter Baylies 2022-09-07 23:44:00 -04:00 committed by GitHub
commit d0832bfcaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 0 deletions

3
.gitignore vendored
View File

@ -77,6 +77,9 @@ db.sqlite3-journal
instance/ instance/
.webassets-cache .webassets-cache
# WebUI temp files:
img2img-tmp.png
# Scrapy stuff: # Scrapy stuff:
.scrapy .scrapy

View File

@ -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): # install brew (and Xcode command line tools):
/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" /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: # install python 3, git, cmake, protobuf:
brew install cmake protobuf rust 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 curl https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-arm64.sh -o Miniconda3-latest-MacOSX-arm64.sh
/bin/bash Miniconda3-latest-MacOSX-arm64.sh /bin/bash Miniconda3-latest-MacOSX-arm64.sh
# EITHER WAY,
# continue from here
# clone the repo # clone the repo
git clone https://github.com/lstein/stable-diffusion.git git clone https://github.com/lstein/stable-diffusion.git
cd stable-diffusion cd stable-diffusion