Fixed hydra.job.id and hydra.job.num not getting passed to jobs in mu…

…ltirun

hydra/core/utils.py

@@ -87,6 +87,7 @@ def run_job(
 ) -> "JobReturn":
     old_cwd = os.getcwd()
     working_dir = str(OmegaConf.select(config, job_dir_key))
+    orig_hydra_cfg = HydraConfig.instance().cfg
     if job_subdir_key is not None:
         # evaluate job_subdir_key lazily.
         # this is running on the client side in sweep and contains things such as job:id which
@@ -97,11 +98,16 @@ def run_job(
         ret = JobReturn()
         ret.working_dir = working_dir
         task_cfg = copy.deepcopy(config)
+        hydra_cfg = OmegaConf.masked_copy(task_cfg, "hydra")
+        # maintain parent to preserve interpolation links from hydra_cfg to job_cfg
+        hydra_cfg._set_parent(task_cfg)
         with read_write(task_cfg):
             with open_dict(task_cfg):
                 del task_cfg["hydra"]
+        HydraConfig.instance().cfg = hydra_cfg  # type: ignore
+
         ret.cfg = task_cfg
-        ret.hydra_cfg = OmegaConf.create({"hydra": HydraConfig.get()})
+        ret.hydra_cfg = hydra_cfg
         overrides = OmegaConf.to_container(config.hydra.overrides.task)
         assert isinstance(overrides, list)
         ret.overrides = overrides
@@ -112,9 +118,6 @@ def run_job(
         if configure_logging:
             configure_log(config.hydra.job_logging, config.hydra.verbose)
 
-        hydra_cfg = OmegaConf.masked_copy(config, "hydra")
-        assert isinstance(hydra_cfg, DictConfig)
-
         if config.hydra.output_subdir is not None:
             hydra_output = Path(config.hydra.output_subdir)
             _save_config(task_cfg, "config.yaml", hydra_output)
@@ -129,6 +132,7 @@ def run_job(
 
         return ret
     finally:
+        HydraConfig.instance().cfg = orig_hydra_cfg
         os.chdir(old_cwd)
 
 

hydra/test_utils/launcher_common_tests.py

@@ -342,6 +342,8 @@ def sweep_1_job(
         assert job_ret[0].hydra_cfg.hydra.job.name == "a_module", (
             "Unexpected job name: " + job_ret[0].hydra_cfg.hydra.job.name
         )
+        assert job_ret[0].hydra_cfg.hydra.job.id is not None
+        assert job_ret[0].hydra_cfg.hydra.job.num is not None
         verify_dir_outputs(sweep.returns[0][0])
 
 
@@ -388,6 +390,9 @@ def sweep_2_jobs(
             assert job_ret.hydra_cfg.hydra.job.name == "a_module", (
                 "Unexpected job name: " + job_ret.hydra_cfg.hydra.job.name
             )
+            assert job_ret.hydra_cfg.hydra.job.id is not None
+            assert job_ret.hydra_cfg.hydra.job.num is not None
+
             verify_dir_outputs(job_ret, job_ret.overrides)
             path = temp_dir / str(i)
             lst = [x for x in temp_dir.iterdir() if x.is_dir()]

news/1270.bugfix

@@ -0,0 +1 @@
+Fixed hydra.job.id and hydra.job.num not getting passed to jobs in multirun