Interface for data mode

zqiao11 · Nov 18, 2024 · 6f65513 · 6f65513
1 parent 3bca23c
commit 6f65513
Show file tree

Hide file tree

Showing 44 changed files with 234 additions and 84 deletions.
diff --git a/cli/conf/lsf-setup/lsf/finetune/data/electricity.yaml b/cli/conf/lsf-setup/lsf/finetune/data/electricity.yaml
@@ -4,3 +4,4 @@ train_length: 18412
 prediction_length: ???
 context_length: ???
 patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/lsf/finetune/data/etth1.yaml b/cli/conf/lsf-setup/lsf/finetune/data/etth1.yaml
@@ -3,4 +3,5 @@ dataset: ETTh1
 train_length: 8640
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/lsf/finetune/data/etth2.yaml b/cli/conf/lsf-setup/lsf/finetune/data/etth2.yaml
@@ -3,4 +3,5 @@ dataset: ETTh2
 train_length: 8640
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/lsf/finetune/data/ettm1.yaml b/cli/conf/lsf-setup/lsf/finetune/data/ettm1.yaml
@@ -3,4 +3,5 @@ dataset: ETTm1
 train_length: 34560
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/lsf/finetune/data/ettm2.yaml b/cli/conf/lsf-setup/lsf/finetune/data/ettm2.yaml
@@ -4,3 +4,4 @@ train_length: 34560
 prediction_length: ???
 context_length: ???
 patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/lsf/finetune/data/weather.yaml b/cli/conf/lsf-setup/lsf/finetune/data/weather.yaml
@@ -4,3 +4,4 @@ train_length: 36887
 prediction_length: ???
 context_length: ???
 patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/lsf/finetune/default.yaml b/cli/conf/lsf-setup/lsf/finetune/default.yaml
@@ -1,6 +1,6 @@
 hydra:
   run:
-    dir: outputs/lsf-setup/lsf/finetune/${hydra:runtime.choices.model}/${exp_name}/${model.finetune_pattern}/${hydra:runtime.choices.data}/${run_name}
+    dir: outputs/lsf-setup/lsf/finetune/${hydra:runtime.choices.model}/${exp_name}/${model.finetune_pattern}/${hydra:runtime.choices.data}/${data.mode}/${run_name}
 defaults:
   - model: ???
   - data: ???

diff --git a/cli/conf/lsf-setup/lsf/finetune/val_data/electricity.yaml b/cli/conf/lsf-setup/lsf/finetune/val_data/electricity.yaml
@@ -4,4 +4,5 @@ offset: 18412 # Same as _lsf_dataset.py
 eval_length: 2630 # Same as _lsf_dataset.py, test_length=5260
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/lsf/finetune/val_data/etth1.yaml b/cli/conf/lsf-setup/lsf/finetune/val_data/etth1.yaml
@@ -4,4 +4,5 @@ offset: 8640
 eval_length: 2880
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/lsf/finetune/val_data/etth2.yaml b/cli/conf/lsf-setup/lsf/finetune/val_data/etth2.yaml
@@ -4,4 +4,5 @@ offset: 8640  # Same as _lsf_dataset.py
 eval_length: 2880  # Same as _lsf_dataset.py
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/lsf/finetune/val_data/ettm1.yaml b/cli/conf/lsf-setup/lsf/finetune/val_data/ettm1.yaml
@@ -4,4 +4,5 @@ offset: 34560  # Same as _lsf_dataset.py
 eval_length: 11520  # Same as _lsf_dataset.py
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/lsf/finetune/val_data/ettm2.yaml b/cli/conf/lsf-setup/lsf/finetune/val_data/ettm2.yaml
@@ -4,4 +4,5 @@ offset: 34560  # Same as _lsf_dataset.py
 eval_length: 11520  # Same as _lsf_dataset.py
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/lsf/finetune/val_data/weather.yaml b/cli/conf/lsf-setup/lsf/finetune/val_data/weather.yaml
@@ -4,4 +4,5 @@ offset: 36887 # Same as _lsf_dataset.py
 eval_length: 5269 # Same as _lsf_dataset.py; test_length=10539
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/multi_scale/eval/model/moirai_1.0_R_small.yaml b/cli/conf/lsf-setup/multi_scale/eval/model/moirai_1.0_R_small.yaml
@@ -5,4 +5,4 @@ module:
 num_samples: 100
 patch_size: ???
 context_length: ???
-num_new_scales: 2
+num_new_scales: 3
diff --git a/cli/conf/lsf-setup/multi_scale/eval/model/moirai_1.1_R_small.yaml b/cli/conf/lsf-setup/multi_scale/eval/model/moirai_1.1_R_small.yaml
@@ -5,4 +5,4 @@ module:
 num_samples: 100
 patch_size: ???
 context_length: ???
-num_new_scales: 2
+num_new_scales: 3
diff --git a/cli/conf/lsf-setup/multi_scale/finetune/data/electricity.yaml b/cli/conf/lsf-setup/multi_scale/finetune/data/electricity.yaml
@@ -4,3 +4,4 @@ train_length: 18412
 prediction_length: ???
 context_length: ???
 patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/multi_scale/finetune/data/etth1.yaml b/cli/conf/lsf-setup/multi_scale/finetune/data/etth1.yaml
