Merge branch 'main' into xpress_slack_bug

pyomo/neos/__init__.py

@@ -30,7 +30,7 @@
     'minos': 'SLC NLP solver',
     'minto': 'MILP solver',
     'mosek': 'Interior point NLP solver',
-    'octeract': 'Deterministic global MINLP solver',
+    #'octeract': 'Deterministic global MINLP solver',
     'ooqp': 'Convex QP solver',
     'path': 'Nonlinear MCP solver',
     'snopt': 'SQP NLP solver',

pyomo/neos/tests/test_neos.py

@@ -79,6 +79,9 @@ def test_doc(self):
         doc = pyomo.neos.doc
         dockeys = set(doc.keys())
 
+        # Octeract interface is disabled, see #3321
+        amplsolvers.remove('octeract')
+
         self.assertEqual(amplsolvers, dockeys)
 
         # gamssolvers = set(v[0].lower() for v in tmp if v[1]=='GAMS')
@@ -149,8 +152,11 @@ def test_minto(self):
     def test_mosek(self):
         self._run('mosek')
 
-    def test_octeract(self):
-        self._run('octeract')
+    # [16 Jul 24] Octeract is erroring.  We will disable the interface
+    # (and testing) until we have time to resolve #3321
+    #
+    # def test_octeract(self):
+    #     self._run('octeract')
 
     def test_ooqp(self):
         if self.sense == pyo.maximize:

pyomo/repn/plugins/nl_writer.py

@@ -1988,6 +1988,18 @@ def _record_named_expression_usage(self, named_exprs, src, comp_type):
             elif info[comp_type] != src:
                 info[comp_type] = 0
 
+    def _resolve_subexpression_args(self, nl, args):
+        final_args = []
+        for arg in args:
+            if arg in self.var_id_to_nl_map:
+                final_args.append(self.var_id_to_nl_map[arg])
+            else:
+                _nl, _ids, _ = self.subexpression_cache[arg][1].compile_repn(
+                    self.visitor
+                )
+                final_args.append(self._resolve_subexpression_args(_nl, _ids))
+        return nl % tuple(final_args)
+
     def _write_nl_expression(self, repn, include_const):
         # Note that repn.mult should always be 1 (the AMPLRepn was
         # compiled before this point).  Omitting the assertion for
@@ -2007,18 +2019,7 @@ def _write_nl_expression(self, repn, include_const):
                     nl % tuple(map(self.var_id_to_nl_map.__getitem__, args))
                 )
             except KeyError:
-                final_args = []
-                for arg in args:
-                    if arg in self.var_id_to_nl_map:
-                        final_args.append(self.var_id_to_nl_map[arg])
-                    else:
-                        _nl, _ids, _ = self.subexpression_cache[arg][1].compile_repn(
-                            self.visitor
-                        )
-                        final_args.append(
-                            _nl % tuple(map(self.var_id_to_nl_map.__getitem__, _ids))
-                        )
-                self.ostream.write(nl % tuple(final_args))
+                self.ostream.write(self._resolve_subexpression_args(nl, args))
 
         elif include_const:
             self.ostream.write(self.template.const % repn.const)

pyomo/repn/tests/ampl/test_nlv2.py

@@ -2703,3 +2703,72 @@ def test_presolve_check_invalid_monomial_constraints(self):
             r"\(fixed body value 5.0 outside bounds \[10, None\]\)\.",
         ):
             nl_writer.NLWriter().write(m, OUT, linear_presolve=True)
+
+    def test_nested_external_expressions(self):
+        # This tests nested external functions in a single expression
+        DLL = find_GSL()
+        if not DLL:
+            self.skipTest("Could not find the amplgsl.dll library")
+
+        m = ConcreteModel()
+        m.hypot = ExternalFunction(library=DLL, function="gsl_hypot")
+        m.p = Param(initialize=1, mutable=True)
+        m.x = Var(bounds=(None, 3))
+        m.y = Var(bounds=(3, None))
+        m.z = Var(initialize=1)
+        m.o = Objective(expr=m.z**2 * m.hypot(m.z, m.hypot(m.x, m.y)) ** 2)
+        m.c = Constraint(expr=m.x == m.y)
+
+        OUT = io.StringIO()
+        nl_writer.NLWriter().write(
+            m, OUT, symbolic_solver_labels=True, linear_presolve=False
+        )
+        self.assertEqual(
+            *nl_diff(
+                """g3 1 1 0	#problem unknown
+ 3 1 1 0 1	#vars, constraints, objectives, ranges, eqns
+ 0 1 0 0 0 0	#nonlinear constrs, objs; ccons: lin, nonlin, nd, nzlb
+ 0 0	#network constraints: nonlinear, linear
+ 0 3 0	#nonlinear vars in constraints, objectives, both
+ 0 1 0 1	#linear network variables; functions; arith, flags
+ 0 0 0 0 0	#discrete variables: binary, integer, nonlinear (b,c,o)
+ 2 3	#nonzeros in Jacobian, obj. gradient
+ 1 1	#max name lengths: constraints, variables
+ 0 0 0 0 0	#common exprs: b,c,o,c1,o1
+F0 1 -1 gsl_hypot
+C0	#c
+n0
+O0 0	#o
+o2	#*
+o5	#^
+v0	#z
+n2
+o5	#^
+f0 2	#hypot
+v0	#z
+f0 2	#hypot
+v1	#x
+v2	#y
+n2
+x1	#initial guess
+0 1	#z
+r	#1 ranges (rhs's)
+4 0	#c
+b	#3 bounds (on variables)
+3	#z
+1 3	#x
+2 3	#y
+k2	#intermediate Jacobian column lengths
+0
+1
+J0 2	#c
+1 1
+2 -1
+G0 3	#o
+0 0
+1 0
+2 0
+""",
+                OUT.getvalue(),
+            )
+        )