From f238979169e266826add7de40186a1e7def5ed50 Mon Sep 17 00:00:00 2001 From: Eric Hanson <5846501+ericphanson@users.noreply.github.com> Date: Tue, 16 Nov 2021 00:55:18 +0100 Subject: [PATCH 1/3] restore Convex.jl's problem depot tests --- test/Project.toml | 3 +++ test/runtests.jl | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/test/Project.toml b/test/Project.toml index 58a80fd..7862ba3 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -1,10 +1,13 @@ [deps] +Convex = "f65535da-76fb-5f13-bab9-19810c17039a" Krylov = "ba0b0d4f-ebba-5204-a429-3ac8c609bfb7" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" +Tulip = "6dd1b50a-3aae-11e9-10b5-ef983d2400fa" [compat] +Convex = "0.14" Krylov = "0.7.7" diff --git a/test/runtests.jl b/test/runtests.jl index c6bb783..8482bb3 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -12,7 +12,7 @@ const TvTYPES = [Float32, Float64, BigFloat] # Check That Tulip.version() matches what's in the Project.toml tlp_ver = Tulip.version() -toml_ver = TOML.parsefile("../Project.toml")["version"] +toml_ver = TOML.parsefile(joinpath(@__DIR__, "Project.toml"))["version"] @test tlp_ver == VersionNumber(toml_ver) @testset "Unit tests" begin @@ -47,14 +47,14 @@ end include("Interfaces/MOI_wrapper.jl") end -# @testset "Convex Problem Depot tests" begin -# for T in TvTYPES -# @testset "$T" begin -# Convex.ProblemDepot.run_tests(; exclude=[r"mip", r"exp", r"socp", r"sdp"], T = T) do problem -# Convex.solve!(problem, () -> Tulip.Optimizer{T}()) -# end -# end -# end -# end +@testset "Convex Problem Depot tests" begin + for T in TvTYPES + @testset "$T" begin + Convex.ProblemDepot.run_tests(; exclude=[r"mip", r"exp", r"socp", r"sdp"], T = T) do problem + Convex.solve!(problem, () -> Tulip.Optimizer{T}()) + end + end + end +end end # Tulip tests From 0ecc1662e35a23cb6699e7fca1900a0917fb9cbf Mon Sep 17 00:00:00 2001 From: Eric Hanson <5846501+ericphanson@users.noreply.github.com> Date: Tue, 16 Nov 2021 00:56:45 +0100 Subject: [PATCH 2/3] fix --- test/Project.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Project.toml b/test/Project.toml index 7862ba3..24e928b 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -6,7 +6,6 @@ MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" -Tulip = "6dd1b50a-3aae-11e9-10b5-ef983d2400fa" [compat] Convex = "0.14" From 075795976fafc10fa620239ca3fe9018dfab28f6 Mon Sep 17 00:00:00 2001 From: Eric Hanson <5846501+ericphanson@users.noreply.github.com> Date: Tue, 16 Nov 2021 01:00:29 +0100 Subject: [PATCH 3/3] fix path; use Convex --- test/runtests.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/runtests.jl b/test/runtests.jl index 8482bb3..5b673c1 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -2,6 +2,7 @@ using LinearAlgebra using SparseArrays using Test using TOML +using Convex using Tulip TLP = Tulip @@ -12,7 +13,7 @@ const TvTYPES = [Float32, Float64, BigFloat] # Check That Tulip.version() matches what's in the Project.toml tlp_ver = Tulip.version() -toml_ver = TOML.parsefile(joinpath(@__DIR__, "Project.toml"))["version"] +toml_ver = TOML.parsefile(joinpath(@__DIR__, "..", "Project.toml"))["version"] @test tlp_ver == VersionNumber(toml_ver) @testset "Unit tests" begin