Skip to content

⚡️ Speed up function build_dict_reverse_order_index by 13% #464

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

Open
codeflash-ai wants to merge 1 commit into
base: main
Choose a base branch
from
Open

⚡️ Speed up function build_dict_reverse_order_index by 13% #464

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 29 additions & 29 deletions nvflare/tool/job/config/config_indexer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,16 @@ def build_list_reverse_order_index(
if key_indices is None:
key_indices = {}

# Minor optimization: move isinstance checks out of the loop where possible, and avoid repeated lookups/creation
add_indices = add_to_indices
is_prim = is_primitive
for index, value in enumerate(config_list):
elmt_key = f"{key}[{index}]"
key_index = KeyIndex(key=elmt_key, value=value, parent_key=root_index, index=index)

if value is None:
continue

if isinstance(value, list):
if len(value) > 0:
if value: # Faster than len(value) > 0
key_indices = build_list_reverse_order_index(
config_list=value,
key=elmt_key,
Expand All @@ -118,29 +119,24 @@ def build_list_reverse_order_index(
key_indices=key_indices,
)
else:
add_to_indices(elmt_key, key_index, key_indices)
add_indices(elmt_key, key_index, key_indices)
if key == "name":
key_index.component_name = value
elif isinstance(value, ConfigTree):
key_indices = build_dict_reverse_order_index(
config=value, excluded_keys=excluded_keys, root_index=key_index, key_indices=key_indices
)
elif is_primitive(value):
elif is_prim(value):
if key == "path":
has_dot = value.find(".") > 0
if has_dot:
# we assume the path's pass value is class name
# there are cases, this maybe not.
# user may have to modify configuration manually in those cases
dot_idx = value.find(".") if isinstance(value, str) else -1
if dot_idx > 0:
last_dot_index = value.rindex(".")
class_name = value[last_dot_index + 1 :]
key_index.component_name = class_name
elif key == "name":
# there are cases, where name is not component
# user may have to modify configuration manually in those cases
key_index.component_name = value

add_to_indices(elmt_key, key_index, key_indices)
add_indices(elmt_key, key_index, key_indices)
else:
raise RuntimeError(f"Unhandled data type: {type(value)}")
return key_indices
Expand Down Expand Up @@ -169,17 +165,21 @@ def build_dict_reverse_order_index(
key_indices = {} if key_indices is None else key_indices
if excluded_keys is None:
excluded_keys = []
root_index = KeyIndex(key="", value=config, parent_key=None, index=None) if root_index is None else root_index
if root_index is None:
root_index = KeyIndex(key="", value=config, parent_key=None, index=None)

# Localize function lookups
add_indices = add_to_indices
is_prim = is_primitive
has_non_prim = has_none_primitives_in_list
for key, value in config.items():
if key in excluded_keys:
continue
if value in excluded_keys:
continue

key_index = KeyIndex(key=key, value=value, parent_key=root_index, index=None)
if isinstance(value, list):
if len(value) > 0 and has_none_primitives_in_list(value):
if value and has_non_prim(value):
key_indices = build_list_reverse_order_index(
config_list=value,
key=key,
Expand All @@ -188,32 +188,32 @@ def build_dict_reverse_order_index(
key_indices=key_indices,
)
else:
add_to_indices(key, key_index, key_indices)

add_indices(key, key_index, key_indices)
elif isinstance(value, ConfigTree):
key_indices = build_dict_reverse_order_index(
config=value, excluded_keys=excluded_keys, root_index=key_index, key_indices=key_indices
)

elif is_primitive(value):
elif is_prim(value):
parent_key = key_index.parent_key
if key == "path":
has_dot = value.find(".") > 0
if has_dot:
# we assume the path's pass value is class name
# there are cases, this maybe not.
# user may have to modify configuration manually in those cases
dot_idx = value.find(".") if isinstance(value, str) else -1
if dot_idx > 0:
last_dot_index = value.rindex(".")
class_name = value[last_dot_index + 1 :]
key_index.component_name = class_name
parent_key.component_name = key_index.component_name if parent_key.index is not None else None
if parent_key.index is not None:
parent_key.component_name = key_index.component_name
else:
parent_key.component_name = None
elif key == "name":
# what if the name is not component ?
key_index.component_name = value
parent_key.component_name = key_index.component_name if parent_key.index else None

add_to_indices(key, key_index, key_indices)
if parent_key.index:
parent_key.component_name = key_index.component_name
else:
parent_key.component_name = None

add_indices(key, key_index, key_indices)
else:
raise RuntimeError(f"Unhandled data type: {type(value)}")
return key_indices
Expand Down