move wrappedallocs macro to utils file

Author: MaxenceGollier

test/runtests.jl

@@ -18,6 +18,7 @@ const global bpdn, bpdn_nls, sol = bpdn_model(compound)
 const global bpdn2, bpdn_nls2, sol2 = bpdn_model(compound, bounds = true)
 const global λ = norm(grad(bpdn, zeros(bpdn.meta.nvar)), Inf) / 10
 
+include("utils.jl")
 include("test_AL.jl")
 
 for (mod, mod_name) ∈ ((x -> x, "exact"), (LSR1Model, "lsr1"), (LBFGSModel, "lbfgs"))

test/test_allocs.jl

@@ -1,44 +1,3 @@
-"""
-    @wrappedallocs(expr)
-
-Given an expression, this macro wraps that expression inside a new function
-which will evaluate that expression and measure the amount of memory allocated
-by the expression. Wrapping the expression in a new function allows for more
-accurate memory allocation detection when using global variables (e.g. when
-at the REPL).
-
-This code is based on that of https://github.com/JuliaAlgebra/TypedPolynomials.jl/blob/master/test/runtests.jl
-
-For example, `@wrappedallocs(x + y)` produces:
-
-```julia
-function g(x1, x2)
-    @allocated x1 + x2
-end
-g(x, y)
-```
-
-You can use this macro in a unit test to verify that a function does not
-allocate:
-
-```
-@test @wrappedallocs(x + y) == 0
-```
-"""
-macro wrappedallocs(expr)
-  kwargs = [a for a in expr.args if isa(a, Expr)]
-  args = [a for a in expr.args if isa(a, Symbol)]
-
-  argnames = [gensym() for a in args]
-  kwargs_dict = Dict{Symbol, Any}(a.args[1] => a.args[2] for a in kwargs if a.head == :kw)
-  quote
-    function g($(argnames...); kwargs_dict...)
-      $(Expr(expr.head, argnames..., kwargs...)) # Call the function twice to make the allocated macro more stable
-      @allocated $(Expr(expr.head, argnames..., kwargs...))
-    end
-    $(Expr(:call, :g, [esc(a) for a in args]...))
-  end
-end
 
 # Test non allocating solve!
 @testset "NLP allocs" begin

test/utils.jl

@@ -0,0 +1,34 @@
+"""
+    @wrappedallocs(expr)
+
+Given an expression, this macro wraps that expression inside a new function
+which will evaluate that expression and measure the amount of memory allocated
+by the expression. Wrapping the expression in a new function allows for more
+accurate memory allocation detection when using global variables (e.g. when
+at the REPL).
+
+This code is based on that of https://github.com/JuliaAlgebra/TypedPolynomials.jl/blob/master/test/runtests.jl
+
+You can use this macro in a unit test to verify that a function does not
+allocate:
+
+```
+@test @wrappedallocs(x + y) == 0
+```
+"""
+macro wrappedallocs(expr)
+  kwargs = [a for a in expr.args if isa(a, Expr)]
+  args = [a for a in expr.args if isa(a, Symbol)]
+
+  argnames = [gensym() for a in args]
+  kwargs_dict = Dict{Symbol, Any}(a.args[1] => a.args[2] for a in kwargs if a.head == :kw)
+  quote
+    function g($(argnames...); kwargs_dict...)
+      $(Expr(expr.head, argnames..., kwargs...)) # Call the function twice to make the allocated macro more stable
+      @allocated $(Expr(expr.head, argnames..., kwargs...))
+    end
+    $(Expr(:call, :g, [esc(a) for a in args]...))
+  end
+end
+
+# Construct the brock-rosenberg problem.