Remove support for autodiff::Symbol, autodiff::Bool, and chunk keyword arguments

Author: devmotion

Project.toml

@@ -1,13 +1,12 @@
 name = "NLSolversBase"
 uuid = "d41bc354-129a-5804-8e4c-c37616107c6c"
-version = "7.10.0"
+version = "8.0.0-dev"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
 DifferentiationInterface = "a0c0ee7d-e4b9-4e03-894e-1c5f64a51d63"
 Distributed = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
-ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 
 [compat]
 ADTypes = "1.11.0"
@@ -19,6 +18,7 @@ julia = "1.10"
 [extras]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
 ComponentArrays = "b0b7db55-cfe3-40fc-9ded-d10e2dbeff66"
+ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 OptimTestProblems = "cec144fc-5a64-5bc6-99fb-dde8f63e154c"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
@@ -27,4 +27,4 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["ADTypes", "ComponentArrays", "LinearAlgebra", "OptimTestProblems", "Random", "RecursiveArrayTools", "SparseArrays", "Test"]
+test = ["ADTypes", "ComponentArrays", "ForwardDiff", "LinearAlgebra", "OptimTestProblems", "Random", "RecursiveArrayTools", "SparseArrays", "Test"]

README.md

@@ -27,14 +27,7 @@ The words in front of `Differentiable` in the type names (`Non`, `Once`, `Twice`
 ## Automatic differentiation
 
 Some constructors for `OnceDifferentiable`, `TwiceDifferentiable`, `OnceDifferentiableConstraints` and `TwiceDifferentiableConstraints` accept a positional argument called `autodiff`.
-This argument can be either:
-
-- An object subtyping `AbstractADType`, defined by [ADTypes.jl](https://github.com/SciML/ADTypes.jl) and supported by [DifferentiationInterface.jl](https://github.com/JuliaDiff/DifferentiationInterface.jl).
-- A `Symbol` like `:finite` (and variants thereof) or `:forward`, which fall back on `ADTypes.AutoFiniteDiff` and `ADTypes.AutoForwardDiff` respectively.
-- A `Bool`, namely `true`, which falls back on `ADTypes.AutoForwardDiff`.
-
-When the positional argument `chunk` is passed, it is used to configure chunk size in `ADTypes.AutoForwardDiff`, but _only_ if `autodiff in (:forward, true)`.
-Indeed, if `autodiff isa ADTypes.AutoForwardDiff`, we assume that the user already selected the appropriate chunk size and so `chunk` is ignored.
+This argument an instance of an `AbstractADType`, defined by [ADTypes.jl](https://github.com/SciML/ADTypes.jl) and supported by [DifferentiationInterface.jl](https://github.com/JuliaDiff/DifferentiationInterface.jl).
 
 ## Examples
 #### Optimization

src/NLSolversBase.jl

@@ -2,10 +2,9 @@ __precompile__(true)
 
 module NLSolversBase
 
-using ADTypes: AbstractADType, AutoForwardDiff, AutoFiniteDiff
+using ADTypes: AbstractADType, AutoFiniteDiff
 import DifferentiationInterface as DI
 using FiniteDiff: FiniteDiff
-using ForwardDiff: ForwardDiff
 import Distributed: clear!
 export AbstractObjective,
        NonDifferentiable,
@@ -46,35 +45,6 @@ export AbstractObjective,
 export AbstractConstraints, OnceDifferentiableConstraints,
     TwiceDifferentiableConstraints, ConstraintBounds
 
-function finitediff_fdtype(autodiff)
-    if autodiff == :finiteforward
-        fdtype = Val{:forward}
-    elseif autodiff == :finitecomplex
-        fdtype = Val{:complex}
-    elseif any(autodiff .== (:finite, :central, :finitecentral))
-        fdtype = Val{:central}
-    end
-    fdtype
-end
-
-forwarddiff_chunksize(::Nothing) = nothing
-forwarddiff_chunksize(::ForwardDiff.Chunk{C}) where {C} = C
-
-is_finitediff(autodiff) = autodiff ∈ (:central, :finite, :finiteforward, :finitecomplex)
-is_forwarddiff(autodiff) = autodiff ∈ (:forward, :forwarddiff, true)
-
-get_adtype(autodiff::AbstractADType, chunk=nothing) = autodiff
-
-function get_adtype(autodiff::Union{Symbol,Bool}, chunk=nothing)
-    if is_finitediff(autodiff)
-        return AutoFiniteDiff(; fdtype=finitediff_fdtype(autodiff)())
-    elseif is_forwarddiff(autodiff)
-        return AutoForwardDiff(; chunksize=forwarddiff_chunksize(chunk))
-    else
-        error("The autodiff value $autodiff is not supported. Use :finite or :forward.")
-    end
-end
-
 x_of_nans(x, Tf=eltype(x)) = fill!(Tf.(x), Tf(NaN))
 
 include("objective_types/inplace_factory.jl")

src/objective_types/constraints.jl

@@ -119,18 +119,9 @@ function OnceDifferentiableConstraints(bounds::ConstraintBounds)
     OnceDifferentiableConstraints(c!, J!, bounds)
 end
 
-function checked_chunk(lx)
-    if isempty(lx)
-        throw(ArgumentError("autodiff on constraints require the full lower bound vector `lx`."))
-    end
-    ForwardDiff.Chunk(lx)
-end
-
 function OnceDifferentiableConstraints(c!, lx::AbstractVector, ux::AbstractVector,
                                        lc::AbstractVector, uc::AbstractVector,
-                                       autodiff::Symbol = :central,
-                                       chunk::ForwardDiff.Chunk = checked_chunk(lx))
-                                       
+                                       autodiff::AbstractADType = AutoFiniteDiff(; fdtype = Val(:central)))                                       
     bounds = ConstraintBounds(lx, ux, lc, uc)
     T = eltype(bounds)
     sizex = size(lx)
@@ -139,11 +130,12 @@ function OnceDifferentiableConstraints(c!, lx::AbstractVector, ux::AbstractVecto
     xcache = zeros(T, sizex)
     ccache = zeros(T, sizec)
 
-    backend = get_adtype(autodiff, chunk)
-    jac_prep = DI.prepare_jacobian(c!, ccache, backend, xcache)
-    function j!(_j, _x)
-        DI.jacobian!(c!, ccache, _j, jac_prep, backend, _x)
-        return _j
+    jac_prep = DI.prepare_jacobian(c!, ccache, autodiff, xcache)
+    j! = let c! = c!, ccache = ccache, jac_prep = jac_prep, autodiff = autodiff
+        function (_j, _x)
+            DI.jacobian!(c!, ccache, _j, jac_prep, autodiff, _x)
+            return _j
+        end
     end
     return OnceDifferentiableConstraints(c!, j!, bounds)
 end
@@ -163,8 +155,7 @@ end
 
 function TwiceDifferentiableConstraints(c!, lx::AbstractVector, ux::AbstractVector,
     lc::AbstractVector, uc::AbstractVector,
-    autodiff::Symbol = :central,
-    chunk::ForwardDiff.Chunk = checked_chunk(lx))
+    autodiff::AbstractADType = AutoFiniteDiff(; fdtype = Val(:central)))
     bounds = ConstraintBounds(lx, ux, lc, uc)
     T = eltype(bounds)
     nc = length(lc)
@@ -180,31 +171,31 @@ function TwiceDifferentiableConstraints(c!, lx::AbstractVector, ux::AbstractVect
         return sum(_λ[i] * ccache[i] for i in eachindex(_λ, ccache))
     end
 
-    backend = get_adtype(autodiff, chunk)
-
-
-    jac_prep = DI.prepare_jacobian(c!, ccache, backend, x_example)
-    function con_jac!(_j, _x)
-        DI.jacobian!(c!, ccache, _j, jac_prep, backend, _x) 
-        return _j
+    jac_prep = DI.prepare_jacobian(c!, ccache, autodiff, x_example)
+    con_jac! = let c! = c!, ccache = ccache, jac_prep = jac_prep, autodiff = autodiff
+        function (_j, _x)
+            DI.jacobian!(c!, ccache, _j, jac_prep, autodiff, _x) 
+            return _j
+        end
     end
 
-    hess_prep = DI.prepare_hessian(sum_constraints, backend, x_example, DI.Constant(λ_example))
-    function con_hess!(_h, _x, _λ)
-        DI.hessian!(sum_constraints, _h, hess_prep, backend, _x, DI.Constant(_λ)) 
-        return _h
+    hess_prep = DI.prepare_hessian(sum_constraints, autodiff, x_example, DI.Constant(λ_example))
+    con_hess! = let sum_constraints = sum_constraints, hess_prep = hess_prep, autodiff = autodiff
+        function (_h, _x, _λ)
+            DI.hessian!(sum_constraints, _h, hess_prep, autodiff, _x, DI.Constant(_λ)) 
+            return _h
+        end
     end
 
     return TwiceDifferentiableConstraints(c!, con_jac!, con_hess!, bounds) 
 end
 
 function TwiceDifferentiableConstraints(c!, con_jac!,lx::AbstractVector, ux::AbstractVector,
     lc::AbstractVector, uc::AbstractVector,
-    autodiff::Symbol = :central,
-    chunk::ForwardDiff.Chunk = checked_chunk(lx))
+    autodiff::AbstractADType = AutoFiniteDiff(; fdtype = Val(:central)),)
     # TODO: is con_jac! still useful? we ignore it here
 
-    return TwiceDifferentiableConstraints(c!, lx, ux, lc, uc, autodiff, chunk)
+    return TwiceDifferentiableConstraints(c!, lx, ux, lc, uc, autodiff)
 end
 
 

src/objective_types/oncedifferentiable.jl

@@ -13,26 +13,26 @@ end
 
 ### Only the objective
 # Ambiguity
-OnceDifferentiable(f, x::AbstractArray,
+function OnceDifferentiable(f, x::AbstractArray,
                    F::Real = real(zero(eltype(x))),
-                   DF::AbstractArray = alloc_DF(x, F); inplace = true, autodiff = :finite,  
-                   chunk::ForwardDiff.Chunk = ForwardDiff.Chunk(x)) =
-    OnceDifferentiable(f, x, F, DF, autodiff, chunk)
-#OnceDifferentiable(f, x::AbstractArray, F::AbstractArray; autodiff = :finite) =
-#    OnceDifferentiable(f, x::AbstractArray, F::AbstractArray, alloc_DF(x, F))
+                   DF::AbstractArray = alloc_DF(x, F);
+                   inplace::Bool = true,
+                   autodiff::AbstractADType = AutoFiniteDiff(; fdtype = Val(:central)))
+    OnceDifferentiable(f, x, F, DF, autodiff)
+end
 function OnceDifferentiable(f, x::AbstractArray,
                    F::AbstractArray, DF::AbstractArray = alloc_DF(x, F);
-                   inplace = true, autodiff = :finite)
+                   inplace::Bool = true,
+                   autodiff::AbstractADType = AutoFiniteDiff(; fdtype = Val(:central)))
     f! = f!_from_f(f, F, inplace)
-
-    OnceDifferentiable(f!, x::AbstractArray, F::AbstractArray, DF, autodiff)
+    OnceDifferentiable(f!, x, F, DF, autodiff)
 end
 
 
 function OnceDifferentiable(f, x_seed::AbstractArray{T},
                             F::Real,
                             DF::AbstractArray,
-                            autodiff, chunk) where T
+                            autodiff::AbstractADType) where {T}
     # When here, at the constructor with positional autodiff, it should already
     # be the case, that f is inplace.
     if  typeof(f) <: Union{InplaceObjective, NotInplaceObjective}
