Skip to content

use MOI.Scaled to remove custom bridges #863

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
araujoms merged 2 commits into from
Oct 22, 2025
Merged

use MOI.Scaled to remove custom bridges #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b4bbac
use MOI.Scaled to remove custom bridges
araujoms Oct 21, 2025
656cd90
fix examples
araujoms Oct 22, 2025
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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ GenericLinearAlgebra = "0.3"
IterativeSolvers = "0.9"
LinearMaps = "3"
LowRankOpt = "0.2"
MathOptInterface = "1"
MathOptInterface = "1.20"
PolynomialRoots = "1"
Requires = "1"
SpecialFunctions = "2"
Expand Down
4 changes: 2 additions & 2 deletions examples/JuMP_utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ MOIU.@model(
MOI.SecondOrderCone,
MOI.RotatedSecondOrderCone,
MOI.ExponentialCone,
MOI.PositiveSemidefiniteConeTriangle,
MOI.Scaled{MOI.PositiveSemidefiniteConeTriangle},
),
(),
(),
Expand All @@ -45,7 +45,7 @@ MOIU.@model(
MOI.Nonnegatives,
MOI.Nonpositives,
MOI.ExponentialCone,
MOI.PositiveSemidefiniteConeTriangle,
MOI.Scaled{MOI.PositiveSemidefiniteConeTriangle},
),
(),
(),
Expand Down
18 changes: 12 additions & 6 deletions src/MathOptInterface/cones.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ end

function cone_from_moi(
::Type{T},
cone::MOI.PositiveSemidefiniteConeTriangle,
cone::MOI.Scaled{MOI.PositiveSemidefiniteConeTriangle},
) where {T <: Real}
return Cones.PosSemidefTri{T, T}(MOI.dimension(cone))
end
Expand Down Expand Up @@ -77,7 +77,10 @@ function cone_from_moi(::Type{T}, cone::MOI.GeometricMeanCone) where {T <: Real}
return (l = MOI.dimension(cone) - 1; Cones.HypoGeoMean{T}(1 + l))
end

function cone_from_moi(::Type{T}, cone::MOI.RootDetConeTriangle) where {T <: Real}
function cone_from_moi(
::Type{T},
cone::MOI.Scaled{MOI.RootDetConeTriangle},
) where {T <: Real}
return Cones.HypoRootdetTri{T, T}(MOI.dimension(cone))
end

Expand All @@ -89,7 +92,10 @@ function cone_from_moi(::Type{T}, cone::MOI.DualExponentialCone) where {T <: Rea
return Cones.HypoPerLog{T}(3, use_dual = true)
end

function cone_from_moi(::Type{T}, cone::MOI.LogDetConeTriangle) where {T <: Real}
function cone_from_moi(
::Type{T},
cone::MOI.Scaled{MOI.LogDetConeTriangle},
) where {T <: Real}
return Cones.HypoPerLogdetTri{T, T}(MOI.dimension(cone))
end

Expand Down Expand Up @@ -795,7 +801,7 @@ const HypatiaCones{T <: Real} = Union{
const SupportedCone{T <: Real} = Union{
HypatiaCones{T},
MOI.Nonnegatives,
MOI.PositiveSemidefiniteConeTriangle,
MOI.Scaled{MOI.PositiveSemidefiniteConeTriangle},
MOI.HermitianPositiveSemidefiniteConeTriangle,
MOI.NormInfinityCone,
MOI.NormOneCone,
Expand All @@ -806,10 +812,10 @@ const SupportedCone{T <: Real} = Union{
MOI.PowerCone{T},
MOI.DualPowerCone{T},
MOI.GeometricMeanCone,
MOI.RootDetConeTriangle,
MOI.Scaled{MOI.RootDetConeTriangle},
MOI.ExponentialCone,
MOI.DualExponentialCone,
MOI.LogDetConeTriangle,
MOI.Scaled{MOI.LogDetConeTriangle},
MOI.RelativeEntropyCone,
_PrimalRankOnePSD{T},
_DualRankOnePSD{T},
Expand Down
40 changes: 0 additions & 40 deletions src/MathOptInterface/transform.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,46 +48,6 @@ function permute_affine(cone::SpecNucCone, func::VAF{T}) where {T}
return idxs_new
end

# transformations (svec rescaling) for MOI symmetric matrix cones not
# in svec (scaled lower triangle) form
const SvecCone = Union{
MOI.PositiveSemidefiniteConeTriangle,
MOI.LogDetConeTriangle,
MOI.RootDetConeTriangle,
}

svec_offset(::MOI.PositiveSemidefiniteConeTriangle) = 1
svec_offset(::MOI.RootDetConeTriangle) = 2
svec_offset(::MOI.LogDetConeTriangle) = 3

needs_untransform(::SvecCone) = true

function untransform_affine(cone::SvecCone, vals::AbstractVector{T}) where {T}
@views svec_vals = vals[svec_offset(cone):end]
Cones.scale_svec!(svec_vals, inv(sqrt(T(2))))
return vals
end

needs_rescale(::SvecCone) = true

function rescale_affine(cone::SvecCone, vals::AbstractVector{T}) where {T}
@views svec_vals = vals[svec_offset(cone):end]
Cones.scale_svec!(svec_vals, sqrt(T(2)))
return vals
end

function rescale_affine(cone::SvecCone, func::VAF{T}, vals::AbstractVector{T}) where {T}
scal_start = svec_offset(cone) - 1
rt2 = sqrt(T(2))
for i in eachindex(vals)
k = func.terms[i].output_index - scal_start
if k > 0 && !MOI.Utilities.is_diagonal_vectorized_index(k)
vals[i] *= rt2
end
end
return vals
end

# transformation (svec rescaling and real/imag parts reordering) for MOI Hermitian PSD cone not in svec (scaled upper triangle) form
needs_untransform(::MOI.HermitianPositiveSemidefiniteConeTriangle) = true

Expand Down
6 changes: 3 additions & 3 deletions test/moicones.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function test_moi_cones(T::Type{<:Real})
# MOI predefined cones

@testset "PositiveSemidefiniteConeTriangle" begin
moi_cone = MOI.PositiveSemidefiniteConeTriangle(3)
moi_cone = MOI.Scaled(MOI.PositiveSemidefiniteConeTriangle(3))
hyp_cone = Hypatia.cone_from_moi(T, moi_cone)
@test hyp_cone isa Cones.PosSemidefTri{T, T}
@test MOI.dimension(moi_cone) == Cones.dimension(hyp_cone) == 6
Expand Down Expand Up @@ -114,7 +114,7 @@ function test_moi_cones(T::Type{<:Real})
end

@testset "RootDetConeTriangle" begin
moi_cone = MOI.RootDetConeTriangle(3)
moi_cone = MOI.Scaled(MOI.RootDetConeTriangle(3))
hyp_cone = Hypatia.cone_from_moi(T, moi_cone)
@test hyp_cone isa Cones.HypoRootdetTri{T, T}
@test MOI.dimension(moi_cone) == Cones.dimension(hyp_cone) == 7
Expand All @@ -138,7 +138,7 @@ function test_moi_cones(T::Type{<:Real})
end

@testset "LogDetConeTriangle" begin
moi_cone = MOI.LogDetConeTriangle(3)
moi_cone = MOI.Scaled(MOI.LogDetConeTriangle(3))
hyp_cone = Hypatia.cone_from_moi(T, moi_cone)
@test hyp_cone isa Cones.HypoPerLogdetTri{T, T}
@test MOI.dimension(moi_cone) == Cones.dimension(hyp_cone) == 8
Expand Down