Merge pull request #307 from avik-pal/ap/relax_term_cond

Author: avik-pal

.github/workflows/CI.yml

@@ -22,7 +22,11 @@ jobs:
       fail-fast: false
       matrix:
         group:
-          - All
+          - Core
+          - NLLS
+          - 23TestProblems
+          - Wrappers
+          - Miscellaneous
         version:
           - '1'
           - '~1.10.0-0'

test/23_test_problems.jl

@@ -12,8 +12,7 @@ function test_on_library(problems, dicts, alg_ops, broken_tests, ϵ = 1e-4;
         @testset "$idx: $(dict["title"])" begin
             for alg in alg_ops
                 try
-                    sol = solve(nlprob, alg; maxiters = 10000,
-                        termination_condition = AbsNormTerminationMode())
+                    sol = solve(nlprob, alg; maxiters = 10000)
                     problem(res, sol.u, nothing)
 
                     skip = skip_tests !== nothing && idx in skip_tests[alg]
@@ -99,20 +98,12 @@ end
     broken_tests = Dict(alg => Int[] for alg in alg_ops)
     broken_tests[alg_ops[1]] = [1, 5, 6, 11]
     broken_tests[alg_ops[2]] = [1, 5, 6, 8, 11, 18]
-    broken_tests[alg_ops[3]] = [1, 4, 5, 6, 9, 11]
+    broken_tests[alg_ops[3]] = [1, 5, 6, 9, 11]
     broken_tests[alg_ops[4]] = [1, 5, 6, 8, 11]
-    broken_tests[alg_ops[5]] = [1, 3, 4, 5, 6, 8, 9, 11, 12, 15, 21]
-    broken_tests[alg_ops[6]] = [3, 4, 5, 6, 8, 9, 11, 12, 21]
-
-    skip_tests = Dict(alg => Int[] for alg in alg_ops)
-    skip_tests[alg_ops[1]] = [2, 22]
-    skip_tests[alg_ops[2]] = [2, 22]
-    skip_tests[alg_ops[3]] = [2, 22]
-    skip_tests[alg_ops[4]] = [2, 22]
-    skip_tests[alg_ops[5]] = [2, 22]
-    skip_tests[alg_ops[6]] = [2, 22]
-
-    test_on_library(problems, dicts, alg_ops, broken_tests; skip_tests)
+    broken_tests[alg_ops[5]] = [1, 2, 3, 4, 5, 6, 8, 9, 11, 12, 21]
+    broken_tests[alg_ops[6]] = [2, 3, 4, 5, 6, 8, 9, 11, 12, 21, 22]
+
+    test_on_library(problems, dicts, alg_ops, broken_tests)
 end
 
 @testset "Klement 23 Test Problems" begin
@@ -121,7 +112,7 @@ end
 
     broken_tests = Dict(alg => Int[] for alg in alg_ops)
     broken_tests[alg_ops[1]] = [1, 2, 4, 5, 6, 11, 22]
-    broken_tests[alg_ops[2]] = [1, 2, 4, 5, 6, 8, 9, 10, 11, 13, 17, 21, 22, 23]
+    broken_tests[alg_ops[2]] = [1, 2, 4, 5, 6, 8, 9, 10, 11, 13, 17, 21, 22]
     broken_tests[alg_ops[3]] = [2, 4, 5, 6, 7, 18, 22]
 
     test_on_library(problems, dicts, alg_ops, broken_tests)

test/runtests.jl

@@ -13,13 +13,14 @@ end
 
 @time begin
     if GROUP == "All" || GROUP == "Core"
-        @time @safetestset "Quality Assurance" include("qa.jl")
         @time @safetestset "Basic Tests + Some AD" include("basictests.jl")
-        @time @safetestset "Sparsity Tests" include("sparse.jl")
-        @time @safetestset "Polyalgs" include("polyalgs.jl")
-        @time @safetestset "Matrix Resizing" include("matrix_resizing.jl")
-        @time @safetestset "Infeasible Problems" include("infeasible.jl")
+    end
+
+    if GROUP == "All" || GROUP == "NLLS"
         @time @safetestset "Nonlinear Least Squares" include("nonlinear_least_squares.jl")
+    end
+
+    if GROUP == "All" || GROUP == "Wrappers"
         @time @safetestset "MINPACK" include("minpack.jl")
         @time @safetestset "NLsolve" include("nlsolve.jl")
     end
@@ -28,6 +29,14 @@ end
         @time @safetestset "23 Test Problems" include("23_test_problems.jl")
     end
 
+    if GROUP == "All" || GROUP == "Miscellaneous"
+        @time @safetestset "Quality Assurance" include("qa.jl")
+        @time @safetestset "Sparsity Tests" include("sparse.jl")
+        @time @safetestset "Polyalgs" include("polyalgs.jl")
+        @time @safetestset "Matrix Resizing" include("matrix_resizing.jl")
+        @time @safetestset "Infeasible Problems" include("infeasible.jl")
+    end
+
     if GROUP == "GPU"
         activate_downstream_env()
         @time @safetestset "GPU Tests" include("gpu.jl")