@@ -43,62 +43,29 @@ function OnceDifferentiable(f, x_seed::AbstractArray{T},
 
         return OnceDifferentiable(fF, dfF, fdfF, x_seed, F, DF)
     else
-        backend = get_adtype(autodiff, chunk)
-        grad_prep = DI.prepare_gradient(f, backend, x_seed)
-        function g!(_g, _x)
-            DI.gradient!(f, _g, grad_prep, backend, _x)
-            return nothing
+        grad_prep = DI.prepare_gradient(f, autodiff, x_seed)
+        g! = let f = f, grad_prep = grad_prep, autodiff = autodiff
+            function (_g, _x)
+                DI.gradient!(f, _g, grad_prep, autodiff, _x)
+                return nothing
+            end
         end
-        function fg!(_g, _x)
-            y, _ = DI.value_and_gradient!(f, _g, grad_prep, backend, _x)
-            return y
+        fg! = let f = f, grad_prep = grad_prep, autodiff = autodiff
+            function (_g, _x)
+                y, _ = DI.value_and_gradient!(f, _g, grad_prep, autodiff, _x)
+                return y
+            end
         end
         return OnceDifferentiable(f, g!, fg!, x_seed, F, DF)
     end
 end
 
-has_not_dep_symbol_in_ad = Ref{Bool}(true)
-OnceDifferentiable(f, x::AbstractArray, F::AbstractArray, autodiff::Symbol, chunk::ForwardDiff.Chunk = ForwardDiff.Chunk(x)) =
-OnceDifferentiable(f, x, F, alloc_DF(x, F), autodiff, chunk)
-function OnceDifferentiable(f, x::AbstractArray, F::AbstractArray,
-                            autodiff::Bool, chunk::ForwardDiff.Chunk = ForwardDiff.Chunk(x))
-    if autodiff == false
-        throw(ErrorException("It is not possible to set the `autodiff` keyword to `false` when constructing a OnceDifferentiable instance from only one function. Pass in the (partial) derivative or specify a valid `autodiff` symbol."))
-    elseif has_not_dep_symbol_in_ad[]
-        @warn("Setting the `autodiff` keyword to `true` is deprecated. Please use a valid symbol instead.")
-        has_not_dep_symbol_in_ad[] = false
-    end
-    OnceDifferentiable(f, x, F, alloc_DF(x, F), :forward, chunk)
-end
-function OnceDifferentiable(f, x_seed::AbstractArray, F::AbstractArray, DF::AbstractArray,
-    autodiff::Symbol , chunk::ForwardDiff.Chunk = ForwardDiff.Chunk(x_seed))
-    if  typeof(f) <: Union{InplaceObjective, NotInplaceObjective}
-        fF = make_f(f, x_seed, F)
-        dfF = make_df(f, x_seed, F)
-        fdfF = make_fdf(f, x_seed, F)
-        return OnceDifferentiable(fF, dfF, fdfF, x_seed, F, DF)
-    else
-        F2 = similar(F)
-        backend = get_adtype(autodiff, chunk)
-        jac_prep = DI.prepare_jacobian(f, F2, backend, x_seed)
-        function j!(_j, _x)
-            DI.jacobian!(f, F2, _j, jac_prep, backend, _x)
-            return _j
-        end
-        function fj!(_y, _j, _x)
-            y, _ = DI.value_and_jacobian!(f, _y, _j, jac_prep, backend, _x)
-            return y
-        end
-        return OnceDifferentiable(f, j!, fj!, x_seed, F, DF)
-    end
-end
-
 ### Objective and derivative
 function OnceDifferentiable(f, df,
                    x::AbstractArray,
                    F::Real = real(zero(eltype(x))),
                    DF::AbstractArray = alloc_DF(x, F);
-                   inplace = true)
+                   inplace::Bool = true)
 
 
     df! = df!_from_df(df, F, inplace)
@@ -112,7 +79,7 @@ function OnceDifferentiable(f, j,
                    x::AbstractArray,
                    F::AbstractArray,
                    J::AbstractArray = alloc_DF(x, F);
-                   inplace = true)
+                   inplace::Bool = true)
 
     f! = f!_from_f(f, F, inplace)
     j! = df!_from_df(j, F, inplace)
@@ -127,7 +94,7 @@ function OnceDifferentiable(f, df, fdf,
     x::AbstractArray,
     F::Real = real(zero(eltype(x))),
     DF::AbstractArray = alloc_DF(x, F);
-    inplace = true)
+    inplace ::Bool = true)
 
     # f is never "inplace" since F is scalar
     df! = df!_from_df(df, F, inplace)
@@ -145,7 +112,7 @@ function OnceDifferentiable(f, df, fdf,
                             x::AbstractArray,
                             F::AbstractArray,
                             DF::AbstractArray = alloc_DF(x, F);
-                            inplace = true)
+                            inplace::Bool = true)
 
     f = f!_from_f(f, F, inplace)
     df! = df!_from_df(df, F, inplace)