Skip to content
Permalink
Browse files

debugging XPRESS; re-enabling CBC on circleci

  • Loading branch information
jonrkarr committed Dec 4, 2017
1 parent af8716c commit 2dc578bb7aea25c7639afeae28bf1e8fc86d5c62
Showing with 14 additions and 12 deletions.
  1. +6 −3 .circleci/config.yml
  2. +7 −8 conv_opt/core.py
  3. +1 −1 conv_opt/solver/xpress.py
@@ -20,6 +20,9 @@ jobs:
- run: pip3 install -U git+https://github.com/KarrLab/karr_lab_build_utils.git#egg=karr_lab_build_utils
- run: karr_lab_build_utils3 install-requirements
- run: pip3 install -U -e .[all]

# make XPRESS license check exit quickly
- run: sed -i 's/^use_server server=".\?\+"$/use_server server=""/g' /opt/xpressmp/bin/xpauth.xpr

- save_cache:
key: cache-v5-{{ .Branch }}-{{ checksum "requirements.txt" }}
@@ -30,13 +33,13 @@ jobs:
- run: |
set +e
#karr_lab_build_utils2 run-tests tests --with-xunit --with-coverage
karr_lab_build_utils2 run-tests tests --with-xunit --with-coverage
RESULT2=$?
#karr_lab_build_utils3 run-tests tests --with-xunit --with-coverage
karr_lab_build_utils3 run-tests tests --with-xunit --with-coverage
RESULT3=$?
#karr_lab_build_utils3 make-and-archive-reports
karr_lab_build_utils3 make-and-archive-reports
if [[ $RESULT2 -eq 0 && $RESULT3 -eq 0 ]]; then
exit 0
@@ -100,16 +100,15 @@ class ExportFormat(enum.Enum):
# :obj:`list` of :obj:`Solver`: list of enabled solvers


if not os.getenv('CIRCLECI', False): # because we haven't been able to get CyLP to work inside CircleCI
try:
import cylp.cy
try:
import cylp.cy
try:
cylp.cy.CyClpSimplex()
ENABLED_SOLVERS.append(Solver.cbc)
except: # pragma: no cover
pass # pragma: no cover
except ImportError: # pragma: no cover
cylp.cy.CyClpSimplex()
ENABLED_SOLVERS.append(Solver.cbc)
except: # pragma: no cover
pass # pragma: no cover
except ImportError: # pragma: no cover
pass # pragma: no cover

try:
import cplex
@@ -16,7 +16,7 @@
import sys
try:
import xpress
except ImportError:
except (ImportError, RuntimeError):
import warnings
warnings.warn('FICO XPRESS is not installed', UserWarning)

0 comments on commit 2dc578b

Please sign in to comment.
You can’t perform that action at this time.