Revert "Reduce allocations using MathOptInterface.jl (#87) (#93)"

This reverts commit bfcc6f3.

Author: ranocha

NEWS.md

@@ -9,13 +9,12 @@ for human readability.
 
 #### Added
 
-- Added shape preserving splines and interpolation using [MathOptInterface.jl](https://github.com/jump-dev/MathOptInterface.jl) and [HiGHS.jl](https://github.com/jump-dev/HiGHS.jl) [#83, #93]
+- Added shape preserving splines and interpolation using [JuMP.jl](https://github.com/jump-dev/JuMP.jl) and [HiGHS.jl](https://github.com/jump-dev/HiGHS.jl) [#83]
 - Added scattered radial basis function interpolation using [KernelInterpolation.jl](https://github.com/JoshuaLampert/KernelInterpolation.jl) [#73]
 - Implementation of visualization routines `plot_topography` and `plot_topography_with_interpolation_knots`
 
 #### Changed
 
-- Replaced [JuMP.jl](https://github.com/jump-dev/JuMP.jl) with [MathOptInterface.jl](https://github.com/jump-dev/MathOptInterface.jl) for Lavery splines to reduce allocations [#93]
 - The required Julia version is updated to v1.10.
 - Visualization routines rely on Makie.jl instead of PyPlot.jl [#52]
 

Project.toml

@@ -11,22 +11,22 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [weakdeps]
 HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
+JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
 KernelInterpolation = "95686e15-3c94-4443-8f08-76d06d509f7b"
 Makie = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
-MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
 
 [extensions]
+JuMPHiGHSExt = ["JuMP", "HiGHS"]
 KernelInterpolationExt = "KernelInterpolation"
 MakieExt = "Makie"
-MathOptInterfaceHiGHSExt = ["HiGHS", "MathOptInterface"]
 
 [compat]
 Downloads = "1.6"
 HiGHS = "1.0"
+JuMP = "1.0"
 KernelInterpolation = "0.3.5"
 LinearAlgebra = "1"
 Makie = "0.21, 0.22, 0.24"
-MathOptInterface = "1.0"
 SparseArrays = "1"
 StaticArrays = "1.9"
 julia = "1.10"

docs/Project.toml

@@ -3,8 +3,8 @@ CairoMakie = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 Changelog = "5217a498-cd5d-4ec6-b8c2-9b85a09b6e3e"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
+JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
 KernelInterpolation = "95686e15-3c94-4443-8f08-76d06d509f7b"
-MathOptInterface = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
 OrdinaryDiffEqLowStorageRK = "b0944070-b475-4768-8dec-fb6eb410534d"
 Trixi = "a7f1ee26-1774-49b1-8366-f1abc58fbfcb"
 TrixiBottomTopography = "86af9953-43df-404b-8eaa-d20d82623a82"
@@ -18,8 +18,8 @@ CairoMakie = "0.13, 0.15"
 Changelog = "1.1"
 Documenter = "1.3"
 HiGHS = "1.0"
+JuMP = "1.0"
 KernelInterpolation = "0.3.5"
-MathOptInterface = "1.0"
 OrdinaryDiffEqLowStorageRK = "1.3"
 Trixi = "0.12, 0.13, 0.14, 0.15, 0.16"
 TrixiShallowWater = "0.2"

docs/make.jl

@@ -5,7 +5,7 @@ using Changelog: Changelog
 # To load the extensions
 import CairoMakie
 import KernelInterpolation
-import MathOptInterface
+import JuMP
 import HiGHS
 
 # Copy list of authors to not need to synchronize it manually.
@@ -97,7 +97,7 @@ makedocs(;
          modules = [TrixiBottomTopography,
              Base.get_extension(TrixiBottomTopography, :MakieExt),
              Base.get_extension(TrixiBottomTopography, :KernelInterpolationExt),
-             Base.get_extension(TrixiBottomTopography, :MathOptInterfaceHiGHSExt)],
+             Base.get_extension(TrixiBottomTopography, :JuMPHiGHSExt)],
          authors = "Andrew R. Winters <andrew.ross.winters@liu.se>, Michael Schlottke-Lakemper <michael@sloede.com>",
          sitename = "TrixiBottomTopography.jl",
          format = Documenter.HTML(;

docs/src/reference.md

@@ -24,7 +24,7 @@ TrixiBottomTopography.RBFInterpolation1D
 TrixiBottomTopography.RBFInterpolation2D
 ```
 
-## MathOptInterfaceHiGHS.jl extension
+## JuMPHiGHS.jl extension
 ```@docs
 TrixiBottomTopography.LaverySpline1D(::Vector{T}, ::Vector{T}) where {T<:Real}
 TrixiBottomTopography.LaverySpline1D(::String)

examples/lavery_spline_1d.jl

@@ -5,7 +5,7 @@
 
 # Include packages
 using TrixiBottomTopography
-using MathOptInterface
+using JuMP
 using HiGHS
 
 # Load in data from one of the examples from Eriksson and Jemsson thesis

examples/lavery_spline_2d.jl

@@ -5,7 +5,7 @@
 
 # Include packages
 using TrixiBottomTopography
-using MathOptInterface
+using JuMP
 using HiGHS
 
 # Load in data from one of the examples from Eriksson and Jemsson thesis