Merge pull request #92 from sandialabs/dev-weh

whart222 · web-flow · commit cc44423bcf13 · 2024-06-20T08:44:31.000-04:00
Several changes
diff --git a/build.sh b/build.sh
@@ -5,18 +5,19 @@
 #
 # This uses Spack to install third-party dependencies in the `_spack` directory.
 #
-with_python="OFF"
-python_exe=""
-spack_reinstall=0
-spack_dev=0
 clang=0
 debug="OFF"
+python_exe=""
+spack_dev=0
+spack_env="coekenv"
 spack_home=`pwd`/_spack
+spack_reinstall=0
+with_python="OFF"
 with_valgrind=""
 while [[ $# -gt 0 ]]; do
     case $1 in
         --help)
-                    echo "build.sh [--help] [--clang] [--debug] [--python] [--python-exe <file>] [--spack-dev] [--spack-home <dir>] [--spack-reinstall] [--valgrind]"
+                    echo "build.sh [--help] [--clang] [--debug] [--python] [--python-exe <file>] [--spack-dev] [--spack-env <env>] [--spack-home <dir>] [--spack-reinstall] [--valgrind]"
                     exit 
         ;;
         --clang)
@@ -27,6 +28,11 @@ while [[ $# -gt 0 ]]; do
                     debug="ON"
                     shift
         ;;
+        --spack-env)
+                    spack_env="$2"
+                    shift
+                    shift
+        ;;
         --python)
                     with_python="ON"
                     shift
@@ -67,15 +73,21 @@ echo "SPACK_HOME=${SPACK_HOME}"
 if [[ "${spack_reinstall}" -eq 1 ]]; then
     \rm -Rf ${SPACK_HOME}
 fi
-if [[ "$spack_dev" -eq 0 ]]; then
-    \rm -Rf _spack_tpls
-    git clone https://github.com/or-fusion/or-fusion-spack-repo.git _spack_tpls
-else
-    git clone git@github.com:or-fusion/or-fusion-spack-repo.git _spack_tpls
+if test -d _spack_tpls; then
     cd _spack_tpls
-    git checkout dev
     git pull
     cd ..
+else
+    if [[ "$spack_dev" -eq 0 ]]; then
+        \rm -Rf _spack_tpls
+        git clone https://github.com/or-fusion/or-fusion-spack-repo.git _spack_tpls
+    else
+        git clone git@github.com:or-fusion/or-fusion-spack-repo.git _spack_tpls
+        cd _spack_tpls
+        git checkout dev
+        git pull
+        cd ..
+    fi
 fi
 \rm -Rf _build
 #
@@ -106,11 +118,14 @@ else
     echo ""
     git clone https://github.com/spack/spack.git ${SPACK_HOME}
     . ${SPACK_HOME}/share/spack/setup-env.sh
+    echo "Adding _spack_tpls"
+    spack repo remove _spack_tpls/repo | true
     spack repo add _spack_tpls/repo
     spack repo list
-    spack env create coekenv
-    spack env activate coekenv
-    spack add asl cppad fmt rapidjson catch2 highs $with_valgrind
+    spack env create $spack_env
+    spack env activate $spack_env
+    spack compiler find
+    spack add asl fmt rapidjson catch2 highs $with_valgrind
     spack install
     spack env deactivate
     spack repo remove _spack_tpls/repo
@@ -126,5 +141,7 @@ echo "Building Coek"
 echo ""
 mkdir _build
 cd _build
-cmake -DCMAKE_PREFIX_PATH=${SPACK_HOME}/var/spack/environments/coekenv/.spack-env/view -Dwith_debug=${debug} -Dwith_python=${with_python} $python_exe -Dwith_gurobi=$with_gurobi -Dwith_highs=ON -Dwith_cppad=ON -Dwith_fmtlib=ON -Dwith_rapidjson=ON -Dwith_catch2=ON -Dwith_tests=ON -Dwith_asl=ON -Dwith_openmp=OFF ..
+cmake -DCMAKE_PREFIX_PATH=${SPACK_HOME}/var/spack/environments/${spack_env}/.spack-env/view -Dwith_debug=${debug} -Dwith_python=${with_python} $python_exe -Dwith_gurobi=$with_gurobi -Dwith_highs=ON -Dwith_cppad=OFF -Dwith_fmtlib=ON -Dwith_rapidjson=ON -Dwith_catch2=ON -Dwith_tests=ON -Dwith_asl=ON -Dwith_openmp=OFF ..
 make -j20
