This commit is contained in:
Mike J Innes 2017-03-08 01:19:51 +00:00
parent 06f2ee2284
commit d35191595d
2 changed files with 40 additions and 0 deletions

View File

@ -0,0 +1,39 @@
using MXNet
# NDArray is row-major so by default all dimensions are reversed in MXNet.
# MXArray tranposes when loading/storing to fix this.
reversedims!(dest, xs) = permutedims!(dest, xs, ndims(xs):-1:1)
immutable MXArray{N}
data::mx.NDArray
scratch::Array{Float32,N}
end
MXArray{T}(data::mx.NDArray, scratch::Array{Float32, T}) = MXArray{T}(data, scratch)
MXArray(data::mx.NDArray) = MXArray(data, Array{Float32}(size(data)))
MXArray(dims::Integer...) = MXArray(mx.zeros(reverse(dims)))
Base.size(xs::MXArray) = reverse(size(xs.data))
function Base.copy!(mx::MXArray, xs::AbstractArray)
@assert size(mx) == size(xs)
reversedims!(mx.scratch, xs)
copy!(mx.data, mx.scratch)
return mx
end
function Base.copy!(xs::AbstractArray, mx::MXArray)
@assert size(xs) == size(mx)
copy!(mx.scratch, mx.data)
reversedims!(xs, mx.scratch)
end
Base.copy(mx::MXArray) = copy!(Array{Float32}(size(mx)), mx)
function MXArray(xs::AbstractArray)
mx = MXArray(size(xs)...)
copy!(mx, xs)
end

View File

@ -4,6 +4,7 @@ using MXNet, DataFlow, ..Flux
export mxnet
include("mxarray.jl")
include("graph.jl")
include("model.jl")