diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..4344fe3 --- /dev/null +++ b/Makefile @@ -0,0 +1,3 @@ +install-test: + docker build -t miplearnjl-test -f test/docker/Dockerfile . + docker run --rm -it miplearnjl-test \ No newline at end of file diff --git a/Project.toml b/Project.toml index 4a70a9e..0041b21 100644 --- a/Project.toml +++ b/Project.toml @@ -4,7 +4,6 @@ authors = ["Alinson S Xavier "] version = "0.3.0" [deps] -CPLEX = "a076750e-1247-5638-91d2-ce28b192dca0" Conda = "8f4d0f93-b110-5947-807f-2305c1781a2d" DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" diff --git a/deps/build.jl b/deps/build.jl index cb0f016..cdc304c 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -5,7 +5,7 @@ function install_miplearn() Conda.update() pip = joinpath(dirname(pyimport("sys").executable), "pip") isfile(pip) || error("$pip: invalid path") - run(`$pip install miplearn==0.3.0.dev0`) + run(`$pip install miplearn==0.3.0.dev1`) end install_miplearn() diff --git a/src/Cuts/Cuts.jl b/src/Cuts/Cuts.jl index 3684a19..5b2da5c 100644 --- a/src/Cuts/Cuts.jl +++ b/src/Cuts/Cuts.jl @@ -8,7 +8,7 @@ import ..to_str_array include("tableau/structs.jl") -include("blackbox/cplex.jl") +# include("blackbox/cplex.jl") include("tableau/collect.jl") include("tableau/gmi.jl") include("tableau/moi.jl") diff --git a/test/Project.toml b/test/Project.toml index f0fecf8..99fa175 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -4,7 +4,6 @@ authors = ["Alinson S. Xavier "] version = "0.1.0" [deps] -CPLEX = "a076750e-1247-5638-91d2-ce28b192dca0" Clp = "e2554f3b-3117-50c0-817c-e040a3ddf72d" Glob = "c27321d9-0574-5035-807b-f59d2c89b15c" HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile new file mode 100644 index 0000000..55d7730 --- /dev/null +++ b/test/docker/Dockerfile @@ -0,0 +1,3 @@ +FROM julia:1.9-buster +ADD . /app +CMD julia --project=/app/test /app/test/docker/run.jl \ No newline at end of file diff --git a/test/docker/run.jl b/test/docker/run.jl new file mode 100644 index 0000000..a95aa04 --- /dev/null +++ b/test/docker/run.jl @@ -0,0 +1,6 @@ +using Pkg +Pkg.develop(path="/app") +Pkg.build("MIPLearn") + +using MIPLearnT +runtests() diff --git a/test/fixtures/bell5.h5 b/test/fixtures/bell5.h5 index 8472b97..13afc24 100644 Binary files a/test/fixtures/bell5.h5 and b/test/fixtures/bell5.h5 differ diff --git a/test/src/BB/test_bb.jl b/test/src/BB/test_bb.jl index 003dcd2..cf51bc7 100644 --- a/test/src/BB/test_bb.jl +++ b/test/src/BB/test_bb.jl @@ -3,7 +3,7 @@ # Released under the modified BSD license. See COPYING.md for more details. using Clp -using CPLEX +# using CPLEX using HiGHS using JuMP using Test @@ -130,5 +130,5 @@ end function test_bb() @time bb_run("Clp", optimizer_with_attributes(Clp.Optimizer)) @time bb_run("HiGHS", optimizer_with_attributes(HiGHS.Optimizer)) - @time bb_run("CPLEX", optimizer_with_attributes(CPLEX.Optimizer, "CPXPARAM_Threads" => 1)) + # @time bb_run("CPLEX", optimizer_with_attributes(CPLEX.Optimizer, "CPXPARAM_Threads" => 1)) end diff --git a/test/src/MIPLearnT.jl b/test/src/MIPLearnT.jl index 6b95fcb..b14b883 100644 --- a/test/src/MIPLearnT.jl +++ b/test/src/MIPLearnT.jl @@ -27,7 +27,7 @@ function runtests() @testset "BB" begin test_bb() end - test_cuts_blackbox_cplex() + # test_cuts_blackbox_cplex() test_io() test_problems_setcover() test_solvers_jump() diff --git a/test/src/test_usage.jl b/test/src/test_usage.jl index 33e52b2..f02ff65 100644 --- a/test/src/test_usage.jl +++ b/test/src/test_usage.jl @@ -6,10 +6,10 @@ function test_usage() LogisticRegression = pyimport("sklearn.linear_model").LogisticRegression @debug "Generating data files..." - dirname = tempdir() + dirname = mktempdir() data = [fixture_setcover_data()] data_filenames = write_pkl_gz(data, dirname) - h5_filenames = ["$(f).h5" for f in data_filenames] + h5_filenames = [replace(f, ".pkl.gz" => ".h5") for f in data_filenames] @debug "Setting up LearningSolver..." solver = LearningSolver(