Skip to content

Cplex direct fix#1276

Merged
jsiirola merged 11 commits intoPyomo:masterfrom
michaelbynum:cplex_direct_fix
Feb 13, 2020
Merged

Cplex direct fix#1276
jsiirola merged 11 commits intoPyomo:masterfrom
michaelbynum:cplex_direct_fix

Conversation

@michaelbynum
Copy link
Copy Markdown
Contributor

@michaelbynum michaelbynum commented Jan 30, 2020

This PR is essentially a re-opening of #1265.

Fixes #1260

Summary/Motivation:

This PR updates the CPLEX direct interface to support CPLEX 12.10. It also adds

pip install cplex

to the GitHub workflow so the cplex direct interface can be tested.

Legal Acknowledgement

By contributing to this software project, I agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the BSD license.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

@codecov
Copy link
Copy Markdown

codecov bot commented Jan 30, 2020 •
edited
Loading

Codecov Report

Merging #1276 into master will decrease coverage by 0.42%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1276      +/-   ##
==========================================
- Coverage   69.37%   68.95%   -0.43%     
==========================================
  Files         534      534              
  Lines       82064    80979    -1085     
==========================================
- Hits        56934    55838    -1096     
- Misses      25130    25141      +11
Impacted Files Coverage Δ
pyomo/gdp/plugins/bigm.py 91.88% <100%> (ø) ⬆️
pyomo/contrib/fbbt/fbbt.py 94.08% <100%> (+0.19%) ⬆️
pyomo/core/base/param.py 82.74% <100%> (-1.47%) ⬇️
pyomo/opt/parallel/pyro.py 18.34% <0%> (-71.56%) ⬇️
pyomo/pysp/scenariotree/action_manager_pyro.py 18.12% <0%> (-63.16%) ⬇️
...mo/pysp/scenariotree/manager_solver_worker_pyro.py 27.53% <0%> (-60.87%) ⬇️
pyomo/solvers/plugins/solvers/cplex_direct.py 12.4% <0%> (-60%) ⬇️
pyomo/solvers/plugins/smanager/pyro.py 23.01% <0%> (-59.53%) ⬇️
pyomo/pysp/scenariotree/manager_worker_pyro.py 21.64% <0%> (-59.28%) ⬇️
pyomo/pysp/scenariotree/server_pyro.py 22.88% <0%> (-55.73%) ⬇️
... and 34 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 793c538...690f8d1. Read the comment docs.

@blnicho
Copy link
Copy Markdown
Member

blnicho commented Jan 30, 2020

@michaelbynum could you merge master into your branch. Some recent updates to the Github Actions workflows should fix the test failures.

jsiirola
jsiirola approved these changes Feb 12, 2020
View reviewed changes
Copy link
Copy Markdown
Member

@jsiirola jsiirola left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is ready to merge, pending tests passing.

@mrmundt, please give this a once-over: I standardized the ubuntu/osx github workflows (reduced the diffs between the drivers). We should probably port the ubuntu workflow from this PR into #1294 so the three workflows are as identical as possible to reduce future maintenance burden.

@mrmundt
Copy link
Copy Markdown
Contributor

mrmundt commented Feb 13, 2020

I think this is ready to merge, pending tests passing.

@mrmundt, please give this a once-over: I standardized the ubuntu/osx github workflows (reduced the diffs between the drivers). We should probably port the ubuntu workflow from this PR into #1294 so the three workflows are as identical as possible to reduce future maintenance burden.

Yessir! Will do!

I changed the warning printout to match the other try-catch blocks within the Windows workflow. The conda deactivate, conda activate lines are a workaround for an issue in Windows-conda installs which fail. If an install fails, the Python version resets to the default 3.7.3, but if you deactivate and then reactivate the environment, it'll continue as it is supposed to.

@jsiirola
Copy link
Copy Markdown
Member

jsiirola commented Feb 13, 2020

The one Jenkins test failure was due to a NEOS connectivity issue unrelated to this PR.

@jsiirola jsiirola merged commit d9229cf into Pyomo:master Feb 13, 2020
@mrmundt mrmundt mentioned this pull request Feb 13, 2020
Merged
@michaelbynum michaelbynum deleted the cplex_direct_fix branch February 18, 2020 20:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jsiirola jsiirola jsiirola approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

CPLEXDirect (and CPLEXPersistent) do not support v12.10

4 participants

@michaelbynum @blnicho @mrmundt @jsiirola