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

Merge removing conflicts

Browse Source
This commit is contained in:
Avik Pal 2018-08-11 18:01:27 +05:30
commit 355091b9d1
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
REQUIRE
View File

@ -1,4 +1,4 @@
julia 0.7- julia 0.7
Juno Juno
MacroTools 0.3.3 MacroTools 0.3.3
NNlib NNlib

2
src/tracker/back.jl
View File

@ -70,7 +70,7 @@ struct Params
Params(xs) = new(IdSet(xs)) Params(xs) = new(IdSet(xs))
end end
@forward Params.params Base.iterate @forward Params.params Base.iterate, Base.length
function Base.show(io::IO, ps::Params) function Base.show(io::IO, ps::Params)
print(io, "Params([") print(io, "Params([")

5
src/tracker/idset.jl
View File

@ -20,8 +20,13 @@ Base.similar(s::IdSet, T::Type) = IdSet{T}()
@forward IdSet.dict Base.length @forward IdSet.dict Base.length
<<<<<<< HEAD
function iterate(v::IdSet, state...) function iterate(v::IdSet, state...)
y = iterate(keys(v.dict), state...) y = iterate(keys(v.dict), state...)
=======
function Base.iterate(v::IdSet, state...)
y = Base.iterate(keys(v.dict), state...)
>>>>>>> 837e03613f98ff9b949815018cba02a3682dab3c
y === nothing && return nothing y === nothing && return nothing
return (y[1], y[2]) return (y[1], y[2])
end end