Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicit loop in _findall to avoid allocations #2771

Merged
merged 4 commits into from
May 25, 2021
Merged

Explicit loop in _findall to avoid allocations #2771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4cf11d
Unroll loop in _findall to avoid allocations
pstorozenko May 22, 2021
23ac786
Spaces added
pstorozenko May 22, 2021
7cff4d9
I missed one case earlier
pstorozenko May 23, 2021
2243b5b
Test fix
pstorozenko May 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions src/other/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,10 @@ function _findall(B::BitVector)::Union{UnitRange{Int}, Vector{Int}}
end
if c == ~UInt64(0)
if stop != -1
I = Vector{Int}(undef,nnzB)
I[1:i-1] .= start:stop
I = Vector{Int}(undef, nnzB)
for j in 1:i-1
I[j] = start + j - 1
end
break
end
if start == -1
Expand All @@ -243,20 +245,26 @@ function _findall(B::BitVector)::Union{UnitRange{Int}, Vector{Int}}
lz = leading_zeros(c)
co = c >> tz == (one(UInt64) << (64 - lz - tz)) - 1 # block of countinous ones in c
if stop != -1 # already found block of ones and zeros, just not materialized
I = Vector{Int}(undef,nnzB)
I[1:i-1] .= start:stop
I = Vector{Int}(undef, nnzB)
for j in 1:i-1
I[j] = start + j - 1
end
break
elseif !co # not countinous ones
I = Vector{Int}(undef,nnzB)
I = Vector{Int}(undef, nnzB)
if start != -1
I[1:i-1] .= start:start + i - 2
for j in 1:i-1
I[j] = start + j - 1
end
end
break
else # countinous block of ones
if start != -1
if tz > 0 # like __1111__ or 111111__
I = Vector{Int}(undef,nnzB)
I[1:i-1] .= start:start + i - 2
I = Vector{Int}(undef, nnzB)
for j in 1:i-1
I[j] = start + j - 1
end
break
else # lz > 0, like __111111
stop = i1 + (64 - lz) - 1
Expand Down Expand Up @@ -310,7 +318,9 @@ function _findall(B::BitVector)::Union{UnitRange{Int}, Vector{Int}}
end

while c == ~UInt64(0)
I[i:i+64-1] .= i1:(i1+64-1)
for j in 0:64-1
I[i + j] = i1 + j
end
i += 64
if Bi == length(Bc)
@assert nnzB == i - 1
Expand Down
2 changes: 1 addition & 1 deletion test/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ end
"TFT small" => ([trues(85); falses(100); trues(85)], Vector{Int}),
"FTFFT small" => ([falses(64 + 32); trues(32); falses(128); trues(32)], Vector{Int}),
"TFTF small" => ([falses(64); trues(64); falses(64); trues(64)], Vector{Int}),
"TFT small" => ([trues(64); falses(10); trues(100)], Vector{Int}),
"TFT small2" => ([trues(64); falses(10); trues(100)], Vector{Int}),

"FTF Big" => ([falses(8500); trues(100000); falses(65000)], UnitRange{Int}),
"TFT Big" => ([trues(8500); falses(100000); trues(65000)], Vector{Int}),
Expand Down