TastyPancakes/Flux.jl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #204 from boathit/master

Browse Source 
eliminate ambiguous
This commit is contained in:
Mike J Innes 2018-03-14 15:34:41 +00:00 committed by GitHub
commit 72f13834f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tracker/scalar.jl
View File

@ -61,6 +61,11 @@ for (M, f, arity) in DiffRules.diffrules()
end end
end end
# Eliminating ambiguity
import Base:^
^(a::TrackedReal, b::Integer) = track(^, a, b)
# Tuples # Tuples
struct TrackedTuple{T<:Tuple} struct TrackedTuple{T<:Tuple}

2
test/tracker.jl
View File

@ -75,6 +75,8 @@ end
@test (param([1,2,3]) .< 2) == [true, false, false] @test (param([1,2,3]) .< 2) == [true, false, false]
@test param(2)^2 == 4.0
@testset "Intermediates" begin @testset "Intermediates" begin
x = param([1]) x = param([1])
l = sum((x .+ x).^2) l = sum((x .+ x).^2)