From 4f72cb44ad0429874c9ba507d325267e295a040c Mon Sep 17 00:00:00 2001 From: Lincoln Stein Date: Sun, 11 Sep 2022 13:05:38 -0400 Subject: [PATCH] moved the notebook files into their own directory --- docs/features/OTHER.md | 19 +++++++++++++----- docs/installation/INSTALL_MAC.md | 11 +++++++--- docs/installation/INSTALL_WINDOWS.md | 20 ++++++++++++++----- .../Stable-Diffusion-local-Windows.ipynb | 0 .../Stable_Diffusion_AI_Notebook.ipynb | 0 .../notebook_helpers.py | 0 6 files changed, 37 insertions(+), 13 deletions(-) rename Stable-Diffusion-local-Windows.ipynb => notebooks/Stable-Diffusion-local-Windows.ipynb (100%) rename Stable_Diffusion_AI_Notebook.ipynb => notebooks/Stable_Diffusion_AI_Notebook.ipynb (100%) rename notebook_helpers.py => notebooks/notebook_helpers.py (100%) diff --git a/docs/features/OTHER.md b/docs/features/OTHER.md index be9aeb48c6b..f8217691a03 100644 --- a/docs/features/OTHER.md +++ b/docs/features/OTHER.md @@ -1,7 +1,11 @@ ## **Google Colab** -Stable Diffusion AI Notebook: Open In Colab
-Open and follow instructions to use an isolated environment running Dream.
+Stable Diffusion AI Notebook:
Open and follow instructions to use an +isolated environment running Dream.
Output Example: ![Colab Notebook](../assets/colab_notebook.png) @@ -10,8 +14,10 @@ Output Example: ## **Seamless Tiling** -The seamless tiling mode causes generated images to seamlessly tile with itself. To use it, add the `--seamless` option when starting the -script which will result in all generated images to tile, or for each `dream>` prompt as shown here: +The seamless tiling mode causes generated images to seamlessly tile +with itself. To use it, add the `--seamless` option when starting the +script which will result in all generated images to tile, or for each +`dream>` prompt as shown here: ``` dream> "pond garden with lotus by claude monet" --seamless -s100 -n4 @@ -21,7 +27,10 @@ dream> "pond garden with lotus by claude monet" --seamless -s100 -n4 ## **Reading Prompts from a File** -You can automate `dream.py` by providing a text file with the prompts you want to run, one line per prompt. The text file must be composed with a text editor (e.g. Notepad) and not a word processor. Each line should look like what you would type at the dream> prompt: +You can automate `dream.py` by providing a text file with the prompts +you want to run, one line per prompt. The text file must be composed +with a text editor (e.g. Notepad) and not a word processor. Each line +should look like what you would type at the dream> prompt: ``` a beautiful sunny day in the park, children playing -n4 -C10 diff --git a/docs/installation/INSTALL_MAC.md b/docs/installation/INSTALL_MAC.md index 4e1dcf2e49b..c5fc8175c25 100644 --- a/docs/installation/INSTALL_MAC.md +++ b/docs/installation/INSTALL_MAC.md @@ -9,9 +9,12 @@ Requirements \*I haven't tested any of this on Intel Macs but I have read that one person got it to work, so Apple Silicon might not be requried. -Things have moved really fast and so these instructions change often and are often out-of-date. One of the problems is that there are so many different ways to run this. +Things have moved really fast and so these instructions change often +and are often out-of-date. One of the problems is that there are so +many different ways to run this. -We are trying to build a testing setup so that when we make changes it doesn't always break. +We are trying to build a testing setup so that when we make changes it +doesn't always break. How to (this hasn't been 100% tested yet): @@ -88,7 +91,9 @@ The original scripts should work as well. python scripts/orig_scripts/txt2img.py --prompt "a photograph of an astronaut riding a horse" --plms ``` -Note, `export PIP_EXISTS_ACTION=w` is a precaution to fix `conda env create -f environment-mac.yaml` never finishing in some situations. So it isn't required but wont hurt. +Note, `export PIP_EXISTS_ACTION=w` is a precaution to fix `conda env +create -f environment-mac.yaml` never finishing in some situations. So +it isn't required but wont hurt. After you follow all the instructions and run dream.py you might get several errors. Here's the errors I've seen and found solutions for. diff --git a/docs/installation/INSTALL_WINDOWS.md b/docs/installation/INSTALL_WINDOWS.md index dfb78e3cdfd..238988a15a3 100644 --- a/docs/installation/INSTALL_WINDOWS.md +++ b/docs/installation/INSTALL_WINDOWS.md @@ -2,10 +2,18 @@ ## **Notebook install (semi-automated)** -We have a [Jupyter notebook](https://github.com/lstein/stable-diffusion/blob/main/Stable-Diffusion-local-Windows.ipynb) with cell-by-cell installation steps. It will download the code in this repo as one of the steps, so instead of cloning this repo, simply download the notebook from the link above and load it up in VSCode (with the appropriate extensions installed)/Jupyter/JupyterLab and start running the cells one-by-one. - -Note that you will need NVIDIA drivers, Python 3.10, and Git installed beforehand - simplified -[step-by-step instructions](https://github.com/lstein/stable-diffusion/wiki/Easy-peasy-Windows-install) are available in the wiki (you'll only need steps 1, 2, & 3 ). +We have a [Jupyter +notebook](https://github.com/lstein/stable-diffusion/blob/main/notebooks/Stable-Diffusion-local-Windows.ipynb) +with cell-by-cell installation steps. It will download the code in +this repo as one of the steps, so instead of cloning this repo, simply +download the notebook from the link above and load it up in VSCode +(with the appropriate extensions installed)/Jupyter/JupyterLab and +start running the cells one-by-one. + +Note that you will need NVIDIA drivers, Python 3.10, and Git installed +beforehand - simplified [step-by-step +instructions](https://github.com/lstein/stable-diffusion/wiki/Easy-peasy-Windows-install) +are available in the wiki (you'll only need steps 1, 2, & 3 ). ## **Manual Install** @@ -43,7 +51,8 @@ conda env create -f environment.yaml (step 6a) conda activate ldm (step 6b) ``` -This will install all python requirements and activate the "ldm" environment which sets PATH and other environment variables properly. +This will install all python requirements and activate the "ldm" +environment which sets PATH and other environment variables properly. 7. Run the command: @@ -97,6 +106,7 @@ This distribution is changing rapidly. If you used the `git clone` method (step ``` git pull +conda env update -f environment.yaml ``` This will bring your local copy into sync with the remote one. diff --git a/Stable-Diffusion-local-Windows.ipynb b/notebooks/Stable-Diffusion-local-Windows.ipynb similarity index 100% rename from Stable-Diffusion-local-Windows.ipynb rename to notebooks/Stable-Diffusion-local-Windows.ipynb diff --git a/Stable_Diffusion_AI_Notebook.ipynb b/notebooks/Stable_Diffusion_AI_Notebook.ipynb similarity index 100% rename from Stable_Diffusion_AI_Notebook.ipynb rename to notebooks/Stable_Diffusion_AI_Notebook.ipynb diff --git a/notebook_helpers.py b/notebooks/notebook_helpers.py similarity index 100% rename from notebook_helpers.py rename to notebooks/notebook_helpers.py