Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docs] add READMEs of supported solvers to the documentation #3309

Merged
merged 41 commits into from
Apr 11, 2023
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
917eb33
[docs] add READMEs of supported solvers to the documentation
odow Mar 29, 2023
da55061
Update solver list
odow Mar 29, 2023
e9bdc03
Update
odow Mar 31, 2023
23aaba7
Update solver urls
odow Mar 31, 2023
1a58413
Update
odow Mar 31, 2023
411b64c
Apply suggestions from code review
odow Apr 3, 2023
5d6807f
Apply suggestions from code review
odow Apr 3, 2023
3c7aa3a
Updates
odow Apr 3, 2023
f50233e
F
odow Apr 3, 2023
d3f318c
Update solvers.toml
odow Apr 3, 2023
976a4a3
Update solvers.toml
odow Apr 3, 2023
a9df9f0
Update solvers.toml
odow Apr 3, 2023
b989fcd
Update solvers.toml
odow Apr 3, 2023
da0ca40
Update solvers.toml
odow Apr 3, 2023
c07cbe0
Update solvers.toml
odow Apr 3, 2023
c8b447d
Update make.jl
odow Apr 3, 2023
b1c7234
Update make.jl
odow Apr 4, 2023
0c7643c
Update accept.txt
odow Apr 4, 2023
231ac88
Update
odow Apr 4, 2023
b007054
Updates
odow Apr 4, 2023
5d66c5c
Update
odow Apr 4, 2023
7d09ca8
Update
odow Apr 4, 2023
274fa8e
Update docs/solvers.toml
odow Apr 4, 2023
0344c66
Update accept.txt
odow Apr 4, 2023
4982f78
Apply suggestions from code review
odow Apr 5, 2023
66c7643
Apply suggestions from code review
odow Apr 5, 2023
5d73e21
Apply suggestions from code review
odow Apr 5, 2023
6ca3ff6
Update solvers.toml
odow Apr 5, 2023
5772b0d
Apply suggestions from code review
odow Apr 5, 2023
65864bc
Apply suggestions from code review
odow Apr 5, 2023
35c91ab
Add extensions section
odow Apr 7, 2023
044f974
Fix typo
odow Apr 7, 2023
10c7c14
Update docs/make.jl
odow Apr 7, 2023
7d191e5
Update packages.toml
odow Apr 8, 2023
d30b1ed
Add SCIP
odow Apr 9, 2023
bd098fd
Update packages.toml
odow Apr 9, 2023
31ffe51
Update accept.txt
odow Apr 9, 2023
44e5327
Update packages.toml
odow Apr 10, 2023
e7242e5
Update packages.toml
odow Apr 10, 2023
e05ee7e
Update docs/packages.toml
odow Apr 11, 2023
fba933c
Update packages.toml
odow Apr 11, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ src/tutorials/*/*.md
src/moi/
src/tutorials/linear/transp.txt
src/release_notes.md
src/solvers
2 changes: 2 additions & 0 deletions docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
GLPK = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
HTTP = "cd3eb016-35fb-5094-929b-558a96fad6f3"
HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
Expand All @@ -19,6 +20,7 @@ Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
SCS = "c946c3f1-0d1f-5ce8-9dea-7daa1f7e2d13"
SQLite = "0aa819cd-b072-5ff4-a722-6bc24af294d9"
StatsPlots = "f3b207a7-027a-5e70-b257-86293d7955fd"
TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

Expand Down
28 changes: 27 additions & 1 deletion docs/make.jl
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import Pkg
Pkg.pkg"add Documenter#633a95a"
import Documenter
import Downloads
import Literate
import Test
import TOML

using JuMP
const MathOptInterface = MOI
Expand Down Expand Up @@ -102,6 +104,29 @@ if !_FAST
end
end

# ==============================================================================
# Add solver README
# ==============================================================================

const _SOLVER_DIR = joinpath(@__DIR__, "src", "solvers")
if isdir(_SOLVER_DIR)
rm(_SOLVER_DIR; recursive = true)
end
mkdir(_SOLVER_DIR)
const _LIST_OF_SOLVERS = String[]
for (solver, data) in TOML.parsefile(joinpath(@__DIR__, "solvers.toml"))
user = get(data, "user", "jump-dev")
repo = "$solver.jl"
tag = get(data, "rev", "master")
odow marked this conversation as resolved.
Show resolved Hide resolved
filename = get(data, "filename", "README.md")
Downloads.download(
"https://raw.githubusercontent.com/$user/$repo/$tag/$filename",
joinpath(@__DIR__, "src", "solvers", "$solver.md"),
)
push!(_LIST_OF_SOLVERS, "solvers/$solver.md")
end
sort!(_LIST_OF_SOLVERS)

# ==============================================================================
# JuMP documentation structure
# ==============================================================================
Expand Down Expand Up @@ -214,6 +239,7 @@ const _PAGES = [
"Style Guide" => "developers/style.md",
"Roadmap" => "developers/roadmap.md",
],
"Solvers" => _LIST_OF_SOLVERS,
"release_notes.md",
]

Expand Down Expand Up @@ -411,7 +437,7 @@ if _PDF
_remove_literate_footer.(joinpath.(root, dir))
end
# Remove release notes from PDF
splice!(_PAGES, 7) # JuMP release notes
splice!(_PAGES, 7:8) # Solvers and JuMP release notes
pop!(_PAGES[end][2]) # MOI release notes
latex_platform = _IS_GITHUB_ACTIONS ? "docker" : "native"
@time Documenter.makedocs(
Expand Down
75 changes: 75 additions & 0 deletions docs/solvers.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
# [Alpine]
# user = "lanl-ansi"
[AmplNLWriter]
rev = "od/readme"
odow marked this conversation as resolved.
Show resolved Hide resolved
odow marked this conversation as resolved.
Show resolved Hide resolved
[BARON]
rev = "od/readme"
odow marked this conversation as resolved.
Show resolved Hide resolved
odow marked this conversation as resolved.
Show resolved Hide resolved
[Cbc]
rev = "od/readme"
odow marked this conversation as resolved.
Show resolved Hide resolved
odow marked this conversation as resolved.
Show resolved Hide resolved
# [CDCS]
# user = "oxfordcontrol"
# [CDDLib]
# user = "JuliaPolyhedra"
# [Clarabel]
# user = "oxfordcontrol"
[Clp]
rev = "od/readme"
# [COPT]
# user = "COPT-Public"
# [COSMO]
# user = "oxfordcontrol"
[CPLEX]
rev = "od/readme"
[CSDP]
odow marked this conversation as resolved.
Show resolved Hide resolved
rev = "od/readme"
# [DAQP]
# user = "darnstrom"
# rev = "main"
# [DiffOpt]
# [Dualization]
# [EAGO]
# user = "PSORLab"
[ECOS]
odow marked this conversation as resolved.
Show resolved Hide resolved
rev = "od/readme"
# [GAMS]
# user = "GAMS-dev"
[GLPK]
odow marked this conversation as resolved.
Show resolved Hide resolved
rev = "od/readme"
[Gurobi]
odow marked this conversation as resolved.
Show resolved Hide resolved
rev = "od/readme"
[HiGHS]
odow marked this conversation as resolved.
Show resolved Hide resolved
rev = "od/readme"
# [Hypatia]
# user = "chriscoey"
[Ipopt]
odow marked this conversation as resolved.
Show resolved Hide resolved
rev = "od/readme"
# [Juniper]
# user = "lanl-ansi"
[KNITRO]
# [MadNLP]
# user = "MadNLP"
[MiniZinc]
odow marked this conversation as resolved.
Show resolved Hide resolved
rev = "od/readme"
[MosekTools]
[MultiObjectiveAlgorithms]
# [NLopt]
# user = "JuliaOpt"
# [OSQP]
# user = "osqp"
# [PATHSolver]
# user = "chkwon"
[Pajarito]
odow marked this conversation as resolved.
Show resolved Hide resolved
[Pavito]
[Penopt]
# [ProxSDP]
# user = "mariohsouto"
# [SCIP]
# user = "scipopt"
[SCS]
odow marked this conversation as resolved.
Show resolved Hide resolved
[SDPA]
[SDPNAL]
[SDPT3]
[SeDuMi]
# [Tulip]
# user = "ds4dm"
[Xpress]