Use more common solution for any julia version

JuliaNLSolvers · Mar 16, 2024 · 65c9946 · 65c9946
1 parent 9840242
commit 65c9946
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/ext/OptimMOIExt.jl b/ext/OptimMOIExt.jl
@@ -6,7 +6,11 @@ import MathOptInterface as MOI
 
 function __init__()
     @static if VERSION >= v"1.9"
-        setglobal!(Optim, :Optimizer, Optimizer)
+        @eval Optim begin
+            OptimMOIExt = Base.get_extension(@__MODULE__, :OptimMOIExt)
+            const Optimizer = OptimMOIExt.Optimizer
+        end
+        # setglobal!(Optim, :Optimizer, Optimizer)
     else
         @eval Optim begin
             using .OptimMOIExt

diff --git a/src/Optim.jl b/src/Optim.jl
@@ -221,11 +221,6 @@ include("multivariate/solvers/constrained/ipnewton/utilities/trace.jl")
 # Maximization convenience wrapper
 include("maximize.jl")
 
-# Pre assign Optimizer, to be overloaded in OptimMOIExt.
-if VERSION >= v"1.9"
-  global Optimizer
-end
-
 function __init__()
     @require_extensions
 end