Merge pull request #40 from henryaddison/remove-old-unet-approach

Remove deterministic package
henryaddison · Oct 22, 2024 · c262366 · c262366
2 parents 4a62319 + 4df883a
commit c262366
Show file tree

Hide file tree

Showing 78 changed files with 215 additions and 1,030 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,9 +13,9 @@ repos:
     hooks:
       - id: black
         language_version: python3.9
-        exclude: ^src/ml_downscaling_emulator/score_sde_pytorch/
+        exclude: ^src/ml_downscaling_emulator/(run_lib.py|sde_lib.py|likelihood.py|sampling.py|losses.py|models|op|configs)
   - repo: https://github.com/pycqa/flake8
     rev: '6.0.0'  # pick a git hash / tag to point to
     hooks:
       - id: flake8
-        exclude: ^src/ml_downscaling_emulator/score_sde_pytorch/
+        exclude: ^src/ml_downscaling_emulator/(run_lib.py|sde_lib.py|likelihood.py|sampling.py|losses.py|models|op|configs)
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ Recommended to run with a sample of the dataset.
 Train models through `bin/main.py`, e.g. to train the model used in the paper use
 
 ```sh
-python bin/main.py --config src/ml_downscaling_emulator/score_sde_pytorch/configs/subvpsde/ukcp_local_pr_12em_cncsnpp_continuous.py --workdir ${DERIVED_DATA}/path/to/models/paper-12em --mode train
+python bin/main.py --config src/ml_downscaling_emulator/configs/subvpsde/ukcp_local_pr_12em_cncsnpp_continuous.py --workdir ${DERIVED_DATA}/path/to/models/paper-12em --mode train
 ```
 
 ```sh

diff --git a/bin/bp/queue-training b/bin/bp/queue-training
@@ -14,7 +14,7 @@ def train_cmd(sde, workdir, config, config_overrides=list):
     train_basecmd = ["python", f"bin/main.py"]
 
     train_opts = {
-        "--config": f"src/ml_downscaling_emulator/score_sde_pytorch/configs/{sde}/{config}.py",
+        "--config": f"src/ml_downscaling_emulator/configs/{sde}/{config}.py",
         "--workdir": workdir,
         "--mode": "train",
     }

diff --git a/bin/deterministic/bp/queue-sampling b/bin/deterministic/bp/queue-sampling
diff --git a/bin/deterministic/bp/queue-training b/bin/deterministic/bp/queue-training
diff --git a/bin/deterministic/bp/train-sample b/bin/deterministic/bp/train-sample
diff --git a/bin/deterministic/main.py b/bin/deterministic/main.py
diff --git a/bin/deterministic/model-size b/bin/deterministic/model-size
diff --git a/bin/main.py b/bin/main.py
@@ -16,7 +16,7 @@
 
 """Training"""
 
-import ml_downscaling_emulator.score_sde_pytorch.run_lib as run_lib
+import ml_downscaling_emulator.run_lib as run_lib
 from absl import app
 from absl import flags
 from ml_collections.config_flags import config_flags
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,7 +41,7 @@ Recommended to run with a sample of the dataset. @@
     Train models through `bin/main.py`, e.g. to train the model used in the paper use
     ```sh
-    python bin/main.py --config src/ml_downscaling_emulator/score_sde_pytorch/configs/subvpsde/ukcp_local_pr_12em_cncsnpp_continuous.py --workdir ${DERIVED_DATA}/path/to/models/paper-12em --mode train
+    python bin/main.py --config src/ml_downscaling_emulator/configs/subvpsde/ukcp_local_pr_12em_cncsnpp_continuous.py --workdir ${DERIVED_DATA}/path/to/models/paper-12em --mode train
     ```
     ```sh
@@ Expand Down @@