From efae8637ed6f68216558943782cced44fcab135d Mon Sep 17 00:00:00 2001
From: Wouter Nuijten <wouternuijten@gmail.com>
Date: Thu, 8 Feb 2024 11:35:31 +0100
Subject: [PATCH] fix benchmarks

---
 benchmark/benchmarks.jl   | 4 ++--
 benchmark/graph_engine.jl | 9 ++++-----
 benchmark/model_zoo.jl    | 1 -
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/benchmark/benchmarks.jl b/benchmark/benchmarks.jl
index 27f24d93..1c0641c4 100644
--- a/benchmark/benchmarks.jl
+++ b/benchmark/benchmarks.jl
@@ -3,7 +3,7 @@ using BenchmarkTools
 const SUITE = BenchmarkGroup()
 include("graph_engine.jl")
 include("model_creation.jl")
-include("constraints_engine.jl")
-SUITE["constraints_engine"] = benchmark_constraints_engine()
+# include("constraints_engine.jl")
+# SUITE["constraints_engine"] = benchmark_constraints_engine()
 SUITE["graph_engine"] = benchmark_graph_engine()
 SUITE["model_creation"] = benchmark_model_creation()
\ No newline at end of file
diff --git a/benchmark/graph_engine.jl b/benchmark/graph_engine.jl
index fd038b1d..d3fe9335 100644
--- a/benchmark/graph_engine.jl
+++ b/benchmark/graph_engine.jl
@@ -20,14 +20,14 @@ function factor_node_creation()
             x = GraphPPL.getorcreate!(model, ctx, :x, j)
         end
         y = GraphPPL.getorcreate!(model, ctx, :y, nothing)
-        SUITE["Create factor node with $i edges"] = @benchmarkable GraphPPL.make_node!(m, c, sum, $y, [$x]) setup=(m=deepcopy($model);c=deepcopy($ctx)) evals=1
+        SUITE["Create factor node with $i edges"] = @benchmarkable GraphPPL.make_node!(m, c, sum, $y, (in = $x,)) setup=(m=deepcopy($model);c=deepcopy($ctx)) evals=1
     end
     return SUITE
 end
 
 function add_n_nodes(n::Int, model, ctx)
     for i in 1:n
-        GraphPPL.add_variable_node!(model, ctx, :x; index=i)
+        GraphPPL.add_variable_node!(model, ctx, :x, i)
     end
 end
 
@@ -43,14 +43,13 @@ function variable_node_creation()
     SUITE = BenchmarkGroup(["node_creation"])
     model = GraphPPL.create_model()
     ctx = GraphPPL.getcontext(model)
-    SUITE["add_variable_node"] = @benchmarkable GraphPPL.add_variable_node!(m, c, :x) setup=(m=deepcopy($model);c=deepcopy($ctx)) evals=1
+    SUITE["add_variable_node"] = @benchmarkable GraphPPL.add_variable_node!(m, c, :x, nothing) setup=(m=deepcopy($model);c=deepcopy($ctx)) evals=1
 
     for j in 10 .^ range(1, stop=3)
         j = convert(Int, j)
         model = GraphPPL.create_model()
         ctx = GraphPPL.getcontext(model)
-        x = GraphPPL.ResizableArray(GraphPPL.NodeLabel, Val(1))
-        ctx.vector_variables[:x] = x
+        x = GraphPPL.getorcreate!(model, ctx, :x, 1)
         SUITE["add $j variable nodes"] = @benchmarkable add_n_nodes($j, m, c) setup=(m=deepcopy($model);c=deepcopy($ctx)) evals=1
         SUITE["getorcreate $j variable nodes ascending"] = @benchmarkable getorcreate_n_nodes($j, m, c) setup=(m=deepcopy($model);c=deepcopy($ctx)) evals=1
         SUITE["getorcreate $j variable nodes descending"] = @benchmarkable getorcreate_n_nodes($j, m, c; asc=false) setup=(m=deepcopy($model);c=deepcopy($ctx)) evals=1
diff --git a/benchmark/model_zoo.jl b/benchmark/model_zoo.jl
index fdff173a..a98ab58e 100644
--- a/benchmark/model_zoo.jl
+++ b/benchmark/model_zoo.jl
@@ -57,7 +57,6 @@ function create_longarray(n::Int)
         ctx,
         long_array,
         (μ = μ, σ = σ, depth=n);
-        __debug__ = false,
     )
     return model
 end