merge upstream

services/hlky/Dockerfile

@@ -9,10 +9,11 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN conda install python=3.8.5 && conda clean -a -y
 RUN conda install pytorch==1.11.0 torchvision==0.12.0 cudatoolkit=11.3 -c pytorch && conda clean -a -y
 
-RUN apt-get update && apt install fonts-dejavu-core rsync -y && apt-get clean
+RUN apt-get update && apt install fonts-dejavu-core rsync gcc -y && apt-get clean
 
 
 RUN <<EOF
+git config --global http.postBuffer 1048576000
 git clone https://github.com/sd-webui/stable-diffusion-webui.git stable-diffusion
 cd stable-diffusion
 git reset --hard 7623a5734740025d79b710f3744bff9276e1467b

services/hlky/webui_streamlit.yaml

@@ -2,9 +2,12 @@
 general:
   gpu: 0
   outdir: /outputs
-  ckpt: "/cache/models/model.ckpt"
+
+  default_model: "Stable Diffusion v1.4"
+  default_model_config: "configs/stable-diffusion/v1-inference.yaml"
+  default_model_path: "/cache/models/model.ckpt"
   fp:
-    name: "embeddings/alex/embeddings_gs-11000.pt"
+    name:
   GFPGAN_dir: "./src/gfpgan"
   RealESRGAN_dir: "./src/realesrgan"
   RealESRGAN_model: "RealESRGAN_x4plus"
@@ -15,43 +18,90 @@ general:
   extra_models_cpu: False
   extra_models_gpu: False
   save_metadata: True
+  save_format: "png"
   skip_grid: False
   skip_save: False
   grid_format: "jpg:95"
   n_rows: -1
   no_verify_input: False
   no_half: False
+  use_float16: False
   precision: "autocast"
   optimized: False
-  optimized_turbo: False
+  optimized_turbo: True
+  optimized_config: "optimizedSD/v1-inference.yaml"
   update_preview: True
-  update_preview_frequency: 1
+  update_preview_frequency: 5
 
 txt2img:
   prompt:
   height: 512
   width: 512
-  cfg_scale: 5.0
+  cfg_scale: 7.5
   seed: ""
   batch_count: 1
   batch_size: 1
-  sampling_steps: 50
-  default_sampler: "k_lms"
+  sampling_steps: 30
+  default_sampler: "k_euler"
   separate_prompts: False
+  update_preview: True
+  update_preview_frequency: 5
   normalize_prompt_weights: True
   save_individual_images: True
   save_grid: True
   group_by_prompt: True
   save_as_jpg: False
-  use_GFPGAN: True
-  use_RealESRGAN: True
+  use_GFPGAN: False
+  use_RealESRGAN: False
   RealESRGAN_model: "RealESRGAN_x4plus"
   variant_amount: 0.0
   variant_seed: ""
+  write_info_files: True
+
+txt2vid:
+  default_model: "CompVis/stable-diffusion-v1-4"
+  custom_models_list:
+    [
+      "CompVis/stable-diffusion-v1-4",
+      "naclbit/trinart_stable_diffusion_v2",
+      "hakurei/waifu-diffusion",
+      "osanseviero/BigGAN-deep-128",
+    ]
+  prompt:
+  height: 512
+  width: 512
+  cfg_scale: 7.5
+  seed: ""
+  batch_count: 1
+  batch_size: 1
+  sampling_steps: 30
+  num_inference_steps: 200
+  default_sampler: "k_euler"
+  scheduler_name: "klms"
+  separate_prompts: False
+  update_preview: True
+  update_preview_frequency: 5
+  dynamic_preview_frequency: True
+  normalize_prompt_weights: True
+  save_individual_images: True
+  save_video: True
+  group_by_prompt: True
+  write_info_files: True
+  do_loop: False
+  save_as_jpg: False
+  use_GFPGAN: False
+  use_RealESRGAN: False
+  RealESRGAN_model: "RealESRGAN_x4plus"
+  variant_amount: 0.0
+  variant_seed: ""
+  beta_start: 0.00085
+  beta_end: 0.012
+  beta_scheduler_type: "linear"
+  max_frames: 1000
 
 img2img:
   prompt:
-  sampling_steps: 50
+  sampling_steps: 30
   # Adding an int to toggles enables the corresponding feature.
   # 0: Create prompt matrix (separate multiple prompts using |, and get all combinations of them)
   # 1: Normalize Prompt Weights (ensure sum of weights add up to 1.0)
@@ -64,11 +114,12 @@ img2img:
   # 8: jpg samples
   # 9: Fix faces using GFPGAN
   # 10: Upscale images using Real-ESRGAN
-  sampler_name: k_lms
+  sampler_name: "k_euler"
   denoising_strength: 0.45
   # 0: Keep masked area
   # 1: Regenerate only masked area
   mask_mode: 0
+  mask_restore: False
   # 0: Just resize
   # 1: Crop and resize
   # 2: Resize and fill
@@ -76,7 +127,7 @@ img2img:
   # Leave blank for random seed:
   seed: ""
   ddim_eta: 0.0
-  cfg_scale: 5.0
+  cfg_scale: 7.5
   batch_count: 1
   batch_size: 1
   height: 512
@@ -86,16 +137,19 @@ img2img:
   loopback: True
   random_seed_loopback: True
   separate_prompts: False
+  update_preview: True
+  update_preview_frequency: 5
   normalize_prompt_weights: True
   save_individual_images: True
   save_grid: True
   group_by_prompt: True
   save_as_jpg: False
-  use_GFPGAN: True
-  use_RealESRGAN: True
+  use_GFPGAN: False
+  use_RealESRGAN: False
   RealESRGAN_model: "RealESRGAN_x4plus"
   variant_amount: 0.0
   variant_seed: ""
+  write_info_files: True
 
 gfpgan:
   strength: 100