From 3af814269344b2498fc2dcc9ff149f3b872816e4 Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Sat, 22 May 2021 20:00:57 +0200 Subject: [PATCH] bazel: Fix math_opt BUILD --- ortools/math_opt/core/BUILD | 14 +++++++++ ortools/math_opt/cpp/BUILD | 24 ++++++++-------- ortools/math_opt/solvers/BUILD | 35 ++++++++++++----------- ortools/math_opt/solvers/gurobi_solver.cc | 2 +- ortools/math_opt/validators/BUILD | 24 ++++++++-------- 5 files changed, 57 insertions(+), 42 deletions(-) diff --git a/ortools/math_opt/core/BUILD b/ortools/math_opt/core/BUILD index b5522f850d..f824879f40 100644 --- a/ortools/math_opt/core/BUILD +++ b/ortools/math_opt/core/BUILD @@ -9,6 +9,7 @@ cc_library( "//ortools/base", "//ortools/math_opt:callback_cc_proto", "//ortools/math_opt:model_cc_proto", + "//ortools/math_opt:model_update_cc_proto", "//ortools/math_opt:sparse_containers_cc_proto", "@com_google_absl//absl/container:flat_hash_set", ], @@ -40,12 +41,25 @@ cc_library( ], ) +cc_library( + name = "model_update_merge", + srcs = ["model_update_merge.cc"], + hdrs = ["model_update_merge.h"], + deps = [ + "//ortools/base", + "//ortools/math_opt:model_cc_proto", + "//ortools/math_opt:model_update_cc_proto", + "//ortools/math_opt:sparse_containers_cc_proto", + ], +) + cc_library( name = "indexed_model", srcs = ["indexed_model.cc"], hdrs = ["indexed_model.h"], deps = [ ":sparse_vector_view", + ":model_update_merge", "//ortools/base", "//ortools/base:int_type", "//ortools/base:map_util", diff --git a/ortools/math_opt/cpp/BUILD b/ortools/math_opt/cpp/BUILD index e24214ae28..78e9788140 100644 --- a/ortools/math_opt/cpp/BUILD +++ b/ortools/math_opt/cpp/BUILD @@ -19,12 +19,12 @@ cc_library( "//ortools/base:int_type", "//ortools/base:status_macros", "//ortools/math_opt:callback_cc_proto", - "//ortools/math_opt:indexed_model", + "//ortools/math_opt/core:indexed_model", "//ortools/math_opt:model_cc_proto", "//ortools/math_opt:model_update_cc_proto", "//ortools/math_opt:parameters_cc_proto", "//ortools/math_opt:result_cc_proto", - "//ortools/math_opt:solver", + "//ortools/math_opt/core:solver", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/memory", "@com_google_absl//absl/status:statusor", @@ -40,7 +40,7 @@ cc_library( ":key_types", "//ortools/base", "//ortools/base:int_type", - "//ortools/math_opt:indexed_model", + "//ortools/math_opt/core:indexed_model", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/types:span", @@ -57,7 +57,7 @@ cc_library( "//ortools/base", "//ortools/base:int_type", "//ortools/base:map_util", - "//ortools/math_opt:indexed_model", + "//ortools/math_opt/core:indexed_model", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/container:flat_hash_map", ], @@ -73,7 +73,7 @@ cc_library( ":variable_and_expressions", "//ortools/base", "//ortools/base:int_type", - "//ortools/math_opt:indexed_model", + "//ortools/math_opt/core:indexed_model", ], ) @@ -85,7 +85,7 @@ cc_library( ":key_types", ":variable_and_expressions", "//ortools/base", - "//ortools/math_opt:indexed_model", + "//ortools/math_opt/core:indexed_model", "@com_google_absl//absl/container:flat_hash_map", ], ) @@ -99,7 +99,7 @@ cc_library( ":variable_and_expressions", "//ortools/base", "//ortools/base:protoutil", - "//ortools/math_opt:indexed_model", + "//ortools/math_opt/core:indexed_model", "//ortools/math_opt:result_cc_proto", "//ortools/math_opt:solution_cc_proto", "@com_google_absl//absl/status:statusor", @@ -131,10 +131,10 @@ cc_library( "//ortools/base:protoutil", "//ortools/base:status_macros", "//ortools/math_opt:callback_cc_proto", - "//ortools/math_opt:indexed_model", + "//ortools/math_opt/core:indexed_model", "//ortools/math_opt:solution_cc_proto", "//ortools/math_opt:sparse_containers_cc_proto", - "//ortools/math_opt:sparse_vector_view", + "//ortools/math_opt/core:sparse_vector_view", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", @@ -153,7 +153,7 @@ cc_library( hdrs = ["key_types.h"], deps = [ "//ortools/base", - "//ortools/math_opt:indexed_model", + "//ortools/math_opt/core:indexed_model", "@com_google_absl//absl/strings", ], ) @@ -166,7 +166,7 @@ cc_library( ":key_types", ":result", "//ortools/base", - "//ortools/math_opt:indexed_model", + "//ortools/math_opt/core:indexed_model", "//ortools/math_opt:solution_cc_proto", "@com_google_absl//absl/container:flat_hash_set", "@com_google_protobuf//:protobuf", @@ -183,7 +183,7 @@ cc_library( ":map_filter", ":result", ":variable_and_expressions", - "//ortools/math_opt:indexed_model", + "//ortools/math_opt/core:indexed_model", "//ortools/math_opt:model_parameters_cc_proto", "//ortools/math_opt:solution_cc_proto", "//ortools/math_opt:sparse_containers_cc_proto", diff --git a/ortools/math_opt/solvers/BUILD b/ortools/math_opt/solvers/BUILD index 9bfbbaf0d4..0ab0549fff 100644 --- a/ortools/math_opt/solvers/BUILD +++ b/ortools/math_opt/solvers/BUILD @@ -18,16 +18,16 @@ cc_library( "//ortools/gscip:gscip_parameters", "//ortools/linear_solver:scip_with_glop", "//ortools/math_opt:callback_cc_proto", - "//ortools/math_opt:math_opt_proto_utils", + "//ortools/math_opt/core:math_opt_proto_utils", "//ortools/math_opt:model_cc_proto", "//ortools/math_opt:model_parameters_cc_proto", "//ortools/math_opt:model_update_cc_proto", "//ortools/math_opt:parameters_cc_proto", "//ortools/math_opt:result_cc_proto", "//ortools/math_opt:solution_cc_proto", - "//ortools/math_opt:solver_interface", + "//ortools/math_opt/core:solver_interface", "//ortools/math_opt:sparse_containers_cc_proto", - "//ortools/math_opt:sparse_vector_view", + "//ortools/math_opt/core:sparse_vector_view", "//ortools/port:proto_utils", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/container:flat_hash_set", @@ -54,11 +54,11 @@ cc_library( "//ortools/base:status_macros", "//ortools/gurobi:environment", "//ortools/math_opt:callback_cc_proto", - "//ortools/math_opt:math_opt_proto_utils", + "//ortools/math_opt/core:math_opt_proto_utils", "//ortools/math_opt:solution_cc_proto", - "//ortools/math_opt:solver_interface", + "//ortools/math_opt/core:solver_interface", "//ortools/math_opt:sparse_containers_cc_proto", - "//ortools/math_opt:sparse_vector_view", + "//ortools/math_opt/core:sparse_vector_view", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", @@ -86,17 +86,18 @@ cc_library( "//ortools/base:status_macros", "//ortools/gurobi:environment", "//ortools/math_opt:callback_cc_proto", - "//ortools/math_opt:math_opt_proto_utils", + "//ortools/math_opt/core:math_opt_proto_utils", "//ortools/math_opt:model_cc_proto", "//ortools/math_opt:model_parameters_cc_proto", "//ortools/math_opt:model_update_cc_proto", "//ortools/math_opt:parameters_cc_proto", "//ortools/math_opt:result_cc_proto", "//ortools/math_opt:solution_cc_proto", - "//ortools/math_opt:solver_interface", + "//ortools/math_opt/core:solver_interface", "//ortools/math_opt:sparse_containers_cc_proto", - "//ortools/math_opt:sparse_vector_view", + "//ortools/math_opt/core:sparse_vector_view", "//ortools/port:proto_utils", + "@com_google_absl//absl/cleanup", "@com_google_absl//absl/memory", "@com_google_absl//absl/status", "@com_google_absl//absl/status:statusor", @@ -127,16 +128,16 @@ cc_library( "//ortools/lp_data", "//ortools/lp_data:base", "//ortools/math_opt:callback_cc_proto", - "//ortools/math_opt:math_opt_proto_utils", + "//ortools/math_opt/core:math_opt_proto_utils", "//ortools/math_opt:model_cc_proto", "//ortools/math_opt:model_parameters_cc_proto", "//ortools/math_opt:model_update_cc_proto", "//ortools/math_opt:parameters_cc_proto", "//ortools/math_opt:result_cc_proto", "//ortools/math_opt:solution_cc_proto", - "//ortools/math_opt:solver_interface", + "//ortools/math_opt/core:solver_interface", "//ortools/math_opt:sparse_containers_cc_proto", - "//ortools/math_opt:sparse_vector_view", + "//ortools/math_opt/core:sparse_vector_view", "//ortools/port:proto_utils", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/memory", @@ -164,15 +165,15 @@ cc_library( # For sat_proto_solver.h/cc, this needs to be broken up. "//ortools/linear_solver", "//ortools/math_opt:callback_cc_proto", - "//ortools/math_opt:math_opt_proto_utils", + "//ortools/math_opt/core:math_opt_proto_utils", "//ortools/math_opt:model_cc_proto", "//ortools/math_opt:model_parameters_cc_proto", "//ortools/math_opt:model_update_cc_proto", "//ortools/math_opt:parameters_cc_proto", - "//ortools/math_opt:proto_converter", + "//ortools/math_opt/io:proto_converter", "//ortools/math_opt:result_cc_proto", "//ortools/math_opt:solution_cc_proto", - "//ortools/math_opt:solver_interface", + "//ortools/math_opt/core:solver_interface", "//ortools/math_opt:sparse_containers_cc_proto", "//ortools/port:proto_utils", "//ortools/sat:sat_parameters_cc_proto", @@ -210,8 +211,8 @@ cc_library( "//ortools/linear_solver:scip_helper_macros", "//ortools/linear_solver:scip_with_glop", "//ortools/math_opt:callback_cc_proto", - "//ortools/math_opt:math_opt_proto_utils", - "//ortools/math_opt:solver_interface", + "//ortools/math_opt/core:math_opt_proto_utils", + "//ortools/math_opt/core:solver_interface", "@com_google_absl//absl/base:core_headers", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/memory", diff --git a/ortools/math_opt/solvers/gurobi_solver.cc b/ortools/math_opt/solvers/gurobi_solver.cc index 5b9eec0660..e2b3ab9678 100644 --- a/ortools/math_opt/solvers/gurobi_solver.cc +++ b/ortools/math_opt/solvers/gurobi_solver.cc @@ -25,7 +25,7 @@ #include "ortools/base/integral_types.h" #include "ortools/base/logging.h" -#include "ortools/base/cleanup.h" +#include "absl/cleanup/cleanup.h" #include "absl/memory/memory.h" #include "absl/status/status.h" #include "absl/status/statusor.h" diff --git a/ortools/math_opt/validators/BUILD b/ortools/math_opt/validators/BUILD index 31a93f908e..f7ecb4fbc6 100644 --- a/ortools/math_opt/validators/BUILD +++ b/ortools/math_opt/validators/BUILD @@ -7,7 +7,7 @@ cc_library( deps = [ "//ortools/base", "//ortools/base:status_macros", - "//ortools/math_opt:model_summary", + "//ortools/math_opt/core:model_summary", "@com_google_absl//absl/container:flat_hash_set", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", @@ -32,7 +32,7 @@ cc_library( ":ids_validator", ":scalar_validator", "//ortools/base:status_macros", - "//ortools/math_opt:sparse_vector_view", + "//ortools/math_opt/core:sparse_vector_view", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", ], @@ -47,8 +47,8 @@ cc_library( "//ortools/base", "//ortools/base:map_util", "//ortools/base:status_macros", - "//ortools/math_opt:model_summary", - "//ortools/math_opt:sparse_vector_view", + "//ortools/math_opt/core:model_summary", + "//ortools/math_opt/core:sparse_vector_view", "@com_google_absl//absl/container:flat_hash_map", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", @@ -68,10 +68,10 @@ cc_library( "//ortools/base", "//ortools/base:status_macros", "//ortools/math_opt:model_cc_proto", - "//ortools/math_opt:model_summary", + "//ortools/math_opt/core:model_summary", "//ortools/math_opt:model_update_cc_proto", "//ortools/math_opt:sparse_containers_cc_proto", - "//ortools/math_opt:sparse_vector_view", + "//ortools/math_opt/core:sparse_vector_view", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", @@ -88,14 +88,14 @@ cc_library( ":sparse_vector_validator", "//ortools/base", "//ortools/base:status_macros", - "//ortools/math_opt:math_opt_proto_utils", + "//ortools/math_opt/core:math_opt_proto_utils", "//ortools/math_opt:model_cc_proto", "//ortools/math_opt:model_parameters_cc_proto", - "//ortools/math_opt:model_summary", + "//ortools/math_opt/core:model_summary", "//ortools/math_opt:result_cc_proto", "//ortools/math_opt:solution_cc_proto", "//ortools/math_opt:sparse_containers_cc_proto", - "//ortools/math_opt:sparse_vector_view", + "//ortools/math_opt/core:sparse_vector_view", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", "@com_google_absl//absl/types:span", @@ -129,10 +129,10 @@ cc_library( "//ortools/base", "//ortools/base:status_macros", "//ortools/math_opt:callback_cc_proto", - "//ortools/math_opt:model_summary", + "//ortools/math_opt/core:model_summary", "//ortools/math_opt:solution_cc_proto", "//ortools/math_opt:sparse_containers_cc_proto", - "//ortools/math_opt:sparse_vector_view", + "//ortools/math_opt/core:sparse_vector_view", "//ortools/port:proto_utils", "@com_google_absl//absl/status", "@com_google_absl//absl/strings", @@ -149,7 +149,7 @@ cc_library( "//ortools/base", "//ortools/base:status_macros", "//ortools/math_opt:model_parameters_cc_proto", - "//ortools/math_opt:model_summary", + "//ortools/math_opt/core:model_summary", "//ortools/math_opt:sparse_containers_cc_proto", "//ortools/math_opt/validators:solution_validator", "@com_google_absl//absl/status",