Fix Optimization ext

bat · Dec 11, 2024 · fb502b2 · fb502b2
1 parent 159f24f
commit fb502b2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/ext/BATOptimizationExt.jl b/ext/BATOptimizationExt.jl
@@ -24,13 +24,13 @@ function test_bat_optimization_ext()
 end
 
 AbstractModeEstimator(optalg::Any) = OptimizationAlg(optalg)
-convert(::Type{AbstractModeEstimator}, alg::OptimizationAlg) = alg.optalg
+Base.convert(::Type{AbstractModeEstimator}, alg::OptimizationAlg) = alg.optalg
 
 BAT.ext_default(::BAT.PackageExtension{:Optimization}, ::Val{:DEFAULT_OPTALG}) = nothing #Optim.NelderMead()
 
 
 function build_optimizationfunction(f, adsel::AutoDiffOperators.ADSelector)
-    adm = convert_ad(ADTypes.AbstractADType, adsel)
+    adm = convert(ADTypes.AbstractADType, reverse_ad_selector(adsel))
     optimization_function = Optimization.OptimizationFunction(f, adm)
     return optimization_function
 end
@@ -59,7 +59,9 @@ function BAT.bat_findmode_impl(target::MeasureLike, algorithm::OptimizationAlg,
     optimization_problem = Optimization.OptimizationProblem(optimization_function, x_init)
 
     algopts = (maxiters = algorithm.maxiters, maxtime = algorithm.maxtime, abstol = algorithm.abstol, reltol = algorithm.reltol)
-    optimization_result = Optimization.solve(optimization_problem, algorithm.optalg; algopts..., algorithm.kwargs...) 
+    # Not all algorithms support abstol, just filter all NaN-valued opts out:
+    filtered_algopts = NamedTuple(filter(p -> !isnan(p[2]), pairs(algopts)))
+    optimization_result = Optimization.solve(optimization_problem, algorithm.optalg; filtered_algopts..., algorithm.kwargs...) 
 
     transformed_mode =  optimization_result.u
     result_mode = inv_trafo(transformed_mode)

diff --git a/test/optimization/test_mode_estimators.jl b/test/optimization/test_mode_estimators.jl
@@ -101,6 +101,10 @@ using Optim, OptimizationOptimJL
         context = BATContext(rng = Philox4x((0, 0)))
         # result is not type-stable:
         test_findmode(posterior, OptimizationAlg(optalg = OptimizationOptimJL.NelderMead(), pretransform = DoNotTransform()), 0.01, context, inferred = false) 
+
+        context = BATContext(rng = Philox4x((0, 0)), ad = ADSelector(ForwardDiff))
+        # result is not type-stable:
+        test_findmode(posterior, OptimizationAlg(optalg = Optimization.LBFGS(), trafo = DoNotTransform()), 0.01, context, inferred = false) 
     end
 
     @testset "Optimization.jl with custom options" begin # checks that options are correctly passed to Optimization.jl