get rid of pycache stuff and make work with windows

JoePenna · Sep 26, 2022 · 25e5c25 · AnujSaharan · Sep 26, 2022 · 25e5c25
1 parent c87b129
commit 25e5c25
Show file tree

Hide file tree

Showing 54 changed files with 13 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,6 @@
 gen.bat
 gen_ref.bat
 train.bat
+__pycache__
+*/**/__pycache__
+logs
diff --git a/configs/stable-diffusion/v1-finetune_unfrozen.yaml b/configs/stable-diffusion/v1-finetune_unfrozen.yaml
@@ -77,7 +77,7 @@ data:
   target: main.DataModuleFromConfig
   params:
     batch_size: 1
-    num_workers: 2
+    num_workers: 1
     wrap: false
     train:
       target: ldm.data.personalized.PersonalizedBase

diff --git a/evaluation/__pycache__/clip_eval.cpython-36.pyc b/evaluation/__pycache__/clip_eval.cpython-36.pyc
diff --git a/evaluation/__pycache__/clip_eval.cpython-38.pyc b/evaluation/__pycache__/clip_eval.cpython-38.pyc
diff --git a/ldm/__pycache__/util.cpython-36.pyc b/ldm/__pycache__/util.cpython-36.pyc
diff --git a/ldm/__pycache__/util.cpython-38.pyc b/ldm/__pycache__/util.cpython-38.pyc
diff --git a/ldm/data/__pycache__/__init__.cpython-36.pyc b/ldm/data/__pycache__/__init__.cpython-36.pyc
diff --git a/ldm/data/__pycache__/__init__.cpython-38.pyc b/ldm/data/__pycache__/__init__.cpython-38.pyc
diff --git a/ldm/data/__pycache__/base.cpython-36.pyc b/ldm/data/__pycache__/base.cpython-36.pyc
diff --git a/ldm/data/__pycache__/base.cpython-38.pyc b/ldm/data/__pycache__/base.cpython-38.pyc
diff --git a/ldm/data/__pycache__/personalized.cpython-36.pyc b/ldm/data/__pycache__/personalized.cpython-36.pyc
diff --git a/ldm/data/__pycache__/personalized.cpython-38.pyc b/ldm/data/__pycache__/personalized.cpython-38.pyc
diff --git a/ldm/data/__pycache__/personalized_compose.cpython-38.pyc b/ldm/data/__pycache__/personalized_compose.cpython-38.pyc
diff --git a/ldm/data/__pycache__/personalized_detailed_text.cpython-36.pyc b/ldm/data/__pycache__/personalized_detailed_text.cpython-36.pyc
diff --git a/ldm/data/__pycache__/personalized_style.cpython-36.pyc b/ldm/data/__pycache__/personalized_style.cpython-36.pyc
diff --git a/ldm/data/__pycache__/personalized_style.cpython-38.pyc b/ldm/data/__pycache__/personalized_style.cpython-38.pyc
diff --git a/ldm/models/__pycache__/autoencoder.cpython-36.pyc b/ldm/models/__pycache__/autoencoder.cpython-36.pyc
diff --git a/ldm/models/__pycache__/autoencoder.cpython-38.pyc b/ldm/models/__pycache__/autoencoder.cpython-38.pyc
diff --git a/ldm/models/diffusion/__pycache__/__init__.cpython-36.pyc b/ldm/models/diffusion/__pycache__/__init__.cpython-36.pyc
diff --git a/ldm/models/diffusion/__pycache__/__init__.cpython-38.pyc b/ldm/models/diffusion/__pycache__/__init__.cpython-38.pyc
diff --git a/ldm/models/diffusion/__pycache__/ddim.cpython-36.pyc b/ldm/models/diffusion/__pycache__/ddim.cpython-36.pyc
diff --git a/ldm/models/diffusion/__pycache__/ddim.cpython-38.pyc b/ldm/models/diffusion/__pycache__/ddim.cpython-38.pyc
diff --git a/ldm/models/diffusion/__pycache__/ddim_inversion.cpython-38.pyc b/ldm/models/diffusion/__pycache__/ddim_inversion.cpython-38.pyc
diff --git a/ldm/models/diffusion/__pycache__/ddpm.cpython-36.pyc b/ldm/models/diffusion/__pycache__/ddpm.cpython-36.pyc
diff --git a/ldm/models/diffusion/__pycache__/ddpm.cpython-38.pyc b/ldm/models/diffusion/__pycache__/ddpm.cpython-38.pyc
diff --git a/ldm/models/diffusion/__pycache__/ddpm_pti.cpython-38.pyc b/ldm/models/diffusion/__pycache__/ddpm_pti.cpython-38.pyc
diff --git a/ldm/models/diffusion/__pycache__/plms.cpython-36.pyc b/ldm/models/diffusion/__pycache__/plms.cpython-36.pyc
diff --git a/ldm/models/diffusion/__pycache__/plms.cpython-38.pyc b/ldm/models/diffusion/__pycache__/plms.cpython-38.pyc
diff --git a/ldm/modules/__pycache__/attention.cpython-36.pyc b/ldm/modules/__pycache__/attention.cpython-36.pyc
diff --git a/ldm/modules/__pycache__/attention.cpython-38.pyc b/ldm/modules/__pycache__/attention.cpython-38.pyc
diff --git a/ldm/modules/__pycache__/ema.cpython-36.pyc b/ldm/modules/__pycache__/ema.cpython-36.pyc
diff --git a/ldm/modules/__pycache__/ema.cpython-38.pyc b/ldm/modules/__pycache__/ema.cpython-38.pyc
diff --git a/ldm/modules/__pycache__/embedding_manager.cpython-36.pyc b/ldm/modules/__pycache__/embedding_manager.cpython-36.pyc
diff --git a/ldm/modules/__pycache__/embedding_manager.cpython-38.pyc b/ldm/modules/__pycache__/embedding_manager.cpython-38.pyc
diff --git a/ldm/modules/__pycache__/x_transformer.cpython-36.pyc b/ldm/modules/__pycache__/x_transformer.cpython-36.pyc
diff --git a/ldm/modules/__pycache__/x_transformer.cpython-38.pyc b/ldm/modules/__pycache__/x_transformer.cpython-38.pyc
diff --git a/ldm/modules/diffusionmodules/__pycache__/__init__.cpython-36.pyc b/ldm/modules/diffusionmodules/__pycache__/__init__.cpython-36.pyc
diff --git a/ldm/modules/diffusionmodules/__pycache__/__init__.cpython-38.pyc b/ldm/modules/diffusionmodules/__pycache__/__init__.cpython-38.pyc
diff --git a/ldm/modules/diffusionmodules/__pycache__/model.cpython-36.pyc b/ldm/modules/diffusionmodules/__pycache__/model.cpython-36.pyc
diff --git a/ldm/modules/diffusionmodules/__pycache__/model.cpython-38.pyc b/ldm/modules/diffusionmodules/__pycache__/model.cpython-38.pyc
diff --git a/ldm/modules/diffusionmodules/__pycache__/openaimodel.cpython-36.pyc b/ldm/modules/diffusionmodules/__pycache__/openaimodel.cpython-36.pyc
diff --git a/ldm/modules/diffusionmodules/__pycache__/openaimodel.cpython-38.pyc b/ldm/modules/diffusionmodules/__pycache__/openaimodel.cpython-38.pyc
diff --git a/ldm/modules/diffusionmodules/__pycache__/util.cpython-36.pyc b/ldm/modules/diffusionmodules/__pycache__/util.cpython-36.pyc
diff --git a/ldm/modules/diffusionmodules/__pycache__/util.cpython-38.pyc b/ldm/modules/diffusionmodules/__pycache__/util.cpython-38.pyc
diff --git a/ldm/modules/distributions/__pycache__/__init__.cpython-36.pyc b/ldm/modules/distributions/__pycache__/__init__.cpython-36.pyc
diff --git a/ldm/modules/distributions/__pycache__/__init__.cpython-38.pyc b/ldm/modules/distributions/__pycache__/__init__.cpython-38.pyc
diff --git a/ldm/modules/distributions/__pycache__/distributions.cpython-36.pyc b/ldm/modules/distributions/__pycache__/distributions.cpython-36.pyc
diff --git a/ldm/modules/distributions/__pycache__/distributions.cpython-38.pyc b/ldm/modules/distributions/__pycache__/distributions.cpython-38.pyc
diff --git a/ldm/modules/encoders/__pycache__/__init__.cpython-36.pyc b/ldm/modules/encoders/__pycache__/__init__.cpython-36.pyc
diff --git a/ldm/modules/encoders/__pycache__/__init__.cpython-38.pyc b/ldm/modules/encoders/__pycache__/__init__.cpython-38.pyc
diff --git a/ldm/modules/encoders/__pycache__/modules.cpython-36.pyc b/ldm/modules/encoders/__pycache__/modules.cpython-36.pyc
diff --git a/ldm/modules/encoders/__pycache__/modules.cpython-38.pyc b/ldm/modules/encoders/__pycache__/modules.cpython-38.pyc
diff --git a/ldm/util.py b/ldm/util.py
@@ -22,7 +22,9 @@ def log_txt_as_img(wh, xc, size=10):
     for bi in range(b):
         txt = Image.new("RGB", wh, color="white")
         draw = ImageDraw.Draw(txt)
