Skip to content

Commit 17c2b24

Browse files
committed
see if tests pass
1 parent 9015152 commit 17c2b24

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/broadcast.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ function mapidx{N}(f, A::AbstractAccArray, args::NTuple{N, Any})
175175
gpu_call(mapidx_kernel, A, (f, A, Cuint(length(A)), args...))
176176
end
177177
# Base functions that are sadly not fit for the the GPU yet (they only work for Int64)
178-
@pure @noinline function gpu_ind2sub{N, T}(dims::NTuple{N}, ind::T)
178+
@pure function gpu_ind2sub{N, T}(dims::NTuple{N}, ind::T)
179179
_ind2sub(NTuple{N, T}(dims), ind - T(1))
180180
end
181181
@pure @inline _ind2sub{T}(::Tuple{}, ind::T) = (ind + T(1),)
@@ -214,7 +214,7 @@ end
214214
@generated function newindex{N, T}(I, ilin::T, keep::NTuple{N}, Idefault, size)
215215
exprs = Expr(:tuple)
216216
for i = 1:N
217-
push!(exprs.args, :(Bool(keep[$i]) ? T(I[$i]) : T(Idefault[$i])))
217+
push!(exprs.args, :(T(Bool(keep[$i]) ? T(I[$i]) : T(Idefault[$i]))))
218218
end
219219
:(Base.@_inline_meta; gpu_sub2ind(size, $exprs))
220220
end

test/runtests.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#TODO remove before merging
2+
Pkg.checkout("Transpiler")
13
using GPUArrays
24
using Base.Test
35
srand(42) # set random seed for reproducability

0 commit comments

Comments
 (0)