Rename environment files to use default .yml extension

.github/workflows/create-caches.yml

@@ -13,10 +13,10 @@ jobs:
         id: vars
         run: |
             if [ "$RUNNER_OS" = "macOS" ]; then
-                echo "::set-output name=ENV_FILE::environment-mac.yaml"
+                echo "::set-output name=ENV_FILE::environment-mac.yml"
                 echo "::set-output name=PYTHON_BIN::/usr/local/miniconda/envs/ldm/bin/python"
             elif [ "$RUNNER_OS" = "Linux" ]; then
-                echo "::set-output name=ENV_FILE::environment.yaml"
+                echo "::set-output name=ENV_FILE::environment.yml"
                 echo "::set-output name=PYTHON_BIN::/usr/share/miniconda/envs/ldm/bin/python"
             fi
       - name: Checkout sources

.github/workflows/test-dream-conda.yml

@@ -19,10 +19,10 @@ jobs:
         run: |
           # Note, can't "activate" via github action; specifying the env's python has the same effect
           if [ "$RUNNER_OS" = "macOS" ]; then
-              echo "::set-output name=ENV_FILE::environment-mac.yaml"
+              echo "::set-output name=ENV_FILE::environment-mac.yml"
               echo "::set-output name=PYTHON_BIN::/usr/local/miniconda/envs/ldm/bin/python"
           elif [ "$RUNNER_OS" = "Linux" ]; then
-              echo "::set-output name=ENV_FILE::environment.yaml"
+              echo "::set-output name=ENV_FILE::environment.yml"
               echo "::set-output name=PYTHON_BIN::/usr/share/miniconda/envs/ldm/bin/python"
           fi
       - name: Checkout sources

docs/CHANGELOG.md

@@ -119,14 +119,14 @@
 - A copy of the prompt and all of its switches and options is now stored in the corresponding
   image in a tEXt metadata field named "Dream". You can read the prompt using scripts/images2prompt.py,
   or an image editor that allows you to explore the full metadata.
-  **Please run "conda env update -f environment.yaml" to load the k_lms dependencies!!**
+  **Please run "conda env update" to load the k_lms dependencies!!**
 
 ---
 
 ## v1.01 (21 August 2022)
 
 - added k_lms sampling.
-  **Please run "conda env update -f environment.yaml" to load the k_lms dependencies!!**
+  **Please run "conda env update" to load the k_lms dependencies!!**
 - use half precision arithmetic by default, resulting in faster execution and lower memory requirements
   Pass argument --full_precision to dream.py to get slower but more accurate image generation
 

docs/README-CompViz.md

