Skip to content

Fix test registries to use explicit parameters + add parameter=nothing for mock strategies #173

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

Merged
ocots merged 1 commit into from
Jul 13, 2026
Merged

Fix test registries to use explicit parameters + add parameter=nothing for mock strategies #173

Show file tree
Hide file tree
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
28 changes: 17 additions & 11 deletions test/suite/integration/test_comprehensive_validation.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,9 @@ function test_strategy_construction(

Test.@testset "build_strategy_from_resolved()" begin
method = if family == Modelers.AbstractNLPModeler
(:collocation, strategy_id, :ipopt)
(:collocation, strategy_id, :ipopt, :cpu)
else
(:collocation, :adnlp, strategy_id)
(:collocation, :adnlp, strategy_id, :cpu)
end

families = (strategy=family,)
Expand Down Expand Up @@ -331,16 +331,19 @@ function test_comprehensive_validation()

# Create registries for testing
modeler_registry = Strategies.create_registry(
Modelers.AbstractNLPModeler => (Modelers.ADNLP, Modelers.Exa)
Modelers.AbstractNLPModeler => (
(Modelers.ADNLP, [Strategies.CPU]),
(Modelers.Exa, [Strategies.CPU, Strategies.GPU]),
)
)

# Create solver registry based on available extensions
solver_types = []
IPOPT_AVAILABLE && push!(solver_types, Solvers.Ipopt)
MADNLP_AVAILABLE && push!(solver_types, Solvers.MadNLP)
MADNCL_AVAILABLE && push!(solver_types, Solvers.MadNCL)
UNO_AVAILABLE && push!(solver_types, Solvers.Uno)
# KNITRO_AVAILABLE && push!(solver_types, Solvers.Knitro) # Never available - no license
IPOPT_AVAILABLE && push!(solver_types, (Solvers.Ipopt, [Strategies.CPU]))
MADNLP_AVAILABLE && push!(solver_types, (Solvers.MadNLP, [Strategies.CPU, Strategies.GPU]))
MADNCL_AVAILABLE && push!(solver_types, (Solvers.MadNCL, [Strategies.CPU, Strategies.GPU]))
UNO_AVAILABLE && push!(solver_types, (Solvers.Uno, [Strategies.CPU]))
# KNITRO_AVAILABLE && push!(solver_types, (Solvers.Knitro, [Strategies.CPU])) # Never available - no license

solver_registry = if isempty(solver_types)
Strategies.create_registry(Solvers.AbstractNLPSolver => ())
Expand Down Expand Up @@ -711,7 +714,7 @@ function test_comprehensive_validation()
)
# Test.@test modeler2.options.mode == :permissive # WRONG - mode should NOT be stored

method = (:collocation, :adnlp, :ipopt)
method = (:collocation, :adnlp, :ipopt, :cpu)
families = (modeler=Modelers.AbstractNLPModeler,)
resolved = Orchestration.resolve_method(method, families, registry)
modeler3 = Orchestration.build_strategy_from_resolved(
Expand Down Expand Up @@ -759,7 +762,10 @@ function test_comprehensive_validation()
local unknown_options = (test_consistency=42)

local registry = Strategies.create_registry(
Modelers.AbstractNLPModeler => (Modelers.ADNLP, Modelers.Exa)
Modelers.AbstractNLPModeler => (
(Modelers.ADNLP, [Strategies.CPU]),
(Modelers.Exa, [Strategies.CPU, Strategies.GPU]),
)
)

# Create strategies with different methods - redirect stderr to hide warnings
Expand All @@ -780,7 +786,7 @@ function test_comprehensive_validation()
mode=:permissive,
)