@@ -3,4 +3,5 @@ dataset: ETTh1
 train_length: 8640
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/multi_scale/finetune/data/etth2.yaml b/cli/conf/lsf-setup/multi_scale/finetune/data/etth2.yaml
@@ -3,4 +3,5 @@ dataset: ETTh2
 train_length: 8640
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/multi_scale/finetune/data/ettm1.yaml b/cli/conf/lsf-setup/multi_scale/finetune/data/ettm1.yaml
@@ -3,4 +3,5 @@ dataset: ETTm1
 train_length: 34560
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/multi_scale/finetune/data/ettm2.yaml b/cli/conf/lsf-setup/multi_scale/finetune/data/ettm2.yaml
@@ -4,3 +4,4 @@ train_length: 34560
 prediction_length: ???
 context_length: ???
 patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/multi_scale/finetune/data/weather.yaml b/cli/conf/lsf-setup/multi_scale/finetune/data/weather.yaml
@@ -4,3 +4,4 @@ train_length: 36887
 prediction_length: ???
 context_length: ???
 patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/multi_scale/finetune/default.yaml b/cli/conf/lsf-setup/multi_scale/finetune/default.yaml
@@ -1,6 +1,6 @@
 hydra:
   run:
-    dir: outputs/lsf-setup/multi_scale/finetune/${hydra:runtime.choices.model}/${exp_name}/${model.finetune_pattern}/${hydra:runtime.choices.data}/${run_name}
+    dir: outputs/lsf-setup/multi_scale/finetune/${hydra:runtime.choices.model}/${exp_name}/${model.finetune_pattern}/${hydra:runtime.choices.data}/${data.mode}/${run_name}
 defaults:
   - model: ???
   - data: ???
@@ -40,7 +40,11 @@ trainer:
       mode: min
       strict: false
       verbose: true
-#      warmup_steps: 1
+      #      warmup_steps: 1
+    - _target_: lightning.pytorch.callbacks.ModelCheckpoint
+      dirpath: ${hydra:runtime.output_dir}/checkpoints
+      save_last: true
+      save_weights_only: true
   max_epochs: 1000
   enable_progress_bar: true
   accumulate_grad_batches: 1

diff --git a/cli/conf/lsf-setup/multi_scale/finetune/val_data/electricity.yaml b/cli/conf/lsf-setup/multi_scale/finetune/val_data/electricity.yaml
@@ -4,4 +4,5 @@ offset: 18412 # Same as _lsf_dataset.py
 eval_length: 2630 # Same as _lsf_dataset.py, test_length=5260
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/multi_scale/finetune/val_data/etth1.yaml b/cli/conf/lsf-setup/multi_scale/finetune/val_data/etth1.yaml
@@ -4,4 +4,5 @@ offset: 8640
 eval_length: 2880
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/multi_scale/finetune/val_data/etth2.yaml b/cli/conf/lsf-setup/multi_scale/finetune/val_data/etth2.yaml
@@ -4,4 +4,5 @@ offset: 8640  # Same as _lsf_dataset.py
 eval_length: 2880  # Same as _lsf_dataset.py
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/multi_scale/finetune/val_data/ettm1.yaml b/cli/conf/lsf-setup/multi_scale/finetune/val_data/ettm1.yaml
@@ -4,4 +4,5 @@ offset: 34560  # Same as _lsf_dataset.py
 eval_length: 11520  # Same as _lsf_dataset.py
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/multi_scale/finetune/val_data/ettm2.yaml b/cli/conf/lsf-setup/multi_scale/finetune/val_data/ettm2.yaml
@@ -4,4 +4,5 @@ offset: 34560  # Same as _lsf_dataset.py
 eval_length: 11520  # Same as _lsf_dataset.py
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/cli/conf/lsf-setup/multi_scale/finetune/val_data/weather.yaml b/cli/conf/lsf-setup/multi_scale/finetune/val_data/weather.yaml
@@ -4,4 +4,5 @@ offset: 36887 # Same as _lsf_dataset.py
 eval_length: 5269 # Same as _lsf_dataset.py; test_length=10539
 prediction_length: ???
 context_length: ???
-patch_size: ???
+patch_size: ???
+mode: ???
diff --git a/project/lsf-setup/build_lsf_ft_datasets.sh b/project/lsf-setup/build_lsf_ft_datasets.sh
@@ -3,7 +3,7 @@ set -a
 source .env
 set +a
 
-ds_type="wide"  # "wide_multivariate"
+ds_type="wide_multivariate"  # "wide_multivariate"
 path_prefix=$LSF_PATH
 
 for data in ETTh1 ETTh2; do

diff --git a/project/lsf-setup/lsf/finetune/small/electricity.sh b/project/lsf-setup/lsf/finetune/small/electricity.sh
@@ -8,6 +8,7 @@ exp_name=lsf
 data=electricity
 cl=5000
 ps=64
