Skip to content

Commit 121653e

Browse files
author
Joe Petviashvili
committed
fix indexing types
1 parent 7a638b7 commit 121653e

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

src/indexing.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ create_seq(i::Int) = af_seq(i-1, i-1, 1)
2727
create_seq(::Colon) = af_seq(1, 1, 0)
2828

2929
set_indexer!(indexers, i, s::Union{Range,Int,Colon}) = set_seq_indexer(indexers, create_seq(s), i, true)
30-
set_indexer!(indexers, i, s::AFArray{Bool}) = set_array_indexer(indexers, find(s)-1, i)
31-
set_indexer!(indexers, i, s::AFArray) = set_array_indexer(indexers, s-1, i)
30+
set_indexer!(indexers, i, s::AFArray{Bool}) = set_array_indexer(indexers, find(s)-UInt32(1), i)
31+
set_indexer!(indexers, i, s::AFArray) = set_array_indexer(indexers, s-UInt32(1), i)
3232

3333
function set_seq_indexer(indexer, idx, dim::dim_t, is_batch::Bool)
3434
_error(ccall((:af_set_seq_indexer,af_lib),af_err,
@@ -58,7 +58,7 @@ end
5858
function create_indexers(idx)
5959
indexers = create_indexers()
6060
for (i, thing) in enumerate(idx)
61-
set_indexer!(indexers, i-1, thing)
61+
set_indexer!(indexers, i-UInt32(1), thing)
6262
end
6363
indexers
6464
end

src/util.jl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ function sort_index{T,N}(_in::AFArray{T,N},dim::Integer=1,isAscending::Bool=true
352352
_error(ccall((:af_sort_index,af_lib),af_err,
353353
(Ptr{af_array},Ptr{af_array},af_array,UInt32,Bool),
354354
out,indices,_in.arr,UInt32(dim - 1),isAscending))
355-
(AFArray{T,N}(out[]),AFArray{UInt32,N}(indices[])+1)
355+
(AFArray{T,N}(out[]),AFArray{UInt32,N}(indices[])+UInt32(1))
356356
end
357357

358358
function sortperm{T,N}(a::AFArray{T,N}, dim::Integer=1,isAscending::Bool=true)
@@ -424,7 +424,11 @@ end
424424
function find{T,N}(_in::AFArray{T,N})
425425
idx = RefValue{af_array}(0)
426426
_error(ccall((:af_where,af_lib),af_err,(Ptr{af_array},af_array),idx,_in.arr))
427-
AFArray{Int32,N}(idx[])+1
427+
out = AFArray{UInt32,1}(idx[])
428+
if length(out) > 0
429+
out = out + UInt32(1)
430+
end
431+
return out
428432
end
429433

430434
cumsum(a::AFArray, dim::Int=1) = scan(a, dim, AF_BINARY_ADD, true)

0 commit comments

Comments
 (0)