Merge pull request #51 from SymbolicML/fix-fill-similar

Fix type stability of `fill_similar`

Author: MilesCranmer

Project.toml

@@ -1,7 +1,7 @@
 name = "DynamicExpressions"
 uuid = "a40a106e-89c9-4ca8-8020-a735e8728b6b"
 authors = ["MilesCranmer <miles.cranmer@gmail.com>"]
-version = "0.13.0"
+version = "0.13.1"
 
 [deps]
 Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"

src/Utils.jl

@@ -155,7 +155,11 @@ function _add_idmap_to_call(def::Expr, id_map::Expr)
     return Expr(:call, def.args[1], def.args[2:end]..., id_map)
 end
 
-@inline fill_similar(value, array, args...) = fill!(similar(array, args...), value)
+@inline function fill_similar(value, array, args...)
+    out_array = similar(array, args...)
+    fill!(out_array, value)
+    return out_array
+end
 
 function deprecate_varmap(variable_names, varMap, func_name)
     if varMap !== nothing

test/test_utils.jl

@@ -1,4 +1,6 @@
 using DynamicExpressions
+using DynamicExpressions.UtilsModule: fill_similar
+using Test
 
 operators = OperatorEnum(; binary_operators=(+, *, -, /, ^), unary_operators=(exp, sin))
 
@@ -33,3 +35,8 @@ tree = x1 + Node(; val=0.0) - sin(x2 - Node(; val=0.5))
 @test get_constants(tree) == [0.0, 0.5]
 set_constants!(tree, [1.0, 2.0])
 @test repr(tree) == "((x1 + 1.0) - sin(x2 - 2.0))"
+
+# Ensure that fill_similar is type stable
+x = randn(Float32, 3, 10)
+@inferred fill_similar(0.5f0, x, axes(x, 1))
+fill_similar(0.5f0, x, axes(x, 1)) == fill(0.5f0, 3)