+make install
+
diff --git a/cmake/FindGUROBI.cmake b/cmake/FindGUROBI.cmake
@@ -40,7 +40,7 @@ find_library(
     if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
         find_library(
             GUROBI_CXX_LIBRARY
-            NAMES gurobi_g++5.2
+            NAMES gurobi_g++5.2 gurobi_g++8.5
             HINTS ${GUROBI_DIR} $ENV{GUROBI_HOME}
             PATH_SUFFIXES lib)
     else()
diff --git a/lib/coek/coek/CMakeLists.txt b/lib/coek/coek/CMakeLists.txt
@@ -153,6 +153,7 @@ endif()
 # GUROBI LIBRARY
 #
 if(with_gurobi)
+    find_package(GUROBI REQUIRED)
     list(APPEND sources
                 solvers/gurobi/gurobi.cpp)
     list(APPEND coek_compile_options -DWITH_GUROBI)
diff --git a/lib/pyomo_coek/pyomo_coek/components_only/__init__.py b/lib/pyomo_coek/pyomo_coek/components_only/__init__.py
@@ -7,7 +7,25 @@
 from .linear_expression import LinearExpression
 from pyomo.core.base.block import Block
 from pyomo.core.base.PyomoModel import ConcreteModel
-from pyomo.core.base.set import RangeSet, Binary, Set, Reals, NonNegativeReals, Any
+from pyomo.core.base.set import RangeSet, \
+    Reals, \
+    PositiveReals, \
+    NonPositiveReals, \
+    NegativeReals, \
+    NonNegativeReals, \
+    Integers, \
+    PositiveIntegers, \
+    NonPositiveIntegers, \
+    NegativeIntegers, \
+    NonNegativeIntegers, \
+    Boolean, \
+    Binary, \
+    Any, \
+    AnyWithNone, \
+    EmptySet, \
+    UnitInterval, \
+    PercentFraction
+
 from pyomo.core.base.objective import minimize, maximize
 from pyomo.opt.base.solvers import SolverFactory
 from pyomo.opt import SolutionStatus, TerminationCondition
diff --git a/lib/pyomo_coek/pyomo_coek/components_only/solvers.py b/lib/pyomo_coek/pyomo_coek/components_only/solvers.py
@@ -7,8 +7,8 @@
     SolutionLoader,
     Results,
     Solver,
-    SolverFactory,
 )
+from pyomo.opt import SolverFactory
 from munch import Munch
 import poek as pk
 from typing import Tuple, Dict
@@ -157,7 +157,9 @@ def resolve(self, timer: HierarchicalTimer = None):
             res.best_feasible_objective = self._poek_nlp_model.get_objective().value
         return res
 
-    def solve(self, model: _BlockData, timer: HierarchicalTimer = None) -> Results:
+    def solve(self, model: _BlockData, options=None, timer: HierarchicalTimer = None) -> Results:
+        if options is None:
+            options = {}
         if timer is None:
             timer = HierarchicalTimer()
 
@@ -179,10 +181,14 @@ def solve(self, model: _BlockData, timer: HierarchicalTimer = None) -> Results:
             nlp = pk.nlp_model(pm, "cppad")
             self._poek_nlp_model = nlp
             self._set_options()
+            for key, option in options.items():
+                self._opt.set_option(key, option)
             _res = self._opt.solve(nlp)
         else:
             self._opt = pk.solver(self._solver_name)
             self._set_options()
+            for key, option in options.items():
+                self._opt.set_option(key, option)
             _res = self._opt.solve(pm)
         timer.stop("coek solve")
 
@@ -201,6 +207,7 @@ def solve(self, model: _BlockData, timer: HierarchicalTimer = None) -> Results:
         res = Results()
         res.solution_loader = self.solution_loader
         res.termination_condition = poek2pyomo_termination_condition[_res.termination_condition]
+        res.message = _res.error_message
         res.solution_status = poek2pyomo_solution_status[_res.solution_status]
         if pk.check_optimal_termination(_res):
             res.best_feasible_objective = _res.objective_value
@@ -220,7 +227,7 @@ def write(self, model: _BlockData, filename, timer: HierarchicalTimer = None):
 
 
 class Gurobi(HybridSolver):
