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

Change Optimization kwarg autoad to adtype #2168

Merged
merged 1 commit into from
Feb 15, 2024
Merged

Change Optimization kwarg autoad to adtype #2168

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
14 changes: 7 additions & 7 deletions src/optimisation/Optimisation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,17 +283,17 @@
model::Model,
estimator::Union{MLE, MAP};
constrained::Bool=true,
autoad::Union{Nothing, AbstractADType}=NoAD(),
adtype::Union{Nothing, AbstractADType}=NoAD(),
)
if autoad === nothing
Base.depwarn("the use of `autoad=nothing` is deprecated, please use `autoad=SciMLBase.NoAD()`", :optim_function)
if adtype === nothing
Base.depwarn("the use of `adtype=nothing` is deprecated, please use `adtype=SciMLBase.NoAD()`", :optim_function)

Check warning on line 289 in src/optimisation/Optimisation.jl

View check run for this annotation

Codecov / codecov/patch

src/optimisation/Optimisation.jl#L288-L289 

Added lines #L288 - L289 were not covered by tests
end

obj, init, t = optim_objective(model, estimator; constrained=constrained)

l(x, _) = obj(x)
f = if autoad isa AbstractADType && autoad !== NoAD()
OptimizationFunction(l, autoad)
f = if adtype isa AbstractADType && adtype !== NoAD()
OptimizationFunction(l, adtype)

Check warning on line 296 in src/optimisation/Optimisation.jl

View check run for this annotation

Codecov / codecov/patch

src/optimisation/Optimisation.jl#L295-L296 

Added lines #L295 - L296 were not covered by tests
else
OptimizationFunction(
l;
Expand All @@ -310,10 +310,10 @@
estimator::Union{MAP, MLE};
constrained::Bool=true,
init_theta=nothing,
autoad::Union{Nothing, AbstractADType}=NoAD(),
adtype::Union{Nothing, AbstractADType}=NoAD(),
kwargs...,
)
f, init, transform = optim_function(model, estimator; constrained=constrained, autoad=autoad)
f, init, transform = optim_function(model, estimator; constrained=constrained, adtype=adtype)

Check warning on line 316 in src/optimisation/Optimisation.jl

View check run for this annotation

Codecov / codecov/patch

src/optimisation/Optimisation.jl#L316 

Added line #L316 was not covered by tests

u0 = init_theta === nothing ? init() : init(init_theta)
prob = OptimizationProblem(f, u0; kwargs...)
Expand Down
Loading