Fixed experiment

NUS-HPC-AI-Lab · Jan 25, 2025 · d2c105b · d2c105b
1 parent d10230a
commit d2c105b
Show file tree

Hide file tree

Showing 41 changed files with 159 additions and 42 deletions.
diff --git a/configs/ablation/base.yaml b/configs/ablation/base.yaml
@@ -15,7 +15,7 @@ vae:
 
 data:
   dataset:
-    _target_: speedit.dataset.image.image_dataset
+    _target_: speed.dataset.image.image_dataset
     image_size: ${image_size}
     class_cond: false
     root: "/home/zyk/ffhq-dataset/images256x256"
@@ -24,7 +24,7 @@ data:
   num_workers: 4
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: ours
   sampling: ours
@@ -33,7 +33,7 @@ diffusion:
   tau: 700
 
 model:
-  _target_: speedit.networks.unet.create_unet_model
+  _target_: speed.networks.unet.create_unet_model
   input_size: 32
   num_channels: 128
   num_res_blocks: 3

diff --git a/configs/ablation/component/base.yaml b/configs/ablation/component/base.yaml
@@ -1,6 +1,6 @@
 data:
   dataset:
-    _target_: speedit.dataset.image.image_dataset
+    _target_: speed.dataset.image.image_dataset
     image_size: ${image_size}
     class_cond: false
     root: "/data1/xinpeng/ffhq/images256x256"
diff --git a/configs/ablation/k/base.yaml b/configs/ablation/k/base.yaml
@@ -1,6 +1,6 @@
 data:
   dataset:
-    _target_: speedit.dataset.image.image_dataset
+    _target_: speed.dataset.image.image_dataset
     image_size: ${image_size}
     class_cond: false
     root: "/home/zyk/ffhq-dataset/images256x256"
diff --git a/configs/ablation/lambda/base.yaml b/configs/ablation/lambda/base.yaml
@@ -1,6 +1,6 @@
 data:
   dataset:
-    _target_: speedit.dataset.image.image_dataset
+    _target_: speed.dataset.image.image_dataset
     image_size: ${image_size}
     class_cond: false
     root: "/data1/xinpeng/ffhq/images256x256"
diff --git a/configs/comparison/base.yaml b/configs/comparison/base.yaml
@@ -14,15 +14,15 @@ vae:
 
 data:
   dataset:
-    _target_: speedit.dataset.image.image_dataset
+    _target_: speed.dataset.image.image_dataset
     image_size: ${image_size}
     class_cond: false
 
   batch_size: 32
   num_workers: 4
 
 model:
-  _target_: speedit.networks.dit.DiT_XL_2
+  _target_: speed.networks.dit.DiT_XL_2
   condition: none
 
 

diff --git a/configs/comparison/celeba/base.yaml b/configs/comparison/celeba/base.yaml
@@ -0,0 +1,9 @@
+data:
+  dataset:
+    root: ~/big_space/SamJ/data/Celeb-A/Img/img_align_celeba
+
+diffusion:
+  _target_: speed.diffusion.iddpm.IDDPM
+  timestep_respacing: ""
+
+experiment_dir: outputs/celeba/base
diff --git a/configs/comparison/ffhq/clts.yaml b/configs/comparison/ffhq/clts.yaml
@@ -2,7 +2,7 @@ experiment_dir: outputs/ffhq/clts
 
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: none
   sampling: CLTS
diff --git a/configs/comparison/ffhq/faster.yaml b/configs/comparison/ffhq/faster.yaml
@@ -1,7 +1,7 @@
 experiment_dir: outputs/ffhq/faster
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: ours
   sampling: ours

diff --git a/configs/comparison/ffhq/lognorm.yaml b/configs/comparison/ffhq/lognorm.yaml
@@ -2,7 +2,7 @@ experiment_dir: outputs/ffhq/lognorm
 
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: none
   sampling: lognorm
diff --git a/configs/comparison/ffhq/min_snr.yaml b/configs/comparison/ffhq/min_snr.yaml
@@ -2,7 +2,7 @@ experiment_dir: outputs/ffhq/min_snr
 
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: min_snr
   sampling: uniform
diff --git a/configs/comparison/ffhq/p2.yaml b/configs/comparison/ffhq/p2.yaml
@@ -2,7 +2,7 @@ experiment_dir: outputs/ffhq/p2
 
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: p2
   sampling: uniform
diff --git a/configs/comparison/ffhq/theory.yaml b/configs/comparison/ffhq/theory.yaml
@@ -2,7 +2,7 @@ experiment_dir: outputs/ffhq/theory
 
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: theory
   sampling: speed
