fix import error

ZedongPeng · Sep 21, 2023 · d82dcde · d82dcde
1 parent ff401df
commit d82dcde
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pyomo/contrib/mindtpy/algorithm_base_class.py b/pyomo/contrib/mindtpy/algorithm_base_class.py
@@ -34,7 +34,6 @@
     SolutionStatus,
     SolverStatus,
 )
-from pyomo.contrib.pynumero.interfaces.external_grey_box import ExternalGreyBoxBlock
 from pyomo.core import (
     minimize,
     maximize,
@@ -85,7 +84,7 @@
 
 single_tree, single_tree_available = attempt_import('pyomo.contrib.mindtpy.single_tree')
 tabu_list, tabu_list_available = attempt_import('pyomo.contrib.mindtpy.tabu_list')
-
+egb = attempt_import('pyomo.contrib.pynumero.interfaces.external_grey_box')[0]
 
 class _MindtPyAlgorithm(object):
     def __init__(self, **kwds):
@@ -326,7 +325,7 @@ def build_ordered_component_lists(self, model):
         )
         util_block.grey_box_list = list(
             model.component_data_objects(
-                ctype=ExternalGreyBoxBlock, active=True, descend_into=(Block)
+                ctype=egb.ExternalGreyBoxBlock, active=True, descend_into=(Block)
             )
         )
         util_block.linear_constraint_list = list(
@@ -359,7 +358,7 @@ def build_ordered_component_lists(self, model):
         util_block.variable_list = list(
             v
             for v in model.component_data_objects(
-                ctype=Var, descend_into=(Block, ExternalGreyBoxBlock)
+                ctype=Var, descend_into=(Block, egb.ExternalGreyBoxBlock)
             )
             if v in var_set
         )

diff --git a/pyomo/contrib/mindtpy/tests/MINLP_simple.py b/pyomo/contrib/mindtpy/tests/MINLP_simple.py
@@ -39,12 +39,13 @@
 )
 from pyomo.common.collections import ComponentMap
 from pyomo.contrib.mindtpy.tests.MINLP_simple_grey_box import GreyBoxModel
-from pyomo.contrib.pynumero.interfaces.external_grey_box import ExternalGreyBoxBlock
+from pyomo.common.dependencies import attempt_import
+egb = attempt_import('pyomo.contrib.pynumero.interfaces.external_grey_box')[0]
 
 
 def build_model_external(m):
     ex_model = GreyBoxModel(initial={"X1": 0, "X2": 0, "Y1": 0, "Y2": 1, "Y3": 1})
-    m.egb = ExternalGreyBoxBlock()
+    m.egb = egb.ExternalGreyBoxBlock()
     m.egb.set_external_model(ex_model)
 
 

diff --git a/pyomo/contrib/mindtpy/tests/MINLP_simple_grey_box.py b/pyomo/contrib/mindtpy/tests/MINLP_simple_grey_box.py
@@ -1,10 +1,10 @@
 from pyomo.common.dependencies import numpy as np
 import pyomo.common.dependencies.scipy.sparse as scipy_sparse
-from pyomo.contrib.pynumero.interfaces.external_grey_box import ExternalGreyBoxModel
-from pyomo.contrib.pynumero.interfaces.external_grey_box import ExternalGreyBoxBlock
+from pyomo.common.dependencies import attempt_import
+egb = attempt_import('pyomo.contrib.pynumero.interfaces.external_grey_box')[0]
 
 
-class GreyBoxModel(ExternalGreyBoxModel):
+class GreyBoxModel(egb.ExternalGreyBoxModel):
     """Greybox model to compute the example OF."""
 
     def __init__(self, initial, use_exact_derivatives=True, verbose=True):