Skip to content

Commit 9862fbb

Browse files
murraybjmurraybj
authored
Merge pull request #16 from SECQUOIA/ipopt_fix_for_compilation
Ipopt fix for compilation
2 parents 4a12920 + a9c99e2 commit 9862fbb

File tree

519 files changed

+43281
-34
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

519 files changed

+43281
-34
lines changed

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
.venv/
2-
_build/

‎Material/Dynamic Exercises/param_est1.ipynb

+1-2
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,7 @@
141141
"discretizer = pyo.TransformationFactory('dae.collocation')\n",
142142
"discretizer.apply_to(model,nfe=8,ncp=5)\n",
143143
"\n",
144-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
145-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
144+
"solver = pyo.SolverFactory('ipopt')\n",
146145
"\n",
147146
"results = solver.solve(model,tee=True)\n",
148147
"\n",

‎Material/Dynamic Exercises/param_est2.ipynb

+2-4
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,7 @@
313313
"discretizer = pyo.TransformationFactory('dae.collocation')\n",
314314
"discretizer.apply_to(m,nfe=10,ncp=3,scheme='LAGRANGE-RADAU')\n",
315315
"\n",
316-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
317-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
316+
"solver = pyo.SolverFactory('ipopt')\n",
318317
"solver.solve(m, tee=True)\n",
319318
"\n",
320319
"print('k1= '+str(pyo.value(m.k1)))\n",
@@ -576,8 +575,7 @@
576575
"discretizer = pyo.TransformationFactory('dae.collocation')\n",
577576
"discretizer.apply_to(m,nfe=10,ncp=3,scheme='LAGRANGE-RADAU')\n",
578577
"\n",
579-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
580-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
578+
"solver = pyo.SolverFactory('ipopt')\n",
581579
"solver.solve(m, tee=True)\n",
582580
"\n",
583581
"print('k1= '+str(pyo.value(m.k1)))\n",

‎Material/Dynamic Exercises/small_colloc.ipynb

+1-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,7 @@
152152
" return m.time[0,0] == 0\n",
153153
"m.init_con_t = pyo.Constraint(rule=_init_con_t)\n",
154154
"\n",
155-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
156-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
155+
"solver = pyo.SolverFactory('ipopt')\n",
157156
"solver.solve(m,tee=True)\n",
158157
"\n",
159158
"import matplotlib.pyplot as plt\n",

‎Material/Dynamic Exercises/small_dae.ipynb

+1-3
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,7 @@
116116
"discretizer = pyo.TransformationFactory('dae.collocation')\n",
117117
"discretizer.apply_to(m, nfe=2, ncp=3 , scheme='LAGRANGE-RADAU')\n",
118118
"\n",
119-
"\n",
120-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
121-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
119+
"solver = pyo.SolverFactory('ipopt')\n",
122120
"solver.solve(m,tee=True)\n",
123121
"\n",
124122
"import matplotlib.pyplot as plt\n",

‎Material/Dynamic Exercises/small_findiff.ipynb

+1-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@
113113
" return m.z[0] == -3\n",
114114
"m.init_con = pyo.Constraint(rule=_init_con)\n",
115115
"\n",
116-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
117-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
116+
"solver = pyo.SolverFactory('ipopt')\n",
118117
"solver.solve(m,tee=True)\n",
119118
"\n",
120119
"import matplotlib.pyplot as plt\n",

‎Material/Nonlinear Exercises/1.1 Alternative Initialization.ipynb

+1-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@
3939
"model.obj = pyo.Objective(rule=rosenbrock, sense=pyo.minimize)\n",
4040
"\n",
4141
"\n",
42-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
43-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
42+
"solver = pyo.SolverFactory('ipopt')\n",
4443
"\n",
4544
"print('x_init, y_init, x_soln, y_soln')\n",
4645
"y_init = 5.0\n",

‎Material/Nonlinear Exercises/1.2 Evaluation errors.ipynb

