linear_solver: backport from main

This commit is contained in:
Corentin Le Molgat
2025-10-16 13:06:55 +02:00
parent 87f3383057
commit 28cfca9a22
4 changed files with 305 additions and 145 deletions

View File

@@ -15,13 +15,34 @@ load("@rules_cc//cc:cc_library.bzl", "cc_library")
package(default_visibility = ["//visibility:public"])
cc_library(
name = "preprocessor",
srcs = ["preprocessor.cc"],
hdrs = ["preprocessor.h"],
deps = [
"//ortools/glop:preprocessor",
"//ortools/lp_data",
"//ortools/lp_data:base",
"//ortools/lp_data:lp_utils",
"//ortools/lp_data:sparse",
"//ortools/lp_data:sparse_column",
"//ortools/util:fp_utils",
"//ortools/util:return_macros",
"//ortools/util:stats",
"@abseil-cpp//absl/log",
"@abseil-cpp//absl/log:check",
],
)
cc_library(
name = "proto_utils",
hdrs = ["proto_utils.h"],
visibility = ["//visibility:public"],
deps = [
"//ortools/linear_solver:linear_solver_cc_proto",
"//ortools/port:proto_utils",
"@abseil-cpp//absl/log",
"@abseil-cpp//absl/log:check",
"@abseil-cpp//absl/status:statusor",
"@protobuf",
],
)
@@ -56,6 +77,7 @@ cc_library(
hdrs = ["pdlp_proto_solver.h"],
deps = [
"//ortools/base:logging",
"//ortools/base:status_macros",
"//ortools/linear_solver:linear_solver_cc_proto",
"//ortools/linear_solver:model_validator",
"//ortools/pdlp:iteration_stats",
@@ -78,9 +100,12 @@ cc_library(
"//ortools/glop:parameters_cc_proto",
"//ortools/glop:preprocessor",
"//ortools/linear_solver:linear_solver_cc_proto",
"//ortools/lp_data",
"//ortools/lp_data:base",
"//ortools/lp_data:proto_utils",
"//ortools/util:logging",
"@abseil-cpp//absl/memory",
"//ortools/util:time_limit",
"@abseil-cpp//absl/log:check",
],
)
@@ -118,7 +143,7 @@ cc_library(
srcs = ["scip_params.cc"],
hdrs = ["scip_params.h"],
deps = [
"//ortools/base:logging",
"//ortools/base",
"//ortools/linear_solver:scip_helper_macros",
"@abseil-cpp//absl/status",
"@abseil-cpp//absl/strings",
@@ -136,16 +161,19 @@ cc_library(
"//conditions:default": [],
}),
deps = [
"//ortools/base",
":scip_params",
"//ortools/base:status_macros",
"//ortools/base:timer",
"//ortools/linear_solver:linear_solver_cc_proto",
"//ortools/linear_solver:model_validator",
"//ortools/linear_solver:scip_helper_macros",
"//ortools/linear_solver/proto_solver:scip_params",
"//ortools/util:lazy_mutable_copy",
"@abseil-cpp//absl/base:core_headers",
"@abseil-cpp//absl/cleanup",
"@abseil-cpp//absl/container:btree",
"@abseil-cpp//absl/flags:flag",
"@abseil-cpp//absl/log",
"@abseil-cpp//absl/log:check",
"@abseil-cpp//absl/status",
"@abseil-cpp//absl/status:statusor",
"@abseil-cpp//absl/strings",
@@ -162,6 +190,7 @@ cc_library(
srcs = ["gurobi_proto_solver.cc"],
hdrs = ["gurobi_proto_solver.h"],
deps = [
"//ortools/base:status_macros",
"//ortools/base:timer",
"//ortools/linear_solver:gurobi_util",
"//ortools/linear_solver:linear_solver_cc_proto",
@@ -177,7 +206,6 @@ cc_library(
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/strings:str_format",
"@abseil-cpp//absl/time",
"@abseil-cpp//absl/types:optional",
],
)
@@ -193,28 +221,13 @@ cc_library(
"//ortools/base:timer",
"//ortools/linear_solver:linear_solver_cc_proto",
"//ortools/linear_solver:model_validator",
"//ortools/port:proto_utils",
"//ortools/util:lazy_mutable_copy",
"@abseil-cpp//absl/status",
"@abseil-cpp//absl/status:statusor",
"@abseil-cpp//absl/strings",
"@abseil-cpp//absl/time",
"@abseil-cpp//absl/types:optional",
"@highs",
],
)
cc_library(
name = "preprocessor",
srcs = ["preprocessor.cc"],
hdrs = ["preprocessor.h"],
deps = [
"//ortools/glop:preprocessor",
"//ortools/lp_data",
"//ortools/lp_data:base",
"//ortools/lp_data:lp_utils",
"//ortools/lp_data:sparse",
"//ortools/lp_data:sparse_column",
"//ortools/util:fp_utils",
"//ortools/util:return_macros",
"//ortools/util:stats",
"@abseil-cpp//absl/log",
"@abseil-cpp//absl/log:check",
"@protobuf",
],
)