Skip to content
Snippets Groups Projects
Commit 18375a93 authored by Duc Ta's avatar Duc Ta
Browse files

Merge branch 'confTool_speedup' into '24.0'

confTool: speedup in case ignoreDefaults is not used

See merge request atlas/athena!69407
parents acf95802 82e8723c
No related branches found
Tags nightly/main/2024-03-05T0301
No related merge requests found
......@@ -139,7 +139,8 @@ def types_in_properties(comp_name, value, dict_to_update):
else:
logger.debug("What is typeless comp? %s", value)
if isinstance(value, dict):
[ types_in_properties(comp_name, v, dict_to_update) for v in value.values() ]
for v in value.values():
types_in_properties(comp_name, v, dict_to_update)
def collect_types(conf):
......@@ -464,8 +465,6 @@ def loadConfigFile(fname, args) -> Dict:
if conf is None:
sys.exit("Unable to load %s file" % fname)
known_types = collect_types(conf)
if args.includeComps or args.excludeComps or args.includeClasses or args.excludeClasses:
logger.info(f"include/exclude comps like {args.includeComps}/{args.excludeComps}")
conf = excludeIncludeComps(conf, args, args.follow)
......@@ -477,6 +476,7 @@ def loadConfigFile(fname, args) -> Dict:
conf = renameComps(conf, args)
if args.ignoreDefaults:
known_types = collect_types(conf)
conf = ignoreDefaults(conf, args, known_types)
if args.shortenDefaultComponents:
......@@ -531,7 +531,7 @@ class ComponentsDiffFileLoader:
return (
first.get_name() == second.get_name()
and first.x_pos == second.x_pos
and type(first) == type(second)
and type(first) is type(second)
)
def mark_differences(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment