Remove vendored DifferentialRiccatiEquations

.gitlab-ci.yml

@@ -49,7 +49,7 @@ demo:
   interruptible: true
   image: julia:1.7
   variables:
-    GIT_SUBMODULE_STRATEGY: recursive
+    DATADEPS_ALWAYS_ACCEPT: 1
     JULIA_PROJECT: "@."
   script:
     - cd demo

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "demo/vendor/DifferentialRiccatiEquations.jl"]
-	path = demo/vendor/DifferentialRiccatiEquations.jl
-	url = ../DifferentialRiccatiEquations.jl.git

CHANGELOG.md

@@ -1,6 +1,7 @@
 # DEV
 
 - Allow LoggingExtras version 1
+- Remove vendored DifferentialRiccatiEquations
 
 # v0.4.5
 

README.md

@@ -30,13 +30,6 @@ Check out the demo and test files:
 * `test/problems/diffeq-ode.jl` solves a linear ordinary differential equation (ODE) using [OrdinaryDiffEq.jl]
 * `test/problems/non-diffeq.jl` counts time discretization points (test for custom types)
 
-Before running the demos, make sure to initialize the git submodules:
-
-```bash
-cd path/to/ParaReal.jl
-git submodule update --init
-```
-
 [OrdinaryDiffEq.jl]: https://github.com/SciML/OrdinaryDiffEq.jl
 
 ## Acknowledgments
@@ -49,10 +42,5 @@ I would like to thank the code reviewers:
 ## License
 
 The ParaReal package is licensed under [MIT], see `LICENSE`.
-This does *not* cover files in `demo/vendor/` which are redistributed under their respective licenses:
-
-* DifferentialRiccatiEquations.jl: [MIT]
-* `Rail371.mat` within DifferentialRiccatiEquations.jl: [CC-BY-4.0]
 
 [MIT]: https://spdx.org/licenses/MIT.html
-[CC-BY-4.0]: https://spdx.org/licenses/CC-BY-4.0.html

demo/Manifest.toml

@@ -4,6 +4,11 @@ julia_version = "1.6.7"
 manifest_format = "2.0"
 project_hash = "cde264e0e9dfc26a3adabfc618b29398b6ae2438"
 
+[[deps.ArgCheck]]
+git-tree-sha1 = "a3a402a35a2f7e0b87828ccabbd5ebfbebe356b4"
+uuid = "dce04be8-c92d-5529-be00-80e4d2c0e197"
+version = "2.3.0"
+
 [[deps.ArgTools]]
 uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
 
@@ -13,11 +18,22 @@ uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
 [[deps.Base64]]
 uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
+[[deps.BitFlags]]
+git-tree-sha1 = "2dc09997850d68179b69dafb58ae806167a32b1b"
+uuid = "d1d4a3ce-64b1-5f1a-9ba4-7e7e69966f35"
+version = "0.1.8"
+
 [[deps.BufferedStreams]]
 git-tree-sha1 = "bb065b14d7f941b8617bc323063dbe79f55d16ea"
 uuid = "e1450e63-4bb3-523b-b2a4-4ffa8c0fd77d"
 version = "1.1.0"
 
+[[deps.ChainRulesCore]]
+deps = ["Compat", "LinearAlgebra", "SparseArrays"]
+git-tree-sha1 = "575cd02e080939a33b6df6c5853d14924c08e35b"
+uuid = "d360d2e6-b24c-11e9-a2a3-2a2ae2dbcce4"
+version = "1.23.0"
+
 [[deps.CodecZlib]]
 deps = ["TranscodingStreams", "Zlib_jll"]
 git-tree-sha1 = "ded953804d019afa9a3f98981d99b33e3db7b6da"
@@ -35,6 +51,18 @@ git-tree-sha1 = "78bee250c6826e1cf805a88b7f1e86025275d208"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
 version = "3.46.0"
 
+[[deps.ConcurrentUtilities]]
+deps = ["Serialization", "Sockets"]
+git-tree-sha1 = "6cbbd4d241d7e6579ab354737f4dd95ca43946e1"
+uuid = "f0e56b4a-5159-44fe-b623-3e5288b988bb"
+version = "2.4.1"
+
+[[deps.DataDeps]]
+deps = ["HTTP", "Libdl", "Reexport", "SHA", "Scratch", "p7zip_jll"]
+git-tree-sha1 = "8ae085b71c462c2cb1cfedcb10c3c877ec6cf03f"
+uuid = "124859b0-ceae-595e-8997-d05f6a7a8dfe"
+version = "0.7.13"
+
 [[deps.Dates]]
 deps = ["Printf"]
 uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
@@ -45,14 +73,20 @@ uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 
 [[deps.DifferentialRiccatiEquations]]
 deps = ["CommonSolve", "Compat", "LinearAlgebra", "MatrixEquations", "SparseArrays", "UnPack"]
-path = "vendor/DifferentialRiccatiEquations.jl"
+git-tree-sha1 = "f635b38a4d310c0501d1f9dca006f4e246f41270"
 uuid = "9819f967-4574-4d9d-b214-002eeba273d9"
-version = "0.2.2"
+version = "0.3.0"
 
 [[deps.Distributed]]
 deps = ["Random", "Serialization", "Sockets"]
 uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 
+[[deps.DocStringExtensions]]
+deps = ["LibGit2"]
+git-tree-sha1 = "2fb1e02f2b635d0845df5d7c167fec4dd739b00d"
+uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
+version = "0.9.3"
+
 [[deps.Downloads]]
 deps = ["ArgTools", "LibCURL", "NetworkOptions"]
 uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
@@ -63,6 +97,12 @@ git-tree-sha1 = "67e9001646db6e45006643bf37716ecd831d37d2"
 uuid = "634d3b9d-ee7a-5ddf-bec9-22491ea816e1"
 version = "2.9.1"
 
+[[deps.ExceptionUnwrapping]]
+deps = ["Test"]
+git-tree-sha1 = "dcb08a0d93ec0b1cdc4af184b26b591e9695423a"
+uuid = "460bff9d-24e4-43bc-9d9f-a8973cb893f4"
+version = "0.1.10"
+
 [[deps.FileIO]]
 deps = ["Pkg", "Requires", "UUIDs"]
 git-tree-sha1 = "94f5101b96d2d968ace56f7f2db19d0a5f592e28"
@@ -81,6 +121,12 @@ git-tree-sha1 = "4cc2bb72df6ff40b055295fdef6d92955f9dede8"
 uuid = "0234f1f7-429e-5d53-9886-15a909be8d59"
 version = "1.12.2+2"
 
+[[deps.HTTP]]
+deps = ["Base64", "CodecZlib", "ConcurrentUtilities", "Dates", "ExceptionUnwrapping", "Logging", "LoggingExtras", "MbedTLS", "NetworkOptions", "OpenSSL", "Random", "SimpleBufferStream", "Sockets", "URIs", "UUIDs"]
+git-tree-sha1 = "2c3ec1f90bb4a8f7beafb0cffea8a4c3f4e636ab"
+uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
+version = "1.10.6"
+
 [[deps.InteractiveUtils]]
 deps = ["Markdown"]
 uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
@@ -121,10 +167,10 @@ deps = ["Libdl"]
 uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 
 [[deps.LinearMaps]]
-deps = ["LinearAlgebra", "SparseArrays", "Statistics"]
-git-tree-sha1 = "d1b46faefb7c2f48fdec69e6f3cc34857769bc15"
+deps = ["ChainRulesCore", "LinearAlgebra", "SparseArrays", "Statistics"]
+git-tree-sha1 = "9948d6f8208acfebc3e8cf4681362b2124339e7e"
 uuid = "7a12625a-238d-50fd-b39a-03d52299707e"
-version = "3.8.0"
+version = "3.11.2"
 
 [[deps.Logging]]
 uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
@@ -141,6 +187,12 @@ git-tree-sha1 = "971be550166fe3f604d28715302b58a3f7293160"
 uuid = "23992714-dd62-5051-b70f-ba57cb901cac"
 version = "0.10.3"
 
+[[deps.MORWiki]]
+deps = ["Compat", "DataDeps", "DocStringExtensions", "LinearAlgebra", "MatrixMarket", "SparseArrays", "UnPack", "ZipArchives", "unzip_jll"]
+git-tree-sha1 = "26ba4150b172102d3441c9466eb9d37ef0c07617"
+uuid = "4add22a6-c4b7-49d8-833a-0e1707ec89d0"
+version = "0.2.0"
+
 [[deps.MacroTools]]
 deps = ["Markdown", "Random"]
 git-tree-sha1 = "3d3e902b31198a27340d0bf00d6ac452866021cf"
@@ -153,9 +205,21 @@ uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
 
 [[deps.MatrixEquations]]
 deps = ["LinearAlgebra", "LinearMaps"]
-git-tree-sha1 = "3b284e9c98f645232f9cf07d4118093801729d43"
+git-tree-sha1 = "825264b8ce24f1ea5ea5f7572be8c4cf34973337"
 uuid = "99c1a7ee-ab34-5fd5-8076-27c950a045f4"
-version = "2.2.2"
+version = "2.3.2"
+
+[[deps.MatrixMarket]]
+deps = ["CodecZlib", "LinearAlgebra", "SparseArrays", "TranscodingStreams"]
+git-tree-sha1 = "903fd51345b94a3aa271118ca189d0c4a2cae2e3"
+uuid = "4d4711f2-db25-561a-b6b3-d35e7d4047d3"
+version = "0.5.0"
+
+[[deps.MbedTLS]]
+deps = ["Dates", "MbedTLS_jll", "MozillaCACerts_jll", "NetworkOptions", "Random", "Sockets"]
+git-tree-sha1 = "c067a280ddc25f196b5e7df3877c6b226d390aaf"
+uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
+version = "1.1.9"
 
 [[deps.MbedTLS_jll]]
 deps = ["Artifacts", "Libdl"]
