Skip to content

Commit

Permalink
Merge pull request #334 from jump-dev/ml/jump-dev
Browse files Browse the repository at this point in the history
update for migration to jump-dev
  • Loading branch information
blegat authored Jul 1, 2020
2 parents c76d8f0 + 8510762 commit 183a1c5
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "Gurobi"
uuid = "2e9cd046-0924-5485-92f1-d5272153d98b"
repo = "https://github.com/JuliaOpt/Gurobi.jl"
repo = "https://github.com/jump-dev/Gurobi.jl"
version = "0.8.1"

[deps]
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ set_optimizer_attribute(model, "NonConvex", 2)

## Use with JuMP

We highly recommend that you use the *Gurobi.jl* package with higher level packages such as [JuMP.jl](https://github.com/JuliaOpt/JuMP.jl).
We highly recommend that you use the *Gurobi.jl* package with higher level packages such as [JuMP.jl](https://github.com/jump-dev/JuMP.jl).

This can be done using the ``Gurobi.Optimizer`` object. Here is how to create a *JuMP* model that uses Gurobi as the solver.
```julia
Expand All @@ -28,7 +28,7 @@ See the [Gurobi Documentation](https://www.gurobi.com/documentation/current/refm

## Reusing the same Gurobi environment for multiple solves

When using this package via other packages such as [JuMP.jl](https://github.com/JuliaOpt/JuMP.jl), the default behavior is to obtain a new Gurobi license token every time a model is created and solved. If you are using Gurobi in a setting where the number of concurrent Gurobi uses is limited (e.g. ["Single-Use" or "Floating-Use" licenses](http://www.gurobi.com/products/licensing-pricing/licensing-overview)), you might instead prefer to obtain a single license token that is shared by all models that your program solves. You can do this by passing a Gurobi Environment object as the first parameter to `Gurobi.Optimizer`. For example, the follow code snippet solves multiple problems with JuMP using the same license token:
When using this package via other packages such as [JuMP.jl](https://github.com/jump-dev/JuMP.jl), the default behavior is to obtain a new Gurobi license token every time a model is created and solved. If you are using Gurobi in a setting where the number of concurrent Gurobi uses is limited (e.g. ["Single-Use" or "Floating-Use" licenses](http://www.gurobi.com/products/licensing-pricing/licensing-overview)), you might instead prefer to obtain a single license token that is shared by all models that your program solves. You can do this by passing a Gurobi Environment object as the first parameter to `Gurobi.Optimizer`. For example, the follow code snippet solves multiple problems with JuMP using the same license token:

```julia
using JuMP, Gurobi
Expand Down Expand Up @@ -133,7 +133,7 @@ MOI.get(model, Gurobi.VariableAttribute("LB"), x) # Returns 0.0

MOI.get(model, Gurobi.ModelAttribute("NumConstrs")) # Returns 1
```
Note that we are using [JuMP in direct-mode](https://www.juliaopt.org/JuMP.jl/v0.20.0/solvers/#Direct-mode-1).
Note that we are using [JuMP in direct-mode](https://jump.dev/JuMP.jl/v0.20.0/solvers/#Direct-mode-1).
A complete list of supported Gurobi attributes can be found in [their online documentation](https://www.gurobi.com/documentation/8.1/refman/attributes.html).

*Most users should not need to use the low-level API detailed in the following sections.*
Expand Down Expand Up @@ -394,7 +394,7 @@ solution = linprog(f, A, '<', b, lb, Inf, GurobiSolver(Presolve=0))

##### Example 1.4: Linear programming with JuMP (Algebraic model)

Using [JuMP](https://github.com/JuliaOpt/JuMP.jl), we can specify linear programming problems using a more
Using [JuMP](https://github.com/jump-dev/JuMP.jl), we can specify linear programming problems using a more
natural algebraic approach.

```julia
Expand Down
2 changes: 1 addition & 1 deletion deps/build.jl
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ if !found && !haskey(ENV, "GUROBI_JL_SKIP_LIB_CHECK")
diagnose_gurobi_install()
error("""
Unable to locate Gurobi installation. If the advice above did not help,
open an issue at https://github.com/JuliaOpt/Gurobi.jl and post the full
open an issue at https://github.com/jump-dev/Gurobi.jl and post the full
print-out of this diagnostic attempt.
""")
end
2 changes: 1 addition & 1 deletion src/Gurobi.jl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ if isfile(_DEPS_FILE)
else
error("""
Gurobi not properly installed. Please run Pkg.build(\"Gurobi\"). For
more information go to https://github.com/JuliaOpt/Gurobi.jl
more information go to https://github.com/jump-dev/Gurobi.jl
""")
end

Expand Down
2 changes: 1 addition & 1 deletion src/MPB_wrapper.jl
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ function updatemodel!(m::GurobiMathProgModel)
You have encountered a known bug in Gurobi. Any information you query from the model may be incorrect.
This bug has existed since the first version of Gurobi but is fixed in Gurobi v7.0.
For more information go to https://github.com/JuliaOpt/Gurobi.jl/issues/60
For more information go to https://github.com/jump-dev/Gurobi.jl/issues/60
Please leave a comment stating that you encountered this bug! We would like to know how prevalent it is.
""")
end
Expand Down
2 changes: 1 addition & 1 deletion test/MOI/MOI_wrapper.jl
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ end
end

@testset "LQOI Issue #38" begin
# https://github.com/JuliaOpt/LinQuadOptInterface.jl/issues/38#issuecomment-407625187
# https://github.com/jump-dev/LinQuadOptInterface.jl/issues/38#issuecomment-407625187
_getinner(opt::Gurobi.Optimizer) = opt.inner
@inferred _getinner(Gurobi.Optimizer(GUROBI_ENV))
end
Expand Down
2 changes: 1 addition & 1 deletion test/MathProgBase/mathprog.jl
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ include(mathprogbase_file("conicinterface.jl"))
coniclineartest(GurobiSolver(OutputFlag=0))
# The following tests are not passing on Gurobi 8.0.0 due to known bug
# on infeasibility check of SOC models.
# https://github.com/JuliaOpt/Gurobi.jl/pull/123
# https://github.com/jump-dev/Gurobi.jl/pull/123
if Gurobi.version < v"8.0.0"
conicSOCtest(GurobiSolver(OutputFlag=0))
conicSOCRotatedtest(GurobiSolver(OutputFlag=0))
Expand Down

0 comments on commit 183a1c5

Please sign in to comment.