VI -> Vector{Int}

Author: amontoison

src/nlp/batch_api.jl

@@ -19,7 +19,7 @@ Abstract base type for batched nonlinear optimization models.
 Each model in the batch has the same number of variables and constraints,
 and the sparsity patterns of the Jacobian and the Hessian of the Lagrangian are identical across the batch.
 """
-abstract type AbstractBatchNLPModel{T,S,VI} end
+abstract type AbstractBatchNLPModel{T, S} end
 
 """
     bf = batch_obj(bnlp, bx)
@@ -75,9 +75,9 @@ function batch_cons! end
 
 This function is only available if `bnlp.meta.jac_available` is set to `true`.
 """
-function batch_jac_structure(bnlp::AbstractBatchNLPModel{T, S, VI}) where {T, S, VI}
-  jrows = VI(undef, bnlp.meta.nnzj)
-  jcols = VI(undef, bnlp.meta.nnzj)
+function batch_jac_structure(bnlp::AbstractBatchNLPModel{T, S}) where {T, S}
+  jrows = Vector{Int}(undef, bnlp.meta.nnzj)
+  jcols = Vector{Int}(undef, bnlp.meta.nnzj)
   batch_jac_structure!(bnlp, jrows, jcols)
   return (jrows, jcols)
 end
@@ -152,9 +152,9 @@ function batch_jtprod! end
 
 This function is only available if `bnlp.meta.hess_available` is set to `true`.
 """
-function batch_hess_structure(bnlp::AbstractBatchNLPModel{T,S,VI}) where {T, S, VI}
-  hrows = VI(undef, bnlp.meta.nnzh)
-  hcols = VI(undef, bnlp.meta.nnzh)
+function batch_hess_structure(bnlp::AbstractBatchNLPModel{T,S}) where {T, S}
+  hrows = Vector{Int}(undef, bnlp.meta.nnzh)
+  hcols = Vector{Int}(undef, bnlp.meta.nnzh)
   batch_hess_structure!(bnlp, hrows, hcols)
   return hrows, hcols
 end

src/nlp/batch_meta.jl

@@ -5,7 +5,7 @@ export AbstractBatchNLPModelMeta, BatchNLPModelMeta
 
 Abstract base type for metadata related to batched nonlinear optimization models.
 """
-abstract type AbstractBatchNLPModelMeta{T, S, VI} end
+abstract type AbstractBatchNLPModelMeta{T, S} end
 
 """
     BatchNLPModelMeta <: AbstractBatchNLPModelMeta
@@ -70,31 +70,31 @@ The following keyword arguments are accepted:
 - `jfree`: indices of "free" constraints (there shouldn't be any)
 - `jinf`: indices of the visibly infeasible constraints
 """
-struct BatchNLPModelMeta{T, S, VI} <: AbstractBatchNLPModelMeta{T, S, VI}
+struct BatchNLPModelMeta{T, S} <: AbstractBatchNLPModelMeta{T, S}
   nbatch::Int
   nvar::Int
   x0::S
   lvar::S
   uvar::S
 
-  ifix::VI
-  ilow::VI
-  iupp::VI
-  irng::VI
-  ifree::VI
-  iinf::VI
+  ifix::Vector{Int}
+  ilow::Vector{Int}
+  iupp::Vector{Int}
+  irng::Vector{Int}
+  ifree::Vector{Int}
+  iinf::Vector{Int}
 
   ncon::Int
   y0::S
   lcon::S
   ucon::S
 
-  jfix::VI
-  jlow::VI
-  jupp::VI
-  jrng::VI
-  jfree::VI
-  jinf::VI
+  jfix::Vector{Int}
+  jlow::Vector{Int}
+  jupp::Vector{Int}
+  jrng::Vector{Int}
+  jfree::Vector{Int}
+  jinf::Vector{Int}
 
   nnzj::Int
   nnzh::Int
@@ -111,7 +111,7 @@ struct BatchNLPModelMeta{T, S, VI} <: AbstractBatchNLPModelMeta{T, S, VI}
   hprod_available::Bool
 end
 
-function BatchNLPModelMeta{T, S, VI}(
+function BatchNLPModelMeta{T, S}(
   nbatch::Int,
   nvar::Int;
   x0::S = fill!(S(undef, nvar * nbatch), zero(T)),
@@ -132,35 +132,35 @@ function BatchNLPModelMeta{T, S, VI}(
   jprod_available::Bool = (ncon > 0),
   jtprod_available::Bool = (ncon > 0),
   hprod_available::Bool = true,
-) where {T, S, VI}
+) where {T, S}
   if (nvar < 1) || (ncon < 0) || (nnzj < 0) || (nnzh < 0)
     error("Nonsensical dimensions")
   end
 
-  ifix = convert(VI, findall(lvar .== uvar))
-  ilow = convert(VI, findall((lvar .> T(-Inf)) .& (uvar .== T(Inf))))
-  iupp = convert(VI, findall((lvar .== T(-Inf)) .& (uvar .< T(Inf))))
-  irng = convert(VI, findall((lvar .> T(-Inf)) .& (uvar .< T(Inf)) .& (lvar .< uvar)))
-  ifree = convert(VI, findall((lvar .== T(-Inf)) .& (uvar .== T(Inf))))
-  iinf = convert(VI, findall(lvar .> uvar))
+  ifix = findall(lvar .== uvar)
+  ilow = findall((lvar .> T(-Inf)) .& (uvar .== T(Inf)))
+  iupp = findall((lvar .== T(-Inf)) .& (uvar .< T(Inf)))
+  irng = findall((lvar .> T(-Inf)) .& (uvar .< T(Inf)) .& (lvar .< uvar))
+  ifree = findall((lvar .== T(-Inf)) .& (uvar .== T(Inf)))
+  iinf = findall(lvar .> uvar)
 
   if ncon > 0
-    jfix = convert(VI, findall(lcon .== ucon))
-    jlow = convert(VI, findall((lcon .> T(-Inf)) .& (ucon .== T(Inf))))
-    jupp = convert(VI, findall((lcon .== T(-Inf)) .& (ucon .< T(Inf))))
-    jrng = convert(VI, findall((lcon .> T(-Inf)) .& (ucon .< T(Inf)) .& (lcon .< ucon)))
-    jfree = convert(VI, findall((lcon .== T(-Inf)) .& (ucon .== T(Inf))))
-    jinf = convert(VI, findall(lcon .> ucon))
+    jfix = findall(lcon .== ucon)
+    jlow = findall((lcon .> T(-Inf)) .& (ucon .== T(Inf)))
+    jupp = findall((lcon .== T(-Inf)) .& (ucon .< T(Inf)))
+    jrng = findall((lcon .> T(-Inf)) .& (ucon .< T(Inf)) .& (lcon .< ucon))
+    jfree = findall((lcon .== T(-Inf)) .& (ucon .== T(Inf)))
+    jinf = findall(lcon .> ucon)
   else
-    jfix = VI(undef, 0)
-    jlow = VI(undef, 0)
-    jupp = VI(undef, 0)
-    jrng = VI(undef, 0)
-    jfree = VI(undef, 0)
-    jinf = VI(undef, 0)
+    jfix = Int[]
+    jlow = Int[]
+    jupp = Int[]
+    jrng = Int[]
+    jfree = Int[]
+    jinf = Int[]
   end
 
-  BatchNLPModelMeta{T, S, VI}(
+  BatchNLPModelMeta{T, S}(
     nbatch,
     nvar,
     x0,