Update schedules and clean up configs

mackelab · May 15, 2024 · 7103022 · 7103022
1 parent 22797a9
commit 7103022
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 84 deletions.
diff --git a/conf/config.yaml b/conf/config.yaml
@@ -3,6 +3,6 @@ defaults:
   - dataset: ner
   - network: lconv_ner
   - diffusion_kernel: white_noise
-  - diffusion: diffusion_quad_500
+  - diffusion: diffusion_linear_200
   - optimizer: base_optimizer
   - classifier: no_classifier
diff --git a/conf/network/bconv_ajile.yaml b/conf/network/bconv_ajile.yaml
diff --git a/conf/network/bconv_crcns.yaml b/conf/network/bconv_crcns.yaml
diff --git a/conf/network/bconv_ner.yaml b/conf/network/bconv_ner.yaml
diff --git a/conf/network/bconv_tycho.yaml b/conf/network/bconv_tycho.yaml
diff --git a/conf/network/lconv_crcns.yaml b/conf/network/lconv_crcns.yaml
@@ -7,8 +7,8 @@ in_kernel_size: 32
 out_kernel_size: 32
 slconv_kernel_size: 64
 num_scales: 5
-decay_min: 1.0
-decay_max: 4.0
+decay_min: 2.0
+decay_max: 2.0
 heads: 3
 in_mask_mode: full
 mid_mask_mode: full

diff --git a/conf/network/lconv_gait.yaml b/conf/network/lconv_gait.yaml
diff --git a/conf/network/lconv_ner.yaml b/conf/network/lconv_ner.yaml
@@ -3,13 +3,13 @@ signal_channel: 56
 time_dim: 16
 cond_channel: 32
 hidden_channel: 16
-in_kernel_size: 65
-out_kernel_size: 65
+in_kernel_size: 1
+out_kernel_size: 1
 slconv_kernel_size: 65
 num_scales: 1
 decay_min: 2.0
 decay_max: 2.0
-heads: 3
+heads: 1
 in_mask_mode: restricted
 mid_mask_mode: off_diag_8
 out_mask_mode: restricted

diff --git a/scripts/crcns_script.sh b/scripts/crcns_script.sh
@@ -4,7 +4,7 @@ python3 ../ntd/train_diffusion_model.py \
     base.experiment=crcns_experiment \
     base.tag=lconv_wn \
     dataset=crcns \
-    diffusion=diffusion_quad_500 \
+    diffusion=diffusion_linear_200 \
     diffusion_kernel=white_noise \
     network=lconv_crcns \
     optimizer=base_optimizer \

diff --git a/scripts/ner_script.sh b/scripts/ner_script.sh
@@ -4,7 +4,7 @@ python3 ../ntd/train_diffusion_model.py \
     base.experiment=ner_experiment \
     base.tag=lconv_wn \
     dataset=ner \
-    diffusion=diffusion_linear_1000 \
+    diffusion=diffusion_linear_200 \
     diffusion_kernel=white_noise \
     network=lconv_ner \
     optimizer=base_optimizer \

diff --git a/scripts/tycho_conditional_script.sh b/scripts/tycho_conditional_script.sh
@@ -18,7 +18,7 @@ python3 ../ntd/train_diffusion_model.py \
 
 # Baseline
 python3 ../ntd/utils/classifier_utils.py \
-    base.experiment=ycho_conditional_experiment \
+    base.experiment=tycho_conditional_experiment \
     base.tag=raw_classifier \
     dataset=tycho_conditional \
     classifier=tycho_classifier

diff --git a/scripts/tycho_unconditional_script.sh b/scripts/tycho_unconditional_script.sh