[BAZEL] switch to scip with soplex that was recently pushed to BCR

This commit is contained in:
Laurent Perron
2025-01-02 22:27:29 +01:00
parent 5373b42518
commit 44ef41a090
3 changed files with 6 additions and 22 deletions

View File

@@ -37,7 +37,7 @@ bazel_dep(name = "rules_jvm_external", version = "6.6")
bazel_dep(name = "rules_license", version = "1.0.0")
bazel_dep(name = "rules_proto", version = "7.1.0")
bazel_dep(name = "rules_python", version = "1.0.0")
bazel_dep(name = "scip", version = "9.2.0.bcr.2")
bazel_dep(name = "scip", version = "9.2.0.bcr.3")
bazel_dep(name = "swig", version = "4.3.0")
bazel_dep(name = "zlib", version = "1.3.1.bcr.4")

View File

@@ -66,10 +66,10 @@ cc_library(
hdrs = ["legacy_scip_params.h"],
deps = [
"//ortools/linear_solver:scip_helper_macros",
"//ortools/linear_solver:scip_with_glop",
"@com_google_absl//absl/status",
"@com_google_absl//absl/strings",
"@com_google_absl//absl/strings:str_format",
"@scip",
],
)
@@ -92,7 +92,6 @@ cc_library(
"//ortools/base:status_builder",
"//ortools/base:status_macros",
"//ortools/linear_solver:scip_helper_macros",
"//ortools/linear_solver:scip_with_glop",
"//ortools/port:proto_utils",
"//ortools/util:status_macros",
"@com_google_absl//absl/cleanup",
@@ -101,6 +100,7 @@ cc_library(
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@scip",
],
)
@@ -111,8 +111,8 @@ cc_library(
deps = [
":gscip",
"//ortools/base:status_macros",
"//ortools/linear_solver:scip_with_glop",
"@com_google_absl//absl/status",
"@scip",
],
)
@@ -123,9 +123,9 @@ cc_library(
deps = [
"//ortools/base",
"//ortools/linear_solver:scip_helper_macros",
"//ortools/linear_solver:scip_with_glop",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",
"@scip",
],
)

View File

@@ -202,7 +202,6 @@ cc_library(
"//conditions:default": [],
}) + select({
":use_scip": [
"lpi_glop.cpp",
"scip_callback.cc",
"scip_interface.cc",
],
@@ -312,9 +311,9 @@ cc_library(
"//conditions:default": [],
}) + select({
":use_scip": [
":scip_with_glop",
"//ortools/gscip:legacy_scip_params",
"//ortools/linear_solver/proto_solver:scip_proto_solver",
"@scip",
],
"//conditions:default": [],
}),
@@ -344,21 +343,6 @@ cc_library(
],
)
copy_file(
name = "lpi_glop",
src = "@scip//:src/lpi/lpi_glop.cpp",
out = "lpi_glop.cpp",
)
cc_library(
name = "scip_with_glop",
srcs = ["lpi_glop.cpp"],
deps = [
"//ortools/glop:lp_solver",
"@scip",
],
)
cc_library(
name = "scip_helper_macros",
hdrs = ["scip_helper_macros.h"],