Skip to content

Commit b431548

Browse files
committed
Purge Gurobi.
We are not allowed to redistribute it in our docker containers, and it was not critical to any examples.
1 parent dc9ea92 commit b431548

File tree

5 files changed

+4
-29
lines changed

5 files changed

+4
-29
lines changed

examples/uav_planning.ipynb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"from pydrake.multibody.plant import AddMultibodyPlantSceneGraph\n",
2626
"from pydrake.multibody.parsing import Parser\n",
2727
"from pydrake.perception import PointCloud\n",
28-
"from pydrake.solvers import GurobiSolver, MosekSolver\n",
28+
"from pydrake.solvers import MosekSolver\n",
2929
"from pydrake.systems.analysis import Simulator\n",
3030
"from pydrake.systems.framework import DiagramBuilder\n",
3131
"\n",
@@ -34,7 +34,6 @@
3434
"from reproduction.uav.building_generation import *\n",
3535
"from reproduction.util import *\n",
3636
"\n",
37-
"gurobi_license = GurobiSolver.AcquireLicense()\n",
3837
"mosek_license = MosekSolver.AcquireLicense()"
3938
]
4039
},

gcs/base.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
)
99
from pydrake.solvers import (
1010
CommonSolverOption,
11-
GurobiSolver,
1211
MathematicalProgram,
1312
MosekSolver,
1413
SolverOptions,
@@ -155,8 +154,6 @@ def setPaperSolverOptions(self):
155154
solver_options.SetOption(MosekSolver.id(), "MSK_IPAR_INTPNT_SOLVE_FORM", 1)
156155
solver_options.SetOption(MosekSolver.id(), "MSK_DPAR_MIO_TOL_REL_GAP", 1e-3)
157156
solver_options.SetOption(MosekSolver.id(), "MSK_DPAR_MIO_MAX_TIME", 3600.0)
158-
solver_options.SetOption(GurobiSolver.id(), "MIPGap", 1e-3)
159-
solver_options.SetOption(GurobiSolver.id(), "TimeLimit", 3600.0)
160157
self.options.solver_options = solver_options
161158

162159
def setRoundingStrategy(self, rounding_fn, **kwargs):

reproduction/bimanual/bimanual_iiwa_example.ipynb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,13 @@
2626
"from pydrake.multibody.parsing import LoadModelDirectives, Parser, ProcessModelDirectives\n",
2727
"from pydrake.multibody.plant import AddMultibodyPlantSceneGraph\n",
2828
"from pydrake.multibody.tree import RevoluteJoint\n",
29-
"from pydrake.solvers import GurobiSolver, MosekSolver\n",
29+
"from pydrake.solvers import MosekSolver\n",
3030
"from pydrake.systems.framework import DiagramBuilder\n",
3131
"\n",
3232
"from gcs.linear import LinearGCS\n",
3333
"from reproduction.bimanual.helpers import *\n",
3434
"from reproduction.util import *\n",
3535
"\n",
36-
"gurobi_license = GurobiSolver.AcquireLicense()\n",
3736
"mosek_license = MosekSolver.AcquireLicense()"
3837
]
3938
},

reproduction/prm_comparison/prm_comparison.ipynb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"from pydrake.geometry.optimization import IrisInConfigurationSpace, IrisOptions\n",
2121
"from pydrake.multibody.parsing import LoadModelDirectives, Parser, ProcessModelDirectives\n",
2222
"from pydrake.multibody.plant import AddMultibodyPlantSceneGraph\n",
23-
"from pydrake.solvers import GurobiSolver, MosekSolver\n",
23+
"from pydrake.solvers import MosekSolver\n",
2424
"from pydrake.systems.framework import DiagramBuilder\n",
2525
"\n",
2626
"from gcs.linear import LinearGCS\n",
@@ -43,7 +43,6 @@
4343
"\n",
4444
"from reproduction.util import GcsDir, FindModelFile\n",
4545
"\n",
46-
"gurobi_license = GurobiSolver.AcquireLicense()\n",
4746
"mosek_license = MosekSolver.AcquireLicense()"
4847
]
4948
},

reproduction/uav/uav_generated_rooms.ipynb

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,13 @@
2525
"from pydrake.multibody.plant import AddMultibodyPlantSceneGraph\n",
2626
"from pydrake.multibody.parsing import Parser\n",
2727
"from pydrake.perception import PointCloud\n",
28-
"from pydrake.solvers import GurobiSolver, MosekSolver\n",
28+
"from pydrake.solvers import MosekSolver\n",
2929
"from pydrake.systems.analysis import Simulator\n",
3030
"from pydrake.systems.framework import DiagramBuilder\n",
3131
"\n",
3232
"from reproduction.uav.helpers import *\n",
3333
"from reproduction.util import *\n",
3434
"\n",
35-
"gurobi_license = GurobiSolver.AcquireLicense()\n",
3635
"mosek_license = MosekSolver.AcquireLicense()"
3736
]
3837
},
@@ -102,24 +101,6 @@
102101
"print(\"Solved\", runs, \"buildings in\", np.round((time.time()-start_time)/60., 4), \"minutes.\")"
103102
]
104103
},
105-
{
106-
"cell_type": "markdown",
107-
"metadata": {},
108-
"source": [
109-
"## Using MICP and Gurobi"
110-
]
111-
},
112-
{
113-
"cell_type": "code",
114-
"execution_count": null,
115-
"metadata": {},
116-
"outputs": [],
117-
"source": [
118-
"start_time = time.time()\n",
119-
"plan_through_buildings(save_location, runs, solve_gcs=False, solver=GurobiSolver(), file_addendum=\"gurobi\")\n",
120-
"print(\"Solved\", runs, \"buildings in\", np.round((time.time()-start_time)/60., 4), \"minutes.\")"
121-
]
122-
},
123104
{
124105
"cell_type": "markdown",
125106
"metadata": {},

0 commit comments

Comments
 (0)