+4-6
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@
9292
" return m.y == pyo.sqrt(m.x - 1.0)\n",
9393
"model.con = pyo.Constraint(rule=con_rule)\n",
9494
"\n",
95-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
96-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
95+
"solver = pyo.SolverFactory('ipopt')\n",
9796
"solver.options['halt_on_ampl_error'] = 'yes'\n",
9897
"solver.solve(model, tee=True)\n",
9998
"\n",
@@ -201,8 +200,7 @@
201200
" return m.y == pyo.sqrt(m.x - 1.0)\n",
202201
"model.con = pyo.Constraint(rule=con_rule)\n",
203202
"\n",
204-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
205-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
203+
"solver = pyo.SolverFactory('ipopt')\n",
206204
"solver.options['halt_on_ampl_error'] = 'yes'\n",
207205
"solver.solve(model, tee=True)\n",
208206
"\n",
@@ -314,8 +312,8 @@
314312
" return m.y == pyo.sqrt(m.x - 1.0)\n",
315313
"model.con = pyo.Constraint(rule=con_rule)\n",
316314
"\n",
317-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
318-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
315+
"\n",
316+
"solver = pyo.SolverFactory('ipopt')\n",
319317
"solver.options['halt_on_ampl_error'] = 'yes'\n",
320318
"solver.solve(model, tee=True)\n",
321319
"\n",

‎Material/Nonlinear Exercises/1.3 Alternative Formulations.ipynb

+4-8
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,7 @@
207207
" return (m.x - 1.0) / m.y == 1.0\n",
208208
"model.con = pyo.Constraint(rule=con_rule)\n",
209209
"\n",
210-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
211-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
210+
"solver = pyo.SolverFactory('ipopt')\n",
212211
"solver.solve(model, tee=True)\n",
213212
"\n",
214213
"print(pyo.value(model.x))\n",
@@ -316,8 +315,7 @@
316315
" return m.x / (m.y + 1.0) == 1.0\n",
317316
"model.con = pyo.Constraint(rule=con_rule)\n",
318317
"\n",
319-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
320-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
318+
"solver = pyo.SolverFactory('ipopt')\n",
321319
"solver.solve(model, tee=True)\n",
322320
"\n",
323321
"print(pyo.value(model.x))\n",
@@ -417,8 +415,7 @@
417415
" return m.y == m.x - 1.0\n",
418416
"model.con = pyo.Constraint(rule=con_rule)\n",
419417
"\n",
420-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
421-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
418+
"solver = pyo.SolverFactory('ipopt')\n",
422419
"solver.solve(model, tee=True)\n",
423420
"\n",
424421
"print(pyo.value(model.x))\n",
@@ -557,8 +554,7 @@
557554
" return (m.x - 1.0) / m.y == 1.0\n",
558555
"model.con = pyo.Constraint(rule=con_rule)\n",
559556
"\n",
560-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
561-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
557+
"solver = pyo.SolverFactory('ipopt')\n",
562558
"solver.solve(model, tee=True)\n",
563559
"\n",
564560
"print(pyo.value(model.x))\n",

‎Material/Nonlinear Exercises/1.4 Reactor design problem.ipynb

+1-2
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@
117117
"model.cd_bal = pyo.Constraint(expr=(0 == -model.sv * model.cd \\\n",
118118
" + k3 * model.ca ** 2.0))\n",
119119
"\n",
120-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
121-
"solver = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
120+
"solver = pyo.SolverFactory('ipopt')\n",
122121
"\n",
123122
"solver.solve(model)\n",
124123
"model.pprint()\n"

‎Material/Pyomo Fundamentals/1.5 NLP vs MIP.ipynb

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
"\n",
5858
"model.weight_con = pyo.Constraint(\n",
5959
" expr = sum( w[i]*model.x[i] for i in A ) <= W_max )\n",
60-
"ipopt_runner_path = \"/home/runner/work/pyomo_jupyter_book/pyomo_jupyter_book/solvers/ipopt\"\n",
61-
"opt = pyo.SolverFactory('ipopt', executable=ipopt_runner_path)\n",
60+
"\n",
61+
"opt = pyo.SolverFactory('ipopt')\n",
6262
"opt_success = opt.solve(model)\n",
6363
"\n",
6464
"model.pprint()\n",

‎_build/html/.buildinfo

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Sphinx build info version 1
2+
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
3+
config: db5bfe3e113cf31f87ca67737f012f2e
4+
tags: 645f666f9bcd5a90fca523b33c5a78b7

0 commit comments

Comments
 (0)