Merge pull request #20 from aai-institute/cleanup

General cleanup and refactoring
aai-institute · Sep 22, 2023 · 3e89bec · 3e89bec
2 parents 33f7825 + 7895e4f
commit 3e89bec
Show file tree

Hide file tree

Showing 26 changed files with 166 additions and 1,923 deletions.
diff --git a/experiments/cfair/config.yaml b/experiments/cfair/config.yaml
@@ -1,11 +1,11 @@
 ---
 experiment:
-  __class__experiment_type: laplace_flows.experiments.predefined.ExperimentCollection
+  __class__experiment_type: laplace_flows.experiments.base.ExperimentCollection
   experiment_params:
     name: cfair_basedist_comparison
     experiments:
       - experiment:
-          __class__experiment_type: laplace_flows.experiments.predefined.HyperoptExperiment
+          __class__experiment_type: laplace_flows.experiments.hyperopt.HyperoptExperiment
           experiment_params:
             name: normal
             __class__scheduler: &scheduler ray.tune.schedulers.ASHAScheduler
@@ -38,7 +38,7 @@ experiment:
                 __tune__nonlinearity: &nonlinearity choice([torch.nn.ReLU(), torch.nn.Softplus(), torch.nn.Sigmoid()])
                 base_distribution: Normal
       - experiment:
-          __class__experiment_type: laplace_flows.experiments.predefined.HyperoptExperiment
+          __class__experiment_type: laplace_flows.experiments.hyperopt.HyperoptExperiment
           experiment_params:
             name: laplace
             __class__scheduler: *scheduler

diff --git a/experiments/digits/config.yaml b/experiments/digits/config.yaml
@@ -1,11 +1,11 @@
 ---
 experiment:
-  __class__experiment_type: laplace_flows.experiments.predefined.ExperimentCollection
+  __class__experiment_type: laplace_flows.experiments.base.ExperimentCollection
   experiment_params:
     name: digits_basedist_comparison
     experiments:
       - experiment:
-          __class__experiment_type: laplace_flows.experiments.predefined.HyperoptExperiment
+          __class__experiment_type: laplace_flows.experiments.hyperopt.HyperoptExperiment
           experiment_params:
             name: digits_laplace
             __class__scheduler: &scheduler ray.tune.schedulers.ASHAScheduler
@@ -38,7 +38,7 @@ experiment:
                 __tune__nonlinearity: &nonlinearity choice([torch.nn.ReLU(), torch.nn.Softplus(), torch.nn.Sigmoid()])
                 base_distribution: Laplace
       - experiment:
-          __class__experiment_type: laplace_flows.experiments.predefined.HyperoptExperiment
+          __class__experiment_type: laplace_flows.experiments.hyperopt.HyperoptExperiment
           experiment_params:
             name: digits_normal
             __class__scheduler: *scheduler

diff --git a/experiments/fashion/config.yaml b/experiments/fashion/config.yaml
@@ -1,9 +1,9 @@
 ---
-__object__: laplace_flows.experiments.predefined.ExperimentCollection
+__object__: laplace_flows.experiments.base.ExperimentCollection
 name: fashion_basedist_comparison
 experiments:
     - &exp_laplace
-      __object__: laplace_flows.experiments.predefined.HyperoptExperiment
+      __object__: laplace_flows.experiments.hyperopt.HyperoptExperiment
       name: mnist_laplace
       scheduler: &scheduler 
         __object__: ray.tune.schedulers.ASHAScheduler

diff --git a/experiments/mnist/config.yaml b/experiments/mnist/config.yaml
@@ -1,9 +1,9 @@
 ---
-__object__: veriflow.experiments.predefined.ExperimentCollection
+__object__: veriflow.experiments.base.ExperimentCollection
 name: mnist_basedist_comparison
 experiments:
     - &exp_laplace
-      __object__: veriflow.experiments.predefined.HyperoptExperiment
+      __object__: veriflow.experiments.hyperopt.HyperoptExperiment
       name: mnist_laplace
       scheduler: &scheduler 
         __object__: ray.tune.schedulers.ASHAScheduler

diff --git a/experiments/mnist/config_best.yaml b/experiments/mnist/config_best.yaml
@@ -1,9 +1,9 @@
 ---
-__object__: laplace_flows.experiments.predefined.ExperimentCollection
+__object__: laplace_flows.experiments.base.ExperimentCollection
 name: mnist_basedist_comparison
 experiments:
     - &exp_laplace_best
-      __object__: laplace_flows.experiments.predefined.HyperoptExperiment
+      __object__: laplace_flows.experiments.hyperopt.HyperoptExperiment
       name: mnist_normal_best
       scheduler: &scheduler 
         __object__: ray.tune.schedulers.ASHAScheduler

diff --git a/experiments/mnist/config_lu.yaml b/experiments/mnist/config_lu.yaml
@@ -1,9 +1,9 @@
 ---
-__object__: veriflow.experiments.predefined.ExperimentCollection
+__object__: veriflow.experiments.baseExperimentCollection
 name: mnist_basedist_comparison
 experiments:
     - &exp_laplace
-      __object__: veriflow.experiments.predefined.HyperoptExperiment
+      __object__: veriflow.experiments.hyperopt.HyperoptExperiment
       name: mnist_laplace
       scheduler: &scheduler 
         __object__: ray.tune.schedulers.ASHAScheduler

diff --git a/experiments/synthetic/config.yaml b/experiments/synthetic/config.yaml
@@ -1,9 +1,9 @@
 ---
-__object__: laplace_flows.experiments.predefined.ExperimentCollection
+__object__: laplace_flows.experiments.base.ExperimentCollection
 name: mnist_basedist_comparison
 experiments:
     - &main
-      __object__:  laplace_flows.experiments.predefined.HyperoptExperiment
+      __object__:  laplace_flows.experiments.hyperopt.HyperoptExperiment
       name: normal_moons
       scheduler: &scheduler 
         __object__: ray.tune.schedulers.ASHAScheduler