method = (:collocation, :adnlp, :ipopt)
method = (:collocation, :adnlp, :ipopt, :cpu)
families = (modeler=Modelers.AbstractNLPModeler,)
resolved = Orchestration.resolve_method(method, families, registry)
modeler3 = Orchestration.build_strategy_from_resolved(
Expand Down
30 changes: 18 additions & 12 deletions test/suite/integration/test_route_to_comprehensive.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ Strategies.id(::Type{RouteADNLP}) = :adnlp
Strategies.id(::Type{RouteIpopt}) = :ipopt
Strategies.id(::Type{RouteMadNLP}) = :madnlp

Strategies.parameter(::Type{<:RouteCollocation}) = nothing
Strategies.parameter(::Type{<:RouteADNLP}) = nothing
Strategies.parameter(::Type{<:RouteIpopt}) = nothing
Strategies.parameter(::Type{<:RouteMadNLP}) = nothing

# Add constructors for mock strategies
function RouteCollocation(; mode=:strict, kwargs...)
options = Strategies.build_strategy_options(RouteCollocation; mode=mode, kwargs...)
Expand Down Expand Up @@ -175,6 +180,7 @@ const MOCK_REGISTRY = Strategies.create_registry(
# Test method and families
const MOCK_METHOD = (:collocation, :adnlp, :ipopt)
const MOCK_METHOD_MULTI = (:collocation, :adnlp, :ipopt)
const REAL_METHOD = (:collocation, :adnlp, :ipopt, :cpu)

const MOCK_FAMILIES = (
discretizer=RouteTestDiscretizer, modeler=RouteTestModeler, solver=RouteTestSolver
Expand Down Expand Up @@ -500,7 +506,7 @@ function test_route_to_comprehensive()
Test.@testset "Real Modelers.ADNLP" begin
real_registry = Strategies.create_registry(
RouteTestDiscretizer => (RouteCollocation,),
Modelers.AbstractNLPModeler => (Modelers.ADNLP,),
Modelers.AbstractNLPModeler => ((Modelers.ADNLP, [Strategies.CPU]),),
RouteTestSolver => (RouteIpopt,),
)

Expand All @@ -518,12 +524,12 @@ function test_route_to_comprehensive()
)

routed = Orchestration.route_all_options(
MOCK_METHOD, real_families, ACTION_DEFS, kwargs, real_registry
REAL_METHOD, real_families, ACTION_DEFS, kwargs, real_registry
)

# Build real modeler
resolved = Orchestration.resolve_method(
MOCK_METHOD, real_families, real_registry
REAL_METHOD, real_families, real_registry
)
real_modeler = Orchestration.build_strategy_from_resolved(
resolved,
Expand All @@ -543,7 +549,7 @@ function test_route_to_comprehensive()
real_registry = Strategies.create_registry(
RouteTestDiscretizer => (RouteCollocation,),
RouteTestModeler => (RouteADNLP,),
Solvers.AbstractNLPSolver => (Solvers.Uno,),
Solvers.AbstractNLPSolver => ((Solvers.Uno, [Strategies.CPU]),),
)

real_families = (
Expand All @@ -553,7 +559,7 @@ function test_route_to_comprehensive()
)

# Use :uno in method tuple, not :ipopt
uno_method = (:collocation, :adnlp, :uno)
uno_method = (:collocation, :adnlp, :uno, :cpu)

kwargs = (
grid_size=200,
Expand Down Expand Up @@ -594,7 +600,7 @@ function test_route_to_comprehensive()
real_registry = Strategies.create_registry(
RouteTestDiscretizer => (RouteCollocation,),
RouteTestModeler => (RouteADNLP,),
Solvers.AbstractNLPSolver => (Solvers.Ipopt,),
Solvers.AbstractNLPSolver => ((Solvers.Ipopt, [Strategies.CPU]),),
)

real_families = (
Expand All @@ -611,12 +617,12 @@ function test_route_to_comprehensive()
)

routed = Orchestration.route_all_options(
MOCK_METHOD, real_families, ACTION_DEFS, kwargs, real_registry
REAL_METHOD, real_families, ACTION_DEFS, kwargs, real_registry
)

# Build real solver
resolved = Orchestration.resolve_method(
MOCK_METHOD, real_families, real_registry
REAL_METHOD, real_families, real_registry
)
real_solver = Orchestration.build_strategy_from_resolved(
resolved,
Expand All @@ -626,7 +632,7 @@ function test_route_to_comprehensive()
routed.strategies.solver...,
)

# Verify real solver has the routed options
# Verify real solver has the routed options
test_option_routing(real_solver, :tol, 1e-6)
test_option_routing(real_solver, :max_iter, 1000)
end
Expand All @@ -637,7 +643,7 @@ function test_route_to_comprehensive()
real_registry = Strategies.create_registry(
RouteTestDiscretizer => (RouteCollocation,),
RouteTestModeler => (RouteADNLP,),
Solvers.AbstractNLPSolver => (Solvers.Ipopt,),
Solvers.AbstractNLPSolver => ((Solvers.Ipopt, [Strategies.CPU]),),
)

real_families = (
Expand All @@ -655,12 +661,12 @@ function test_route_to_comprehensive()
)

routed = Orchestration.route_all_options(
MOCK_METHOD, real_families, ACTION_DEFS, kwargs, real_registry
REAL_METHOD, real_families, ACTION_DEFS, kwargs, real_registry
)

# Build real solver
resolved = Orchestration.resolve_method(
MOCK_METHOD, real_families, real_registry
REAL_METHOD, real_families, real_registry
)
real_solver = Orchestration.build_strategy_from_resolved(
resolved,
Expand Down
4 changes: 4 additions & 0 deletions test/suite/integration/test_strict_permissive_integration.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ Strategies.id(::Type{FakeSolver}) = :fake_solver
Strategies.id(::Type{FakeModeler}) = :fake_modeler
Strategies.id(::Type{FakeDiscretizer}) = :fake_discretizer

Strategies.parameter(::Type{<:FakeSolver}) = nothing
Strategies.parameter(::Type{<:FakeModeler}) = nothing
Strategies.parameter(::Type{<:FakeDiscretizer}) = nothing

# Metadata for FakeSolver
function Strategies.metadata(::Type{FakeSolver})
return Strategies.StrategyMetadata(
Expand Down
Loading