Merge pull request #54 from dfdx/fix-to-device-int

Fix to device int
dfdx · Feb 10, 2020 · 8a6d72a · 8a6d72a
2 parents 97e1aef + 1a25598
commit 8a6d72a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/compile.jl b/src/compile.jl
@@ -20,7 +20,8 @@ end
 function Espresso.to_expr(op::Call)
     arg_names = map(make_name, op.args)
     call = Expr(:call, op.fn, arg_names...)
-    assign = (op.val isa Array || is_cuarray(op.val)) ? :(.=) : :(=)
+    # assign = ((op.val isa Array || is_cuarray(op.val)) && op.fn == broadcast) ? :(.=) : :(=)    
+    assign = :(=)
     return Expr(assign, make_name(op.id), call)
 end
 

diff --git a/src/cuda.jl b/src/cuda.jl
@@ -32,7 +32,7 @@ function to_device(device::GPU, x)
     flds = fieldnames(T)
     if is_cuarray(x)
         return x
-    elseif isa(x, Real)
+    elseif isa(x, AbstractFloat)
         return Float32(x)
     elseif isa(x, Tuple)
         return ((to_device(device, el) for el in x)...,)