@@ -170,6 +234,12 @@ uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
 [[deps.NetworkOptions]]
 uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
 
+[[deps.OpenSSL]]
+deps = ["BitFlags", "Dates", "MozillaCACerts_jll", "OpenSSL_jll", "Sockets"]
+git-tree-sha1 = "38cb508d080d21dc1128f7fb04f20387ed4c0af4"
+uuid = "4d8831e6-92b7-49fb-bdf8-b643e874388c"
+version = "1.4.3"
+
 [[deps.OpenSSL_jll]]
 deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"]
 git-tree-sha1 = "e60321e3f2616584ff98f0a4f18d98ae6f89bbb3"
@@ -185,12 +255,18 @@ version = "1.4.1"
 deps = ["CommonSolve", "Distributed", "LinearAlgebra", "Logging", "LoggingExtras", "Requires", "UnPack"]
 path = ".."
 uuid = "d8ab9f86-dde6-11e9-3216-afd74457b932"
-version = "0.4.5"
+version = "0.4.6"
 
 [[deps.Pkg]]
 deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
 uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 
+[[deps.PrecompileTools]]
+deps = ["Preferences"]
+git-tree-sha1 = "5aa36f7049a63a1528fe8f7c3f2113413ffd4e1f"
+uuid = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
+version = "1.2.1"
+
 [[deps.Preferences]]
 deps = ["TOML"]
 git-tree-sha1 = "47e5f437cc0e7ef2ce8406ce1e7e24d44915f88d"
@@ -236,6 +312,11 @@ uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 deps = ["Distributed", "Mmap", "Random", "Serialization"]
 uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
 
+[[deps.SimpleBufferStream]]
+git-tree-sha1 = "874e8867b33a00e784c8a7e4b60afe9e037b74e1"
+uuid = "777ac1f9-54b0-4bf8-805c-2214025038e7"
+version = "1.1.0"
+
 [[deps.Sockets]]
 uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
 
@@ -265,6 +346,11 @@ git-tree-sha1 = "8a75929dcd3c38611db2f8d08546decb514fcadf"
 uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
 version = "0.9.9"
 
+[[deps.URIs]]
+git-tree-sha1 = "67db6cc7b3821e19ebe75791a9dd19c9b1188f2b"
+uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4"
+version = "1.5.1"
+
 [[deps.UUIDs]]
 deps = ["Random", "SHA"]
 uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
@@ -277,6 +363,12 @@ version = "1.0.2"
 [[deps.Unicode]]
 uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
 
+[[deps.ZipArchives]]
+deps = ["ArgCheck", "CodecZlib", "PrecompileTools", "TranscodingStreams", "Zlib_jll"]
+git-tree-sha1 = "0d5fe72caa779d650bf8de3802e20511e5ee0d97"
+uuid = "49080126-0e18-4c2a-b176-c102e4b3760c"
+version = "1.1.1"
+
 [[deps.Zlib_jll]]
 deps = ["Libdl"]
 uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
@@ -288,3 +380,9 @@ uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
 [[deps.p7zip_jll]]
 deps = ["Artifacts", "Libdl"]
 uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"
+
+[[deps.unzip_jll]]
+deps = ["Artifacts", "JLLWrappers", "Libdl"]
+git-tree-sha1 = "5d543463432c2e25027d88f5a314d40d44488391"
+uuid = "88f77b66-78eb-5ed0-bc16-ebba0796830d"
+version = "6.0.2+0"

demo/Project.toml

@@ -2,6 +2,10 @@
 DifferentialRiccatiEquations = "9819f967-4574-4d9d-b214-002eeba273d9"
 DrWatson = "634d3b9d-ee7a-5ddf-bec9-22491ea816e1"
 MAT = "23992714-dd62-5051-b70f-ba57cb901cac"
+MORWiki = "4add22a6-c4b7-49d8-833a-0e1707ec89d0"
 ParaReal = "d8ab9f86-dde6-11e9-3216-afd74457b932"
 SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
+
+[compat]
+DifferentialRiccatiEquations = "0.3"

demo/riccati.jl

@@ -42,7 +42,8 @@
 # Start by launching some worker processes and loading the necessary packages:
 
 using Distributed
-using DrWatson, UnPack, MAT
+using DrWatson, UnPack
+using MORWiki: assemble, SteelProfile
 #md using SlurmClusterManager
 
 addprocs(5) #src
@@ -95,9 +96,7 @@ end
 # Load the system matrices, define problem and algorithm instance,
 # and solve the Riccati equation:
 
-data = joinpath(pkgdir(DifferentialRiccatiEquations), "test", "Rail371.mat")
-P = matread(data)
-@unpack E, A, B, C = P
+@unpack E, A, B, C = assemble(SteelProfile(371))
 L = E \ collect(C')
 D = spdiagm(fill(0.01, size(L, 2)))
 X₀ = LDLᵀ(L, D)