-    name = "appsi_coek_gurobi"
+    name = "coek_gurobi"
 
     def __init__(self):
         super().__init__("gurobi")
diff --git a/lib/pyomo_coek/pyomo_coek/components_only/variable.py b/lib/pyomo_coek/pyomo_coek/components_only/variable.py
@@ -17,7 +17,29 @@
 from pyomo.common.timing import ConstructionTimer
 from pyomo.common.log import is_debug_set
 import sys
-from pyomo.core.base.set import Binary, Reals, Integers, Any, GlobalSetBase
+
+from pyomo.core.base.set import GlobalSetBase
+from pyomo.core.base.set_types import  \
+    Reals, \
+    PositiveReals, \
+    NonPositiveReals, \
+    NegativeReals, \
+    NonNegativeReals, \
+    Integers, \
+    PositiveIntegers, \
+    NonPositiveIntegers, \
+    NegativeIntegers, \
+    NonNegativeIntegers, \
+    Boolean, \
+    Binary, \
+    Any, \
+    AnyWithNone, \
+    EmptySet, \
+    UnitInterval, \
+    PercentFraction, \
+    RealInterval, \
+    IntegerInterval
+
 from pyomo.common.collections import ComponentMap
 from weakref import ref as weakref_ref
 from pyomo.common.deprecation import deprecation_warning
@@ -33,9 +55,20 @@
 
 
 _domain_map = ComponentMap()
-_domain_map[Binary] = pk.VariableTypes.Binary
 _domain_map[Reals] = pk.VariableTypes.Reals
+_domain_map[PositiveReals] = pk.VariableTypes.Reals
+_domain_map[NonPositiveReals] = pk.VariableTypes.Reals
+_domain_map[NegativeReals] = pk.VariableTypes.Reals
+_domain_map[NonNegativeReals] = pk.VariableTypes.Reals
 _domain_map[Integers] = pk.VariableTypes.Integers
+_domain_map[PositiveIntegers] = pk.VariableTypes.Integers
+_domain_map[NonPositiveIntegers] = pk.VariableTypes.Integers
+_domain_map[NegativeIntegers] = pk.VariableTypes.Integers
+_domain_map[NonNegativeIntegers] = pk.VariableTypes.Integers
+_domain_map[Binary] = pk.VariableTypes.Binary
+_domain_map[Boolean] = pk.VariableTypes.Binary
+_domain_map[UnitInterval] = pk.VariableTypes.Reals
+_domain_map[PercentFraction] = pk.VariableTypes.Reals
 
 _rev_domain_map = dict()
 _rev_domain_map[pk.VariableTypes.Binary] = Binary
@@ -185,6 +218,26 @@ def domain(self):
     @domain.setter
     def domain(self, val):
         self._pe.within = _domain_map[val]
+        if val == PositiveReals:
+            self.bounds = (0,None)
+        elif val == NonPositiveReals:
+            self.bounds = (None,0)
+        elif val == NegativeReals:
+            self.bounds = (None,0)
+        elif val == NonNegativeReals:
+            self.bounds = (0,None)
+        elif val == PositiveIntegers:
+            self.bounds = (1,None)
+        elif val == NonPositiveIntegers:
+            self.bounds = (None,0)
+        elif val == NegativeIntegers:
+            self.bounds = (None,-1)
+        elif val == NonNegativeIntegers:
+            self.bounds = (0,None)
+        elif val == UnitInterval:
+            self.bounds = (0,1)
+        elif val == PercentFraction:
+            self.bounds = (0,1)
 
     @property
     def lower(self):
@@ -420,6 +473,7 @@ def construct(self, data=None):
                 # (constant portions of) every VarData so as to not
                 # repeat all the domain/bounds validation.
                 try:
+                    self.index_set().construct()
                     ref = self._getitem_when_not_present(next(iter(self.index_set())))
                 except StopIteration:
                     # Empty index!

Original file line number	Diff line number	Diff line change
`@@ -153,6 +153,7 @@ endif()`
`153`	`153`	`# GUROBI LIBRARY`
`154`	`154`	`#`
`155`	`155`	`if(with_gurobi)`
	`156`	`+ find_package(GUROBI REQUIRED)`
`156`	`157`	`list(APPEND sources`
`157`	`158`	`solvers/gurobi/gurobi.cpp)`
`158`	`159`	`list(APPEND coek_compile_options -DWITH_GUROBI)`