Skip to content

Commit 55a4c6e

Browse files
WikuniaWikunia
committed
use glpk optimizer in benchmark and Arpack in Project.toml
1 parent 1a8b397 commit 55a4c6e

File tree

3 files changed

+138
-3
lines changed

3 files changed

+138
-3
lines changed

‎benchmark/Manifest.toml

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
# This file is machine-generated - editing it directly is not advised
2+
3+
[[ArgTools]]
4+
uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f"
5+
6+
[[Arpack]]
7+
deps = ["Arpack_jll", "Libdl", "LinearAlgebra", "Logging"]
8+
git-tree-sha1 = "dadb9a82914224b22e5f2b73a82fd5de46d3cf16"
9+
uuid = "7d9fca2a-8960-54d3-9f78-7d1dccf2cb97"
10+
version = "0.5.2"
11+
12+
[[Arpack_jll]]
13+
deps = ["Libdl", "OpenBLAS_jll", "Pkg"]
14+
git-tree-sha1 = "e214a9b9bd1b4e1b4f15b22c0994862b66af7ff7"
15+
uuid = "68821587-b530-5797-8361-c406ea357684"
16+
version = "3.5.0+3"
17+
18+
[[Artifacts]]
19+
uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
20+
21+
[[Base64]]
22+
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
23+
24+
[[CompilerSupportLibraries_jll]]
25+
deps = ["Artifacts", "Libdl"]
26+
uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae"
27+
28+
[[Dates]]
29+
deps = ["Printf"]
30+
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
31+
32+
[[Downloads]]
33+
deps = ["ArgTools", "LibCURL", "NetworkOptions"]
34+
uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
35+
36+
[[InteractiveUtils]]
37+
deps = ["Markdown"]
38+
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
39+
40+
[[LibCURL]]
41+
deps = ["LibCURL_jll", "MozillaCACerts_jll"]
42+
uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21"
43+
44+
[[LibCURL_jll]]
45+
deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"]
46+
uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0"
47+
48+
[[LibGit2]]
49+
deps = ["Base64", "NetworkOptions", "Printf", "SHA"]
50+
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
51+
52+
[[LibSSH2_jll]]
53+
deps = ["Artifacts", "Libdl", "MbedTLS_jll"]
54+
uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8"
55+
56+
[[Libdl]]
57+
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
58+
59+
[[LinearAlgebra]]
60+
deps = ["Libdl"]
61+
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
62+
63+
[[Logging]]
64+
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
65+
66+
[[Markdown]]
67+
deps = ["Base64"]
68+
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
69+
70+
[[MbedTLS_jll]]
71+
deps = ["Artifacts", "Libdl"]
72+
uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1"
73+
74+
[[MozillaCACerts_jll]]
75+
uuid = "14a3606d-f60d-562e-9121-12d972cd8159"
76+
77+
[[NetworkOptions]]
78+
uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"
79+
80+
[[OpenBLAS_jll]]
81+
deps = ["Artifacts", "CompilerSupportLibraries_jll", "Libdl"]
82+
uuid = "4536629a-c528-5b80-bd46-f80d51c5b363"
83+
84+
[[Pkg]]
85+
deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"]
86+
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
87+
88+
[[Printf]]
89+
deps = ["Unicode"]
90+
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
91+
92+
[[REPL]]
93+
deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"]
94+
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
95+
96+
[[Random]]
97+
deps = ["Serialization"]
98+
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
99+
100+
[[SHA]]
101+
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
102+
103+
[[Serialization]]
104+
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
105+
106+
[[Sockets]]
107+
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
108+
109+
[[TOML]]
110+
deps = ["Dates"]
111+
uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
112+
113+
[[Tar]]
114+
deps = ["ArgTools", "SHA"]
115+
uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e"
116+
117+
[[UUIDs]]
118+
deps = ["Random", "SHA"]
119+
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
120+
121+
[[Unicode]]
122+
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"
123+
124+
[[Zlib_jll]]
125+
deps = ["Libdl"]
126+
uuid = "83775a58-1f1d-513f-b197-d71354ab007a"
127+
128+
[[nghttp2_jll]]
129+
deps = ["Artifacts", "Libdl"]
130+
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
131+
132+
[[p7zip_jll]]
133+
deps = ["Artifacts", "Libdl"]
134+
uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0"

‎benchmark/Project.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[deps]
2+
Arpack = "7d9fca2a-8960-54d3-9f78-7d1dccf2cb97"

‎benchmark/eternity/benchmark.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@ function solve_eternity(
5252
"branch_strategy" => branch_strategy,
5353
))
5454
if optimize
55-
cbc_optimizer = optimizer_with_attributes(Cbc.Optimizer, "logLevel" => 0)
55+
glpk_optimizer = optimizer_with_attributes(GLPK.Optimizer, "msg_lev" => GLPK.GLP_MSG_OFF)
5656
m = Model(optimizer_with_attributes(
5757
CS.Optimizer,
5858
"logging" => [],
5959
"all_solutions" => all_solutions,
60-
"lp_optimizer" => cbc_optimizer,
60+
"lp_optimizer" => glpk_optimizer,
6161
"seed" => 1,
6262
))
6363
end
@@ -147,6 +147,5 @@ function solve_eternity(
147147
optimize!(m)
148148

149149
status = JuMP.termination_status(m)
150-
@show status
151150
@assert status == MOI.OPTIMAL
152151
end

0 commit comments

Comments
 (0)