+mode=S
 ft_pattern=full
 
 
@@ -25,9 +26,11 @@ for pl in 96 192 336 720; do
   data.patch_size=${ps} \
   data.context_length=$cl \
   data.prediction_length=$pl \
+  data.mode=${mode} \
   val_data=${data} \
   val_data.patch_size=${ps} \
   val_data.context_length=$cl \
   val_data.prediction_length=$pl \
+  val_data.mode=${mode} \
   model.lr=5e-6
 done
diff --git a/project/lsf-setup/lsf/finetune/small/etth1.sh b/project/lsf-setup/lsf/finetune/small/etth1.sh
@@ -8,6 +8,7 @@ exp_name=lsf
 data=etth1
 cl=5000
 ps=64
+mode=M
 ft_pattern=full
 
 
@@ -25,8 +26,10 @@ for pl in 96 192 336 720; do
   data.patch_size=${ps} \
   data.context_length=$cl \
   data.prediction_length=$pl \
+  data.mode=${mode} \
   val_data=${data} \
   val_data.patch_size=${ps} \
   val_data.context_length=$cl \
-  val_data.prediction_length=$pl
+  val_data.prediction_length=$pl \
+  val_data.mode=${mode}
 done
diff --git a/project/lsf-setup/lsf/finetune/small/etth2.sh b/project/lsf-setup/lsf/finetune/small/etth2.sh
@@ -8,6 +8,7 @@ exp_name=lsf
 data=etth2
 cl=3000
 ps=64
+mode=M
 ft_pattern=full
 
 
@@ -25,8 +26,10 @@ for pl in 96 192 336 720; do
   data.patch_size=${ps} \
   data.context_length=$cl \
   data.prediction_length=$pl \
+  data.mode=${mode} \
   val_data=${data} \
   val_data.patch_size=${ps} \
   val_data.context_length=$cl \
-  val_data.prediction_length=$pl
+  val_data.prediction_length=$pl \
+  val_data.mode=${mode}
 done
diff --git a/project/lsf-setup/lsf/finetune/small/ettm1.sh b/project/lsf-setup/lsf/finetune/small/ettm1.sh
@@ -8,6 +8,7 @@ exp_name=lsf
 data=ettm1
 cl=4000
 ps=128
+mode=S
 ft_pattern=full
 
 
@@ -25,8 +26,10 @@ for pl in 96 192 336 720; do
   data.patch_size=${ps} \
   data.context_length=$cl \
   data.prediction_length=$pl \
+  data.mode=${mode} \
   val_data=${data} \
   val_data.patch_size=${ps} \
   val_data.context_length=$cl \
-  val_data.prediction_length=$pl
+  val_data.prediction_length=$pl \
+  val_data.mode=${mode}
 done
diff --git a/project/lsf-setup/lsf/finetune/small/ettm2.sh b/project/lsf-setup/lsf/finetune/small/ettm2.sh
@@ -8,6 +8,7 @@ exp_name=lsf
 data=ettm2
 cl=3000
 ps=64
+mode=S
 ft_pattern=full
 
 
@@ -25,8 +26,10 @@ for pl in 96 192 336 720; do
   data.patch_size=${ps} \
   data.context_length=$cl \
   data.prediction_length=$pl \
+  data.mode=${mode} \
   val_data=${data} \
   val_data.patch_size=${ps} \
   val_data.context_length=$cl \
-  val_data.prediction_length=$pl
+  val_data.prediction_length=$pl \
+  val_data.mode=${mode}
 done
diff --git a/project/lsf-setup/lsf/finetune/small/weather.sh b/project/lsf-setup/lsf/finetune/small/weather.sh
@@ -8,6 +8,7 @@ exp_name=lsf
 data=weather
 cl=2000
 ps=128
+mode=M
 ft_pattern=full
 
 
@@ -25,8 +26,10 @@ for pl in 96 192 336 720; do
   data.patch_size=${ps} \
   data.context_length=$cl \
   data.prediction_length=$pl \
+  data.mode=${mode} \
   val_data=${data} \
   val_data.patch_size=${ps} \
   val_data.context_length=$cl \
-  val_data.prediction_length=$pl
+  val_data.prediction_length=$pl \
+  val_data.mode=${mode}
 done
diff --git a/project/lsf-setup/multi_scale/finetune/small/electricity.sh b/project/lsf-setup/multi_scale/finetune/small/electricity.sh
@@ -8,6 +8,7 @@ exp_name=lsf
 data=electricity
 cl=5000
 ps=64
+mode=S
 ft_pattern=full
 
 
@@ -25,9 +26,11 @@ for pl in 96 192 336 720; do
   data.patch_size=${ps} \
   data.context_length=$cl \
   data.prediction_length=$pl \
+  data.mode=${mode} \
   val_data=${data} \
   val_data.patch_size=${ps} \
   val_data.context_length=$cl \
   val_data.prediction_length=$pl \
+  val_data.mode=${mode} \
   model.lr=5e-6
 done