Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rewrite SCIP wrapper with Clang.jl to support a MIP solver through MOI #76

Merged
merged 82 commits into from
Jan 6, 2019
Merged

Rewrite SCIP wrapper with Clang.jl to support a MIP solver through MOI #76

merged 82 commits into from
Jan 6, 2019

Conversation

rschwarz
Copy link
Collaborator

@rschwarz rschwarz commented Dec 18, 2018 •
edited
Loading

fixes #28, but does not support callbacks or nonlinear expressions 😞

@rschwarz
add gen/generate_wrapper.jl
158beb4 
 - based on example of ArrowGlib.jl
 - incomplete (only wrap scip_general.h)
@rschwarz
add folder for generated wrapper files
39d47e9
@rschwarz
wrap all scip_*.h files
7c3b621 
 - these declarations used to be in scip.h
 - types are still missing
@rschwarz
wrap selected type_*.h headers
c4bb9ac 
 - those that appear in the first block in scip.h
 - but not type_var.h, which yields an error
   (undefined `union SCIP_DomChg`)
@rschwarz
wrap almost all type_*.h headers
4d5ef74
@rschwarz
don't add pub_*.h headers (for now)
479aae1
@rschwarz
also wrap type_var.h
d221a07 
 - requires updated Clang.jl with #214 fixed.
@rschwarz
adapt generate_wrapper.jl to restruct branch of Clang.jl
d84a772 
 - see PR JuliaInterop/Clang.jl#210
 - and discussion at JuliaInterop/Clang.jl#214
@rschwarz
no special order of type_* headers in generate_wrapper.jl
41c21f9
@rschwarz
regenerate wrapper
92d3685
@rschwarz
reset README
baa31dd
@rschwarz
update LICENSE, REQUIRE
8e1ee3e
@rschwarz
delete most of the old code (and tests)
3fd6395
@rschwarz
add deps/build.jl
91dbc68 
 - inspired by Gurobi.jl
 - seems to work when `/usr/lib/libscip.so` exists.
@rschwarz
include all wrappers into another file
9f9b2be
@rschwarz
add some manually wrapped constants :-(
fbc281f
@rschwarz
rename type SCIP to SCIP_, avoid name conflict with module
a58373e
@rschwarz
manually define FILE
8a3f945
@rschwarz
include nlpi headers in generate_wrapper.jl
31b9959
@rschwarz
include lpi headers in generate_wrapper.jl
187ea2b
@rschwarz
manually define BMS_{BLK,BUF}MEM
fe558bd
@rschwarz
check version during module init
8c60dff
@rschwarz
start on first test
e9282e0
@rschwarz
generate wrapper for scipdefplugins.h
b9d1f7c
@rschwarz
wrap included tests in named testset
93218b4
@rschwarz
extend first test
dd9bea0
@rschwarz
build.jl: check environment variable first
c1c5f8d 
 - otherwise, if system-wide installation exists, can not point it to another
   installation which is useful for testing (debug mode build)
@rschwarz
extend first test (actually add variable)
94749bc
@rschwarz
generate_wrapper: include all cons_* headers
e7401cf 
 - otherwise, constraints can not be created!
@rschwarz
test: add linear constraint
b53ca2a
@rschwarz
Copy link
Collaborator Author

I would be ready to merge this to master and the continue to work on features in separate PRs.

@rschwarz rschwarz self-assigned this Dec 28, 2018
mlubin
mlubin reviewed Jan 1, 2019
View reviewed changes
Copy link
Collaborator

@mlubin mlubin left a comment

Choose a reason for hiding this comment

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

Very nice! I made a bunch of comments but most of the hard work is already done.

README.md Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
REQUIRE Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
src/wrapper/README.md Show resolved Hide resolved
src/MOI_wrapper.jl Outdated Show resolved Hide resolved
src/MOI_wrapper.jl Show resolved Hide resolved
src/MOI_wrapper.jl Outdated Show resolved Hide resolved
test/REQUIRE Outdated Show resolved Hide resolved
test/managed_scip.jl Outdated Show resolved Hide resolved
@rschwarz rschwarz mentioned this pull request Jan 4, 2019
Closed
@rschwarz rschwarz mentioned this pull request Jan 4, 2019
Open
@mlubin mlubin mentioned this pull request Jan 6, 2019
Closed
@mlubin
Copy link
Collaborator

mlubin commented Jan 6, 2019

(Unable to reply inline)

Other solvers map this to OPTIMAL. I.e., terminating with a gap is optimal within the user-provided termination criteria.

Hm, strange. But what if the solver "accidentally" proves optimality (zero gap)? These cases could not be distinguished, then, using the status?

Correct. If you set a convergence tolerance on the solver and the solver happens to do better than you asked, you still get OPTIMAL. You can always check the gap manually later.

mlubin
mlubin reviewed Jan 6, 2019
View reviewed changes
Copy link
Collaborator

@mlubin mlubin left a comment

Choose a reason for hiding this comment

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

The points remaining are minor and I think properly accounted for with issues if needed, so LGTM to merge after addressing my last comments.

src/MOI_wrapper.jl Outdated Show resolved Hide resolved
src/MOI_wrapper.jl Show resolved Hide resolved
@rschwarz rschwarz mentioned this pull request Jan 6, 2019
Closed
@rschwarz rschwarz merged commit f06c0f5 into master Jan 6, 2019
@rschwarz rschwarz deleted the rs/clang branch January 6, 2019 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mlubin mlubin mlubin left review comments

Assignees

@rschwarz rschwarz

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove CSIP dependency
4 participants
@rschwarz @mlubin @odow @fserra