Versioned configs (#209)

cswinter · web-flow · commit 19cdebb27924 · 2022-03-30T02:04:40.000Z
diff --git a/configs/entity-gym/cherry_pick.ron b/configs/entity-gym/cherry_pick.ron
@@ -1,5 +1,6 @@
 // Achieves > 0.99 mean episodic return most of the time: https://wandb.ai/entity-neural-network/enn-ppo/reports/CherryPick--VmlldzoxNjI3MzA0
 ExperimentConfig(
+    version: 0,
     env: (
         id: "CherryPick",
         kwargs: "{\"num_cherries\": 32}",
diff --git a/configs/entity-gym/count.ron b/configs/entity-gym/count.ron
@@ -1,5 +1,6 @@
 // Achieves episodic return of 1.0: https://wandb.ai/entity-neural-network/enn-ppo/reports/Count--VmlldzoxNjI2OTI4
 ExperimentConfig(
+    version: 0,
     env: (
         id: "Count",
         kwargs: "{\"masked_choices\": 2}"
diff --git a/configs/entity-gym/floor_is_lava.ron b/configs/entity-gym/floor_is_lava.ron
@@ -1,5 +1,6 @@
 // Achieves > 0.99 episodic return: https://wandb.ai/entity-neural-network/enn-ppo/reports/FloorIsLava--VmlldzoxNjM3OTU3
 ExperimentConfig(
+    version: 0,
     env: (
         id: "FloorIsLava",
     ),
diff --git a/configs/entity-gym/minefield-relattn1.ron b/configs/entity-gym/minefield-relattn1.ron
@@ -1,5 +1,6 @@
 // Achieves > 0.99 episodic return: https://wandb.ai/entity-neural-network/enn-ppo/reports/Minefield-Baselines--VmlldzoxNzAyOTE2
 ExperimentConfig(
+    version: 0,
     env: (
         id: "Minefield",
         kwargs: "{\"max_mines\": 10}"
diff --git a/configs/entity-gym/minefield-relattn2.ron b/configs/entity-gym/minefield-relattn2.ron
@@ -1,5 +1,6 @@
 // Achieves > 0.99 episodic return: https://wandb.ai/entity-neural-network/enn-ppo/reports/Minefield-Baselines--VmlldzoxNzAyOTE2
 ExperimentConfig(
+    version: 0,
     env: (
         id: "Minefield",
         kwargs: "{\"max_mines\": 10}"
diff --git a/configs/entity-gym/minefield.ron b/configs/entity-gym/minefield.ron
@@ -1,5 +1,6 @@
 // Achieves > 0.99 episodic return: https://wandb.ai/entity-neural-network/enn-ppo/reports/Minefield-Baselines--VmlldzoxNzAyOTE2
 ExperimentConfig(
+    version: 0,
     env: (
         id: "Minefield",
         kwargs: "{\"max_mines\": 10}"
diff --git a/configs/entity-gym/move_to_origin.ron b/configs/entity-gym/move_to_origin.ron
@@ -1,5 +1,6 @@
 // Achieves 0.99 mean episodic return most of the time: https://wandb.ai/entity-neural-network/enn-ppo/reports/MoveToOrigin--VmlldzoxNjI3MzA5
 ExperimentConfig(
+    version: 0,
     env: (
         id: "MoveToOrigin",
     ),
diff --git a/configs/entity-gym/multi_armed_bandit.ron b/configs/entity-gym/multi_armed_bandit.ron
@@ -1,5 +1,6 @@
 // Achieves episodic return of 1.0: https://wandb.ai/entity-neural-network/enn-ppo/reports/MultiArmedBandit--VmlldzoxNjI3MDY4 https://wandb.ai/entity-neural-network/enn-ppo/reports/MultiArmedBandit--VmlldzoxNjIxMDYw
 ExperimentConfig(
+    version: 0,
     env: (
         id: "MultiArmedBandit",
     ),
diff --git a/configs/entity-gym/multisnake_1snakes11len.ron b/configs/entity-gym/multisnake_1snakes11len.ron
@@ -1,5 +1,6 @@
 // Achieves > 0.99 episodic return: https://wandb.ai/entity-neural-network/enn-ppo/reports/MultiSnake--VmlldzoxNjM3OTYz
 ExperimentConfig(
+    version: 0,
     env: (
         id: "MultiSnake",
         kwargs: "{\"num_snakes\": 1, \"max_snake_length\": 11}",
diff --git a/configs/entity-gym/not_hotdog.ron b/configs/entity-gym/not_hotdog.ron
@@ -1,5 +1,6 @@
 // Achieves episodic return of 1.0: https://wandb.ai/entity-neural-network/enn-ppo/reports/NotHotdog--VmlldzoxNjI3MDcz
 ExperimentConfig(
+    version: 0,
     env: (
         id: "NotHotdog",
     ),
diff --git a/configs/entity-gym/pick_matching_balls.ron b/configs/entity-gym/pick_matching_balls.ron
@@ -1,5 +1,6 @@
 // Achieves > 0.995 mean episodic return: https://wandb.ai/entity-neural-network/enn-ppo/reports/PickMatchingBalls--VmlldzoxNjIxMjQ5
 ExperimentConfig(
+    version: 0,
     env: (
         id: "PickMatchingBalls",
         kwargs: "{\"max_balls\": 32, \"one_hot\": true, \"randomize\": true}",
diff --git a/configs/entity-gym/rock_paper_scissors.ron b/configs/entity-gym/rock_paper_scissors.ron
@@ -1,4 +1,5 @@
 ExperimentConfig(
+    version: 0,
     env: (
         id: "RockPaperScissors",
     ),
diff --git a/configs/entity-gym/xor.ron b/configs/entity-gym/xor.ron
@@ -1,5 +1,6 @@
 // Achieves 1.0 episodic return: https://wandb.ai/entity-neural-network/enn-ppo/reports/Xor--VmlldzoxNjI2OTEz
 ExperimentConfig(
+    version: 0,
     env: (
         id: "Xor",
     ),
diff --git a/configs/procgen/bigfish.ron b/configs/procgen/bigfish.ron
@@ -1,5 +1,6 @@
 // Baselines for BigFish, BossFight, StarPilot, Leaper, Plunder on both easy and hard distribution mode: https://wandb.ai/entity-neural-network/enn-ppo/reports/Procgen-Baselines--VmlldzoxNzUxNDcy
 ExperimentConfig(
+    version: 0,
     env: (
         id: "Procgen:BigFish",
     ),
diff --git a/enn_ppo/config-schema.ron b/enn_ppo/config-schema.ron
diff --git a/enn_ppo/enn_ppo/config.py b/enn_ppo/enn_ppo/config.py
@@ -2,6 +2,8 @@
 from dataclasses import dataclass, field
 from typing import Optional
 
+import hyperstate
+
 from rogue_net.rogue_net import RogueNetConfig
 
 
@@ -126,7 +128,7 @@ class OptimizerConfig:
 
 
 @dataclass
-class TrainConfig:
+class TrainConfig(hyperstate.Versioned):
     """Experiment settings.
 
     Attributes:
@@ -172,3 +174,11 @@ class TrainConfig:
     trial: Optional[int] = None
     data_dir: str = "."
     cuda_empty_cache: bool = False
+
+    @classmethod
+    def version(clz) -> int:
+        return 0
+
+
+if __name__ == "__main__":
+    hyperstate.schema_evolution_cli(TrainConfig)
diff --git a/enn_ppo/enn_ppo/tests/test_configs.py b/enn_ppo/enn_ppo/tests/test_configs.py
@@ -2,11 +2,28 @@
 from pathlib import Path
 
 import hyperstate
+from hyperstate.schema.schema_change import Severity
+from hyperstate.schema.schema_checker import SchemaChecker
+from hyperstate.schema.types import load_schema
 
-from enn_ppo.train import TrainConfig
+from enn_ppo.config import TrainConfig
+
+
+def test_schema() -> None:
+    schema_files = Path(__file__).parent.parent.parent / "config-schema.ron"
+    path = str(schema_files)
+    print(path)
+    with open(path) as f:
+        f.read()
+    old = load_schema(path)
+    checker = SchemaChecker(old, TrainConfig)
+    if checker.severity() >= Severity.WARN:
+        checker.print_report()
+    assert checker.severity() == Severity.INFO
 
 
 def test_configs() -> None:
-    config_dir = Path(__file__).parent.parent.parent.parent / "configs/entity-gym"
-    for config_file in listdir(config_dir):
-        hyperstate.load(TrainConfig, config_dir / config_file)
+    for subdir in ["entity-gym", "procgen"]:
+        config_dir = Path(__file__).parent.parent.parent.parent / "configs" / subdir
+        for config_file in listdir(config_dir):
+            hyperstate.load(TrainConfig, config_dir / config_file)
diff --git a/enn_ppo/poetry.lock b/enn_ppo/poetry.lock
diff --git a/enn_ppo/pyproject.toml b/enn_ppo/pyproject.toml
diff --git a/enn_zoo/poetry.lock b/enn_zoo/poetry.lock
diff --git a/enn_zoo/pyproject.toml b/enn_zoo/pyproject.toml
diff --git a/poetry.lock b/poetry.lock
