closes facebookresearch#1784: disambiguate get_override_key treatment…

… of global
Jasha10 · Aug 25, 2021 · d61edcc · d61edcc
1 parent e3ba7cc
commit d61edcc
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 3 deletions.
diff --git a/hydra/core/default_element.py b/hydra/core/default_element.py
@@ -250,7 +250,9 @@ def get_override_key(self) -> str:
         default_pkg = self.get_default_package()
         final_pkg = self.get_final_package(default_to_package_header=False)
         key = self.get_group_path()
-        if default_pkg != final_pkg and final_pkg != "":
+        if default_pkg != final_pkg:
+            if final_pkg == "":
+                final_pkg = "_global_"
             key = f"{key}@{final_pkg}"
         return key
 

diff --git a/tests/defaults_list/data/experiment/override_with_global_default.yaml b/tests/defaults_list/data/experiment/override_with_global_default.yaml
@@ -1,2 +1,2 @@
 defaults:
-  - override /group1@_global_: file2
+  - override /group1@_global_.group1: file2
diff --git a/tests/defaults_list/data/experiment/override_with_global_default2.yaml b/tests/defaults_list/data/experiment/override_with_global_default2.yaml
@@ -0,0 +1,2 @@
+defaults:
+  - override /group1@_global_: file2
diff --git a/tests/defaults_list/data/group_default_at_global.yaml b/tests/defaults_list/data/group_default_at_global.yaml
@@ -0,0 +1,2 @@
+defaults:
+  - group1@_global_: file1
diff --git a/tests/defaults_list/data/two_group_defaults_different_pkgs_global.yaml b/tests/defaults_list/data/two_group_defaults_different_pkgs_global.yaml
@@ -0,0 +1,3 @@
+defaults:
+  - group1: file1
+  - group1@_global_: file2
diff --git a/tests/defaults_list/test_defaults_list.py b/tests/defaults_list/test_defaults_list.py
@@ -639,7 +639,7 @@ def test_group_default_pkg1(
         ),
         param(
             "include_nested_group_global_",
-            ["group1/group2=file2"],
+            ["group1/group2@_global_=file2"],
             [
                 ResultDefault(
                     config_path="group1/group2/file2",

diff --git a/tests/defaults_list/test_defaults_tree.py b/tests/defaults_list/test_defaults_tree.py
@@ -682,6 +682,19 @@ def test_override_option_from_defaults_list(
             ),
             id="two_group_defaults_different_pkgs:override_second",
         ),
+        param(
+            "two_group_defaults_different_pkgs_global",
+            [],
+            DefaultsTreeNode(
+                node=ConfigDefault(path="two_group_defaults_different_pkgs_global"),
+                children=[
+                    GroupDefault(group="group1", value="file1"),
+                    GroupDefault(group="group1", value="file2", package="_global_"),
+                    ConfigDefault(path="_self_"),
+                ],
+            ),
+            id="two_group_defaults_different_pkgs_global",
+        ),
     ],
 )
 def test_two_group_defaults_different_pkgs(
@@ -1133,6 +1146,21 @@ def test_experiment_overriding_hydra_group(
             ),
             id="include_absolute_config:override_with_global_default",
         ),
+        param(
+            "group_default_at_global",
+            ["+experiment=override_with_global_default2"],
+            DefaultsTreeNode(
+                node=ConfigDefault(path="group_default_at_global"),
+                children=[
+                    GroupDefault(group="group1", value="file2", package="_global_"),
+                    ConfigDefault(path="_self_"),
+                    GroupDefault(
+                        group="experiment", value="override_with_global_default2"
+                    ),
+                ],
+            ),
+            id="include_absolute_config:override_with_global_default2",
+        ),
     ],
 )
 def test_experiment_overriding_global_group(