put new functionality in a package extention

Author: ajwheeler

Project.toml

@@ -19,15 +19,17 @@ WoodburyMatrices = "efce3f68-66dc-5838-9240-27a6d6f5f9b6"
 
 [weakdeps]
 Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
+ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 
 [extensions]
 InterpolationsUnitfulExt = "Unitful"
+InterpolationsForwardDiffExt = "ForwardDiff"
 
 [compat]
 Adapt = "2, 3, 4.0"
 AxisAlgorithms = "0.3, 1"
 ChainRulesCore = "0.10, 1.0, 1.2, 1.3"
-ForwardDiff = "1.0.1"
+ForwardDiff = "0.10, 1.0"
 OffsetArrays = "0.10, 0.11, 1.0.1"
 Ratios = "0.3, 0.4"
 Requires = "1.1"

ext/InterpolationsForwardDiffExt.jl

@@ -0,0 +1,23 @@
+module InterpolationsForwardDiffExt
+
+import Interpolations
+using ForwardDiff
+
+# this strips arbitrary layers of ForwardDiff.Dual, returning the innermost value
+Interpolations.just_dual_value(x::ForwardDiff.Dual) = Interpolations.just_dual_value(ForwardDiff.value(x))
+
+function Interpolations.maybe_clamp(::Interpolations.NeedsCheck, itp, xs::Tuple{Vararg{ForwardDiff.Dual}})
+    xs_values = Interpolations.just_dual_value.(xs)
+    clamped_vals = Interpolations.maybe_clamp(Interpolations.NeedsCheck(), itp, xs_values)
+    apply_partials.(xs, clamped_vals)
+end
+
+# apply partials from arbitrarily nested ForwardDiff.Dual to a value
+# used in maybe_clamp, above
+function apply_partials(x_dual::D, val::Number) where D <: ForwardDiff.Dual
+    ∂s = ForwardDiff.partials(x_dual)
+    apply_partials(ForwardDiff.value(x_dual), D(val, ∂s))
+end
+apply_partials(_::Number, val::Number) = val
+
+end

src/Interpolations.jl

@@ -447,29 +447,13 @@ maybe_clamp(itp, xs) = maybe_clamp(BoundsCheckStyle(itp), itp, xs)
 maybe_clamp(::NeedsCheck, itp, xs) = map(clamp, xs, lbounds(itp), ubounds(itp))
 maybe_clamp(::CheckWillPass, itp, xs) = xs
 
-using ForwardDiff
-# TODO
-function maybe_clamp(::NeedsCheck, itp, xs::Tuple{Vararg{ForwardDiff.Dual}})
-    xs_values = just_dual_value.(xs)
-    clamped_vals = maybe_clamp(NeedsCheck(), itp, xs_values)
-    apply_partials.(xs, clamped_vals)
-end
+# this strips arbitrary layers of ForwardDiff.Dual, returning the innermost value
+# it's other methods are defined in InterpolationsForwardDiffExt.jl
+just_dual_value(x::Number) = x
 
 Base.hash(x::AbstractInterpolation, h::UInt) = Base.hash_uint(3h - objectid(x))
 Base.hash(x::AbstractExtrapolation, h::UInt) = Base.hash_uint(3h - objectid(x))
 
-# TODO use this, and define a method in a ForwardDiff package extension
-# stip off arbitrary layers of ForwardDiff.Dual, returning the innermost value
-just_dual_value(x::Number) = x
-just_dual_value(x::ForwardDiff.Dual) = just_dual_value(ForwardDiff.value(x))
-
-# apply partials from arbitrarily nested ForwardDiff.Dual to a value
-function apply_partials(x_dual::D, val::Number) where D <: ForwardDiff.Dual
-    ∂s = ForwardDiff.partials(x_dual)
-    apply_partials(ForwardDiff.value(x_dual), D(val, ∂s))
-end
-apply_partials(x_dual::Number, val::Number) = val
-
 include("nointerp/nointerp.jl")
 include("b-splines/b-splines.jl")
 include("gridded/gridded.jl")