diff --git a/environment.yaml b/environment.yaml index 83669e254c..b554cfc035 100644 --- a/environment.yaml +++ b/environment.yaml @@ -10,6 +10,7 @@ dependencies: - torchvision=0.12.0 - numpy=1.19.2 - pip: + - accelerate==0.12.0 - albumentations==0.4.3 - opencv-python==4.1.2.30 - pudb==2019.2 @@ -18,14 +19,13 @@ dependencies: - pytorch-lightning==1.4.2 - omegaconf==2.1.1 - test-tube>=0.7.5 - - streamlit>=0.73.1 - - pillow==9.0.1 + - streamlit==1.12.0 + - pillow==9.2.0 - einops==0.3.0 - torch-fidelity==0.3.0 - transformers==4.19.2 - torchmetrics==0.6.0 - - kornia==0.6 - - accelerate==0.12.0 + - kornia==0.6.0 - -e git+https://github.com/openai/CLIP.git@main#egg=clip - -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers - -e git+https://github.com/lstein/k-diffusion.git@master#egg=k-diffusion diff --git a/requirements.txt b/requirements.txt index 78d43aae26..30b2251a1c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,15 +8,15 @@ kornia==0.6.0 numpy==1.19.2 omegaconf==2.1.1 opencv-python==4.1.2.30 -pillow==9.0.1 +pillow==9.2.0 pudb==2019.2 -pytorch +torch==1.11.0 +torchvision==0.12.0 pytorch-lightning==1.4.2 streamlit==1.12.0 test-tube>=0.7.5 torch-fidelity==0.3.0 torchmetrics==0.6.0 -torchvision transformers==4.19.2 -e git+https://github.com/openai/CLIP.git@main#egg=clip -e git+https://github.com/CompVis/taming-transformers.git@master#egg=taming-transformers diff --git a/scripts/dream.py b/scripts/dream.py index dc5fad5bac..e3efc4b3e0 100755 --- a/scripts/dream.py +++ b/scripts/dream.py @@ -183,6 +183,7 @@ def main_loop(t2i,parser,log,infile): if opt.variants is not None: print(f"Generating {opt.variants} variant(s)...") newopt = copy.deepcopy(opt) + newopt.iterations = 1 newopt.variants = None for r in results: newopt.init_img = r[0] diff --git a/src/k-diffusion b/src/k-diffusion index db57990687..ef1bf07627 160000 --- a/src/k-diffusion +++ b/src/k-diffusion @@ -1 +1 @@ -Subproject commit db5799068749bf3a6d5845120ed32df16b7d883b +Subproject commit ef1bf07627c9a10ba9137e68a0206b844544a7d9