From ff4b9ac4925ed7f29ba8aee0345f2d87a073bae4 Mon Sep 17 00:00:00 2001
From: JonathanCrabbe <jonathan.cr1302@gmail.com>
Date: Tue, 19 Dec 2023 17:18:49 +0000
Subject: [PATCH] Move properties specific to score module

---
 cmd/conf/score_model/default.yaml               | 6 ++----
 cmd/conf/score_model/noise_scheduler/vesde.yaml | 4 ++--
 cmd/conf/score_model/noise_scheduler/vpsde.yaml | 2 +-
 cmd/conf/train.yaml                             | 2 --
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/cmd/conf/score_model/default.yaml b/cmd/conf/score_model/default.yaml
index 1ee8ceb..53c41c2 100644
--- a/cmd/conf/score_model/default.yaml
+++ b/cmd/conf/score_model/default.yaml
@@ -4,10 +4,8 @@ d_model: 72
 num_layers: 10
 n_head: 12
 lr_max: 1.0e-3
-fourier_noise_scaling: ${fourier_noise_scaling}
-likelihood_weighting: ${likelihood_weighting}
-
+fourier_noise_scaling: False
+likelihood_weighting: False
 
 defaults:
   - noise_scheduler: vpsde
-  
diff --git a/cmd/conf/score_model/noise_scheduler/vesde.yaml b/cmd/conf/score_model/noise_scheduler/vesde.yaml
index 12fddf4..2bd84d6 100644
--- a/cmd/conf/score_model/noise_scheduler/vesde.yaml
+++ b/cmd/conf/score_model/noise_scheduler/vesde.yaml
@@ -1,5 +1,5 @@
 _target_: fdiff.schedulers.vesde_scheduler.VEScheduler
 eps: 1e-5
-sigma_min: 0.01 
+sigma_min: 0.01
 sigma_max: 2
-fourier_noise_scaling: ${fourier_noise_scaling}
+fourier_noise_scaling: ${score_model.fourier_noise_scaling}
diff --git a/cmd/conf/score_model/noise_scheduler/vpsde.yaml b/cmd/conf/score_model/noise_scheduler/vpsde.yaml
index 9be98dd..7f10ad2 100644
--- a/cmd/conf/score_model/noise_scheduler/vpsde.yaml
+++ b/cmd/conf/score_model/noise_scheduler/vpsde.yaml
@@ -2,4 +2,4 @@ _target_: fdiff.schedulers.vpsde_scheduler.VPScheduler
 eps: 1e-5
 beta_min: 0.1
 beta_max: 20
-fourier_noise_scaling: ${fourier_noise_scaling}
+fourier_noise_scaling: ${score_model.fourier_noise_scaling}
diff --git a/cmd/conf/train.yaml b/cmd/conf/train.yaml
index 5d71fcc..bd8c946 100644
--- a/cmd/conf/train.yaml
+++ b/cmd/conf/train.yaml
@@ -1,7 +1,5 @@
 random_seed: 42
 fourier_transform: True
-fourier_noise_scaling: False
-likelihood_weighting: False 
 standardize: True
 
 defaults: