Merge remote-tracking branch 'upstream/master' into add-more-tf-ops-2

2017-06-09 17:55:00 +02:00 · 2017-06-09 17:55:00 +02:00 · d80c1abf5e
commit d80c1abf5e
parent 6b4db60f05 9b18fd639a
1 changed files with 2 additions and 2 deletions
--- a/src/backend/mxnet/mxarray.jl
+++ b/src/backend/mxnet/mxarray.jl
@ -32,8 +32,8 @@ end

 Base.copy(mx::MXArray) = copy!(Array{Float32}(size(mx)), mx)

-function MXArray(xs::AbstractArray)
-  mx = MXArray(size(xs))
+function MXArray(xs::AbstractArray, ctx = mx.cpu())
+  mx = MXArray(size(xs), ctx)
  copy!(mx, xs)
 end