From 46c6599bd74176ec553dbc51a2574237597a0e28 Mon Sep 17 00:00:00 2001 From: tmigot Date: Tue, 16 Mar 2021 02:32:02 +0100 Subject: [PATCH] compat to nlpmodels014 --- Manifest.toml | 86 ++++++++++++------------------------------------ Project.toml | 12 +++++-- src/Stopping.jl | 2 +- test/runtests.jl | 2 +- 4 files changed, 32 insertions(+), 70 deletions(-) diff --git a/Manifest.toml b/Manifest.toml index 993521d7..1623fd24 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -15,36 +15,18 @@ git-tree-sha1 = "dbfddfafb75fae5356e00529ce67454125935945" uuid = "324d7699-5711-5eae-9e2f-1d82baa6b597" version = "0.9.3" -[[ChainRulesCore]] -deps = ["Compat", "LinearAlgebra", "SparseArrays"] -git-tree-sha1 = "de4f08843c332d355852721adb1592bce7924da3" -uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4" -version = "0.9.29" - [[CodecZlib]] deps = ["TranscodingStreams", "Zlib_jll"] git-tree-sha1 = "ded953804d019afa9a3f98981d99b33e3db7b6da" uuid = "944b1d66-785c-5afd-91f1-9de20f533193" version = "0.7.0" -[[CommonSubexpressions]] -deps = ["MacroTools", "Test"] -git-tree-sha1 = "7b8a93dba8af7e3b42fecabf646260105ac373f7" -uuid = "bbf7d656-a473-5ed7-a52c-81e309532950" -version = "0.3.0" - [[Compat]] deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] git-tree-sha1 = "919c7f3151e79ff196add81d7f4e45d91bbf420b" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" version = "3.25.0" -[[CompilerSupportLibraries_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "8e695f735fca77e9708e795eda62afdb869cbb70" -uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "0.3.4+0" - [[Crayons]] git-tree-sha1 = "3f71217b538d7aaee0b69ab47d9b7724ca8afa0d" uuid = "a8cc5b0e-0ffa-5ad4-8c14-923d3ee1735f" @@ -80,18 +62,6 @@ uuid = "ade2ca70-3891-5945-98fb-dc099432e06a" deps = ["Mmap"] uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab" -[[DiffResults]] -deps = ["StaticArrays"] -git-tree-sha1 = "c18e98cba888c6c25d1c3b048e4b3380ca956805" -uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5" -version = "1.0.3" - -[[DiffRules]] -deps = ["NaNMath", "Random", "SpecialFunctions"] -git-tree-sha1 = "214c3fcac57755cfda163d91c58893a8723f93e9" -uuid = "b552c78f-8df3-52c6-915a-8e097449b14b" -version = "1.0.2" - [[Distributed]] deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" @@ -107,12 +77,6 @@ git-tree-sha1 = "8339d61043228fdd3eb658d86c926cb282ae72a8" uuid = "59287772-0a20-5a39-b81b-1366585eb4c0" version = "0.4.2" -[[ForwardDiff]] -deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"] -git-tree-sha1 = "c68fb7481b71519d313114dca639b35262ff105f" -uuid = "f6369f11-7733-5829-9624-2563aa707210" -version = "0.10.17" - [[Future]] deps = ["Random"] uuid = "9fa8497b-333b-5362-9e8d-4d0656e87820" @@ -149,7 +113,16 @@ git-tree-sha1 = "81690084b6198a2e1da36fcfda16eeca9f9f24e4" uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6" version = "0.21.1" +[[LLSModels]] +deps = ["NLPModels", "NLPModelsModifiers", "SparseArrays"] +git-tree-sha1 = "accdf286e81f3ec1ad1ad82ad56e3ff346f90b5d" +repo-rev = "master" +repo-url = "https://github.com/JuliaSmoothOptimizers/LLSModels.jl" +uuid = "39f5bc3e-5160-4bf8-ac48-504fd2534d24" +version = "0.1.0" + [[LibGit2]] +deps = ["Printf"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" [[Libdl]] @@ -188,21 +161,16 @@ version = "0.4.5" uuid = "a63ad114-7e13-5084-954f-fe012c677804" [[NLPModels]] -deps = ["FastClosures", "ForwardDiff", "LinearAlgebra", "LinearOperators", "Printf", "SparseArrays", "Test"] -git-tree-sha1 = "9b83f43b97d7aed9b1c12f0dc87ca894d9225d43" +deps = ["FastClosures", "LinearAlgebra", "LinearOperators", "Printf", "SparseArrays"] +git-tree-sha1 = "2f45c1807e867e6f365d0332230bf02a03199c98" uuid = "a4795742-8479-5a88-8948-cc11e1c8c1a6" -version = "0.13.2" +version = "0.14.0" -[[NaNMath]] -git-tree-sha1 = "bfe47e760d60b82b66b61d2d44128b62e3a369fb" -uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" -version = "0.3.5" - -[[OpenSpecFun_jll]] -deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "9db77584158d0ab52307f8c04f8e7c08ca76b5b3" -uuid = "efe28fd5-8261-553b-a9e1-b2916fc3738e" -version = "0.5.3+4" +[[NLPModelsModifiers]] +deps = ["FastClosures", "LinearAlgebra", "LinearOperators", "NLPModels", "Printf", "SparseArrays"] +git-tree-sha1 = "2ede3a8d4483da83c0283a6cde5edd478d7f6be0" +uuid = "e01155f1-5c6f-4375-a9d8-616dd036575f" +version = "0.1.0" [[OrderedCollections]] git-tree-sha1 = "4fa2ba51070ec13fcc7517db714445b4ab986bdf" @@ -216,7 +184,7 @@ uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" version = "1.0.16" [[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Test", "UUIDs"] +deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[PooledArrays]] @@ -268,10 +236,10 @@ uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" uuid = "6462fe0b-24de-5631-8697-dd941f90decc" [[SolverTools]] -deps = ["DataFrames", "JLD2", "LinearAlgebra", "LinearOperators", "Logging", "NLPModels", "Printf"] -git-tree-sha1 = "06c88810a679bbca1016e759eef74016b4c9318c" +deps = ["DataFrames", "JLD2", "LinearAlgebra", "LinearOperators", "NLPModels", "Printf"] +git-tree-sha1 = "008ba30a486a7119ddf05eb9c69b9df88bf791dd" uuid = "b5612192-2639-5dc1-abfe-fbedd65fab29" -version = "0.3.2" +version = "0.4.0" [[SortingAlgorithms]] deps = ["DataStructures", "Random", "Test"] @@ -283,18 +251,6 @@ version = "0.3.1" deps = ["LinearAlgebra", "Random"] uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" -[[SpecialFunctions]] -deps = ["ChainRulesCore", "OpenSpecFun_jll"] -git-tree-sha1 = "5919936c0e92cff40e57d0ddf0ceb667d42e5902" -uuid = "276daf66-3868-5448-9aa4-cd146d93841b" -version = "1.3.0" - -[[StaticArrays]] -deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "9da72ed50e94dbff92036da395275ed114e04d49" -uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.0.1" - [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" diff --git a/Project.toml b/Project.toml index 96fdd698..34bbad5c 100644 --- a/Project.toml +++ b/Project.toml @@ -1,10 +1,11 @@ name = "Stopping" uuid = "c4fe5a9e-e7fb-5c3d-89d5-7f405ab2214f" authors = ["Jean-Pierre Dussault ", "Tangi Migot ", "Sam Goyette "] -version = "0.3.0" +version = "0.3.1" [deps] DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0" +LLSModels = "39f5bc3e-5160-4bf8-ac48-504fd2534d24" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" LinearOperators = "5c8ed15e-5a4c-59e4-a42b-c7e8811fb125" NLPModels = "a4795742-8479-5a88-8948-cc11e1c8c1a6" @@ -16,9 +17,14 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [compat] DataFrames = "^0.21, 0.22" LinearOperators = "^1" -NLPModels = "^0.13" -SolverTools = "^0.3" +LLSModels = "0.1" +NLPModels = "0.14" +SolverTools = "0.4" julia = "^1.3.0" [extras] +ADNLPModels = "54578032-b7ea-4c30-94aa-7cbd1cce6c9a" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" + +[targets] +test = ["ADNLPModels", "Test"] diff --git a/src/Stopping.jl b/src/Stopping.jl index 6d0f55a8..8f378414 100644 --- a/src/Stopping.jl +++ b/src/Stopping.jl @@ -47,7 +47,7 @@ the Stopping to reuse for another call. module Stopping using LinearAlgebra, LinearOperators, SparseArrays - using DataFrames, NLPModels, Printf + using DataFrames, LLSModels, NLPModels, Printf """ AbstractState: diff --git a/test/runtests.jl b/test/runtests.jl index 32c5d488..4648f098 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1,6 +1,6 @@ using Test -using DataFrames, LinearAlgebra, NLPModels, Printf, SparseArrays +using ADNLPModels, DataFrames, LinearAlgebra, LLSModels, NLPModels, Printf, SparseArrays using Stopping using Stopping: _init_field