Skip to content

Fix inference for certain hessian BC/NoInterp combinations #274

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

Merged
timholy merged 1 commit into from
Nov 24, 2018
Merged

Fix inference for certain hessian BC/NoInterp combinations #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/b-splines/indexing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,12 @@ end
slot_substitute(kind1::Tuple{Int,Vararg{Any}}, kind2, p, v, g, h) = slot_substitute(Base.tail(kind1), kind2, p, v, g, h)
# Substitute the dth dimension's gradient coefs for the remaining coefs
function slot_substitute(kind1::K, kind2::K, p, v, g, h) where K
(maybe_weightedindex.(p, substitute_ruled(v, kind1, h)), slot_substitute(Base.tail(kind1), kind2, p, v, g, h)...)
ss = substitute_ruled(v, kind1, h)
(map(maybe_weightedindex, p, ss), slot_substitute(Base.tail(kind1), kind2, p, v, g, h)...)
end
function slot_substitute(kind1, kind2, p, v, g, h)
ss = substitute_ruled(substitute_ruled(v, kind1, g), kind2, g)
(maybe_weightedindex.(p, ss), slot_substitute(Base.tail(kind1), kind2, p, v, g, h)...)
(map(maybe_weightedindex, p, ss), slot_substitute(Base.tail(kind1), kind2, p, v, g, h)...)
end
# Termination
slot_substitute(kind1::Tuple{}, kind2::Tuple{Int,Vararg{Any}}, p, v, g, h) = _slot_substitute(kind1::Tuple{}, kind2, p, v, g, h)
Expand Down
13 changes: 7 additions & 6 deletions test/hessian.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,11 @@ using Test, Interpolations, LinearAlgebra, ForwardDiff
if ndims(A) == 1
# Hessian of Constant and Linear should always be 0 in 1d
for x in InterpolationTestUtils.thirds(axes(A))
@test all(iszero, Interpolations.hessian(itp, x...))
@test all(iszero, Interpolations.hessian!(h, itp, x...))
@test all(iszero, @inferred(Interpolations.hessian(itp, x...)))
@test all(iszero, @inferred(Interpolations.hessian!(h, itp, x...)))
end
else
for x in InterpolationTestUtils.thirds(axes(A))
check_hessian(itp, h)
end
check_hessian(itp, h)
end
end

Expand All @@ -41,8 +39,11 @@ using Test, Interpolations, LinearAlgebra, ForwardDiff
itp = interpolate(A2, (BSpline(Quadratic(Flat(OnCell()))), NoInterp()))
v = A2[:, 2]
itpcol = interpolate(v, BSpline(Quadratic(Flat(OnCell()))))
@test Interpolations.hessian(itp, 3.2, 2) == Interpolations.hessian(itpcol, 3.2)
@test @inferred(Interpolations.hessian(itp, 3.2, 2)) == @inferred(Interpolations.hessian(itpcol, 3.2))

itp = interpolate(A2, (BSpline(Quadratic(Periodic(OnGrid()))), NoInterp()))
itpcol = interpolate(v, BSpline(Quadratic(Periodic(OnGrid()))))
@test @inferred(Interpolations.hessian(itp, 1.0, 2)) == @inferred(Interpolations.hessian(itpcol, 1.0))

@testset "Monotonic" begin
x = [0.0, 0.2, 0.5, 0.6, 0.9, 1.0]
Expand Down