Skip to content

Commit 7b83b72

Browse files
authored
Use much-faster OmegaConf.unsafe_merge over .merge (#5366)
Signed-off-by: Deepyaman Datta <deepyaman.datta@utexas.edu>
1 parent 6d68f28 commit 7b83b72

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

kedro/config/omegaconf_config.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,11 +373,12 @@ def load_and_merge_dir_config(
373373
if key == "parameters":
374374
# Merge with runtime parameters only for "parameters"
375375
return OmegaConf.to_container(
376-
OmegaConf.merge(*aggregate_config, self.runtime_params), resolve=True
376+
OmegaConf.unsafe_merge(*aggregate_config, self.runtime_params),
377+
resolve=True,
377378
)
378379

379380
merged_config_container = OmegaConf.to_container(
380-
OmegaConf.merge(*aggregate_config), resolve=True
381+
OmegaConf.unsafe_merge(*aggregate_config), resolve=True
381382
)
382383
return {
383384
k: v for k, v in merged_config_container.items() if not k.startswith("_")
@@ -588,7 +589,7 @@ def _soft_merge(
588589
config: dict[str, Any], env_config: dict[str, Any], env_path: str | None = None
589590
) -> Any:
590591
# Soft merge the two env dirs. The chosen env will override base if keys clash.
591-
return OmegaConf.to_container(OmegaConf.merge(config, env_config))
592+
return OmegaConf.to_container(OmegaConf.unsafe_merge(config, env_config))
592593

593594
def _is_hidden(self, path_str: str) -> bool:
594595
"""Check if path contains any hidden directory or is a hidden file"""

0 commit comments

Comments
 (0)