From 8907ee695ef1993697a0c8bef60d2faeaa6d8deb Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Fri, 23 Feb 2024 09:14:28 +0100 Subject: [PATCH] Move proto_solver deps to be guarded by select(). --- ortools/linear_solver/BUILD.bazel | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ortools/linear_solver/BUILD.bazel b/ortools/linear_solver/BUILD.bazel index 49523632cb..5998d21f0c 100644 --- a/ortools/linear_solver/BUILD.bazel +++ b/ortools/linear_solver/BUILD.bazel @@ -267,11 +267,8 @@ cc_library( "//ortools/base:timer", "//ortools/gurobi:environment", "//ortools/gurobi:gurobi_util", - "//ortools/linear_solver/proto_solver:glop_proto_solver", "//ortools/linear_solver/proto_solver:gurobi_proto_solver", - "//ortools/linear_solver/proto_solver:pdlp_proto_solver", "//ortools/linear_solver/proto_solver:sat_proto_solver", - "//ortools/linear_solver/proto_solver:scip_proto_solver", "//ortools/port:file", "//ortools/port:proto_utils", "//ortools/sat:cp_model_cc_proto", @@ -295,6 +292,7 @@ cc_library( ":use_glop": [ "//ortools/glop:lp_solver", "//ortools/glop:parameters_cc_proto", + "//ortools/linear_solver/proto_solver:glop_proto_solver", ], "//conditions:default": [], }) + select({ @@ -305,6 +303,7 @@ cc_library( "//conditions:default": [], }) + select({ ":use_pdlp": [ + "//ortools/linear_solver/proto_solver:pdlp_proto_solver", "//ortools/pdlp:primal_dual_hybrid_gradient", "//ortools/pdlp:solve_log_cc_proto", "//ortools/pdlp:solvers_cc_proto", @@ -314,6 +313,7 @@ cc_library( ":use_scip": [ ":scip_with_glop", "//ortools/gscip:legacy_scip_params", + "//ortools/linear_solver/proto_solver:scip_proto_solver", ], "//conditions:default": [], }),