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

give up and use AbstractArray

Browse Source
This commit is contained in:
Mike J Innes 2017-06-05 16:09:06 +01:00
parent 837173d65b
commit ddcd576a74
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/mxnet/graph.jl
View File

@ -90,7 +90,7 @@ end
register(ctx::Context, node) = node register(ctx::Context, node) = node
function var(ctx::Context, p::Union{Flux.Param{<:AArray},AArray,AlterParam}) function var(ctx::Context, p::Union{Flux.Param{<:AbstractArray},AbstractArray,AlterParam})
id = gensym() id = gensym()
ctx[:params][id] = p ctx[:params][id] = p
return mx.Variable(id) return mx.Variable(id)

2
src/backend/tensorflow/graph.jl
View File

@ -62,7 +62,7 @@ end
interp(ctx, c::Conv2D, x) = interp(ctx, c::Conv2D, x) =
nn.conv2d(x, interp(ctx, constant(c.filter)), [1,c.stride...,1], "VALID") nn.conv2d(x, interp(ctx, constant(c.filter)), [1,c.stride...,1], "VALID")
param(ctx, p::Flux.Param{<:AArray}) = param(ctx, p::Flux.Param{<:AbstractArray}) =
haskey(ctx[:params], p) ? haskey(ctx[:params], p) ?
ctx[:params][p] : ctx[:params][p] :
(ctx[:params][p] = (ctx[:params][p] =

2
src/compiler/code.jl
View File

@ -34,7 +34,7 @@ function build_type(T, params)
end end
if any(x->isexpr(x, Symbol), params) if any(x->isexpr(x, Symbol), params)
push!(ex.args, push!(ex.args,
:($T($(map(x->isexpr(x, Symbol) ? :($x::AArray) : x, params)...)) = :($T($(map(x->isexpr(x, Symbol) ? :($x::AbstractArray) : x, params)...)) =
$T($(map(x->isexpr(x, Symbol) ? :(param($x)) : namify(x), params)...)))) $T($(map(x->isexpr(x, Symbol) ? :(param($x)) : namify(x), params)...))))
end end
ex ex

2
src/utils.jl
View File

@ -2,8 +2,6 @@ call(f, xs...) = f(xs...)
# Arrays # Arrays
const AArray = AbstractArray
initn(dims...) = randn(dims...)/100 initn(dims...) = randn(dims...)/100
unsqueeze(xs, dim = 1) = reshape(xs, (size(xs)[1:dim-1]..., 1, size(xs)[dim:end]...)) unsqueeze(xs, dim = 1) = reshape(xs, (size(xs)[1:dim-1]..., 1, size(xs)[dim:end]...))