update imports

Author: michaelbynum

Diff for: pyomo/contrib/coramin/algorithms/bnb/bnb.py

@@ -16,7 +16,7 @@
 from pyomo.contrib.coramin.cutting_planes.base import CutGenerator
 from typing import Tuple, List, Optional
 import math
-import numpy as np
+from pyomo.common.dependencies import numpy as np
 import logging
 from pyomo.contrib.appsi.base import (
     Solver,

Diff for: pyomo/contrib/coramin/algorithms/multitree/multitree.py

@@ -42,7 +42,7 @@
 from pyomo.common.modeling import unique_component_name
 from pyomo.common.errors import InfeasibleConstraintException
 from pyomo.contrib.fbbt.fbbt import BoundsManager
-import numpy as np
+from pyomo.common.dependencies import numpy as np
 from pyomo.core.expr.visitor import identify_variables
 from pyomo.contrib.coramin.clone import clone_shallow_active_flat, get_clone_and_var_map
 from pyomo.contrib.coramin.algorithms.cut_gen import AlphaBBConfig, find_cut_generators

Diff for: pyomo/contrib/coramin/domain_reduction/dbt.py

@@ -27,7 +27,7 @@
     metis_available = True
 except ImportError:
     metis_available = False
-import numpy as np
+from pyomo.common.dependencies import numpy as np
 import math
 from pyomo.core.base.block import declare_custom_block, _BlockData
 from pyomo.contrib.coramin.utils.pyomo_utils import get_objective

Diff for: pyomo/contrib/coramin/domain_reduction/obbt.py

@@ -7,7 +7,7 @@
 from pyomo.contrib import appsi
 import logging
 import traceback
-import numpy as np
+from pyomo.common.dependencies import numpy as np
 import math
 import time
 from typing import Union, Sequence, Optional, List

Diff for: pyomo/contrib/coramin/heuristics/diving.py

@@ -5,7 +5,7 @@
 from typing import Tuple, List, Sequence, Optional, MutableMapping
 from pyomo.contrib import appsi
 from pyomo.contrib.coramin.utils.pyomo_utils import get_objective
-import numpy as np
+from pyomo.common.dependencies import numpy as np
 import math
 from pyomo.common.collections import ComponentSet, ComponentMap
 from pyomo.core.expr.visitor import identify_variables

Diff for: pyomo/contrib/coramin/heuristics/feasibility_pump.py

@@ -10,7 +10,7 @@
 import time
 from pyomo.common.modeling import unique_component_name
 import random
-import numpy as np
+from pyomo.common.dependencies import numpy as np
 
 
 def collect_integer_vars(

Diff for: pyomo/contrib/coramin/relaxations/hessian.py

@@ -6,7 +6,7 @@
 from pyomo.core.expr.numvalue import is_fixed
 import math
 from pyomo.contrib.fbbt.fbbt import compute_bounds_on_expr
-import numpy as np
+from pyomo.common.dependencies import numpy as np
 from pyomo.contrib.coramin.utils.coramin_enums import EigenValueBounder
 from pyomo.core.base.block import _BlockData
 from typing import Optional, MutableMapping

Diff for: pyomo/contrib/coramin/relaxations/tests/test_auto_relax.py

@@ -5,7 +5,7 @@
 from pyomo.core.expr.visitor import identify_variables, identify_components
 import math
 from pyomo.common.collections import ComponentSet
-import numpy as np
+from pyomo.common.dependencies import numpy as np
 from pyomo.core.base.param import _ParamData, ScalarParam
 from pyomo.core.expr.sympy_tools import sympyify_expression
 from pyomo.contrib import appsi

Diff for: pyomo/contrib/coramin/relaxations/tests/test_relaxations.py

@@ -5,7 +5,7 @@
 from pyomo.core.base.var import _GeneralVarData
 from pyomo.core.expr.numeric_expr import ExpressionBase
 from typing import Sequence, List, Tuple
-import numpy as np
+from pyomo.common.dependencies import numpy as np
 import itertools
 from pyomo.contrib import appsi
 from pyomo.core.expr.visitor import identify_variables

Diff for: pyomo/contrib/coramin/relaxations/tests/test_univariate_relaxations.py

@@ -2,7 +2,7 @@
 import math
 import pyomo.environ as pe
 from pyomo.contrib import coramin
-import numpy as np
+from pyomo.common.dependencies import numpy as np
 from pyomo.contrib.coramin.relaxations.segments import compute_k_segment_points
 from pyomo.contrib import appsi
 

Diff for: pyomo/contrib/coramin/relaxations/univariate.py

@@ -2,7 +2,7 @@
 from pyomo.contrib.coramin.utils.coramin_enums import RelaxationSide, FunctionShape
 from .relaxations_base import BasePWRelaxationData, _check_cut
 from .custom_block import declare_custom_block
-import numpy as np
+from pyomo.common.dependencies import numpy as np
 import math
 import scipy.optimize
 from ._utils import check_var_pts, _get_bnds_list, _get_bnds_tuple

Diff for: pyomo/contrib/coramin/utils/mpi_utils.py

@@ -1,5 +1,5 @@
 from mpi4py import MPI
-import numpy as np
+from pyomo.common.dependencies import numpy as np
 import sys
 import os
 

Diff for: pyomo/contrib/coramin/utils/plot_relaxation.py

@@ -1,4 +1,4 @@
-import numpy as np
+from pyomo.common.dependencies import numpy as np
 
 try:
     import plotly.graph_objects as go