remove panoc wrappers

Author: MohamedLaghdafHABIBOULLAH

paper/examples/Bench-utils.jl

@@ -55,28 +55,6 @@ end
 # Accuracy for SVM (as in original script)
 acc = vec -> length(findall(x -> x < 1, vec)) / length(vec) * 100
 
-# PANOC (SVM) with RootNormLhalf
-function run_panoc_svm!(model, x0; λ = 1.0, maxit = 500, tol = 1e-3, verbose = false)
-    f = BenchUtils.Counting(model)
-    g = BenchUtils.Counting(RootNormLhalf(λ))
-    algo = ProximalAlgorithms.PANOC(maxit = maxit, tol = tol, verbose = verbose)
-    x̂, it = algo(x0 = x0, f = f, g = g)
-    BenchUtils.reset_counters!(f)
-    BenchUtils.reset_counters!(g)
-    t = @elapsed x̂, it = algo(x0 = x0, f = f, g = g)
-    return (
-        name      = "PANOC (SVM)",
-        status    = "first_order",
-        time      = t,
-        iters     = it,
-        fevals    = f.eval_count,
-        gevals    = f.gradient_count,
-        proxcalls = g.prox_count,
-        solution  = x̂,
-        final_obj = obj(model, x̂)
-    )
-end
-
 function run_tr_svm!(model, x0; λ = 1.0, qn = :LSR1, atol = 1e-3, rtol = 1e-3, verbose = 0, sub_kwargs = (;))
     qn_model = ensure_qn(model, qn)
     reset!(qn_model)
@@ -135,7 +113,6 @@ function bench_svm!(cfg = CFG)
     x0 = model.meta.x0
 
     results = NamedTuple[]
-    (:PANOC in cfg.RUN_SOLVERS) && push!(results, run_panoc_svm!(model, x0; λ = cfg.LAMBDA_L0, maxit = cfg.MAXIT_PANOC, tol = cfg.TOL, verbose = cfg.VERBOSE_PANOC))
     (:TR    in cfg.RUN_SOLVERS) && push!(results, run_tr_svm!(model, x0; λ = cfg.LAMBDA_L0, qn = cfg.QN_FOR_TR, atol = cfg.TOL, rtol = cfg.RTOL, verbose = cfg.VERBOSE_RO, sub_kwargs = cfg.SUB_KWARGS_R2N))
     (:R2N   in cfg.RUN_SOLVERS) && push!(results, run_r2n_svm!(model, x0; λ = cfg.LAMBDA_L0, qn = cfg.QN_FOR_R2N, atol = cfg.TOL, rtol = cfg.RTOL, verbose = cfg.VERBOSE_RO, sub_kwargs = cfg.SUB_KWARGS_R2N))
 
@@ -173,33 +150,6 @@ end
 # ======= NNMF bench ====== #
 #############################
 
-function run_panoc_nnmf!(model, x0; λ = 1.0, maxit = 500, tol = 1e-3, verbose = false, selected = nothing)
-    f = BenchUtils.Counting(model)
-    # Define the nonsmooth term for panoc
-    dim = model.meta.nvar
-    l = zeros(dim)
-    u = fill(Inf, dim)
-    h = ShiftedNormL0Box(NormL0(λ), zeros(dim), zeros(dim), l, u, false, selected)
-    h_panoc = BenchUtils.MyShiftedl0Box(h)
-    g = BenchUtils.Counting(h_panoc)
-    algo = ProximalAlgorithms.PANOC(maxit = maxit, tol = tol, verbose = verbose)
-    x̂, it = algo(x0 = x0, f = f, g = g)
-    BenchUtils.reset_counters!(f)
-    BenchUtils.reset_counters!(g)
-    t = @elapsed x̂, it = algo(x0 = x0, f = f, g = g)
-    return (
-        name      = "PANOC (NNMF)",
-        status    = "first_order",
-        time      = t,
-        iters     = it,
-        fevals    = f.eval_count,
-        gevals    = f.gradient_count,
-        proxcalls = g.prox_count,
-        solution  = x̂,
-        final_obj = obj(model, x̂)
-    )
-end
-
 function run_tr_nnmf!(model, x0; λ = 1.0, qn = :LSR1, atol = 1e-3, rtol = 1e-3, verbose = 0, sub_kwargs = (;), selected = nothing)
     qn_model = ensure_qn(model, qn)
     reset!(qn_model)
@@ -291,7 +241,6 @@ function bench_nnmf!(cfg = CFG2; m = 100, n = 50, k = 5)
     cfg.LAMBDA_L0 = norm(grad(model, rand(model.meta.nvar)), Inf) / 200
 
     results = NamedTuple[]
-    (:PANOC in cfg.RUN_SOLVERS) && push!(results, run_panoc_nnmf!(model, x0; λ = cfg.LAMBDA_L0, maxit = cfg.MAXIT_PANOC, tol = cfg.TOL, verbose = cfg.VERBOSE_PANOC, selected = selected))
     (:TR  in cfg.RUN_SOLVERS) && push!(results, run_tr_nnmf!(model, x0; λ = cfg.LAMBDA_L0, qn = cfg.QN_FOR_TR, atol = cfg.TOL, rtol = cfg.RTOL, verbose = cfg.VERBOSE_RO, sub_kwargs = cfg.SUB_KWARGS_R2N, selected = selected))
     (:R2N in cfg.RUN_SOLVERS) && push!(results, run_r2n_nnmf!(model, x0; λ = cfg.LAMBDA_L0, qn = cfg.QN_FOR_R2N, atol = cfg.TOL, rtol = cfg.RTOL, verbose = cfg.VERBOSE_RO, sub_kwargs = cfg.SUB_KWARGS_R2N, selected = selected))
     (:LM  in cfg.RUN_SOLVERS) && push!(results, run_LM_nnmf!(nls_model, x0; λ = cfg.LAMBDA_L0, atol = cfg.TOL, rtol = cfg.RTOL, verbose = cfg.VERBOSE_RO, selected = selected))

paper/examples/Benchmark.jl

@@ -8,7 +8,7 @@ Base.@kwdef mutable struct Config
     MAXIT_PANOC::Int          = 10000
     VERBOSE_PANOC::Bool       = false
     VERBOSE_RO::Int           = 0
-    RUN_SOLVERS::Vector{Symbol} = [:PANOC, :TR, :R2N]   # mutable
+    RUN_SOLVERS::Vector{Symbol} = [:TR, :R2N]   # mutable
     QN_FOR_TR::Symbol         = :LSR1
     QN_FOR_R2N::Symbol        = :LBFGS
     SUB_KWARGS_R2N::NamedTuple = (; max_iter = 200)
@@ -17,6 +17,6 @@ end
 
 # One global, constant *binding* to a mutable object = type stable & editable
 const CFG = Config(QN_FOR_R2N=:LSR1)
-const CFG2 = Config(RUN_SOLVERS = [:PANOC, :LM, :TR, :R2N], QN_FOR_TR = :LBFGS)
+const CFG2 = Config(RUN_SOLVERS = [:LM, :TR, :R2N], QN_FOR_TR = :LBFGS)
 
 end # module