Merge pull request #209 from invenia/ox/ambifil

Fix ambiguity in fill
invenia · Aug 17, 2021 · f5adedb · f5adedb · oxinabox · Aug 17, 2021
2 parents eadaaaf + 16fffeb
commit f5adedb
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 1 deletion.
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "Nabla"
 uuid = "49c96f43-aa6d-5a04-a506-44c7070ebe78"
-version = "0.13.1"
+version = "0.13.2"
 
 [deps]
 ChainRules = "082447d4-558c-5d27-93f4-14fc19e9eca2"

diff --git a/src/Nabla.jl b/src/Nabla.jl
@@ -47,6 +47,10 @@ module Nabla
     # Sensitivities via ChainRules
     include("sensitivities/chainrules.jl")
 
+    # Overloads we added to solve ambiguitities (probably caused by ChainRules)
+    include("sensitivities/ambiguity_resolution.jl")
+
+
     # Sensitivities for the basics.
     include("sensitivities/indexing.jl")
     include("sensitivities/scalar.jl")

diff --git a/src/sensitivities/ambiguity_resolution.jl b/src/sensitivities/ambiguity_resolution.jl
@@ -0,0 +1,7 @@
+function Base.fill(val::Node, dims::Vararg{Union{Integer,AbstractUnitRange}})
+    return invoke(fill, Tuple{Node, Vararg{Any}}, val, dims...)
+end
+
+function Base.fill(val::Node, dims::Tuple{Vararg{Integer}})
+    return invoke(fill, Tuple{Node, Vararg{Any}}, val, dims)
+end
diff --git a/test/runtests.jl b/test/runtests.jl
@@ -63,6 +63,7 @@ end
 @testset "Sensitivities" begin
     include("finite_differencing.jl")
 
+    include("sensitivities/ambiguity_resolution.jl")
     # Test sensitivities for the basics.
     include("sensitivities/indexing.jl")
     include("sensitivities/scalar.jl")

diff --git a/test/sensitivities/ambiguity_resolution.jl b/test/sensitivities/ambiguity_resolution.jl
@@ -0,0 +1,9 @@
+@testset "Ambiguity Resolution" begin
+    @testset "fill" begin
+        k = fill(Leaf(Tape(), 1.2), 3, 4)
+        @test k.pullback !== nothing
+
+        x = fill(Leaf(Tape(), 1.2), (3, 4))
+        @test x.pullback !== nothing
+    end
+end