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鈥檒l 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

Commits on Dec 14, 2018

  1. add gen/generate_wrapper.jl 

     - based on example of ArrowGlib.jl
 - incomplete (only wrap scip_general.h)
    @rschwarz
    rschwarz committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    158beb4 View commit details
    Browse the repository at this point in the history

  2. add folder for generated wrapper files

    @rschwarz
    rschwarz committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    39d47e9 View commit details
    Browse the repository at this point in the history

  3. wrap all scip_*.h files 

     - these declarations used to be in scip.h
 - types are still missing
    @rschwarz
    rschwarz committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    7c3b621 View commit details
    Browse the repository at this point in the history

  4. wrap selected type_*.h headers 

     - those that appear in the first block in scip.h
 - but not type_var.h, which yields an error
   (undefined `union SCIP_DomChg`)
    @rschwarz
    rschwarz committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    c4bb9ac View commit details
    Browse the repository at this point in the history

  5. wrap almost all type_*.h headers

    @rschwarz
    rschwarz committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    4d5ef74 View commit details
    Browse the repository at this point in the history

  6. don't add pub_*.h headers (for now)

    @rschwarz
    rschwarz committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    479aae1 View commit details
    Browse the repository at this point in the history

  7. also wrap type_var.h 

     - requires updated Clang.jl with #214 fixed.
    @rschwarz
    rschwarz committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    d221a07 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2018

  1. adapt generate_wrapper.jl to restruct branch of Clang.jl 

     - see PR JuliaInterop/Clang.jl#210
 - and discussion at JuliaInterop/Clang.jl#214
    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    d84a772 View commit details
    Browse the repository at this point in the history

  2. no special order of type_* headers in generate_wrapper.jl

    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    41c21f9 View commit details
    Browse the repository at this point in the history

  3. regenerate wrapper

    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    92d3685 View commit details
    Browse the repository at this point in the history

  4. reset README

    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    baa31dd View commit details
    Browse the repository at this point in the history

  5. update LICENSE, REQUIRE

    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    8e1ee3e View commit details
    Browse the repository at this point in the history

  6. delete most of the old code (and tests)

    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    3fd6395 View commit details
    Browse the repository at this point in the history

  7. add deps/build.jl 

     - inspired by Gurobi.jl
 - seems to work when `/usr/lib/libscip.so` exists.
    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    91dbc68 View commit details
    Browse the repository at this point in the history

  8. include all wrappers into another file

    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    9f9b2be View commit details
    Browse the repository at this point in the history

  9. add some manually wrapped constants :-(

    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    fbc281f View commit details
    Browse the repository at this point in the history

  10. rename type SCIP to SCIP_, avoid name conflict with module

    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    a58373e View commit details
    Browse the repository at this point in the history

  11. manually define FILE

    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    8a3f945 View commit details
    Browse the repository at this point in the history

  12. include nlpi headers in generate_wrapper.jl

    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    31b9959 View commit details
    Browse the repository at this point in the history

  13. include lpi headers in generate_wrapper.jl

    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    187ea2b View commit details
    Browse the repository at this point in the history

  14. manually define BMS_{BLK,BUF}MEM

    @rschwarz
    rschwarz committed Dec 15, 2018
    Configuration menu
    Copy the full SHA
    fe558bd View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2018

  1. check version during module init

    @rschwarz
    rschwarz committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    8c60dff View commit details
    Browse the repository at this point in the history

  2. start on first test

    @rschwarz
    rschwarz committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    e9282e0 View commit details
    Browse the repository at this point in the history

  3. generate wrapper for scipdefplugins.h

    @rschwarz
    rschwarz committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    b9d1f7c View commit details
    Browse the repository at this point in the history

  4. wrap included tests in named testset

    @rschwarz
    rschwarz committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    93218b4 View commit details
    Browse the repository at this point in the history

  5. extend first test

    @rschwarz
    rschwarz committed Dec 16, 2018
    Configuration menu
    Copy the full SHA
    dd9bea0 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2018

  1. build.jl: check environment variable first 

     - otherwise, if system-wide installation exists, can not point it to another
   installation which is useful for testing (debug mode build)
    @rschwarz
    rschwarz committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    c1c5f8d View commit details
    Browse the repository at this point in the history

  2. extend first test (actually add variable)

    @rschwarz
    rschwarz committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    94749bc View commit details
    Browse the repository at this point in the history

  3. generate_wrapper: include all cons_* headers 

     - otherwise, constraints can not be created!
    @rschwarz
    rschwarz committed Dec 17, 2018
    Configuration menu
    Copy the full SHA
    e7401cf View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2018

  1. test: add linear constraint

    @rschwarz
    rschwarz committed Dec 18, 2018
    Configuration menu
    Copy the full SHA
    b53ca2a View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2018

  1. fix type in test

    @rschwarz
    rschwarz committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    4810361 View commit details
    Browse the repository at this point in the history

  2. add MOI to REQUIRE

    @rschwarz
    rschwarz committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    543a572 View commit details
    Browse the repository at this point in the history

  3. prepare MOI_wrapper.jl

    @rschwarz
    rschwarz committed Dec 19, 2018
    Configuration menu
    Copy the full SHA
    81ce845 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2018

  1. add ManagedSCIP (for memory) and include in Optimizer

    @rschwarz
    rschwarz committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    f35860a View commit details
    Browse the repository at this point in the history

  2. manage vars, conss for ManagedSCIP

    @rschwarz
    rschwarz committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    49bbe94 View commit details
    Browse the repository at this point in the history

  3. add simple @sc macro for SCIP_CALL

    @rschwarz
    rschwarz committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    42bed2d View commit details
    Browse the repository at this point in the history

  4. add Travis CI config

    @rschwarz
    rschwarz committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    f50bef4 View commit details
    Browse the repository at this point in the history

  5. travis: install scip .deb package 

     - use info from PySCIPOpt
 - also switch to Ubuntu Xenial
    @rschwarz
    rschwarz committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    d3316aa View commit details
    Browse the repository at this point in the history

  6. travis: add using Pkg

    @rschwarz
    rschwarz committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    5a96eae View commit details
    Browse the repository at this point in the history

  7. travis: install some dependencies

    @rschwarz
    rschwarz committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    5d08d9a View commit details
    Browse the repository at this point in the history

  8. add .codecov.yml

    @rschwarz
    rschwarz committed Dec 20, 2018
    Configuration menu
    Copy the full SHA
    2f8cd78 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2018

  1. implement more methods to support contlineartest (WIP)

    @rschwarz
    rschwarz committed Dec 21, 2018
    Configuration menu
    Copy the full SHA
    de1a030 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2018

  1. generate_wrapper: include pub_*.h headers 

     - need it now for SCIPvarGetObj from pub_var.h
    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    eab75e8 View commit details
    Browse the repository at this point in the history

  2. implement enough of MOI to get to the actual solution query

    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    041024d View commit details
    Browse the repository at this point in the history

  3. implement status and solution queries

    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    e74b98d View commit details
    Browse the repository at this point in the history

  4. add allow_modification(o) to reset SCIP stage

    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    c6ed123 View commit details
    Browse the repository at this point in the history

  5. implement more problem modification

    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    60c26ec View commit details
    Browse the repository at this point in the history

  6. do not support linear constraints with constant offset 

     - because I would need to merge it with lhs/rhs
 - but then I can not modify the constraint with set(, ConstraintSet, )
 - so I just throw AddConstraintNotAllowed
    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    b97dcff View commit details
    Browse the repository at this point in the history

  7. add more solution queries

    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    85ea505 View commit details
    Browse the repository at this point in the history

  8. enable some MOI contlinear tests

    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    0abb816 View commit details
    Browse the repository at this point in the history

  9. fix ResultCount for unbounded problems

    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    f4b71d8 View commit details
    Browse the repository at this point in the history

  10. support basic, generic parameter setting

    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    49494b4 View commit details
    Browse the repository at this point in the history

  11. disable SCIP output for MOI tests

    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    aa3d318 View commit details
    Browse the repository at this point in the history

  12. fix get(ConstraintPrimal, SingleVariable)

    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    f34c1d0 View commit details
    Browse the repository at this point in the history

  13. support problem and variable names

    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    92d42b9 View commit details
    Browse the repository at this point in the history

  14. support names for some constraints 

     - but not for SingleVariable function (these are not really stored as
   SCIP_CONS)
    @rschwarz
    rschwarz committed Dec 22, 2018
    Configuration menu
    Copy the full SHA
    a99be15 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2018

  1. try to support names for SingleVariable constraints 

     - also implement is_valid, for tests
    @rschwarz
    rschwarz committed Dec 23, 2018
    Configuration menu
    Copy the full SHA
    3d92cfc View commit details
    Browse the repository at this point in the history

  2. partially revert support for names 

     - we only support what SCIP offers directly:
   - get/set name of problem
   - get/set name of variable by index
   - get/set name of (proper) constraints index
 - don't support names of SingleVariable constraints
   - are represented as variable bounds
   - would have to store names and reverse mapping separately
 - don't support getting index by name
   - don't want to keep track of duplicate names
   - have to be careful about original vs transformed problem
    @rschwarz
    rschwarz committed Dec 23, 2018
    Configuration menu
    Copy the full SHA
    ee976e7 View commit details
    Browse the repository at this point in the history

  3. use abbreviations for MOI types

    @rschwarz
    rschwarz committed Dec 23, 2018
    Configuration menu
    Copy the full SHA
    110682c View commit details
    Browse the repository at this point in the history

  4. support variable types binary, integer

    @rschwarz
    rschwarz committed Dec 23, 2018
    Configuration menu
    Copy the full SHA
    acecde3 View commit details
    Browse the repository at this point in the history

  5. add more solve statistics

    @rschwarz
    rschwarz committed Dec 23, 2018
    Configuration menu
    Copy the full SHA
    97a2108 View commit details
    Browse the repository at this point in the history

  6. enable some intlineartests

    @rschwarz
    rschwarz committed Dec 23, 2018
    Configuration menu
    Copy the full SHA
    b3ef38d View commit details
    Browse the repository at this point in the history

  7. update README

    @rschwarz
    rschwarz committed Dec 23, 2018
    Configuration menu
    Copy the full SHA
    e1821f1 View commit details
    Browse the repository at this point in the history

  8. README: fix typos

    @rschwarz
    rschwarz committed Dec 23, 2018
    Configuration menu
    Copy the full SHA
    7e4054b View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2019

  1. README: fix typo, more detail about pointer types

    @rschwarz
    rschwarz committed Jan 4, 2019
    Configuration menu
    Copy the full SHA
    279fae4 View commit details
    Browse the repository at this point in the history

  2. add dummy SCIPSolver() to warn old users about MPB/MOI.

    @rschwarz
    rschwarz committed Jan 4, 2019
    Configuration menu
    Copy the full SHA
    c5d54e3 View commit details
    Browse the repository at this point in the history

  3. rm dependency on Compat

    @rschwarz
    rschwarz committed Jan 4, 2019
    Configuration menu
    Copy the full SHA
    5f5d2c1 View commit details
    Browse the repository at this point in the history

  4. add version check agains upper bound (next major)

    @rschwarz
    rschwarz committed Jan 4, 2019
    Configuration menu
    Copy the full SHA
    cb51e3d View commit details
    Browse the repository at this point in the history

  5. documentation formatting

    @rschwarz
    rschwarz committed Jan 4, 2019
    Configuration menu
    Copy the full SHA
    b4e7529 View commit details
    Browse the repository at this point in the history

  6. added documentation

    @rschwarz
    rschwarz committed Jan 4, 2019
    Configuration menu
    Copy the full SHA
    881b9a7 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2019

  1. use get_* functions more

    @rschwarz
    rschwarz committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    d098f10 View commit details
    Browse the repository at this point in the history

  2. rm get_ prefix for accessor functions

    @rschwarz
    rschwarz committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    d7c20e0 View commit details
    Browse the repository at this point in the history

  3. introduce VarRef, ConsRef in place of Ints

    @rschwarz
    rschwarz committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    8a89494 View commit details
    Browse the repository at this point in the history

  4. add copyright notice to files from Clang.jl

    @rschwarz
    rschwarz committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    d231570 View commit details
    Browse the repository at this point in the history

  5. reconsider type aliases 

     - remove those that are used infrequently
 - use longer, more descriptive names
 - use CamelCase when abbreviated name is more than just initials
    @rschwarz
    rschwarz committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    d8a5fd8 View commit details
    Browse the repository at this point in the history

  6. add explicit return keywords to functions

    @rschwarz
    rschwarz committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    8d70941 View commit details
    Browse the repository at this point in the history

  7. rm empty test/REQUIRE

    @rschwarz
    rschwarz committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    3ea173a View commit details
    Browse the repository at this point in the history

  8. rm test that depends on GC behavior

    @rschwarz
    rschwarz committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    04e31fe View commit details
    Browse the repository at this point in the history

  9. add test for memory mgmt with solving

    @rschwarz
    rschwarz committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    f4b5883 View commit details
    Browse the repository at this point in the history

  10. warn about setting FEASIBLITY_SENSE

    @rschwarz
    rschwarz committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    7da7c14 View commit details
    Browse the repository at this point in the history

  11. map gap limit to MOI.OPTIMAL (conform with other solvers)

    @rschwarz
    rschwarz committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    3ed02b0 View commit details
    Browse the repository at this point in the history

  12. constant names consistent with style guide

    @rschwarz
    rschwarz committed Jan 6, 2019
    Configuration menu
    Copy the full SHA
    3b4f087 View commit details
    Browse the repository at this point in the history