bazel: backport from main
This commit is contained in:
@@ -380,7 +380,7 @@ cc_library(
|
||||
"@abseil-cpp//absl/status",
|
||||
"@abseil-cpp//absl/status:statusor",
|
||||
"@abseil-cpp//absl/time",
|
||||
"@protobuf",
|
||||
"@protobuf//:duration_cc_proto",
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
@@ -412,6 +412,7 @@ cc_library(
|
||||
":status",
|
||||
":variables_info",
|
||||
"//ortools/base",
|
||||
"//ortools/base:numbers",
|
||||
"//ortools/base:timer",
|
||||
"//ortools/linear_solver:linear_solver_cc_proto",
|
||||
"//ortools/lp_data",
|
||||
|
||||
@@ -180,8 +180,9 @@ cc_library(
|
||||
|
||||
cc_test(
|
||||
name = "bidirectional_dijkstra_test",
|
||||
size = "medium",
|
||||
size = "small",
|
||||
srcs = ["bidirectional_dijkstra_test.cc"],
|
||||
tags = ["noci"],
|
||||
deps = [
|
||||
":bidirectional_dijkstra",
|
||||
":bounded_dijkstra",
|
||||
@@ -394,7 +395,7 @@ cc_test(
|
||||
name = "shortest_paths_test",
|
||||
size = "enormous",
|
||||
srcs = ["shortest_paths_test.cc"],
|
||||
tags = ["noasan"], # Times out occasionally in ASAN mode.
|
||||
tags = ["noci"], # Times out occasionally in ASAN mode.
|
||||
deps = [
|
||||
":shortest_paths",
|
||||
"//ortools/base:gmock_main",
|
||||
@@ -542,6 +543,7 @@ cc_test(
|
||||
name = "min_cost_flow_test",
|
||||
size = "medium",
|
||||
srcs = ["min_cost_flow_test.cc"],
|
||||
tags = ["noci"],
|
||||
deps = [
|
||||
":min_cost_flow",
|
||||
"//ortools/base:gmock_main",
|
||||
|
||||
@@ -21,12 +21,14 @@ cc_library(
|
||||
hdrs = ["init.h"],
|
||||
deps = [
|
||||
"//ortools/base",
|
||||
"//ortools/base:logging",
|
||||
"//ortools/sat:cp_model_solver",
|
||||
"//ortools/sat:cp_model_solver_helpers",
|
||||
"//ortools/sat:cp_model_utils",
|
||||
"//ortools/third_party_solvers:gurobi_environment",
|
||||
"@abseil-cpp//absl/base:log_severity",
|
||||
"@abseil-cpp//absl/flags:flag",
|
||||
"@abseil-cpp//absl/log",
|
||||
"@abseil-cpp//absl/log:globals",
|
||||
"@abseil-cpp//absl/log:initialize",
|
||||
"@abseil-cpp//absl/strings:string_view",
|
||||
],
|
||||
)
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "absl/strings/string_view.h"
|
||||
#include "ortools/base/init_google.h"
|
||||
#include "ortools/sat/cp_model_solver.h"
|
||||
#include "ortools/sat/cp_model_solver_helpers.h"
|
||||
#include "ortools/sat/cp_model_utils.h"
|
||||
#include "ortools/third_party_solvers/gurobi_environment.h"
|
||||
|
||||
namespace operations_research {
|
||||
|
||||
Reference in New Issue
Block a user