Updating compatibility for Hydra 1.1 (#494)

facebookresearch · Jul 30, 2021 · 4aff7a8 · 4aff7a8
1 parent 57e6240
commit 4aff7a8
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 16 deletions.
diff --git a/...ples/parlai_chat_task_demo/conf/base.yaml → ...at_task_demo/hydra_configs/conf/base.yaml b/...ples/parlai_chat_task_demo/conf/base.yaml → ...at_task_demo/hydra_configs/conf/base.yaml
diff --git a/..._chat_task_demo/conf/custom_prebuilt.yaml → ...o/hydra_configs/conf/custom_prebuilt.yaml b/..._chat_task_demo/conf/custom_prebuilt.yaml → ...o/hydra_configs/conf/custom_prebuilt.yaml
diff --git a/...ai_chat_task_demo/conf/custom_simple.yaml → ...emo/hydra_configs/conf/custom_simple.yaml b/...ai_chat_task_demo/conf/custom_simple.yaml → ...emo/hydra_configs/conf/custom_simple.yaml
diff --git a/...s/parlai_chat_task_demo/conf/example.yaml → ...task_demo/hydra_configs/conf/example.yaml b/...s/parlai_chat_task_demo/conf/example.yaml → ...task_demo/hydra_configs/conf/example.yaml
diff --git a/...at_task_demo/conf/onboarding_example.yaml → ...ydra_configs/conf/onboarding_example.yaml b/...at_task_demo/conf/onboarding_example.yaml → ...ydra_configs/conf/onboarding_example.yaml
diff --git a/examples/parlai_chat_task_demo/parlai_test_script.py b/examples/parlai_chat_task_demo/parlai_test_script.py
@@ -51,7 +51,7 @@ class TestScriptConfig(RunScriptConfig):
 register_script_config(name="scriptconfig", module=TestScriptConfig)
 
 
-@hydra.main(config_name="scriptconfig")
+@hydra.main(config_path="hydra_configs", config_name="scriptconfig")
 def main(cfg: DictConfig) -> None:
     db, cfg = load_db_and_process_config(cfg)
 

diff --git a/...ples/simple_static_task/conf/example.yaml → ...atic_task/hydra_configs/conf/example.yaml b/...ples/simple_static_task/conf/example.yaml → ...atic_task/hydra_configs/conf/example.yaml
diff --git a/..._static_task/conf/onboarding_example.yaml → ...ydra_configs/conf/onboarding_example.yaml b/..._static_task/conf/onboarding_example.yaml → ...ydra_configs/conf/onboarding_example.yaml
diff --git a/examples/simple_static_task/static_run_with_onboarding.py b/examples/simple_static_task/static_run_with_onboarding.py
@@ -43,7 +43,7 @@ class TestScriptConfig(RunScriptConfig):
 register_script_config(name="scriptconfig", module=TestScriptConfig)
 
 
-@hydra.main(config_name="scriptconfig")
+@hydra.main(config_path="hydra_configs", config_name="scriptconfig")
 def main(cfg: DictConfig) -> None:
     correct_config_answer = cfg.correct_answer
 

diff --git a/examples/simple_static_task/static_test_script.py b/examples/simple_static_task/static_test_script.py
@@ -39,7 +39,7 @@ class TestScriptConfig(RunScriptConfig):
 register_script_config(name="scriptconfig", module=TestScriptConfig)
 
 
-@hydra.main(config_name="scriptconfig")
+@hydra.main(config_path="hydra_configs", config_name="scriptconfig")
 def main(cfg: DictConfig) -> None:
     db, cfg = load_db_and_process_config(cfg)
     operator = Operator(db)

diff --git a/examples/static_react_task/conf/example.yaml → ...eact_task/hydra_configs/conf/example.yaml b/examples/static_react_task/conf/example.yaml → ...eact_task/hydra_configs/conf/example.yaml
diff --git a/...c_react_task/conf/onboarding_example.yaml → ...ydra_configs/conf/onboarding_example.yaml b/...c_react_task/conf/onboarding_example.yaml → ...ydra_configs/conf/onboarding_example.yaml
diff --git a/examples/static_react_task/run_task.py b/examples/static_react_task/run_task.py
@@ -71,7 +71,7 @@ def build_task(task_dir):
     os.chdir(return_dir)
 
 
-@hydra.main(config_name="scriptconfig")
+@hydra.main(config_path="hydra_configs", config_name="scriptconfig")
 def main(cfg: DictConfig) -> None:
     task_dir = cfg.task_dir
 

diff --git a/mephisto/operations/hydra_config.py b/mephisto/operations/hydra_config.py
@@ -23,9 +23,9 @@ class DatabaseArgs:
 
 @dataclass
 class MephistoConfig:
-    blueprint: BlueprintArgs = BlueprintArgs()
-    provider: ProviderArgs = ProviderArgs()
-    architect: ArchitectArgs = ArchitectArgs()
+    blueprint: BlueprintArgs = MISSING
+    provider: ProviderArgs = MISSING
+    architect: ArchitectArgs = MISSING
     task: TaskConfigArgs = TaskConfigArgs()
     database: DatabaseArgs = DatabaseArgs()
     log_level: str = "info"
@@ -38,7 +38,9 @@ class RunScriptConfig:
 
 def register_abstraction_config(name: str, node: Any, abstraction_type: str):
     config.store(
-        name=name, node=node, group=f"mephisto/{abstraction_type}", package="_group_"
+        name=name,
+        node=node,
+        group=f"mephisto/{abstraction_type}",
     )
 
 
@@ -50,7 +52,6 @@ def initialize_named_configs():
         name="base_mephisto_config",
         node=MephistoConfig,
         group="mephisto",
-        package="_group_",
     )
 
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -19,7 +19,7 @@ torch = {version = "^1.4.0", optional = true }
 pyyaml = {version = "^5.3", optional = true }
 gevent-websocket = "^0.10.1"
 tabulate = "^0.8.7"
