fix

Author: tmigot

src/OptimizationProblems.jl

@@ -16,7 +16,7 @@ for file in files
 end
 number_of_problems = length(files)
 
-const names = [
+const cols_names = [
   :nvar
   :variable_nvar
   :ncon
@@ -82,9 +82,9 @@ The following keys are valid:
   - `defined_everywhere::Union{Bool, Missing}`: true if the objective is define for all values of the variables
   - `origin::Symbol`: origin of the problem, in [:academic, :modelling, :real, :unknown]
 """
-const meta = DataFrame(names .=> [Array{T}(undef, number_of_problems) for T in types])
+const meta = DataFrame(cols_names .=> [Array{T}(undef, number_of_problems) for T in types])
 
-for name in names, i = 1:number_of_problems
+for name in cols_names, i = 1:number_of_problems
   meta[!, name][i] = eval(Meta.parse("$(split(files[i], ".")[1])_meta"))[name]
 end
 

test/runtests.jl

@@ -9,7 +9,23 @@ addprocs(np - 1)
 
 @everywhere import ADNLPModels
 
-@everywhere include("test-defined-problems.jl")
+@everywhere function defined_names(mod::Module)
+    # Exported only (default) + actually defined. Adjust all=true if you prefer.
+    [n for n in names(mod) if isdefined(mod, n)]
+end
+
+const list_problems =
+    setdiff(union(defined_names(ADNLPProblems), defined_names(PureJuMP)), [:PureJuMP, :ADNLPProblems])
+
+# The problems included should be carefully argumented and issues
+# to create them added.
+# TODO: tests are limited for JuMP-only problems
+const list_problems_not_ADNLPProblems = Symbol[]
+const list_problems_ADNLPProblems = setdiff(list_problems, list_problems_not_ADNLPProblems)
+const list_problems_not_PureJuMP = Symbol[]
+const list_problems_PureJuMP = setdiff(list_problems, list_problems_not_PureJuMP)
+
+include("test-defined-problems.jl")
 @everywhere include("test-utils.jl")
 
 @test ndef == OptimizationProblems.PureJuMP.default_nvar
@@ -69,10 +85,16 @@ end
     end
   end
 
-  if prob in list_problems_PureJuMP
+  model = begin
+      mod = PureJuMP
+      if isdefined(mod, prob)
+            getfield(mod, prob)(n = ndef)
+      else
+            nothing
+      end
+  end
+  if !isnothing(model)
     @testset "Test problems compatibility for $prob" begin
-      prob_fn = eval(Meta.parse("PureJuMP.$(prob)"))
-      model = prob_fn(n = ndef)
       nlp_jump = MathOptNLPModel(model)
       test_compatibility(prob, nlp_jump, nlp_ad, ndef)
     end

test/test-defined-problems.jl

@@ -1,28 +1,3 @@
-@everywhere function defined_names(mod::Module)
-    # Exported only (default) + actually defined. Adjust all=true if you prefer.
-    [n for n in names(mod) if isdefined(mod, n)]
-end
-
-@everywhere const list_problems =
-    intersect(defined_names(ADNLPProblems), defined_names(PureJuMP))
-
-# The problems included should be carefully argumented and issues
-# to create them added.
-# TODO: tests are limited for JuMP-only problems
-@everywhere const list_problems_not_ADNLPProblems = Symbol[]
-@everywhere const list_problems_not_PureJuMP = Symbol[]
-
-@everywhere const list_problems_ADNLPProblems =
-    setdiff(list_problems, list_problems_not_ADNLPProblems)
-
-@everywhere const list_problems_PureJuMP =
-    setdiff(list_problems, list_problems_not_PureJuMP)
-
-@test setdiff(union(names(ADNLPProblems), list_problems_not_ADNLPProblems), list_problems) ==
-      [:ADNLPProblems]
-@test setdiff(union(names(PureJuMP), list_problems_not_PureJuMP), list_problems) ==
-      [:PureJuMP]
-
 @everywhere function probe_missing(mod::Module, syms::Vector{Symbol})
     missing = Symbol[]
     for s in syms
@@ -33,16 +8,25 @@ end
     return (pid = myid(), missing = missing)
 end
 
+const list_problems_ADNLPProblems =
+    setdiff(list_problems, list_problems_not_ADNLPProblems)
 probes = @sync begin
     for pid in workers()
         @async remotecall_fetch(probe_missing, pid, ADNLPProblems, list_problems_ADNLPProblems)
     end
 end
 @info "ADNLPProblems missing per worker" probes
 
+const list_problems_PureJuMP =
+    setdiff(list_problems, list_problems_not_PureJuMP)
 probes = @sync begin
     for pid in workers()
         @async remotecall_fetch(probe_missing, pid, PureJuMP, list_problems_PureJuMP)
     end
 end
 @info "PureJuMP missing per worker" probes
+
+@test setdiff(union(names(ADNLPProblems), list_problems_not_ADNLPProblems), list_problems) ==
+      [:ADNLPProblems]
+@test setdiff(union(names(PureJuMP), list_problems_not_PureJuMP), list_problems) ==
+      [:PureJuMP]