aboutsummaryrefslogtreecommitdiff
path: root/extras
diff options
context:
space:
mode:
authorMarco Poletti <poletti.marco@gmail.com>2020-04-01 22:24:19 -0700
committerMarco Poletti <poletti.marco@gmail.com>2020-04-01 22:51:52 -0700
commit0974365e6554351fbe5ddc3b81ba7ec427c85595 (patch)
tree1415004d70e6b85a1c282828cd4131cb047115bd /extras
parent46204017ff05d2b17efcb06b1027590e51b6079c (diff)
downloadgoogle-fruit-0974365e6554351fbe5ddc3b81ba7ec427c85595.tar.gz
Fix the benchmark code to work with newer versions of networkx where Graph.predecessors and Graph.successors return an iterable instead of a list.
Diffstat (limited to 'extras')
-rw-r--r--extras/benchmark/boost_di_source_generator.py4
-rw-r--r--extras/benchmark/fruit_source_generator.py4
-rw-r--r--extras/benchmark/no_di_library_source_generator.py4
3 files changed, 6 insertions, 6 deletions
diff --git a/extras/benchmark/boost_di_source_generator.py b/extras/benchmark/boost_di_source_generator.py
index 2576e03..cf8cf9a 100644
--- a/extras/benchmark/boost_di_source_generator.py
+++ b/extras/benchmark/boost_di_source_generator.py
@@ -20,13 +20,13 @@ def generate_files(injection_graph: nx.DiGraph, generate_runtime_bench_code: boo
file_content_by_name = dict()
for node_id in injection_graph.nodes:
- deps = injection_graph.successors(node_id)
+ deps = list(injection_graph.successors(node_id))
file_content_by_name['component%s.h' % node_id] = _generate_component_header(node_id, deps)
file_content_by_name['component%s.cpp' % node_id] = _generate_component_source(node_id, deps)
[toplevel_node] = [node_id
for node_id in injection_graph.nodes
- if not injection_graph.predecessors(node_id)]
+ if not any(True for p in injection_graph.predecessors(node_id))]
file_content_by_name['main.cpp'] = _generate_main(injection_graph, toplevel_node, generate_runtime_bench_code)
return file_content_by_name
diff --git a/extras/benchmark/fruit_source_generator.py b/extras/benchmark/fruit_source_generator.py
index e0be36f..f7bc786 100644
--- a/extras/benchmark/fruit_source_generator.py
+++ b/extras/benchmark/fruit_source_generator.py
@@ -24,11 +24,11 @@ def generate_files(injection_graph: nx.DiGraph, generate_runtime_bench_code: boo
for node_id in injection_graph.nodes:
file_content_by_name['component%s.h' % node_id] = _generate_component_header(node_id)
- file_content_by_name['component%s.cpp' % node_id] = _generate_component_source(node_id, injection_graph.successors(node_id))
+ file_content_by_name['component%s.cpp' % node_id] = _generate_component_source(node_id, list(injection_graph.successors(node_id)))
[toplevel_node] = [node_id
for node_id in injection_graph.nodes
- if not injection_graph.predecessors(node_id)]
+ if not any(True for p in injection_graph.predecessors(node_id))]
file_content_by_name['main.cpp'] = _generate_main(toplevel_node, generate_runtime_bench_code)
return file_content_by_name
diff --git a/extras/benchmark/no_di_library_source_generator.py b/extras/benchmark/no_di_library_source_generator.py
index ccfb624..65046a2 100644
--- a/extras/benchmark/no_di_library_source_generator.py
+++ b/extras/benchmark/no_di_library_source_generator.py
@@ -20,7 +20,7 @@ def generate_files(injection_graph: nx.DiGraph, use_new_delete: bool, use_interf
file_content_by_name = dict()
for node_id in injection_graph.nodes:
- deps = injection_graph.successors(node_id)
+ deps = list(injection_graph.successors(node_id))
if use_interfaces:
file_content_by_name['class%s_interface.h' % node_id] = _generate_class_interface_header(node_id)
file_content_by_name['class%s.h' % node_id] = _generate_class_header_with_interfaces(node_id, deps)
@@ -150,7 +150,7 @@ Class{class_index}::Class{class_index}({constructor_params})
def _generate_main(injection_graph: nx.DiGraph, use_interfaces: bool, use_new_delete: bool, generate_runtime_bench_code: bool):
[toplevel_class_index] = [node_id
for node_id in injection_graph.nodes
- if not injection_graph.predecessors(node_id)]
+ if not any(True for p in injection_graph.predecessors(node_id))]
if use_interfaces:
include_directives = ''.join('#include "class%s.h"\n' % index