ExaVector and ExaMatrix

ext/ExaModelsLinearAlgebra.jl

@@ -106,6 +106,20 @@ const ExaNode = Union{
 const VecExaNode = AbstractVector{<:ExaNode}
 const MatExaNode = AbstractMatrix{<:ExaNode}
 
+# --- ExaVector / ExaMatrix convenience constructors ---
+
+# Variable constructors
+ExaModels.ExaVector(c::ExaModels.ExaCore, n::Int; kwargs...) =
+    ExaModels.ExaVector(ExaModels.variable(c, n; kwargs...))
+ExaModels.ExaMatrix(c::ExaModels.ExaCore, m::Int, n::Int; kwargs...) =
+    ExaModels.ExaMatrix(ExaModels.variable(c, m, n; kwargs...))
+
+# Parameter constructors
+ExaModels.ExaVector(c::ExaModels.ExaCore, start::AbstractVector) =
+    ExaModels.ExaVector(ExaModels.parameter(c, start))
+ExaModels.ExaMatrix(c::ExaModels.ExaCore, start::AbstractMatrix) =
+    ExaModels.ExaMatrix(ExaModels.parameter(c, start))
+
 # Type promotion: [x, 0] should give Vector{AbstractNode} with Null(0), not Vector{Any}
 Base.promote_rule(::Type{<:ExaModels.AbstractNode}, ::Type{<:Real}) = ExaModels.AbstractNode
 Base.convert(::Type{ExaModels.AbstractNode}, x::Real) =

src/ExaModels.jl

@@ -40,6 +40,8 @@ include("utils.jl")
 
 export ExaModel,
     ExaCore,
+    ExaVector,
+    ExaMatrix,
     ExaModelsBackend,
     Subexpr,
     ReducedSubexpr,

src/nlp.jl

@@ -98,6 +98,20 @@ Parameter
   θ ∈ R^{$(join(size(v.size)," × "))}
 """,
 )
+const Indexable = Union{Variable, Parameter, Subexpr, ParameterSubexpr}
+
+struct ExaVector{V<:Indexable} <: AbstractVector{AbstractNode}
+    var::V
+end
+Base.size(v::ExaVector) = (v.var.length,)
+Base.getindex(v::ExaVector, i::Int) = v.var[i]
+
+struct ExaMatrix{V<:Indexable} <: AbstractMatrix{AbstractNode}
+    var::V
+end
+Base.size(M::ExaMatrix) = M.var.size
+Base.getindex(M::ExaMatrix, i::Int, j::Int) = M.var[i, j]
+
 struct Objective{R,F,I} <: AbstractObjective
     inner::R
     f::F