-hydra-core = "^1.0.0"
+hydra-core = "^1.1.0"
 tqdm = "^4.50.2"
 xmltodict = "^0.12.0"
 

diff --git a/requirements.txt b/requirements.txt
@@ -178,12 +178,12 @@ PyYAML==5.4.1 \
     --hash=sha256:fd7f6999a8070df521b6384004ef42833b9bd62cfee11a09bda1079b4b704247 \
     --hash=sha256:fdc842473cd33f45ff6bce46aea678a54e3d21f1b61a7750ce3c498eedfe25d6 \
     --hash=sha256:fe69978f3f768926cfa37b867e3843918e012cf83f680806599ddce33c2c68b0
-hydra-core==1.0.0 \
-    --hash=sha256:a1c513768fc3271aca0759023d680b19df31bb44442b508d64c77d07438def29 \
-    --hash=sha256:ea8dad523fced49b88f3472493a4ffee50bf4ffc51459a2372dc85184802bf71
-omegaconf==2.0.2 \
-    --hash=sha256:3892d6a6848e1f54869d6ea3720f7208e4bb4276774f97dbb899fb540ac84506 \
-    --hash=sha256:dede7746b3dc18c5670dcec4ce283593d229a055a1c9cf089e2663545396fba0
+hydra-core==1.1.0 \
+    --hash=sha256:22370397633af05db594d69d885ead0728039feaec1bb4f666643f811dc6d183 \
+    --hash=sha256:ef20f54c99d6061e1fffee33f43901eb7a09f23291f6bda56afe1c8f68033b2b
+omegaconf==2.1.0 \
+    --hash=sha256:a08aec03a63c66449b550b85d70238f4dee9c6c4a0541d6a98845dcfeb12439d \
+    --hash=sha256:a9c576639f66793c874e32d17138ecce7a57e132a4537d2b6dff899d6958f956
 importlib-resources==3.0.0; python_version < "3.9" \
     --hash=sha256:19f745a6eca188b490b1428c8d1d4a0d2368759f32370ea8fb89cad2ab1106c3 \
     --hash=sha256:d028f66b66c0d5732dae86ba4276999855e162a749c92620a38c1d779ed138a7