-        font = ImageFont.truetype('data/DejaVuSans.ttf', size=size)
+        # Changed to work on Windows
+        font = ImageFont.load_default()
+        #font = ImageFont.truetype('data/DejaVuSans.ttf', size=size)
         nc = int(40 * (wh[0] / 256))
         lines = "\n".join(xc[bi][start:start + nc] for start in range(0, len(xc[bi]), nc))
 

diff --git a/main.py b/main.py
@@ -607,8 +607,6 @@ def on_train_epoch_start(self, trainer, pl_module):
         lightning_config = config.pop("lightning", OmegaConf.create())
         # merge trainer cli with config
         trainer_config = lightning_config.get("trainer", OmegaConf.create())
-        # default to ddp
-        trainer_config["accelerator"] = "ddp"
         for k in nondefault_trainer_args(opt):
             trainer_config[k] = getattr(opt, k)
         if not "gpus" in trainer_config:
@@ -821,8 +819,12 @@ def divein(*args, **kwargs):
 
         import signal
 
-        signal.signal(signal.SIGUSR1, melk)
-        signal.signal(signal.SIGUSR2, divein)
+
+        # Changed to work with windows
+        signal.signal(signal.SIGTERM, melk)
+        #signal.signal(signal.SIGUSR1, melk)
+        signal.signal(signal.SIGTERM, divein)
+        #signal.signal(signal.SIGUSR2, divein)
 
         # run
         if opt.train: