Relative recursive defaults take3

.gitignore

@@ -1,4 +1,5 @@
 /.idea
+/temp
 outputs
 multirun
 dist

examples/advanced/defaults_list_interpolation/conf/config.yaml

@@ -0,0 +1,4 @@
+defaults:
+  - db: mysql
+  - server: apache
+  - optional server_db: ${server}_${db}

examples/advanced/defaults_list_interpolation/conf/db/mysql.yaml

@@ -0,0 +1 @@
+name: mysql

examples/advanced/defaults_list_interpolation/conf/db/sqlite.yaml

@@ -0,0 +1 @@
+name: sqlite

examples/advanced/defaults_list_interpolation/conf/server/apache.yaml

@@ -0,0 +1,2 @@
+name: apache
+workers: 10

examples/advanced/defaults_list_interpolation/conf/server/nginx.yaml

@@ -0,0 +1 @@
+name: nginx

examples/advanced/defaults_list_interpolation/conf/server_db/apache_sqlite.yaml

@@ -0,0 +1,2 @@
+# @package server
+workers: 5

examples/advanced/defaults_list_interpolation/my_app.py

@@ -0,0 +1,13 @@
+# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
+from omegaconf import DictConfig, OmegaConf
+
+import hydra
+
+
+@hydra.main(config_path="conf", config_name="config")
+def my_app(cfg: DictConfig) -> None:
+    print(OmegaConf.to_yaml(cfg))
+
+
+if __name__ == "__main__":
+    my_app()

examples/advanced/nested_defaults_list/conf/config.yaml

@@ -0,0 +1,4 @@
+defaults:
+  - server/apache
+
+debug: false

examples/advanced/nested_defaults_list/conf/config2.yaml

@@ -0,0 +1,5 @@
+defaults:
+  - server/apache
+  - override server/db: sqlite
+
+debug: false

examples/advanced/nested_defaults_list/conf/server/apache.yaml

@@ -0,0 +1,4 @@
+defaults:
+  - db: mysql
+
+name: apache

examples/advanced/nested_defaults_list/conf/server/db/mysql.yaml

@@ -0,0 +1 @@
+name: mysql

examples/advanced/nested_defaults_list/conf/server/db/sqlite.yaml

@@ -0,0 +1 @@
+name: sqlite

examples/advanced/nested_defaults_list/my_app.py

@@ -0,0 +1,13 @@
+# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
+from omegaconf import DictConfig, OmegaConf
+
+import hydra
+
+
+@hydra.main(config_path="conf", config_name="config")
+def my_app(cfg: DictConfig) -> None:
+    print(OmegaConf.to_yaml(cfg))
+
+
+if __name__ == "__main__":
+    my_app()

examples/configure_hydra/custom_help/conf/config.yaml

@@ -1,3 +1,3 @@
 defaults:
   - db: mysql
-  - hydra/help: my_app_help
+  - override hydra/help: my_app_help

examples/configure_hydra/logging/conf/config.yaml

@@ -1,2 +1,2 @@
 defaults:
-  - hydra/job_logging: custom
+  - override hydra/job_logging: custom

examples/patterns/configuring_experiments/conf/config.yaml

@@ -0,0 +1,3 @@
+defaults:
+  - db: mysql
+  - server: apache

examples/patterns/configuring_experiments/conf/db/mysql.yaml

@@ -0,0 +1 @@
+name: mysql

examples/patterns/configuring_experiments/conf/db/sqlite.yaml

@@ -0,0 +1 @@
+name: sqlite

examples/patterns/configuring_experiments/conf/experiment/aplite.yaml

@@ -0,0 +1,7 @@
+# @package _global_
+defaults:
+  - override /db: sqlite
+
+
+server:
+  port: 8080

examples/patterns/configuring_experiments/conf/experiment/nglite.yaml

@@ -0,0 +1,7 @@
+# @package _global_
+defaults:
+  - override /server: nginx
+  - override /db: sqlite
+
+server:
+  port: 8080

examples/patterns/configuring_experiments/conf/server/apache.yaml

@@ -0,0 +1,2 @@
+name: apache
+port: 80

examples/patterns/configuring_experiments/conf/server/nginx.yaml

@@ -0,0 +1,2 @@
+name: nginx
+port: 80

examples/patterns/configuring_experiments/my_app.py

@@ -0,0 +1,13 @@
+# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
+from omegaconf import DictConfig, OmegaConf
+
+import hydra
+
+
+@hydra.main(config_path="conf", config_name="config")
+def my_app(cfg: DictConfig) -> None:
+    print(OmegaConf.to_yaml(cfg))
+
+
+if __name__ == "__main__":
+    my_app()

examples/patterns/extending_configs/conf/config.yaml

@@ -0,0 +1,2 @@
+defaults:
+  - db: ???

examples/patterns/extending_configs/conf/db/base_mysql.yaml

@@ -0,0 +1,4 @@
+host: localhost
+port: 3306
+user: ???
+password: ???

examples/patterns/extending_configs/conf/db/mysql_extending_from_another_group.yaml

@@ -0,0 +1,7 @@
+defaults:
+  - /db_schema/base_mysql@_here_
+
+user: omry
+password: secret
+port: 3307
+encoding: utf8

examples/patterns/extending_configs/conf/db/mysql_extending_from_this_group.yaml

@@ -0,0 +1,7 @@
+defaults:
+  - base_mysql
+
+user: omry
+password: secret
+port: 3307
+encoding: utf8

examples/patterns/extending_configs/conf/db_schema/base_mysql.yaml

@@ -0,0 +1,4 @@
+host: localhost
+port: 3306
+user: ???
+password: ???

examples/patterns/extending_configs/my_app.py

@@ -0,0 +1,13 @@
+# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
+from omegaconf import DictConfig, OmegaConf
+
+import hydra
+
+
+@hydra.main(config_path="conf", config_name="config")
+def my_app(cfg: DictConfig) -> None:
+    print(OmegaConf.to_yaml(cfg))
+
+
+if __name__ == "__main__":
+    my_app()

examples/patterns/specializing_config/conf/config.yaml

@@ -1,5 +1,4 @@
 defaults:
   - dataset: imagenet
   - model: alexnet
-  - dataset_model: ${dataset}_${model}
-    optional: true
+  - optional dataset_model: ${dataset}_${model}

examples/plugins/example_configsource_plugin/hydra_plugins/example_configsource_plugin/example_configsource_plugin.py

@@ -1,5 +1,4 @@
 # Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
-from copy import copy
 from typing import Any, Dict, List, Optional
 
 from hydra.core.object_type import ObjectType
@@ -27,12 +26,8 @@ def __init__(self, provider: str, path: str):
             "primary_config_with_non_global_package.yaml": {"primary": True},
             "config_without_group.yaml": {"group": False},
             "config_with_unicode.yaml": {"group": "数据库"},
-            "dataset/imagenet.yaml": {
-                "dataset": {"name": "imagenet", "path": "/datasets/imagenet"}
-            },
-            "dataset/cifar10.yaml": {
-                "dataset": {"name": "cifar10", "path": "/datasets/cifar10"}
-            },
+            "dataset/imagenet.yaml": {"name": "imagenet", "path": "/datasets/imagenet"},
+            "dataset/cifar10.yaml": {"name": "cifar10", "path": "/datasets/cifar10"},
             "level1/level2/nested1.yaml": {"l1_l2_n1": True},
             "level1/level2/nested2.yaml": {"l1_l2_n2": True},
             "package_test/explicit.yaml": {"foo": "bar"},
