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

Jump to bottom

Use deepmerge package for merging dicts #442

Closed
wants to merge 1 commit into from
Closed

Use deepmerge package for merging dicts #442

Show file tree
Hide file tree
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
23 changes: 6 additions & 17 deletions edalize/flows/edaflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,6 @@ def subprocess_run_3_9(
run = subprocess.run


def merge_dict(d1, d2):
for key, value in d2.items():
if isinstance(value, dict):
d1[key] = merge_dict(d1.get(key, {}), value)
elif isinstance(value, list):
d1[key] = d1.get(key, []) + value
else:
d1[key] = value
return d1


class Node(object):
def __init__(self, name, deps=[], fdto={}, tool=None):
self.deps = deps
Expand Down Expand Up @@ -187,6 +176,8 @@ def extract_flow_options(self):

# Filter out tool options for each tool from self.flow_options
def extract_tool_options(self):
from deepmerge import always_merger as dict_merger

tool_options = {}
edam_flow_opts = self.edam.get("flow_options", {})
for name, node in self.flow.get_nodes().items():
Expand All @@ -195,24 +186,22 @@ def extract_tool_options(self):
import_module(f"edalize.tools.{node.tool}"), node.tool.capitalize()
)
# Inject the flow-defined tool options to the EDAM
tool_options[node.tool] = merge_dict(
tool_options[node.tool] = dict_merger.merge(
node.fdto, tool_options.get(node.tool, {})
)

# Assign the EDAM-defined tool options to the right tool
for opt_name in list(edam_flow_opts.keys()):
if opt_name in ToolClass.get_tool_options():
tool_options[node.tool] = merge_dict(
tool_options[node.tool] = dict_merger.merge(
tool_options[node.tool],
{opt_name: edam_flow_opts.get(opt_name)},
)

self.edam["tool_options"] = tool_options

def configure_tools(self, graph):
def merge_edam(a, b):
# Yeah, I know. It's just a temporary hack
return b
from deepmerge import merge_or_raise as edam_merger

# Instantiate each node and add to list of unconfigured nodes
unconfigured_nodes = list(graph.get_nodes().values())
Expand All @@ -226,7 +215,7 @@ def merge_edam(a, b):
all_deps_configured = True
for n in node.deps:
if n.inst.edam:
input_edam = merge_edam(input_edam, n.inst.edam)
input_edam = edam_merger.merge(n.inst.edam, input_edam)
else:
all_deps_configured = False

Expand Down
4 changes: 1 addition & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,7 @@ def read(fname):
"setuptools_scm < 7.0; python_version<'3.7'",
"setuptools_scm; python_version>='3.7'",
],
install_requires=[
"Jinja2>=3",
],
install_requires=["Jinja2>=3", "deepmerge>=0.0.5"],
tests_require=["pytest>=3.3.0", "vunit_hdl>=4.0.8"],
# The reporting modules have dependencies that shouldn't be required for
# all Edalize users.
Expand Down