Remove custom instantiate, this is now handled in MathOptIIS

Author: odow

Project.toml

@@ -18,6 +18,6 @@ MathOptAnalyzerJuMPExt = "JuMP"
 [compat]
 Dualization = "0.6"
 JuMP = "1.24"
-MathOptIIS = "0.1.1, 0.2"
+MathOptIIS = "0.2"
 MathOptInterface = "1.37"
 julia = "1.10"

src/Infeasibility/Infeasibility.jl

@@ -6,7 +6,7 @@
 module Infeasibility
 
 import MathOptAnalyzer
-import MathOptIIS as MOIIS
+import MathOptIIS
 import MathOptInterface as MOI
 
 include("structs.jl")

src/Infeasibility/analyze.jl

@@ -3,7 +3,7 @@
 # Use of this source code is governed by an MIT-style license that can be found
 # in the LICENSE.md file or at https://opensource.org/licenses/MIT.
 
-function _add_result(out::Data, model, iis, meta::MOIIS.BoundsData)
+function _add_result(out::Data, model, iis, meta::MathOptIIS.BoundsData)
     @assert length(iis.constraints) == 2
     err = InfeasibleBounds{Float64}(
         MOI.get(model, MOI.ConstraintFunction(), iis.constraints[1]),
@@ -14,7 +14,7 @@ function _add_result(out::Data, model, iis, meta::MOIIS.BoundsData)
     return
 end
 
-function _add_result(out::Data, model, iis, meta::MOIIS.IntegralityData)
+function _add_result(out::Data, model, iis, meta::MathOptIIS.IntegralityData)
     @assert length(iis.constraints) >= 2
     err = InfeasibleIntegrality{Float64}(
         MOI.get(model, MOI.ConstraintFunction(), iis.constraints[1]),
@@ -26,7 +26,7 @@ function _add_result(out::Data, model, iis, meta::MOIIS.IntegralityData)
     return
 end
 
-function _add_result(out::Data, model, iis, meta::MOIIS.RangeData)
+function _add_result(out::Data, model, iis, meta::MOMathOptIISIIS.RangeData)
     @assert length(iis.constraints) >= 1
     for con in iis.constraints
         if con isa MOI.ConstraintIndex{MOI.VariableIndex}
@@ -49,35 +49,15 @@ function _add_result(out::Data, model, iis, meta)
     return
 end
 
-function _instantiate_with_modify(optimizer, ::Type{T}) where {T}
-    model = MOI.instantiate(optimizer)
-    if !MOI.supports_incremental_interface(model)
-        # Don't use `default_cache` for the cache because, for example, SCS's
-        # default cache doesn't support modifying coefficients of the constraint
-        # matrix. JuMP uses the default cache with SCS because it has an outer
-        # layer of caching; we don't have that here, so we can't use the
-        # default.
-        #
-        # We could revert to using the default cache if we fix this in MOI.
-        cache = MOI.Utilities.UniversalFallback(MOI.Utilities.Model{T}())
-        model = MOI.Utilities.CachingOptimizer(cache, model)
-    end
-    return MOI.Bridges.full_bridge_optimizer(model, T)
-end
-
 function MathOptAnalyzer.analyze(
     ::Analyzer,
     model::MOI.ModelLike;
     optimizer = nothing,
 )
-    solver = MOIIS.Optimizer()
-    MOI.set(solver, MOIIS.InfeasibleModel(), model)
+    solver = MathOptIIS.Optimizer()
+    MOI.set(solver, MathOptIIS.InfeasibleModel(), model)
     if optimizer !== nothing
-        MOI.set(
-            solver,
-            MOIIS.InnerOptimizer(),
-            () -> _instantiate_with_modify(optimizer, Float64),
-        )
+        MOI.set(solver, MathOptIIS.InnerOptimizer(), optimizer)
     end
     MOI.compute_conflict!(solver)
     out = Data()