@@ -88,20 +88,7 @@ function ancestors_workload(nodes, reps::Int)
8888 return s
8989end
9090
91- function ancestors_workload_inplace_1 (nodes, reps:: Int )
92- s = 0.0
93- @inbounds for _ in 1 : reps
94- for n in nodes
95- out = ancestors! (n, :mass , recursivity_level= 4 , type= Float64)
96- for v in out
97- s += v
98- end
99- end
100- end
101- return s
102- end
103-
104- function ancestors_workload_inplace_2 (nodes, reps:: Int )
91+ function ancestors_workload_inplace (nodes, reps:: Int )
10592 s = 0.0
10693 buf = Float64[]
10794 @inbounds for _ in 1 : reps
130117
131118function descendants_extraction_workload_inplace_2 (root)
132119 vals = Float64[]
133- descendants! (vals, root, :mass , type = Float64 )
120+ descendants! (vals, root, :mass )
134121end
135122
136123suite_name = " mstg"
@@ -163,8 +150,7 @@ SUITE[suite_name]["many_queries"]["parent_repeated"] = @benchmarkable parent_wor
163150SUITE[suite_name][" many_queries" ][" ancestors_repeated" ] = @benchmarkable ancestors_workload ($ leaves, 40 )
164151# Test if ancestors! exists in the package first:
165152if isdefined (MultiScaleTreeGraph, :ancestors! )
166- SUITE[suite_name][" many_queries" ][" ancestors_repeated_inplace_1" ] = @benchmarkable ancestors_workload_inplace_1 ($ leaves, 40 )
167- SUITE[suite_name][" many_queries" ][" ancestors_repeated_inplace_2" ] = @benchmarkable ancestors_workload_inplace_2 ($ leaves, 40 )
153+ SUITE[suite_name][" many_queries" ][" ancestors_repeated_inplace" ] = @benchmarkable ancestors_workload_inplace (leaves, 40 )
168154end
169155
170156if abspath (PROGRAM_FILE ) == @__FILE__
0 commit comments