Skip to content

Commit c07c102

Browse files
torressasimonbowly
andauthored
Update with v12.0.0 libraries (#27)
Co-authored-by: Simon Bowly <bowly@gurobi.com>
1 parent 4e2f72c commit c07c102

10 files changed

+47
-82
lines changed

Artifacts.toml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
[[Gurobi]]
2-
git-tree-sha1 = "0edbadd2721b9fc45e48158015af672c7fe8698a"
2+
git-tree-sha1 = "c12ed87f704f6143cfac6977f14b6e192b9a1be3"
33
arch = "x86_64"
44
os = "linux"
55

66
[[Gurobi.download]]
7-
sha256 = "ac41673f45fa177a0f2e10da6843b4c6c453ab924d7ae908669ddbf60a90e1cf"
8-
url = "https://anaconda.org/Gurobi/gurobi/11.0.3/download/linux-64/gurobi-11.0.3-py311_0.tar.bz2"
7+
sha256 = "9ee0dc92f05d71ff119e1095bb7f85cfdc48e1838ac528b7986734e361ec4c70"
8+
url = "https://anaconda.org/Gurobi/gurobi/12.0.0/download/linux-64/gurobi-12.0.0-py311_0.tar.bz2"
99
[[Gurobi]]
10-
git-tree-sha1 = "6f77c3577547830a6750396c26f466fe422b2dcf"
10+
git-tree-sha1 = "4fbb888b4fef38cb20a89bc30cfe80e237ddc022"
1111
arch = "aarch64"
1212
os = "linux"
1313

1414
[[Gurobi.download]]
15-
sha256 = "7c2bdd94a79cec28a222f0e558c3ea5ee44439e8b75c5fd9d748c9410457b213"
16-
url = "https://anaconda.org/Gurobi/gurobi/11.0.3/download/linux-aarch64/gurobi-11.0.3-py311_0.tar.bz2"
15+
sha256 = "0aef0f5ff3cd070c2d19971ddc46e145f3be138d99c46164c6b3f4caefeca1d5"
16+
url = "https://anaconda.org/Gurobi/gurobi/12.0.0/download/linux-aarch64/gurobi-12.0.0-py311_0.tar.bz2"
1717
[[Gurobi]]
18-
git-tree-sha1 = "c8b5dda8d738ea893863c21a2a211689376e6081"
18+
git-tree-sha1 = "3cf43492d8dd8ca1b56f7586337aa2cef46e88b0"
1919
arch = "x86_64"
2020
os = "macos"
2121

2222
[[Gurobi.download]]
23-
sha256 = "d93292c26293490d3d843d679c69c4b4b03afe2297791412b71e33f691627e6e"
24-
url = "https://anaconda.org/Gurobi/gurobi/11.0.3/download/osx-64/gurobi-11.0.3-py311_0.tar.bz2"
23+
sha256 = "1a7bdd55ee6672c8e03b5e850ce80320213634cd011ddc6e66fce9ec73813457"
24+
url = "https://anaconda.org/Gurobi/gurobi/12.0.0/download/osx-64/gurobi-12.0.0-py311_0.tar.bz2"
2525
[[Gurobi]]
26-
git-tree-sha1 = "4e272e7a93e64f059eb513cca7024d4d733579f0"
26+
git-tree-sha1 = "d69be48c7cfd9757edf4e5c526dc21fbfbbfeca5"
2727
arch = "aarch64"
2828
os = "macos"
2929

3030
[[Gurobi.download]]
31-
sha256 = "4bcecbcc3e3326594304a0adaa55a95d5e654686782f7a37250457cf5c0c74d2"
32-
url = "https://anaconda.org/Gurobi/gurobi/11.0.3/download/osx-arm64/gurobi-11.0.3-py311_0.tar.bz2"
31+
sha256 = "26e5e2dba36b555baba848155ec9030b9567d0822df8c1bff18f2cfb8d24998a"
32+
url = "https://anaconda.org/Gurobi/gurobi/12.0.0/download/osx-arm64/gurobi-12.0.0-py311_0.tar.bz2"
3333
[[Gurobi]]
34-
git-tree-sha1 = "76c77f6de91d7cca8311906d79cddf42b2ce6e65"
34+
git-tree-sha1 = "b021a044a0a882f1179239684d144d58f37324ed"
3535
arch = "x86_64"
3636
os = "windows"
3737

3838
[[Gurobi.download]]
39-
sha256 = "4e2cae98498198ea33757cb3a5a803fc4239374a7b2391ae0bea582f98332c7c"
40-
url = "https://anaconda.org/Gurobi/gurobi/11.0.3/download/win-64/gurobi-11.0.3-py311_0.tar.bz2"
39+
sha256 = "88d11f8d6a5a27db7507c7e2ca043a88b99d9e8734e8819bb4d1cc0dc0fa1963"
40+
url = "https://anaconda.org/Gurobi/gurobi/12.0.0/download/win-64/gurobi-12.0.0-py311_0.tar.bz2"

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "Gurobi_jll"
22
uuid = "c018c7e6-a5b0-4aea-8f80-9c1ef9991411"
33
authors = ["odow <o.dowson@gmail.com>"]
4-
version = "11.0.3"
4+
version = "12.0.0"
55

66
[deps]
77
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"

README.md

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ you accept the terms of this agreement.
1919

2020
A copy of the license agreement is stored at `share/doc/gurobi/EULA.pdf` in the
2121
installed artifact. Copies of the licenses of third-party software used in the
22-
Gurobi libraries are provided in `share/doc/gurobi/refman/copyright_notices_for_3rd_.html`
23-
in the installed artifact, which is located at `Gurobi_jll.artifact_dir`.
22+
Gurobi libraries are provided in `info/licenses/thirdparty` in the installed
23+
artifact, which is located at `Gurobi_jll.artifact_dir`.
2424

2525
The underlying solver is a closed-source commercial product for which you must
2626
[purchase a license](https://www.gurobi.com).
@@ -43,13 +43,6 @@ The code bindings within this package are autogenerated from the following
4343
* `ExecutableProduct`: `gurobi_cl`
4444
* `ExecutableProduct`: `grbgetkey`
4545

46-
## Documentationn
46+
## Documentation
4747

48-
Use `Gurobi_jll.open_documentation()` to open a local copy of the Gurobi
49-
documentation in your browser.
50-
51-
```julia
52-
julia> import Gurobi_jll
53-
54-
julia> Gurobi_jll.open_documentation()
55-
```
48+
Visit https://docs.gurobi.com/ for the documentation of Gurobi Optimizer.

src/Gurobi_jll.jl

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,4 @@ JLLWrappers.@generate_main_file_header("Gurobi")
1414

1515
JLLWrappers.@generate_main_file("Gurobi", UUID("c018c7e6-a5b0-4aea-8f80-9c1ef9991411"))
1616

17-
function get_documentation_path()
18-
path = @static if Sys.iswindows()
19-
joinpath("Doc", "Gurobi", "refman", "index.html")
20-
else
21-
joinpath("share", "doc", "gurobi", "refman", "index.html")
22-
end
23-
return joinpath(artifact_dir, path)
24-
end
25-
26-
function _browser_command(path::String)
27-
@static if Sys.isapple()
28-
return `open $path`
29-
elseif Sys.iswindows()
30-
return `cmd /c start $path`
31-
else
32-
@assert Sys.islinux()
33-
return `xdg-open $path`
34-
end
35-
end
36-
37-
"""
38-
open_documentation()
39-
40-
Open a local copy of the Gurobi documentation in your browser.
41-
"""
42-
open_documentation() = run(_browser_command(get_documentation_path()))
43-
4417
end # module Gurobi_jll

src/wrappers/aarch64-apple-darwin.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export gurobi_cl, grbgetkey, libgurobi
77

88
JLLWrappers.@generate_wrapper_header("Gurobi")
99

10-
JLLWrappers.@declare_library_product(libgurobi, "@rpath/libgurobi110.dylib")
10+
JLLWrappers.@declare_library_product(libgurobi, "@rpath/libgurobi120.dylib")
1111

1212
JLLWrappers.@declare_executable_product(gurobi_cl)
1313

@@ -17,7 +17,7 @@ function __init__()
1717
JLLWrappers.@generate_init_header()
1818
JLLWrappers.@init_library_product(
1919
libgurobi,
20-
"lib/libgurobi110.dylib",
20+
"lib/libgurobi120.dylib",
2121
RTLD_LAZY | RTLD_DEEPBIND,
2222
)
2323
JLLWrappers.@init_executable_product(gurobi_cl, "bin/gurobi_cl")

src/wrappers/aarch64-linux-gnu.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export gurobi_cl, grbgetkey, libgurobi
77

88
JLLWrappers.@generate_wrapper_header("Gurobi")
99

10-
JLLWrappers.@declare_library_product(libgurobi, "libgurobi110.so")
10+
JLLWrappers.@declare_library_product(libgurobi, "libgurobi120.so")
1111

1212
JLLWrappers.@declare_executable_product(gurobi_cl)
1313

@@ -17,7 +17,7 @@ function __init__()
1717
JLLWrappers.@generate_init_header()
1818
JLLWrappers.@init_library_product(
1919
libgurobi,
20-
"lib/libgurobi110.so",
20+
"lib/libgurobi120.so",
2121
RTLD_LAZY | RTLD_DEEPBIND,
2222
)
2323
JLLWrappers.@init_executable_product(gurobi_cl, "bin/gurobi_cl")

src/wrappers/x86_64-apple-darwin.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export gurobi_cl, grbgetkey, libgurobi
77

88
JLLWrappers.@generate_wrapper_header("Gurobi")
99

10-
JLLWrappers.@declare_library_product(libgurobi, "@rpath/libgurobi110.dylib")
10+
JLLWrappers.@declare_library_product(libgurobi, "@rpath/libgurobi120.dylib")
1111

1212
JLLWrappers.@declare_executable_product(gurobi_cl)
1313

@@ -17,12 +17,12 @@ function __init__()
1717
JLLWrappers.@generate_init_header()
1818
# This is needed to work-around a permission issue on some intel macs.
1919
# See Gurobi.jl#545 for details.
20-
libgurobi_path = joinpath(artifact_dir, "lib", "libgurobi110.dylib")
20+
libgurobi_path = joinpath(artifact_dir, "lib", "libgurobi120.dylib")
2121
run(`codesign --remove-signature $libgurobi_path`)
2222
# Back to the standard header
2323
JLLWrappers.@init_library_product(
2424
libgurobi,
25-
"lib/libgurobi110.dylib",
25+
"lib/libgurobi120.dylib",
2626
RTLD_LAZY | RTLD_DEEPBIND,
2727
)
2828
JLLWrappers.@init_executable_product(gurobi_cl, "bin/gurobi_cl")

src/wrappers/x86_64-linux-gnu.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export gurobi_cl, grbgetkey, libgurobi
77

88
JLLWrappers.@generate_wrapper_header("Gurobi")
99

10-
JLLWrappers.@declare_library_product(libgurobi, "libgurobi110.so")
10+
JLLWrappers.@declare_library_product(libgurobi, "libgurobi120.so")
1111

1212
JLLWrappers.@declare_executable_product(gurobi_cl)
1313

@@ -17,7 +17,7 @@ function __init__()
1717
JLLWrappers.@generate_init_header()
1818
JLLWrappers.@init_library_product(
1919
libgurobi,
20-
"lib/libgurobi110.so",
20+
"lib/libgurobi120.so",
2121
RTLD_LAZY | RTLD_DEEPBIND,
2222
)
2323
JLLWrappers.@init_executable_product(gurobi_cl, "bin/gurobi_cl")

src/wrappers/x86_64-w64-mingw32.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export gurobi_cl, grbgetkey, libgurobi
77

88
JLLWrappers.@generate_wrapper_header("Gurobi")
99

10-
JLLWrappers.@declare_library_product(libgurobi, "gurobi110.dll")
10+
JLLWrappers.@declare_library_product(libgurobi, "gurobi120.dll")
1111

1212
JLLWrappers.@declare_executable_product(gurobi_cl)
1313

@@ -23,7 +23,7 @@ function __init__()
2323
end
2424
JLLWrappers.@init_library_product(
2525
libgurobi,
26-
"gurobi110.dll",
26+
"gurobi120.dll",
2727
RTLD_LAZY | RTLD_DEEPBIND,
2828
)
2929
JLLWrappers.@init_executable_product(gurobi_cl, "gurobi_cl.exe")

test/runtests.jl

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ end
2020
technicalP::Ptr{Cint},
2121
)::Cvoid
2222
# Update these values when you update Artifacts.toml
23-
@test majorP[] == 11
23+
@test majorP[] == 12
2424
@test minorP[] == 0
25-
@test technicalP[] == 3
25+
@test technicalP[] == 0
2626
end
2727

2828
@testset "gurobi_cl" begin
@@ -42,7 +42,20 @@ end
4242

4343
@testset "license_error" begin
4444
envptr = Ref{Ptr{Cvoid}}()
45-
error = @ccall libgurobi.GRBemptyenv(envptr::Ptr{Ptr{Cvoid}})::Cint
45+
# Temporary workaround for 12.0.0. This can be reverted to use GRBemptyenv for 12.0.1
46+
# https://docs.gurobi.com/projects/optimizer/en/12.0/reference/releasenotes/knownbugs.html
47+
#
48+
# This does not affect usage in Gurobi.jl because it defines the function
49+
#
50+
# function GRBemptyenv(envP)
51+
# return GRBemptyenvinternal(
52+
# envP,
53+
# GRB_VERSION_MAJOR,
54+
# GRB_VERSION_MINOR,
55+
# GRB_VERSION_TECHNICAL,
56+
# )
57+
# end
58+
error = @ccall libgurobi.GRBemptyenvinternal(envptr::Ptr{Ptr{Cvoid}}, 12::Int, 0::Int, 0::Int)::Cint
4659
@test error == 0
4760
error = @ccall libgurobi.GRBstartenv(envptr[]::Ptr{Cvoid})::Cint
4861
@test error == 10009 || error == 0
@@ -51,17 +64,3 @@ end
5164
@test startswith(unsafe_string(ret), "No Gurobi license found")
5265
end
5366
end
54-
55-
@testset "open_documentation" begin
56-
@test isfile(Gurobi_jll.get_documentation_path())
57-
if Sys.isapple()
58-
@test Gurobi_jll._browser_command("abc") == `open abc`
59-
Gurobi_jll.open_documentation()
60-
elseif Sys.iswindows()
61-
@test Gurobi_jll._browser_command("abc") == `cmd /c start abc`
62-
Gurobi_jll.open_documentation()
63-
else
64-
@test Gurobi_jll._browser_command("abc") == `xdg-open abc`
65-
# Gurobi_jll.open_documentation() # Errors in CI
66-
end
67-
end

0 commit comments

Comments
 (0)