From 434d0bf49692af55ed809af3c10d46ba9b942d7f Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Tue, 23 Aug 2022 21:58:44 -0400 Subject: [PATCH 01/18] Ipopt_jll with LBT --- Project.toml | 4 +++- src/Ipopt.jl | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 1b1ac33..0321e2e 100644 --- a/Project.toml +++ b/Project.toml @@ -5,10 +5,12 @@ version = "1.0.4" [deps] Ipopt_jll = "9cc047cb-c261-5740-88fc-0cf96f7bdcc7" +LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" +OpenBLAS32_jll = "656ef2d0-ae68-5445-9ca0-591084a874a2" [compat] -Ipopt_jll = "=3.13.2, =3.13.4, =300.1400.400" +Ipopt_jll = "=3.13.2, =3.13.4, =300.1400.400, =300.1400.401" MathOptInterface = "1" julia = "1.6" diff --git a/src/Ipopt.jl b/src/Ipopt.jl index 6d5016f..8be87df 100644 --- a/src/Ipopt.jl +++ b/src/Ipopt.jl @@ -6,11 +6,14 @@ module Ipopt import Ipopt_jll +import OpenBLAS32_jll import MathOptInterface +import LinearAlgebra const MOI = MathOptInterface function __init__() + (VERSION ≥ v"1.8") && LinearAlgebra.BLAS.lbt_forward(OpenBLAS32_jll.libopenblas_path) global libipopt = Ipopt_jll.libipopt return end From a5e963111c55d9e947949a6ff304a2830c8ed951 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Wed, 24 Aug 2022 14:22:21 +1200 Subject: [PATCH 02/18] Update src/Ipopt.jl --- src/Ipopt.jl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Ipopt.jl b/src/Ipopt.jl index 8be87df..c138444 100644 --- a/src/Ipopt.jl +++ b/src/Ipopt.jl @@ -13,7 +13,9 @@ import LinearAlgebra const MOI = MathOptInterface function __init__() - (VERSION ≥ v"1.8") && LinearAlgebra.BLAS.lbt_forward(OpenBLAS32_jll.libopenblas_path) + if VERSION >= v"1.8" + LinearAlgebra.BLAS.lbt_forward(OpenBLAS32_jll.libopenblas_path) + end global libipopt = Ipopt_jll.libipopt return end From 7c17463b95c614ae5381243f92864fc117b649c1 Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Tue, 23 Aug 2022 22:42:58 -0400 Subject: [PATCH 03/18] Add a compat entry for OpenBLAS32_jll --- Project.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/Project.toml b/Project.toml index 0321e2e..6ee9020 100644 --- a/Project.toml +++ b/Project.toml @@ -12,6 +12,7 @@ OpenBLAS32_jll = "656ef2d0-ae68-5445-9ca0-591084a874a2" [compat] Ipopt_jll = "=3.13.2, =3.13.4, =300.1400.400, =300.1400.401" MathOptInterface = "1" +OpenBLAS32_jll = "0.3.10" julia = "1.6" [extras] From 061c3915f6c3217a0af0bb52bd8c9a68b4c8a3e7 Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Tue, 23 Aug 2022 23:18:55 -0400 Subject: [PATCH 04/18] Test with OpenBLAS32 0.3.10 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 6ee9020..7ef84b8 100644 --- a/Project.toml +++ b/Project.toml @@ -12,7 +12,7 @@ OpenBLAS32_jll = "656ef2d0-ae68-5445-9ca0-591084a874a2" [compat] Ipopt_jll = "=3.13.2, =3.13.4, =300.1400.400, =300.1400.401" MathOptInterface = "1" -OpenBLAS32_jll = "0.3.10" +OpenBLAS32_jll = "=0.3.10" julia = "1.6" [extras] From 6d93cf0f0ee8bb57f703533269fee45f2d9cd4f6 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Wed, 24 Aug 2022 17:30:03 +1200 Subject: [PATCH 05/18] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 7ef84b8..6ee9020 100644 --- a/Project.toml +++ b/Project.toml @@ -12,7 +12,7 @@ OpenBLAS32_jll = "656ef2d0-ae68-5445-9ca0-591084a874a2" [compat] Ipopt_jll = "=3.13.2, =3.13.4, =300.1400.400, =300.1400.401" MathOptInterface = "1" -OpenBLAS32_jll = "=0.3.10" +OpenBLAS32_jll = "0.3.10" julia = "1.6" [extras] From 93c0fad529536cd13e9531416638d74f2a3b0eb9 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Wed, 24 Aug 2022 17:32:16 +1200 Subject: [PATCH 06/18] Update src/Ipopt.jl --- src/Ipopt.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ipopt.jl b/src/Ipopt.jl index c138444..646ceda 100644 --- a/src/Ipopt.jl +++ b/src/Ipopt.jl @@ -14,7 +14,7 @@ const MOI = MathOptInterface function __init__() if VERSION >= v"1.8" - LinearAlgebra.BLAS.lbt_forward(OpenBLAS32_jll.libopenblas_path) + LinearAlgebra.BLAS.lbt_forward(OpenBLAS32_jll.libopenblas_path; verbose = true) end global libipopt = Ipopt_jll.libipopt return From 0ffb652affdb4292f034c1cdd0a78ba38367e8ab Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Thu, 25 Aug 2022 09:21:07 +1200 Subject: [PATCH 07/18] Update Ipopt.jl --- src/Ipopt.jl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Ipopt.jl b/src/Ipopt.jl index 646ceda..0e8e636 100644 --- a/src/Ipopt.jl +++ b/src/Ipopt.jl @@ -14,7 +14,10 @@ const MOI = MathOptInterface function __init__() if VERSION >= v"1.8" - LinearAlgebra.BLAS.lbt_forward(OpenBLAS32_jll.libopenblas_path; verbose = true) + LinearAlgebra.BLAS.lbt_forward( + OpenBLAS32_jll.libopenblas_path; + verbose = true, + ) end global libipopt = Ipopt_jll.libipopt return From d7e962cc9aa9f8a84b7150d2531fff606e7902c0 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Thu, 25 Aug 2022 09:26:33 +1200 Subject: [PATCH 08/18] Update Ipopt.jl --- src/Ipopt.jl | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/Ipopt.jl b/src/Ipopt.jl index 0e8e636..9592506 100644 --- a/src/Ipopt.jl +++ b/src/Ipopt.jl @@ -6,18 +6,21 @@ module Ipopt import Ipopt_jll -import OpenBLAS32_jll -import MathOptInterface import LinearAlgebra +import MathOptInterface +import OpenBLAS32_jll const MOI = MathOptInterface function __init__() if VERSION >= v"1.8" - LinearAlgebra.BLAS.lbt_forward( - OpenBLAS32_jll.libopenblas_path; - verbose = true, - ) + config = LinearAlgebra.BLAS.lbt_get_config() + if !any(lib -> lib.interface == :lp64, config.loaded_libs) + LinearAlgebra.BLAS.lbt_forward( + OpenBLAS32_jll.libopenblas_path; + verbose = true, + ) + end end global libipopt = Ipopt_jll.libipopt return From 9be9938f45f7f3eebc417b82ca7d8e352fdfc412 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Thu, 25 Aug 2022 09:43:29 +1200 Subject: [PATCH 09/18] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 6ee9020..b38b3b0 100644 --- a/Project.toml +++ b/Project.toml @@ -12,7 +12,7 @@ OpenBLAS32_jll = "656ef2d0-ae68-5445-9ca0-591084a874a2" [compat] Ipopt_jll = "=3.13.2, =3.13.4, =300.1400.400, =300.1400.401" MathOptInterface = "1" -OpenBLAS32_jll = "0.3.10" +OpenBLAS32_jll = "=0.3.20" julia = "1.6" [extras] From 5d7570176aa3a1406412749ca3fffdef99b73f16 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Thu, 25 Aug 2022 10:25:34 +1200 Subject: [PATCH 10/18] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index b38b3b0..6ee9020 100644 --- a/Project.toml +++ b/Project.toml @@ -12,7 +12,7 @@ OpenBLAS32_jll = "656ef2d0-ae68-5445-9ca0-591084a874a2" [compat] Ipopt_jll = "=3.13.2, =3.13.4, =300.1400.400, =300.1400.401" MathOptInterface = "1" -OpenBLAS32_jll = "=0.3.20" +OpenBLAS32_jll = "0.3.10" julia = "1.6" [extras] From e165ca71fd751139511322b599465ef5837a6b45 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Thu, 25 Aug 2022 11:47:58 +1200 Subject: [PATCH 11/18] Update Ipopt.jl --- src/Ipopt.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Ipopt.jl b/src/Ipopt.jl index 9592506..19b21c6 100644 --- a/src/Ipopt.jl +++ b/src/Ipopt.jl @@ -13,7 +13,7 @@ import OpenBLAS32_jll const MOI = MathOptInterface function __init__() - if VERSION >= v"1.8" + if false # VERSION >= v"1.8" config = LinearAlgebra.BLAS.lbt_get_config() if !any(lib -> lib.interface == :lp64, config.loaded_libs) LinearAlgebra.BLAS.lbt_forward( From 4274313adc2e52dbd0c41ea7471cc925bf0f62cd Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Fri, 26 Aug 2022 09:01:34 +1200 Subject: [PATCH 12/18] Update Ipopt.jl --- src/Ipopt.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Ipopt.jl b/src/Ipopt.jl index 19b21c6..46d85af 100644 --- a/src/Ipopt.jl +++ b/src/Ipopt.jl @@ -13,12 +13,13 @@ import OpenBLAS32_jll const MOI = MathOptInterface function __init__() - if false # VERSION >= v"1.8" + if VERSION >= v"1.8" config = LinearAlgebra.BLAS.lbt_get_config() if !any(lib -> lib.interface == :lp64, config.loaded_libs) LinearAlgebra.BLAS.lbt_forward( OpenBLAS32_jll.libopenblas_path; verbose = true, + clear = false, ) end end From fc9fd16cb8a00fb2e9457f6324989c2fc4160f7e Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Fri, 26 Aug 2022 09:35:37 +1200 Subject: [PATCH 13/18] Update C_wrapper.jl --- test/C_wrapper.jl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/C_wrapper.jl b/test/C_wrapper.jl index 8bb74e4..93e4826 100644 --- a/test/C_wrapper.jl +++ b/test/C_wrapper.jl @@ -3,12 +3,12 @@ # Use of this source code is governed by an MIT-style license that can be found # in the LICENSE.md file or at https://opensource.org/licenses/MIT. -module TestCWrapper +# module TestCWrapper using Ipopt using Test -function test_hs071() +# function test_hs071() # hs071 # min x1 * x4 * (x1 + x2 + x3) + x3 # st x1 * x2 * x3 * x4 >= 25 @@ -211,9 +211,9 @@ function test_hs071() finalize(prob) # Needed before the `rm` on Windows. # unlink the output file rm("blah.txt") - return -end +# return +# end -end # TestCWrapper +# end # TestCWrapper -runtests(TestCWrapper) +# runtests(TestCWrapper) From 60cb0ee070e84bd1f1ca54c13ddcbd7e2e019c05 Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Thu, 1 Sep 2022 21:21:29 -0400 Subject: [PATCH 14/18] Test Ipopt_jll 300.1400.402 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 6ee9020..b76a370 100644 --- a/Project.toml +++ b/Project.toml @@ -10,7 +10,7 @@ MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" OpenBLAS32_jll = "656ef2d0-ae68-5445-9ca0-591084a874a2" [compat] -Ipopt_jll = "=3.13.2, =3.13.4, =300.1400.400, =300.1400.401" +Ipopt_jll = "=3.13.2, =3.13.4, =300.1400.400, =300.1400.402" MathOptInterface = "1" OpenBLAS32_jll = "0.3.10" julia = "1.6" From d7de35850ca9d809d40e3032ca7b8cd0ce26794c Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Fri, 2 Sep 2022 14:39:19 +1200 Subject: [PATCH 15/18] Update ci.yml --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3d6d271..80fd600 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,9 @@ jobs: - version: '1.6' os: ubuntu-latest arch: x86 + - version: '1' + os: windows-latest + arch: x86 steps: - uses: actions/checkout@v2 - uses: julia-actions/setup-julia@v1 From 72161efbd0b52baf55ec8c8ce5986a3c7d1b5d41 Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Mon, 3 Oct 2022 22:01:13 -0400 Subject: [PATCH 16/18] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index b76a370..d2210e6 100644 --- a/Project.toml +++ b/Project.toml @@ -10,7 +10,7 @@ MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee" OpenBLAS32_jll = "656ef2d0-ae68-5445-9ca0-591084a874a2" [compat] -Ipopt_jll = "=3.13.2, =3.13.4, =300.1400.400, =300.1400.402" +Ipopt_jll = "=3.13.2, =3.13.4, =300.1400.400, =300.1400.403" MathOptInterface = "1" OpenBLAS32_jll = "0.3.10" julia = "1.6" From 46703fbc2441e8cd49478ea0bafdf9803c74a8bb Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Sat, 8 Oct 2022 17:47:46 +1300 Subject: [PATCH 17/18] Update C_wrapper.jl --- test/C_wrapper.jl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/C_wrapper.jl b/test/C_wrapper.jl index 93e4826..581f95d 100644 --- a/test/C_wrapper.jl +++ b/test/C_wrapper.jl @@ -3,12 +3,12 @@ # Use of this source code is governed by an MIT-style license that can be found # in the LICENSE.md file or at https://opensource.org/licenses/MIT. -# module TestCWrapper +module TestCWrapper using Ipopt using Test -# function test_hs071() +function test_hs071() # hs071 # min x1 * x4 * (x1 + x2 + x3) + x3 # st x1 * x2 * x3 * x4 >= 25 @@ -211,9 +211,9 @@ using Test finalize(prob) # Needed before the `rm` on Windows. # unlink the output file rm("blah.txt") -# return -# end + return +end -# end # TestCWrapper +end # TestCWrapper -# runtests(TestCWrapper) +runtests(TestCWrapper) From 7441c410bae8b8355d8fe2eb27937c5df6373fd4 Mon Sep 17 00:00:00 2001 From: Oscar Dowson Date: Sat, 8 Oct 2022 17:48:05 +1300 Subject: [PATCH 18/18] Update test/C_wrapper.jl --- test/C_wrapper.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/C_wrapper.jl b/test/C_wrapper.jl index 581f95d..8bb74e4 100644 --- a/test/C_wrapper.jl +++ b/test/C_wrapper.jl @@ -211,7 +211,7 @@ function test_hs071() finalize(prob) # Needed before the `rm` on Windows. # unlink the output file rm("blah.txt") - return + return end end # TestCWrapper