@@ -47,7 +42,7 @@ def __init__(self, provider: str, path: str):
             },
             "configs_with_defaults_list/global_package.yaml": {
                 "defaults": [{"foo": "bar"}],
-                "configs_with_defaults_list": {"x": 10},
+                "x": 10,
             },
             "configs_with_defaults_list/group_package.yaml": {
                 "defaults": [{"foo": "bar"}],
@@ -60,37 +55,24 @@ def scheme() -> str:
         return "example"
 
     def load_config(
-        self,
-        config_path: str,
-        is_primary_config: bool,
-        package_override: Optional[str] = None,
+        self, config_path: str, package_override: Optional[str] = None
     ) -> ConfigResult:
-        normalized_config_path = self._normalize_file_name(config_path)
+        name = self._normalize_file_name(config_path)
 
-        if normalized_config_path not in self.configs:
+        if name not in self.configs:
             raise ConfigLoadError("Config not found : " + config_path)
-        header = (
-            copy(self.headers[normalized_config_path])
-            if normalized_config_path in self.headers
-            else {}
-        )
-        if "package" not in header:
-            header["package"] = ""
 
-        self._update_package_in_header(
-            header=header,
-            normalized_config_path=normalized_config_path,
-            is_primary_config=is_primary_config,
-            package_override=package_override,
-        )
-        cfg = OmegaConf.create(self.configs[normalized_config_path])
-        defaults_list = self._extract_defaults_list(config_path=config_path, cfg=cfg)
+        res_header: Dict[str, Optional[str]] = {"package": None}
+        if name in self.headers:
+            header = self.headers[name]
+            res_header["package"] = header["package"] if "package" in header else None
+
+        cfg = OmegaConf.create(self.configs[name])
         return ConfigResult(
-            config=self._embed_config(cfg, header["package"]),
+            config=cfg,
             path=f"{self.scheme()}://{self.path}",
             provider=self.provider,
-            header=header,
-            defaults_list=defaults_list,
+            header=res_header,
         )
 
     def available(self) -> bool:

examples/plugins/example_launcher_plugin/example/conf/config.yaml

@@ -1,3 +1,3 @@
 defaults:
-  - hydra/launcher: example
   - db: mysql
+  - override hydra/launcher: example

examples/plugins/example_launcher_plugin/tests/test_example_launcher_plugin.py

@@ -29,18 +29,7 @@ class TestExampleLauncher(LauncherTestSuite):
 
 @pytest.mark.parametrize(
     "task_launcher_cfg, extra_flags",
-    [
-        (
-            {
-                "defaults": [
-                    {"hydra/launcher": "example"},
-                    {"hydra/hydra_logging": "hydra_debug"},
-                    {"hydra/job_logging": "disabled"},
-                ],
-            },
-            ["-m"],
-        )
-    ],
+    [({}, ["-m", "hydra/launcher=example"])],
 )
 class TestExampleLauncherIntegration(IntegrationTestSuite):
     """

examples/plugins/example_sweeper_plugin/example/conf/config.yaml

@@ -1,3 +1,3 @@
 defaults:
-  - hydra/sweeper: example
   - db: mysql
+  - override hydra/sweeper: example

examples/plugins/example_sweeper_plugin/tests/test_example_sweeper_plugin.py

@@ -81,19 +81,13 @@ class TestExampleSweeperWithBatching(BatchedSweeperTestSuite):
     "task_launcher_cfg, extra_flags",
     [
         (
-            {
-                "defaults": [
-                    {
-                        # CHANGE THIS TO YOUR SWEEPER CONFIG NAME
-                        "hydra/sweeper": "example"
-                    },
-                    {"hydra/launcher": "basic"},
-                    {"hydra/hydra_logging": "hydra_debug"},
-                    {"hydra/job_logging": "disabled"},
-                ],
-                "hydra": {},
-            },
-            ["-m"],
+            {},
+            [
+                "-m",
+                # CHANGE THIS TO YOUR SWEEPER CONFIG NAME
+                "hydra/sweeper=example",
+                "hydra/launcher=basic",
+            ],
         )
     ],
 )