From 291a94802d0fd2152ece969b1344ee849e9661f5 Mon Sep 17 00:00:00 2001 From: nathanemac <91251698+nathanemac@users.noreply.github.com> Date: Tue, 19 Nov 2024 15:30:54 -0500 Subject: [PATCH 1/2] change project.toml and libproxtv.jl to be aligned with new version of proxTV_jll --- Project.toml | 2 +- src/libproxtv.jl | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Project.toml b/Project.toml index 25535e2..2f5385b 100644 --- a/Project.toml +++ b/Project.toml @@ -15,7 +15,7 @@ julia = "1.9" JuliaFormatter = "1" LAPACK_jll = "3.12.0" OpenBLAS32_jll = "0.3.21" -proxTV_jll = "3.3.2" +proxTV_jll = "3.4.0" LinearAlgebra = "1" [extras] diff --git a/src/libproxtv.jl b/src/libproxtv.jl index 5e2d429..337ebc4 100644 --- a/src/libproxtv.jl +++ b/src/libproxtv.jl @@ -132,7 +132,7 @@ function solveLinearLP(z, n, p, lambda, s) end # original TV function -function TV(y, lambda, x, info, n, p, ws) +function TV(y, lambda, x, info, n, p, ws; objGap = 1e-5) @ccall libproxtv.TV( y::Ptr{Float64}, lambda::Float64, @@ -141,6 +141,7 @@ function TV(y, lambda, x, info, n, p, ws) n::Int32, p::Float64, ws::Ptr{Workspace}, + objGap::Float64, )::Int32 end @@ -363,7 +364,7 @@ function FW_TVp(y, lambda, x, info, n, p, ws) )::Int32 end -function GPFW_TVp(y, lambda, x, info, n, p, ws) +function GPFW_TVp(y, lambda, x, info, n, p, ws; objGap = 1e-5) @ccall libproxtv.GPFW_TVp( y::Ptr{Float64}, lambda::Float64, @@ -372,6 +373,7 @@ function GPFW_TVp(y, lambda, x, info, n, p, ws) n::Int32, p::Float64, ws::Ptr{Workspace}, + objGap::Float64, )::Int32 end From 7e83604f0630fdaf6bf549abb9ca77b8f7fedf6b Mon Sep 17 00:00:00 2001 From: nathanemac <91251698+nathanemac@users.noreply.github.com> Date: Thu, 21 Nov 2024 13:39:59 -0500 Subject: [PATCH 2/2] update ProxTV.jl --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 2f5385b..4cd805a 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "ProxTV" uuid = "925ea013-038b-5ab6-a1ab-e0849925e528" authors = ["Nathan Allaire and contributors"] -version = "0.1.0" +version = "0.2.0" [deps] JuliaFormatter = "98e50ef6-434e-11e9-1051-2b60c6c9e899"