Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve OmegaConfigLoader performance #4367

Merged
merged 9 commits into from
Jan 3, 2025
Merged

Improve OmegaConfigLoader performance #4367

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
20fc619
improve global and runtime param resolver
ravi-kumar-pilla Dec 3, 2024
953024b
Merge branch 'main' into chore/improve-ocl
ravi-kumar-pilla Dec 17, 2024
5aad24f
Merge branch 'main' of https://github.com/kedro-org/kedro into chore/…
ravi-kumar-pilla Dec 23, 2024
c256a5f
testing with slack suggestions
ravi-kumar-pilla Dec 23, 2024
d81cced
Merge branch 'chore/improve-ocl' of https://github.com/kedro-org/kedr…
ravi-kumar-pilla Dec 23, 2024
2d7fdff
fix type lint issue
ravi-kumar-pilla Dec 23, 2024
1129213
Merge branch 'main' into chore/improve-ocl
ravi-kumar-pilla Jan 2, 2025
0cba7d6
Merge branch 'main' into chore/improve-ocl
ravi-kumar-pilla Jan 3, 2025
4eb7fac
update release note
ravi-kumar-pilla Jan 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 15 additions & 10 deletions kedro/config/omegaconf_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ def __init__( # noqa: PLR0913
self.base_env = base_env or ""
self.default_run_env = default_run_env or ""
self.merge_strategy = merge_strategy or {}

self._globals_oc: DictConfig | None = None
self._runtime_params_oc: DictConfig | None = None
self.config_patterns = {
"catalog": ["catalog*", "catalog*/**", "**/catalog*"],
"parameters": ["parameters*", "parameters*/**", "**/parameters*"],
Expand Down Expand Up @@ -346,12 +347,11 @@ def load_and_merge_dir_config(
OmegaConf.merge(*aggregate_config, self.runtime_params), resolve=True
)

merged_config_container = OmegaConf.to_container(
OmegaConf.merge(*aggregate_config), resolve=True
)
return {
k: v
for k, v in OmegaConf.to_container(
OmegaConf.merge(*aggregate_config), resolve=True
).items()
if not k.startswith("_")
k: v for k, v in merged_config_container.items() if not k.startswith("_")
}

@staticmethod
Expand Down Expand Up @@ -436,9 +436,12 @@ def _get_globals_value(self, variable: str, default_value: Any = _NO_VALUE) -> A
raise InterpolationResolutionError(
"Keys starting with '_' are not supported for globals."
)
globals_oc = OmegaConf.create(self._globals)

if not self._globals_oc:
self._globals_oc = OmegaConf.create(self._globals)

interpolated_value = OmegaConf.select(
globals_oc, variable, default=default_value
self._globals_oc, variable, default=default_value
)
if interpolated_value != _NO_VALUE:
return interpolated_value
Expand All @@ -449,9 +452,11 @@ def _get_globals_value(self, variable: str, default_value: Any = _NO_VALUE) -> A

def _get_runtime_value(self, variable: str, default_value: Any = _NO_VALUE) -> Any:
"""Return the runtime params values to the resolver"""
runtime_oc = OmegaConf.create(self.runtime_params)
if not self._runtime_params_oc:
self._runtime_params_oc = OmegaConf.create(self.runtime_params)

interpolated_value = OmegaConf.select(
runtime_oc, variable, default=default_value
self._runtime_params_oc, variable, default=default_value
)
if interpolated_value != _NO_VALUE:
return interpolated_value
Expand Down
Loading