Release 2.1

.github/workflows/linux.yml

@@ -31,7 +31,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: build tpls with Spack and then Coek
         run: |
-            ./build.sh
+            ./build.sh --with-spack
       - name: test
         run: |
           cd _build

ChangeLog.md

@@ -4,6 +4,26 @@ Here we list changes of Coek.  More detailed information
 about incremental changes can be found in the [commit
 history](https://github.com/sandialabs/coek/commits).
 
+## 2.1
+
+* Reworked Spack to use the or-fusion-spack-repo to define TPLs
+* coek: Expanded list of domain names used to specify domain and bounds values
+* coek: Updates to gurobi configuration and environment setup logic
+* coek: Removed void* references and used shared pointer references instead
+* coek: Reverted IndexVector to std::vector to resolve memory management issues
+* coek: Refactored assoc_array logic to avoid cross-links within coek
+* coek: Added Data logic, which represents immutable model data that is used in compact expressions
+* coek: Added IndexSequence, which iterates over the IndexParameters associated with a ConcreteSet.  This provides a more generic iterator concept than ExpressionSequence.
+* coek: Reworking map logic to use IndexSequence objects.  
+* coek: Fixes to compact expression walkers.
+* coek: Enabled expand() logic for Parameter's 
+* coek: Fixed bugs with compact LP writer
+* pycoek: Enable setup of data/param/var data with SequenceContext objects
+* pycoek: Expose DataPortal
+* tests: More robust testing scripts
+* tests: Enable comparisons with coek as a baseline
+* tests: Treating Gurobi license issues as warnings
+
 ## 2.0
 
 * Adding support for builds with Spack

README.md

@@ -1,6 +1,6 @@
 [![Github Actions Status](https://github.com/sandialabs/coek/workflows/Linux%20Build%20and%20Tests/badge.svg?event=push)](https://github.com/sandialabs/coek/actions?query=workflow%3A%22Linux+Build+and+Tests%22++) 
 
-# The Coek Project
+# The Coek Project 
 
 ## Overview
 

build.sh

@@ -5,28 +5,48 @@
 #
 # 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
+compact="OFF"
 debug="OFF"
+python_exe=""
+scip_config="OFF"
+spack_dev=0
+spack_env="coekenv"
 spack_home=`pwd`/_spack
+spack_reinstall=0
+
+with_asl="ON"
+with_catch="ON"
+with_fmtlib="ON"
+with_highs="ON"
+with_python="OFF"
+with_rapidjson="ON"
+with_scip=""
+with_spack=0
 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] [--compact] [--debug] [--python] [--python-exe <file>] [--scip] [--spack-dev] [--spack-env <env>] [--spack-home <dir>] [--spack-reinstall] [--valgrind] [--with-spack]"
                     exit 
         ;;
         --clang)
                     clang=1
                     shift
         ;;
+        --compact)
+                    compact="ON"
+                    shift
+        ;;
         --debug)
                     debug="ON"
                     shift
         ;;
+        --spack-env)
+                    spack_env="$2"
+                    shift
+                    shift
+        ;;
         --python)
                     with_python="ON"
                     shift
@@ -35,6 +55,11 @@ while [[ $# -gt 0 ]]; do
                     python_exe="-DPython_EXECUTABLE=$2"
                     shift
         ;;
+        --scip)
+                    with_scip="scip"
+                    scip_config="ON"
+                    shift
+        ;;
         --spack-dev)
                     spack_dev=1
                     shift
@@ -52,70 +77,115 @@ while [[ $# -gt 0 ]]; do
                     with_valgrind="valgrind"
                     shift
         ;;
+        --with-spack)
+                    with_spack=1
+                    shift
+        ;;
         *)
                     echo "unknown option: $1"
                     exit 
         ;;
     esac
 done
 
-#
-# Setup directories
-#
-export SPACK_HOME=${spack_home}
-echo "SPACK_HOME=${SPACK_HOME}"
-if [[ "${spack_reinstall}" -eq 1 ]]; then
-    \rm -Rf ${SPACK_HOME}
-fi
-\rm -Rf _build
-#
-# Configure gurobi
-#
-if [[ -z "${GUROBI_HOME}" ]]; then
-    with_gurobi="OFF"
-else
-    with_gurobi="ON"
-fi
-#
-# Configure clang
-#
-if [[ $clang -eq 1 ]]; then
-   export CXX=clang++
-   export CC=clang
-fi
-#
-# Install spack
-#
-if test -d ${SPACK_HOME}; then
-    echo ""
-    echo "WARNING: Spack directory exists."
-    echo ""
-else
-    echo ""
-    echo "Installing Coek dependencies using Spack"
-    echo ""
-    if [[ "$spack_dev" -eq 0 ]]; then
-        git clone https://github.com/or-fusion/spack.git ${SPACK_HOME}
+if [[ "$with_spack" -eq 1 ]]; then
+    #
+    # Setup directories
+    #
+    export SPACK_HOME=${spack_home}
+    echo "SPACK_HOME=${SPACK_HOME}"
+    if [[ "${spack_reinstall}" -eq 1 ]]; then
+        \rm -Rf ${SPACK_HOME}
+    fi
+    if test -d _spack_tpls; then
+        cd _spack_tpls
+        git pull
+        cd ..
     else
