Fix error in benchmark

Author: MilesCranmer

benchmark/benchmarks.jl

@@ -37,15 +37,23 @@ function benchmark_evaluation()
 
             (turbo || bumper) && !(T in (Float32, Float64)) && continue
             turbo && bumper && continue
-            bumper && PACKAGE_VERSION < v"0.15.0" && continue
+            if bumper
+                try
+                    eval_tree_array(Node{T}(val=1.0), ones(T, 5, n), operators; turbo, bumper)
+                catch e
+                    isa(e, MethodError) || rethrow(e)
+                    @warn "Skipping bumper tests"
+                    continue  # Assume its not available
+                end
+            end
 
             extra_key = turbo ? "_turbo" : (bumper ? "_bumper" : "")
             extra_kws = bumper ? (; bumper=Val(true)) : ()
             eval_tree_array(
                 gen_random_tree_fixed_size(20, operators, 5, T),
                 randn(MersenneTwister(0), T, 5, n),
                 operators;
-                turbo=turbo,
+                turbo,
                 extra_kws...
             )
             suite[T]["evaluation$(extra_key)"] = @benchmarkable(

src/EvaluateEquation.jl

@@ -64,17 +64,14 @@ function eval_tree_array(
     cX::AbstractMatrix{T},
     operators::OperatorEnum;
     turbo::Union{Bool,Val}=Val(false),
-    bumper::Val=Val(false),
+    bumper::Union{Bool,Val}=Val(false),
 ) where {T<:Number}
-    v_turbo = if isa(turbo, Val)
-        turbo
-    else
-        turbo ? Val(true) : Val(false)
-    end
-    if v_turbo isa Val{true} || bumper isa Val{true}
+    v_turbo = isa(turbo, Val) ? turbo : (turbo ? Val(true) : Val(false))
+    v_bumper = isa(bumper, Val) ? bumper : (bumper ? Val(true) : Val(false))
+    if v_turbo isa Val{true} || v_bumper isa Val{true}
         @assert T in (Float32, Float64)
     end
-    if bumper isa Val{true}
+    if v_bumper isa Val{true}
         return bumper_eval_tree_array(tree, cX, operators)
     end
     if v_turbo isa Val{true}
@@ -89,13 +86,14 @@ function eval_tree_array(
     tree::AbstractExpressionNode{T1},
     cX::AbstractMatrix{T2},
     operators::OperatorEnum;
-    kws...,
+    turbo::Union{Bool,Val}=Val(false),
+    bumper::Union{Bool,Val}=Val(false),
 ) where {T1<:Number,T2<:Number}
     T = promote_type(T1, T2)
     @warn "Warning: eval_tree_array received mixed types: tree=$(T1) and data=$(T2)."
     tree = convert(constructorof(typeof(tree)){T}, tree)
     cX = Base.Fix1(convert, T).(cX)
-    return eval_tree_array(tree, cX, operators; kws...)
+    return eval_tree_array(tree, cX, operators; turbo, bumper)
 end
 
 get_nuna(::Type{<:OperatorEnum{B,U}}) where {B,U} = counttuple(U)