Compare commits

...

2 Commits

Author SHA1 Message Date
Mike J Innes 8ca042d2b0 update travis 2019-02-14 18:06:54 +00:00
Mike J Innes 54f7efa379 missing conversions 2019-02-14 13:30:27 +00:00
3 changed files with 7 additions and 5 deletions

View File

@ -6,7 +6,7 @@ os:
# - osx
julia:
- 1.0
- 1.1
- nightly
matrix:

View File

@ -35,10 +35,10 @@ Base.eltype(x::Type{<:TrackedArray{T}}) where T <: Real = TrackedReal{T}
Base.convert(::Type{T}, x::S) where {T<:TrackedArray,S<:T} = x
Base.convert(::Type{<:TrackedArray}, x::TrackedArray) =
error("Not implemented: convert $(typeof(x)) to $T")
Base.convert(::Type{TrackedArray{T,N,A}}, x::TrackedArray) where {T,N,A} =
track(convert, A, x)
Base.convert(::Type{<:TrackedArray{T,N,A}}, x::AbstractArray) where {T,N,A} =
Base.convert(::Type{TrackedArray{T,N,A}}, x::AbstractArray) where {T,N,A} =
TrackedArray(convert(A, x))
Base.show(io::IO, t::Type{TrackedArray{T,N,A}}) where {T,N,A<:AbstractArray{T,N}} =

View File

@ -37,7 +37,9 @@ Base.convert(::Type{TrackedReal{T}}, x::TrackedReal{T}) where T = x
Base.convert(::Type{TrackedReal{T}}, x::Real) where T = TrackedReal(convert(T, x))
Base.convert(::Type{TrackedReal{T}}, x::TrackedReal{S}) where {T,S} =
error("Not implemented: convert tracked $S to tracked $T")
track(convert, T, x)
@grad convert(T, x) = convert(T, data(x)), -> (nothing, convert(typeof(x), ))
(T::Type{<:TrackedReal})(x::Real) = convert(T, x)