-        git clone [email protected]:or-fusion/spack.git ${SPACK_HOME}
+        if [[ "$spack_dev" -eq 0 ]]; then
+            \rm -Rf _spack_tpls
+            git clone --depth 1 https://github.com/or-fusion/or-fusion-spack-repo.git _spack_tpls
+        else
+            git clone [email protected]:or-fusion/or-fusion-spack-repo.git _spack_tpls
+            cd _spack_tpls
+            git checkout dev
+            git pull
+            cd ..
+        fi
     fi
-    . ${SPACK_HOME}/share/spack/setup-env.sh
-    spack env create coekenv
-    spack env activate coekenv
-    spack add asl cppad fmt rapidjson catch2 highs $with_valgrind
-    spack install
-    spack env deactivate
-fi
-if test -d ${SPACK_HOME}; then
-    export SPACK_HOME=$(cd ${SPACK_HOME}; pwd)
-    echo "SPACK_HOME=${SPACK_HOME}"
+    #
+    # Configure gurobi
+    #
+    if [[ -z "${GUROBI_HOME}" ]]; then
+        with_gurobi="OFF"
+    else
+        with_gurobi="ON"
+    fi
+    #
+    # Configure clang
+    #
+    if [[ $clang -eq 1 ]]; then
+       export CXX=clang++
+       export CC=clang
+    fi
+    #
+    # Install spack
+    #
+    if test -d ${SPACK_HOME}; then
+        echo ""
+        echo "WARNING: Spack directory exists."
+        echo ""
+    else
+        echo ""
+        echo "Installing Coek dependencies using Spack"
+        echo ""
+        git clone --depth 1 https://github.com/spack/spack.git ${SPACK_HOME}
+        . ${SPACK_HOME}/share/spack/setup-env.sh
+        echo ""
+        echo "Removing _spack_tpls"
+        echo ""
+        spack repo remove `pwd`/_spack_tpls/repo | true
+        echo ""
+        echo "Adding _spack_tpls"
+        echo ""
+        spack repo add `pwd`/_spack_tpls/repo
+        spack repo list
+        spack external find
+        spack compiler find
+        spack env create $spack_env
+        spack env activate $spack_env
+        spack add asl [email protected] rapidjson catch2 highs $with_valgrind $with_scip
+        spack install
+        spack env deactivate
+        spack repo remove `pwd`/_spack_tpls/repo
+    fi
+    if test -d ${SPACK_HOME}; then
+        export SPACK_HOME=$(cd ${SPACK_HOME}; pwd)
+        echo ""
+        echo "SPACK_HOME=${SPACK_HOME}"
+        echo ""
+    fi
+    spack_cmake_options="-DCMAKE_PREFIX_PATH=${SPACK_HOME}/var/spack/environments/${spack_env}/.spack-env/view"
+else
+    spack_cmake_options=""
+    with_python="OFF"
+    python_exe=""
+    with_gurobi="OFF"
+    with_highs="OFF"
+    with_fmtlib="OFF"
+    with_rapidjson="OFF"
+    with_catch="OFF"
+    with_asl="OFF"
 fi
 #
 # Install coek
 #
 echo "Building Coek"
 echo ""
+\rm -Rf _build
 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 $spack_cmake_options -Dwith_debug=${debug} -Dwith_python=${with_python} -Dwith_pybind11=${with_python} $python_exe -Dwith_gurobi=$with_gurobi -Dwith_highs=$with_highs -Dwith_cppad=OFF -Dwith_fmtlib=$with_fmtlib -Dwith_rapidjson=$with_rapidjson -Dwith_catch2=$with_catch -Dwith_tests=$with_catch -Dwith_asl=$with_asl -Dwith_openmp=OFF -Dwith_compact=${compact} ..
 make -j20
+make install
+

cmake/FindGUROBI.cmake

@@ -6,7 +6,7 @@ find_path(
 
 find_library(
   GUROBI_LIBRARY
-  NAMES gurobi gurobi81 gurobi90 gurobi95 gurobi100 gurobi110
+  NAMES gurobi gurobi81 gurobi90 gurobi95 gurobi100 gurobi1003 gurobi110 gurobi120
   HINTS ${GUROBI_DIR} $ENV{GUROBI_HOME}
   PATH_SUFFIXES lib)
 
@@ -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()