diff --git a/configs/comparison/metfaces/base.yaml b/configs/comparison/metfaces/base.yaml
@@ -4,7 +4,7 @@ data:
 
 
 diffusion:
-  _target_: speedit.diffusion.iddpm.IDDPM
+  _target_: speed.diffusion.iddpm.IDDPM
   timestep_respacing: ""
 
 experiment_dir: outputs/metfaces/base
diff --git a/configs/comparison/metfaces/clts.yaml b/configs/comparison/metfaces/clts.yaml
@@ -2,7 +2,7 @@ experiment_dir: /mnt/public/yuanzhihang/outputs/metfaces/clts
 
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: none
   sampling: CLTS
diff --git a/configs/comparison/metfaces/faster.yaml b/configs/comparison/metfaces/faster.yaml
@@ -1,7 +1,7 @@
 experiment_dir: outputs/metfaces/faster2
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: ours
   sampling: ours

diff --git a/configs/comparison/metfaces/lognorm.yaml b/configs/comparison/metfaces/lognorm.yaml
@@ -2,7 +2,7 @@ experiment_dir: outputs/metfaces/lognorm
 
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: none
   sampling: lognorm
diff --git a/configs/comparison/metfaces/min_snr.yaml b/configs/comparison/metfaces/min_snr.yaml
@@ -2,7 +2,7 @@ experiment_dir: /mnt/public/yuanzhihang/outputs/metfaces/min_snr
 
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: min_snr
   sampling: uniform
diff --git a/configs/comparison/metfaces/p2.yaml b/configs/comparison/metfaces/p2.yaml
@@ -2,7 +2,7 @@ experiment_dir: /mnt/public/yuanzhihang/outputs/metfaces/p2
 
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: p2
   sampling: uniform
diff --git a/configs/comparison/schedule/base.yaml b/configs/comparison/schedule/base.yaml
@@ -3,7 +3,7 @@ data:
     root: /mnt/public/yuanzhihang/ffhq/images256x256/
 
 # diffusion:
-#   _target_: speedit.diffusion.iddpm.IDDPM
+#   _target_: speed.diffusion.iddpm.IDDPM
 #   timestep_respacing: ""
 
 # experiment_dir: /mnt/public/yuanzhihang/outputs/ffhq/base
diff --git a/configs/comparison/schedule/baseline/base.yaml b/configs/comparison/schedule/baseline/base.yaml
@@ -1,4 +1,4 @@
 diffusion:
-  _target_: speedit.diffusion.iddpm.IDDPM
+  _target_: speed.diffusion.iddpm.IDDPM
   timestep_respacing: ""
   noise_schedule: linear
diff --git a/configs/comparison/schedule/speed/base.yaml b/configs/comparison/schedule/speed/base.yaml
@@ -1,5 +1,5 @@
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   sampling: speed
   weighting: p2
diff --git a/configs/comparison/unet/ffhq_faster.yaml b/configs/comparison/unet/ffhq_faster.yaml
@@ -1,5 +1,5 @@
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: theory
 

diff --git a/configs/image/imagenet_256/mdt/baseline.yaml b/configs/image/imagenet_256/mdt/baseline.yaml
@@ -1,5 +1,5 @@
 experiment_dir: outputs/mdt/base
 
 diffusion:
-  _target_: speedit.diffusion.mask_iddpm.MASK_IDDPM
+  _target_: speed.diffusion.mask_iddpm.MASK_IDDPM
   timestep_respacing: ""
diff --git a/configs/image/imagenet_256/mdt/faster.yaml b/configs/image/imagenet_256/mdt/faster.yaml
@@ -1,5 +1,5 @@
 experiment_dir: outputs/mdt/faster
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_Mask_IDDPM
+  _target_: speed.diffusion.speed.Speed_Mask_IDDPM
   timestep_respacing: ""
diff --git a/configs/image/text2img/mscoco_base.yaml b/configs/image/text2img/mscoco_base.yaml
@@ -1,5 +1,5 @@
 experiment_dir: outputs/mscoco/base
 
 diffusion:
-  _target_: speedit.diffusion.iddpm.IDDPM
+  _target_: speed.diffusion.iddpm.IDDPM
   timestep_respacing: ""
diff --git a/configs/image/text2img/mscoco_faster.yaml b/configs/image/text2img/mscoco_faster.yaml
@@ -1,7 +1,7 @@
 experiment_dir: outputs/mscoco/faster
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: ours
   sampling: ours