@@ -28,7 +28,7 @@ A suitable [conda](https://conda.io/) environment named `ldm` can be created
 and activated with:
 
 ```
-conda env create -f environment.yaml
+conda env create
 conda activate ldm
 ```
 

docs/features/UPSCALE.md

@@ -3,7 +3,7 @@
 The script also provides the ability to do face restoration and
 upscaling with the help of GFPGAN and Real-ESRGAN respectively.
 
-As of version 1.14, environment.yaml will install the Real-ESRGAN package into the
+As of version 1.14, environment.yml will install the Real-ESRGAN package into the
 standard install location for python packages, and will put GFPGAN into a subdirectory of "src" 
 in the stable-diffusion directory.
 (The reason for this is that the standard GFPGAN distribution has a minor bug that adversely affects image

docs/help/TROUBLESHOOT.md

@@ -7,7 +7,7 @@ install process.
 
 **QUESTION**
 
-During `conda env create -f environment.yaml`, conda hangs indefinitely.
+During `conda env create`, conda hangs indefinitely.
 
 **SOLUTION**
 
@@ -31,7 +31,7 @@ Reinstall the stable diffusion modules. Enter the `stable-diffusion` directory a
 
 **SOLUTION**
 
-From within the `stable-diffusion` directory, run `conda env update -f environment.yaml` This is also frequently the solution to
+From within the `stable-diffusion` directory, run `conda env update` This is also frequently the solution to
 complaints about an unknown function in a module.
 
 ---
@@ -46,7 +46,7 @@ There's a feature or bugfix in the Stable Diffusion GitHub that you want to try
 
 If the fix/feature is on the `main` branch, enter the stable-diffusion directory and do a `git pull`.
 
-Usually this will be sufficient, but if you start to see errors about missing or incorrect modules, use the command `pip install -e .` and/or `conda env update -f environment.yaml` (These commands won't break anything.)
+Usually this will be sufficient, but if you start to see errors about missing or incorrect modules, use the command `pip install -e .` and/or `conda env update` (These commands won't break anything.)
 
 **Sub Branch**
 

docs/installation/INSTALL_LINUX.md

@@ -34,7 +34,7 @@ This will create InvokeAI folder where you will follow the rest of the steps.
 5. Use anaconda to copy necessary python packages, create a new python environment named `ldm` and activate the environment.
 
 ```
-(base) ~/InvokeAI$ conda env create -f environment.yaml
+(base) ~/InvokeAI$ conda env create
 (base) ~/InvokeAI$ conda activate ldm
 (ldm) ~/InvokeAI$
 ```

docs/installation/INSTALL_MAC.md

@@ -76,7 +76,7 @@ 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
 
 # install packages
-PIP_EXISTS_ACTION=w CONDA_SUBDIR=osx-arm64 conda env create -f environment-mac.yaml
+PIP_EXISTS_ACTION=w CONDA_SUBDIR=osx-arm64 conda env create -f environment-mac.yml
 conda activate ldm
 
 # only need to do this once
@@ -93,7 +93,7 @@ python scripts/orig_scripts/txt2img.py --prompt "a photograph of an astronaut ri
 ```
 
 Note, `export PIP_EXISTS_ACTION=w` is a precaution to fix `conda env
-create -f environment-mac.yaml` never finishing in some situations. So
+create -f environment-mac.yml` 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.
@@ -112,7 +112,7 @@ One debugging step is to update to the latest version of PyTorch nightly.
 
     conda install pytorch torchvision torchaudio -c pytorch-nightly
 
-If `conda env create -f environment-mac.yaml` takes forever run this.
+If `conda env create -f environment-mac.yml` takes forever run this.
 
     git clean -f
 
@@ -140,7 +140,7 @@ Third, if it says you're missing taming you need to rebuild your virtual
 environment.
 
     conda env remove -n ldm
-    conda env create -f environment-mac.yaml
+    conda env create -f environment-mac.yml
 
 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 and you'll just need to manually install it. Make sure you activate the virtual environment so it installs there instead of
 globally.
@@ -239,7 +239,7 @@ Example error.
 NotImplementedError: The operator 'aten::_index_put_impl_' is not current implemented for the MPS device. If you want this op to be added in priority during the prototype phase of this feature, please comment on [https://github.com/pytorch/pytorch/issues/77764](https://github.com/pytorch/pytorch/issues/77764). As a temporary fix, you can set the environment variable `PYTORCH_ENABLE_MPS_FALLBACK=1` to use the CPU as a fallback for this op. WARNING: this will be slower than running natively on MPS.
 ```
 
-The lstein branch includes this fix in [environment-mac.yaml](https://github.com/lstein/stable-diffusion/blob/main/environment-mac.yaml).
+The lstein branch includes this fix in [environment-mac.yml](https://github.com/lstein/stable-diffusion/blob/main/environment-mac.yml).
 
 ### "Could not build wheels for tokenizers"
 

docs/installation/INSTALL_WINDOWS.md

@@ -47,8 +47,8 @@ cd InvokeAI
 6. Run the following two commands:
 
 ```
-conda env create -f environment.yaml    (step 6a)
-conda activate ldm                      (step 6b)
+conda env create       (step 6a)
+conda activate ldm     (step 6b)
 ```
 
 This will install all python requirements and activate the "ldm"
@@ -106,7 +106,7 @@ This distribution is changing rapidly. If you used the `git clone` method (step
 
 ```
 git pull
-conda env update -f environment.yaml
+conda env update
 ```
 
 This will bring your local copy into sync with the remote one.

environment-mac.yml

@@ -14,7 +14,7 @@ dependencies:
   # To determine what the latest versions should be, run:
   #
   # ```shell
-  # sed -E 's/ldm/ldm-updated/;20,99s/- ([^=]+)==.+/- \1/' environment-mac.yaml > environment-mac-updated.yml
+  # 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;} '
   # ```
   - albumentations==1.2.1