Mercurial > repos > public > sbplib_julia
diff stencil.jl @ 87:38733e84ef1a patch_based_test
Clean up bounds checking in stencil. change to using uview in DiffOp
author | Vidar Stiernström <vidar.stiernstrom@it.uu.se> |
---|---|
date | Fri, 25 Jan 2019 13:40:15 +0100 |
parents | 7f72e7e14659 |
children | 170e5447bc19 |
line wrap: on
line diff
--- a/stencil.jl Fri Jan 25 10:10:30 2019 +0100 +++ b/stencil.jl Fri Jan 25 13:40:15 2019 +0100 @@ -17,18 +17,17 @@ # Provides index into the Stencil based on offset for the root element function Base.getindex(s::Stencil, i::Int) - # TBD: Rearrange to mark with @boundscheck? - if s.range[1] <= i <= s.range[2] - return s.weights[1 + i - s.range[1]] - else + @boundscheck if i < s.range[1] || s.range[2] < i return eltype(s.weights)(0) end + return s.weights[1 + i - s.range[1]] end -@inline function apply(s::Stencil, v::AbstractVector, i::Int) +Base.@propagate_inbounds function apply(s::Stencil, v::AbstractVector, i::Int) w = zero(eltype(v)) for j ∈ s.range[1]:s.range[2] - @inbounds w += s[j]*v[i+j] # TBD: Make this without boundschecks? + @inbounds weight = s[j] + w += weight*v[i+j] end return w end