Merge branch 'main' of github.com:mackelab/labproject into main

mackelab · Feb 26, 2024 · b936870 · b936870
2 parents 30f262b + 6c2df87
commit b936870
Show file tree

Hide file tree

Showing 10 changed files with 4,700 additions and 530 deletions.
diff --git a/configs/conf_embedding_samplesize.yaml b/configs/conf_embedding_samplesize.yaml
@@ -1,9 +1,10 @@
-exp_log_name: "embed_samplesize" # optional but recommended
+exp_log_name: "embeddings_samplesize" # optional but recommended
 data: ["imagenet_real_embeddings"]
 experiments: ["ScaleSampleSizeSW", "ScaleSampleSizeC2ST", "ScaleSampleSizeMMD", "ScaleSampleSizeFID",]
 n: [10000]
 d: [2048]
 augmentation: ['imagenet_uncond_embeddings']
 
 seed: 0
-runs: 5
+runs: 5
+bandwidth: 64 
diff --git a/configs/conf_scale_reduced.yaml b/configs/conf_scale_reduced.yaml
@@ -1,20 +1,24 @@
 exp_log_name: "sample_size_dimensionality" # optional but recommended
-data: ["toy_2d" , "random", "random"]
-experiments: ["ScaleSampleSizeSW", "ScaleSampleSizeC2ST",
- "ScaleSampleSizeMMD"]
-
-experiments_dim: ["ScaleDimSW", "ScaleDimC2ST", "ScaleDimMMD"]
-dim_sizes: [5, 10, 50, 100, 500, 1000]
-sample_size: [50, 100, 200, 500, 1000, 2000, 3000, 4000]
 
-n:  [10000, 10000, 10000] #[10000, 10000, 10000]
-d: [2, 10, 1000]
+# datasets to use
+data: ["toy_2d" , "random", "random"]
+augmentation: ['gauss', 'one_dim_shift', 'one_dim_shift',]
 
+# number of samples and dimensions
+n:  [10000, 10000, 10000] #samples 
+d: [2, 10, 1000] # dimensions
 
 mmd_bandwidth: [1, 5, 10]
-#mmd_bandwidth: [1, 10, 50]
-augmentation: ['gauss', 'one_dim_shift', 'one_dim_shift',]
 
+# sample size experiments
+experiments: ["ScaleSampleSizeSW", "ScaleSampleSizeC2ST","ScaleSampleSizeMMD"]
+sample_size: [50, 100, 200, 500, 1000, 2000, 3000, 4000]
+runs: 5 # number of sample selection for errorbars
+
+# dimensionality experiments
+experiments_dim: ["ScaleDimSW", "ScaleDimC2ST", "ScaleDimMMD"]
+dim_sizes: [5, 10, 50, 100, 500, 1000]
+runs_dim: 5 # number of sample selection for errorbars
+
+# seed for reproducibility
 seed: 0
-runs: 5
-runs_dim: 5
diff --git a/docs/notebooks/MMD_misspec_experiment.ipynb b/docs/notebooks/MMD_misspec_experiment.ipynb
diff --git a/docs/notebooks/embedding_sample_size.ipynb b/docs/notebooks/embedding_sample_size.ipynb
diff --git a/docs/notebooks/mode_comparison.ipynb b/docs/notebooks/mode_comparison.ipynb
diff --git a/docs/notebooks/sample_size_dim_scaling.ipynb b/docs/notebooks/sample_size_dim_scaling.ipynb