diff --git a/configs/maskdit/faster.yaml b/configs/maskdit/faster.yaml
@@ -1,5 +1,5 @@
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: ours
   sampling: ours

diff --git a/configs/maskdit/unet_base.yaml b/configs/maskdit/unet_base.yaml
@@ -1,5 +1,5 @@
 model:
-  _target_: speedit.networks.unet.create_unet_model
+  _target_: speed.networks.unet.create_unet_model
   input_size: 32
   num_channels: 128
   num_res_blocks: 3

diff --git a/configs/maskdit/unet_faster.yaml b/configs/maskdit/unet_faster.yaml
@@ -1,5 +1,5 @@
 model:
-  _target_: speedit.networks.unet.create_unet_model
+  _target_: speed.networks.unet.create_unet_model
   input_size: 32
   num_channels: 128
   num_res_blocks: 3
@@ -8,7 +8,7 @@ model:
 
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: ours
   sampling: ours

diff --git a/configs/text_to_image/faster.yaml b/configs/text_to_image/faster.yaml
@@ -1,7 +1,7 @@
 experiment_dir: outputs/mscoco/faster
 
 diffusion:
-  _target_: speedit.diffusion.speed.Speed_IDDPM
+  _target_: speed.diffusion.speed.Speed_IDDPM
   timestep_respacing: ""
   weighting: ours
   sampling: ours

diff --git a/docs/For_your_convenience_to_use_SpeeDiT.md b/docs/For_your_convenience_to_use_SpeeDiT.md
@@ -1,3 +1,3 @@
-# For your convenience to use SpeeDiT
+# For your convenience to use speed
 
 We will update it after ICML rebuttal. Hope all guys can make a successful rebuttal!
diff --git a/evaluations/README.md b/evaluations/README.md
@@ -6,13 +6,13 @@
 
 The metrics include FID, sFID, Precision, Recall, and Inception Score. Our calculation based on  [ADM's script](https://github.com/openai/guided-diffusion/tree/main/evaluations) which is based on Tensorflow.
 
-You can use script in  [SpeeDiT/evaluations/image](https://github.com/1zeryu/SpeeDiT/tree/master/evaluations/image)
+You can use script in  [speed/evaluations/image](https://github.com/1zeryu/speed/tree/master/evaluations/image)
 
 ```bash
 python evaluations/image/evaluator.py ref_npz_file sample_npz_file
 ```
 
- You can get more details about **reference file**  and **ADM's evaluation** in  [SpeeDiT/evaluations/image/ADM.md](https://github.com/1zeryu/SpeeDiT/blob/master/evaluations/image/ADM.md).
+ You can get more details about **reference file**  and **ADM's evaluation** in  [speed/evaluations/image/ADM.md](https://github.com/1zeryu/speed/blob/master/evaluations/image/ADM.md).
 
 * Pytorch
 

diff --git a/outputs/celeba/base/train/config.yaml b/outputs/celeba/base/train/config.yaml
@@ -0,0 +1,50 @@
+seed: 0
+experiment_dir: outputs/celeba/base
+experiment_name: unconditional
+ckpt_path: null
+resume_training: null
+ckpt_every: 50000
+log_every: 100
+enable_tensorboard_log: true
+enable_wandb_log: true
+wandb_api_key: d72b5534e4e1c99522d1b8b106cb7b65ea764e59
+wandb:
+  _target_: wandb.init
+  project: diffusion-acceleration
+  name: outputs/celeba/base
+enable_sample_log: false
+sample_log_every: 100
+allow_tf32: true
+image_size: 256
+optimizer:
+  _target_: torch.optim.AdamW
+  lr: 0.0001
+  weight_decay: 0
+vae:
+  _target_: diffusers.models.AutoencoderKL.from_pretrained
+  pretrained_model_name_or_path: transformers/sd-vae-ft-ema
+data:
+  dataset:
+    _target_: speed.dataset.image.image_dataset
+    image_size: 256
+    class_cond: false
+    root: ~/big_space/SamJ/data/Celeb-A/Img/img_align_celeba
+  batch_size: 32
+  num_workers: 4
+model:
+  _target_: speed.networks.dit.DiT_XL_2
+  condition: none
+sample:
+  diffusion:
+    timestep_respacing: '250'
+inference:
+  diffusion:
+    timestep_respacing: '250'
+  per_proc_batch_size: 32
+  num_samples: 10000
+epoch: 200000
+max_training_steps: 200000
+diffusion:
+  _target_: speed.diffusion.iddpm.IDDPM
+  timestep_respacing: ''
+phase: train