From 32b220f8ed2e4da9364f6ace7bd0f14d7b46f26b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Thu, 21 Dec 2023 14:05:29 +0100 Subject: [PATCH 1/7] Enable ConstraintDual tests --- test/MOI_wrapper.jl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/MOI_wrapper.jl b/test/MOI_wrapper.jl index a172087..cba9b1f 100644 --- a/test/MOI_wrapper.jl +++ b/test/MOI_wrapper.jl @@ -23,7 +23,6 @@ function test_runtests() MOI.ConstraintName, MOI.VariableName, MOI.ObjectiveBound, - MOI.ConstraintDual, # TODO MOI.SolverVersion, ], optimal_status = MOI.LOCALLY_SOLVED, @@ -45,7 +44,7 @@ function test_runtests() r"test_model_ScalarFunctionConstantNotZero$", r"test_model_delete$", # Detecting infeasibility or unboundedness not supported - "INFEASIBLE", + "INFEAS", "infeasible", # FIXME investigate r"test_conic_SecondOrderCone_nonnegative_post_bound$", From 30b84e30935740e90ad0379a09f74d94d228a78e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 2 Jan 2024 10:49:15 +0100 Subject: [PATCH 2/7] Bump to MOI v1.24 --- Project.toml | 2 +- src/SDPLR.jl | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index f108eb4..b335b49 100644 --- a/Project.toml +++ b/Project.toml @@ -8,6 +8,6 @@ MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" SDPLR_jll = "3a057b76-36a0-51f0-a66f-6d580b8e8efd" [compat] -MathOptInterface = "1.22" +MathOptInterface = "1.24" SDPLR_jll = "=100.2.300" julia = "1.6" diff --git a/src/SDPLR.jl b/src/SDPLR.jl index 681d819..defed77 100644 --- a/src/SDPLR.jl +++ b/src/SDPLR.jl @@ -2,6 +2,9 @@ module SDPLR using SDPLR_jll +const lib = SDPLR.SDPLR_jll.libsdplr +#const lib = "/home/blegat/git/sdplr/lib/libsdplr.so" + include("bounds.jl") function solve_sdpa_file(file) @@ -142,7 +145,7 @@ function solve( end end GC.@preserve blksz blktype b CAent CArow CAcol CAinfo_entptr CAinfo_type R lambda maxranks ranks pieces begin - ret = @ccall SDPLR.SDPLR_jll.libsdplr.sdplrlib( + ret = @ccall lib.sdplrlib( m::Csize_t, numblk::Csize_t, blksz::Ptr{Cptrdiff_t}, From 658b1cc2a3b6e2f5ffe6cda843bcb57a9b299e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 2 Jan 2024 16:21:28 +0100 Subject: [PATCH 3/7] Fix --- test/MOI_wrapper.jl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/MOI_wrapper.jl b/test/MOI_wrapper.jl index cba9b1f..d5ff7f2 100644 --- a/test/MOI_wrapper.jl +++ b/test/MOI_wrapper.jl @@ -46,6 +46,8 @@ function test_runtests() # Detecting infeasibility or unboundedness not supported "INFEAS", "infeasible", + # Incorrect `ConstraintDual` for `vc2` for MacOS in CI + r"test_linear_integration", # FIXME investigate r"test_conic_SecondOrderCone_nonnegative_post_bound$", r"test_conic_SecondOrderCone_negative_post_bound_2$", From b5ed21f77334d758169fccf1b6a511a433022f7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Wed, 3 Jan 2024 08:54:25 +0100 Subject: [PATCH 4/7] Update src/SDPLR.jl Co-authored-by: Oscar Dowson --- src/SDPLR.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SDPLR.jl b/src/SDPLR.jl index defed77..818e440 100644 --- a/src/SDPLR.jl +++ b/src/SDPLR.jl @@ -1,6 +1,6 @@ module SDPLR -using SDPLR_jll +import SDPLR_jll const lib = SDPLR.SDPLR_jll.libsdplr #const lib = "/home/blegat/git/sdplr/lib/libsdplr.so" From f90ba6f3a51b95ce444622c9cdd29d5f7d439074 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Wed, 3 Jan 2024 08:54:38 +0100 Subject: [PATCH 5/7] Update src/SDPLR.jl Co-authored-by: Oscar Dowson --- src/SDPLR.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SDPLR.jl b/src/SDPLR.jl index 818e440..7b7f2d2 100644 --- a/src/SDPLR.jl +++ b/src/SDPLR.jl @@ -3,7 +3,6 @@ module SDPLR import SDPLR_jll const lib = SDPLR.SDPLR_jll.libsdplr -#const lib = "/home/blegat/git/sdplr/lib/libsdplr.so" include("bounds.jl") From 5f1b2e19187282721cc1fc0eaf2d7b5c99eb2f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Wed, 3 Jan 2024 08:55:38 +0100 Subject: [PATCH 6/7] Fix --- src/SDPLR.jl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/SDPLR.jl b/src/SDPLR.jl index 7b7f2d2..ea7111c 100644 --- a/src/SDPLR.jl +++ b/src/SDPLR.jl @@ -2,8 +2,6 @@ module SDPLR import SDPLR_jll -const lib = SDPLR.SDPLR_jll.libsdplr - include("bounds.jl") function solve_sdpa_file(file) @@ -144,7 +142,7 @@ function solve( end end GC.@preserve blksz blktype b CAent CArow CAcol CAinfo_entptr CAinfo_type R lambda maxranks ranks pieces begin - ret = @ccall lib.sdplrlib( + ret = @ccall SDPLR_jll.libsdplr( m::Csize_t, numblk::Csize_t, blksz::Ptr{Cptrdiff_t}, From e9186b0129df941f60782f3284020fac8cde62fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Wed, 3 Jan 2024 09:20:33 +0100 Subject: [PATCH 7/7] Fix --- src/SDPLR.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SDPLR.jl b/src/SDPLR.jl index ea7111c..285f3a5 100644 --- a/src/SDPLR.jl +++ b/src/SDPLR.jl @@ -142,7 +142,7 @@ function solve( end end GC.@preserve blksz blktype b CAent CArow CAcol CAinfo_entptr CAinfo_type R lambda maxranks ranks pieces begin - ret = @ccall SDPLR_jll.libsdplr( + ret = @ccall SDPLR_jll.libsdplr.sdplrlib( m::Csize_t, numblk::Csize_t, blksz::Ptr{Cptrdiff_t},