diff --git a/ortools/WORKSPACE b/WORKSPACE similarity index 100% rename from ortools/WORKSPACE rename to WORKSPACE diff --git a/ortools/bazel/BUILD b/bazel/BUILD similarity index 100% rename from ortools/bazel/BUILD rename to bazel/BUILD diff --git a/ortools/bazel/glpk.BUILD b/bazel/glpk.BUILD similarity index 100% rename from ortools/bazel/glpk.BUILD rename to bazel/glpk.BUILD diff --git a/ortools/bazel/gtest.BUILD b/bazel/gtest.BUILD similarity index 100% rename from ortools/bazel/gtest.BUILD rename to bazel/gtest.BUILD diff --git a/ortools/bazel/swig.BUILD b/bazel/swig.BUILD similarity index 100% rename from ortools/bazel/swig.BUILD rename to bazel/swig.BUILD diff --git a/ortools/bazel/swig.bzl b/bazel/swig.bzl similarity index 100% rename from ortools/bazel/swig.bzl rename to bazel/swig.bzl diff --git a/examples/WORKSPACE b/examples/WORKSPACE deleted file mode 100644 index 014447bc8b..0000000000 --- a/examples/WORKSPACE +++ /dev/null @@ -1,38 +0,0 @@ -local_repository( - name = "or_tools_libraries", - path = "../src", -) - -git_repository( - name = "com_github_gflags_gflags", - commit = "f8a0efe03aa69b3336d8e228b37d4ccb17324b88", - remote = "https://github.com/gflags/gflags.git", -) - -# proto_library rules implicitly depend on @com_google_protobuf//:protoc, -# which is the proto-compiler. -# This statement defines the @com_google_protobuf repo. -http_archive( - name = "com_google_protobuf", - urls = ["https://github.com/google/protobuf/archive/b4b0e304be5a68de3d0ee1af9b286f958750f5e4.zip"], - strip_prefix = "protobuf-b4b0e304be5a68de3d0ee1af9b286f958750f5e4", - sha256 = "ff771a662fb6bd4d3cc209bcccedef3e93980a49f71df1e987f6afa3bcdcba3a", -) - -# cc_proto_library rules implicitly depend on -# @com_google_protobuf_cc//:cc_toolchain, which is the C++ proto runtime -# (base classes and common utilities). -http_archive( - name = "com_google_protobuf_cc", - urls = ["https://github.com/google/protobuf/archive/b4b0e304be5a68de3d0ee1af9b286f958750f5e4.zip"], - strip_prefix = "protobuf-b4b0e304be5a68de3d0ee1af9b286f958750f5e4", - sha256 = "ff771a662fb6bd4d3cc209bcccedef3e93980a49f71df1e987f6afa3bcdcba3a", -) - -new_http_archive( - name = "glpk", - url = "http://ftp.gnu.org/gnu/glpk/glpk-4.52.tar.gz", - sha256 = "9a5dab356268b4f177c33e00ddf8164496dc2434e83bd1114147024df983a3bb", - build_file = "../src/bazel/glpk.BUILD", -) - diff --git a/examples/cpp/BUILD b/examples/cpp/BUILD index aaf9cc64ea..c83a4f8a98 100644 --- a/examples/cpp/BUILD +++ b/examples/cpp/BUILD @@ -2,9 +2,9 @@ cc_binary( name = "costas_array", srcs = ["costas_array.cc"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//base:random", - "@or_tools_libraries//constraint_solver:cp", + "//ortools/base", + "//ortools/base:random", + "//ortools/constraint_solver:cp", ], ) @@ -13,8 +13,8 @@ cc_binary( srcs = ["cryptarithm.cc"], deps = [ "@com_google_protobuf_cc//:protobuf", - "@or_tools_libraries//base", - "@or_tools_libraries//constraint_solver:cp", + "//ortools/base", + "//ortools/constraint_solver:cp", ], ) @@ -23,10 +23,10 @@ cc_library( srcs = ["cvrptw_lib.cc"], hdrs = ["cvrptw_lib.h"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//base:random", - "@or_tools_libraries//constraint_solver:routing", - "@or_tools_libraries//constraint_solver:routing_flags", + "//ortools/base", + "//ortools/base:random", + "//ortools/constraint_solver:routing", + "//ortools/constraint_solver:routing_flags", ], ) @@ -35,10 +35,10 @@ cc_binary( srcs = ["cvrptw.cc"], deps = [ ":cvrptw_lib", - "@or_tools_libraries//base", - "@or_tools_libraries//base:random", - "@or_tools_libraries//constraint_solver:routing", - "@or_tools_libraries//constraint_solver:routing_flags", + "//ortools/base", + "//ortools/base:random", + "//ortools/constraint_solver:routing", + "//ortools/constraint_solver:routing_flags", ], ) @@ -47,9 +47,9 @@ cc_binary( srcs = ["cvrp_disjoint_tw.cc"], deps = [ ":cvrptw_lib", - "@or_tools_libraries//base", - "@or_tools_libraries//constraint_solver:routing", - "@or_tools_libraries//constraint_solver:routing_flags", + "//ortools/base", + "//ortools/constraint_solver:routing", + "//ortools/constraint_solver:routing_flags", ], ) @@ -58,12 +58,12 @@ cc_binary( srcs = ["cvrptw_with_breaks.cc"], deps = [ ":cvrptw_lib", - "@or_tools_libraries//base", - "@or_tools_libraries//base:random", - "@or_tools_libraries//base:strings", - "@or_tools_libraries//constraint_solver:routing", - "@or_tools_libraries//constraint_solver:routing_enums_cc_proto", - "@or_tools_libraries//constraint_solver:routing_flags", + "//ortools/base", + "//ortools/base:random", + "//ortools/base:strings", + "//ortools/constraint_solver:routing", + "//ortools/constraint_solver:routing_enums_cc_proto", + "//ortools/constraint_solver:routing_flags", ], ) @@ -72,10 +72,10 @@ cc_binary( srcs = ["cvrptw_with_resources.cc"], deps = [ ":cvrptw_lib", - "@or_tools_libraries//base", - "@or_tools_libraries//base:random", - "@or_tools_libraries//constraint_solver:routing", - "@or_tools_libraries//constraint_solver:routing_flags", + "//ortools/base", + "//ortools/base:random", + "//ortools/constraint_solver:routing", + "//ortools/constraint_solver:routing_flags", ], ) @@ -84,11 +84,11 @@ cc_binary( srcs = ["cvrptw_with_stop_times_and_resources.cc"], deps = [ ":cvrptw_lib", - "@or_tools_libraries//base", - "@or_tools_libraries//base:random", - "@or_tools_libraries//base:strings", - "@or_tools_libraries//constraint_solver:routing", - "@or_tools_libraries//constraint_solver:routing_flags", + "//ortools/base", + "//ortools/base:random", + "//ortools/base:strings", + "//ortools/constraint_solver:routing", + "//ortools/constraint_solver:routing_flags", ], ) @@ -97,10 +97,10 @@ cc_binary( srcs = ["cvrptw_with_refueling.cc"], deps = [ ":cvrptw_lib", - "@or_tools_libraries//base", - "@or_tools_libraries//base:random", - "@or_tools_libraries//constraint_solver:routing", - "@or_tools_libraries//constraint_solver:routing_flags", + "//ortools/base", + "//ortools/base:random", + "//ortools/constraint_solver:routing", + "//ortools/constraint_solver:routing_flags", ], ) @@ -108,11 +108,11 @@ cc_library( name = "print_dimacs_assignment", hdrs = ["print_dimacs_assignment.h"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//base:file", - "@or_tools_libraries//base:status", - "@or_tools_libraries//graph:ebert_graph", - "@or_tools_libraries//graph:linear_assignment", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:status", + "//ortools/graph:ebert_graph", + "//ortools/graph:linear_assignment", ], ) @@ -121,11 +121,11 @@ cc_library( srcs = ["parse_dimacs_assignment.cc"], hdrs = ["parse_dimacs_assignment.h"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//base:callback", - "@or_tools_libraries//graph:ebert_graph", - "@or_tools_libraries//graph:linear_assignment", - "@or_tools_libraries//util:filelineiter", + "//ortools/base", + "//ortools/base:callback", + "//ortools/graph:ebert_graph", + "//ortools/graph:linear_assignment", + "//ortools/util:filelineiter", ], ) @@ -135,11 +135,11 @@ cc_binary( deps = [ ":parse_dimacs_assignment", ":print_dimacs_assignment", - "@or_tools_libraries//algorithms:hungarian", - "@or_tools_libraries//base", - "@or_tools_libraries//base:timer", - "@or_tools_libraries//graph:ebert_graph", - "@or_tools_libraries//graph:linear_assignment", + "//ortools/algorithms:hungarian", + "//ortools/base", + "//ortools/base:timer", + "//ortools/graph:ebert_graph", + "//ortools/graph:linear_assignment", ], ) @@ -147,11 +147,11 @@ cc_binary( name = "dobble_ls", srcs = ["dobble_ls.cc"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//base:map_util", - "@or_tools_libraries//base:random", - "@or_tools_libraries//constraint_solver:cp", - "@or_tools_libraries//util:bitset", + "//ortools/base", + "//ortools/base:map_util", + "//ortools/base:random", + "//ortools/constraint_solver:cp", + "//ortools/util:bitset", ], ) @@ -159,10 +159,10 @@ cc_binary( name = "flow_api", srcs = ["flow_api.cc"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//graph:ebert_graph", - "@or_tools_libraries//graph:max_flow", - "@or_tools_libraries//graph:min_cost_flow", + "//ortools/base", + "//ortools/graph:ebert_graph", + "//ortools/graph:max_flow", + "//ortools/graph:min_cost_flow", ], ) @@ -171,11 +171,11 @@ cc_library( srcs = ["fap_parser.cc"], hdrs = ["fap_parser.h"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//base:file", - "@or_tools_libraries//base:hash", - "@or_tools_libraries//base:map_util", - "@or_tools_libraries//base:strings", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:hash", + "//ortools/base:map_util", + "//ortools/base:strings", ], ) @@ -185,9 +185,9 @@ cc_library( hdrs = ["fap_model_printer.h"], deps = [ ":fap_parser", - "@or_tools_libraries//base", - "@or_tools_libraries//base:file", - "@or_tools_libraries//base:strings", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:strings", ], ) @@ -197,9 +197,9 @@ cc_library( hdrs = ["fap_utilities.h"], deps = [ ":fap_parser", - "@or_tools_libraries//base", - "@or_tools_libraries//base:map_util", - "@or_tools_libraries//constraint_solver:cp", + "//ortools/base", + "//ortools/base:map_util", + "//ortools/constraint_solver:cp", ], ) @@ -210,9 +210,9 @@ cc_binary( ":fap_model_printer", ":fap_parser", ":fap_utilities", - "@or_tools_libraries//base", - "@or_tools_libraries//base:map_util", - "@or_tools_libraries//constraint_solver:cp", + "//ortools/base", + "//ortools/base:map_util", + "//ortools/constraint_solver:cp", ], ) @@ -220,8 +220,8 @@ cc_binary( name = "golomb", srcs = ["golomb.cc"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//constraint_solver:cp", + "//ortools/base", + "//ortools/constraint_solver:cp", ], ) @@ -229,8 +229,8 @@ cc_binary( name = "integer_programming", srcs = ["integer_programming.cc"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//linear_solver:linear_solver", + "//ortools/base", + "//ortools/linear_solver:linear_solver", ], ) @@ -238,9 +238,9 @@ cc_library( name = "jobshop_reader", hdrs = ["jobshop.h"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//base:strings", - "@or_tools_libraries//util:filelineiter", + "//ortools/base", + "//ortools/base:strings", + "//ortools/util:filelineiter", ], ) @@ -248,10 +248,10 @@ cc_library( name = "flexible_jobshop_reader", hdrs = ["flexible_jobshop.h"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//base:strings", - "@or_tools_libraries//util:filelineiter", - "@or_tools_libraries//util:string_array", + "//ortools/base", + "//ortools/base:strings", + "//ortools/util:filelineiter", + "//ortools/util:string_array", ], ) @@ -262,9 +262,9 @@ cc_binary( ], deps = [ ":flexible_jobshop_reader", - "@or_tools_libraries//base", - "@or_tools_libraries//base:strings", - "@or_tools_libraries//constraint_solver:cp", + "//ortools/base", + "//ortools/base:strings", + "//ortools/constraint_solver:cp", ], ) @@ -275,9 +275,9 @@ cc_binary( ], deps = [ ":jobshop_reader", - "@or_tools_libraries//base", - "@or_tools_libraries//base:strings", - "@or_tools_libraries//constraint_solver:cp", + "//ortools/base", + "//ortools/base:strings", + "//ortools/constraint_solver:cp", ], ) @@ -289,17 +289,17 @@ cc_binary( deps = [ ":flexible_jobshop_reader", ":jobshop_reader", - "@or_tools_libraries//base", - "@or_tools_libraries//base:file", - "@or_tools_libraries//base:strings", - "@or_tools_libraries//base:timer", - "@or_tools_libraries//sat:disjunctive", - "@or_tools_libraries//sat:integer", - "@or_tools_libraries//sat:intervals", - "@or_tools_libraries//sat:model", - "@or_tools_libraries//sat:optimization", - "@or_tools_libraries//sat:precedences", - "@or_tools_libraries//sat:sat_solver", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:strings", + "//ortools/base:timer", + "//ortools/sat:disjunctive", + "//ortools/sat:integer", + "//ortools/sat:intervals", + "//ortools/sat:model", + "//ortools/sat:optimization", + "//ortools/sat:precedences", + "//ortools/sat:sat_solver", ], ) @@ -308,9 +308,9 @@ cc_binary( srcs = ["linear_programming.cc"], copts = ["-DUSE_GLOP"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//linear_solver:linear_solver", - "@or_tools_libraries//linear_solver:linear_solver_cc_proto", + "//ortools/base", + "//ortools/linear_solver:linear_solver", + "//ortools/linear_solver:linear_solver_cc_proto", ], ) @@ -318,9 +318,9 @@ cc_binary( name = "linear_solver_protocol_buffers", srcs = ["linear_solver_protocol_buffers.cc"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//linear_solver:linear_solver", - "@or_tools_libraries//linear_solver:linear_solver_cc_proto", + "//ortools/base", + "//ortools/linear_solver:linear_solver", + "//ortools/linear_solver:linear_solver_cc_proto", ], ) @@ -328,12 +328,12 @@ cc_binary( name = "ls_api", srcs = ["ls_api.cc"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//base:hash", - "@or_tools_libraries//base:map_util", - "@or_tools_libraries//base:random", - "@or_tools_libraries//base:stl_util", - "@or_tools_libraries//constraint_solver:cp", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:map_util", + "//ortools/base:random", + "//ortools/base:stl_util", + "//ortools/constraint_solver:cp", ], ) @@ -341,8 +341,8 @@ cc_binary( name = "magic_square", srcs = ["magic_square.cc"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//constraint_solver:cp", + "//ortools/base", + "//ortools/constraint_solver:cp", ], ) @@ -350,13 +350,13 @@ cc_binary( name = "network_routing", srcs = ["network_routing.cc"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//base:hash", - "@or_tools_libraries//base:map_util", - "@or_tools_libraries//base:random", - "@or_tools_libraries//constraint_solver:cp", - "@or_tools_libraries//graph:shortestpaths", - "@or_tools_libraries//util:tuple_set", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:map_util", + "//ortools/base:random", + "//ortools/constraint_solver:cp", + "//ortools/graph:shortestpaths", + "//ortools/util:tuple_set", ], ) @@ -366,21 +366,21 @@ cc_binary( "rcpsp_sat.cc", ], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//base:file", - "@or_tools_libraries//base:strings", - "@or_tools_libraries//sat:cp_constraints", - "@or_tools_libraries//sat:cumulative", - "@or_tools_libraries//sat:disjunctive", - "@or_tools_libraries//sat:integer", - "@or_tools_libraries//sat:integer_expr", - "@or_tools_libraries//sat:intervals", - "@or_tools_libraries//sat:model", - "@or_tools_libraries//sat:optimization", - "@or_tools_libraries//sat:precedences", - "@or_tools_libraries//sat:sat_solver", - "@or_tools_libraries//util:filelineiter", - "@or_tools_libraries//util:rcpsp_parser", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:strings", + "//ortools/sat:cp_constraints", + "//ortools/sat:cumulative", + "//ortools/sat:disjunctive", + "//ortools/sat:integer", + "//ortools/sat:integer_expr", + "//ortools/sat:intervals", + "//ortools/sat:model", + "//ortools/sat:optimization", + "//ortools/sat:precedences", + "//ortools/sat:sat_solver", + "//ortools/util:filelineiter", + "//ortools/util:rcpsp_parser", ], ) @@ -388,9 +388,9 @@ cc_binary( name = "nqueens", srcs = ["nqueens.cc"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//base:map_util", - "@or_tools_libraries//constraint_solver:cp", + "//ortools/base", + "//ortools/base:map_util", + "//ortools/constraint_solver:cp", ], ) @@ -398,12 +398,12 @@ cc_binary( name = "pdptw", srcs = ["pdptw.cc"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//base:file", - "@or_tools_libraries//base:mathutil", - "@or_tools_libraries//base:strings", - "@or_tools_libraries//constraint_solver:routing", - "@or_tools_libraries//constraint_solver:routing_flags", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:mathutil", + "//ortools/base:strings", + "//ortools/constraint_solver:routing", + "//ortools/constraint_solver:routing_flags", ], ) @@ -416,27 +416,27 @@ cc_binary( ], deps = [ "@com_google_protobuf_cc//:protobuf", - "@or_tools_libraries//sat:boolean_problem", - "@or_tools_libraries//sat:boolean_problem_cc_proto", - # "@or_tools_libraries//sat:cp_model_proto", - # "@or_tools_libraries//sat:cp_model_solver", - "@or_tools_libraries//sat:drat", - "@or_tools_libraries//sat:lp_utils", - "@or_tools_libraries//sat:optimization", - "@or_tools_libraries//sat:sat_solver", - "@or_tools_libraries//sat:simplification", - "@or_tools_libraries//sat:symmetry", - "@or_tools_libraries//base", - "@or_tools_libraries//base:file", - "@or_tools_libraries//base:strings", - "@or_tools_libraries//base:status", - "@or_tools_libraries//base:random", - "@or_tools_libraries//base:threadpool", - "@or_tools_libraries//algorithms:sparse_permutation", - "@or_tools_libraries//lp_data:mps_reader", - "@or_tools_libraries//lp_data:proto_utils", - "@or_tools_libraries//util:filelineiter", - "@or_tools_libraries//util:time_limit", + "//ortools/sat:boolean_problem", + "//ortools/sat:boolean_problem_cc_proto", + # "//ortools/sat:cp_model_proto", + # "//ortools/sat:cp_model_solver", + "//ortools/sat:drat", + "//ortools/sat:lp_utils", + "//ortools/sat:optimization", + "//ortools/sat:sat_solver", + "//ortools/sat:simplification", + "//ortools/sat:symmetry", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:strings", + "//ortools/base:status", + "//ortools/base:random", + "//ortools/base:threadpool", + "//ortools/algorithms:sparse_permutation", + "//ortools/lp_data:mps_reader", + "//ortools/lp_data:proto_utils", + "//ortools/util:filelineiter", + "//ortools/util:time_limit", ], ) @@ -446,18 +446,18 @@ cc_binary( # "shift_minimization_sat.cc", # ], # deps = [ -# "@or_tools_libraries//base", -# "@or_tools_libraries//base:file", -# "@or_tools_libraries//base:strings", -# "@or_tools_libraries//sat:cp_constraints", -# "@or_tools_libraries//sat:integer", -# "@or_tools_libraries//sat:integer_expr", -# "@or_tools_libraries//sat:model", -# "@or_tools_libraries//sat:optimization", -# "@or_tools_libraries//sat:precedences", -# "@or_tools_libraries//sat:sat_solver", -# "@or_tools_libraries//util:bp_parser", -# "@or_tools_libraries//util:filelineiter", +# "//ortools/base", +# "//ortools/base:file", +# "//ortools/base:strings", +# "//ortools/sat:cp_constraints", +# "//ortools/sat:integer", +# "//ortools/sat:integer_expr", +# "//ortools/sat:model", +# "//ortools/sat:optimization", +# "//ortools/sat:precedences", +# "//ortools/sat:sat_solver", +# "//ortools/util:bp_parser", +# "//ortools/util:filelineiter", # ], #) @@ -469,10 +469,10 @@ cc_binary( "-DUSE_BOP", ], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//linear_solver:linear_solver", - "@or_tools_libraries//linear_solver:linear_solver_cc_proto", - "@or_tools_libraries//lp_data:mps_reader", + "//ortools/base", + "//ortools/linear_solver:linear_solver", + "//ortools/linear_solver:linear_solver_cc_proto", + "//ortools/lp_data:mps_reader", ], ) @@ -480,8 +480,8 @@ cc_binary( name = "sports_scheduling", srcs = ["sports_scheduling.cc"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//constraint_solver:cp", + "//ortools/base", + "//ortools/constraint_solver:cp", ], ) @@ -490,8 +490,8 @@ cc_binary( srcs = ["strawberry_fields_with_column_generation.cc"], copts = ["-DUSE_GLOP"], deps = [ - "@or_tools_libraries//base", - "@or_tools_libraries//linear_solver:linear_solver", + "//ortools/base", + "//ortools/linear_solver:linear_solver", ], ) @@ -500,10 +500,10 @@ cc_binary( srcs = ["tsp.cc"], deps = [ "@com_google_protobuf_cc//:protobuf", - "@or_tools_libraries//base", - "@or_tools_libraries//constraint_solver:cp", - "@or_tools_libraries//constraint_solver:routing", - "@or_tools_libraries//constraint_solver:routing_flags", + "//ortools/base", + "//ortools/constraint_solver:cp", + "//ortools/constraint_solver:routing", + "//ortools/constraint_solver:routing_flags", ], ) @@ -514,17 +514,17 @@ cc_binary( ], deps = [ "@com_google_protobuf_cc//:protobuf", - "@or_tools_libraries//base", - "@or_tools_libraries//base:file", - "@or_tools_libraries//base:strings", - "@or_tools_libraries//sat:disjunctive", - "@or_tools_libraries//sat:integer", - "@or_tools_libraries//sat:integer_expr", - "@or_tools_libraries//sat:intervals", - "@or_tools_libraries//sat:model", - "@or_tools_libraries//sat:optimization", - "@or_tools_libraries//sat:precedences", - "@or_tools_libraries//sat:sat_solver", - "@or_tools_libraries//util:filelineiter", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:strings", + "//ortools/sat:disjunctive", + "//ortools/sat:integer", + "//ortools/sat:integer_expr", + "//ortools/sat:intervals", + "//ortools/sat:model", + "//ortools/sat:optimization", + "//ortools/sat:precedences", + "//ortools/sat:sat_solver", + "//ortools/util:filelineiter", ], ) diff --git a/ortools/algorithms/BUILD b/ortools/algorithms/BUILD index ec6c85b770..9a47212ca2 100644 --- a/ortools/algorithms/BUILD +++ b/ortools/algorithms/BUILD @@ -5,8 +5,8 @@ cc_library( srcs = ["hungarian.cc"], hdrs = ["hungarian.h"], deps = [ - "//base", - "//base:hash", + "//ortools/base", + "//ortools/base:hash", ], ) @@ -17,10 +17,10 @@ cc_test( copts = ["-Iexternal/gtest/include"], deps = [ ":hungarian", - "//base", - "//base:map_util", - "//base:random", - "//base:strings", + "//ortools/base", + "//ortools/base:map_util", + "//ortools/base:random", + "//ortools/base:strings", "@gtest//:main", ], ) @@ -30,8 +30,8 @@ cc_library( hdrs = ["knapsack_solver.h"], deps = [ ":knapsack_solver_for_interface_lib", - "//base", - "//util:time_limit", + "//ortools/base", + "//ortools/util:time_limit", ], ) @@ -40,9 +40,9 @@ cc_library( hdrs = ["knapsack_solver.h"], deps = [ ":knapsack_solver_for_interface_lib", - "//base", - "//linear_solver", - "//util:time_limit", + "//ortools/base", + "//ortools/linear_solver", + "//ortools/util:time_limit", ], ) @@ -51,11 +51,11 @@ cc_library( srcs = ["knapsack_solver.cc"], hdrs = ["knapsack_solver.h"], deps = [ - "//base", - "//base:stl_util", - "//linear_solver", - "//util:bitset", - "//util:time_limit", + "//ortools/base", + "//ortools/base:stl_util", + "//ortools/linear_solver", + "//ortools/util:bitset", + "//ortools/util:time_limit", ], ) @@ -63,7 +63,7 @@ cc_library( name = "dense_doubly_linked_list", hdrs = ["dense_doubly_linked_list.h"], deps = [ - "//base", + "//ortools/base", ], ) @@ -72,9 +72,9 @@ cc_library( srcs = ["dynamic_partition.cc"], hdrs = ["dynamic_partition.h"], deps = [ - "//base", - "//base:murmur", - "//base:strings", + "//ortools/base", + "//ortools/base:murmur", + "//ortools/base:strings", ], ) @@ -83,8 +83,8 @@ cc_library( srcs = ["sparse_permutation.cc"], hdrs = ["sparse_permutation.h"], deps = [ - "//base", - "//base:strings", + "//ortools/base", + "//ortools/base:strings", ], ) @@ -94,8 +94,8 @@ cc_library( hdrs = ["dynamic_permutation.h"], deps = [ ":sparse_permutation", - "//base", - "//base:strings", + "//ortools/base", + "//ortools/base:strings", ], ) @@ -108,13 +108,13 @@ cc_library( ":dynamic_partition", ":dynamic_permutation", ":sparse_permutation", - "//base", - "//base:status", - "//base:strings", - "//graph", - "//graph:util", - "//util:iterators", - "//util:stats", - "//util:time_limit", + "//ortools/base", + "//ortools/base:status", + "//ortools/base:strings", + "//ortools/graph", + "//ortools/graph:util", + "//ortools/util:iterators", + "//ortools/util:stats", + "//ortools/util:time_limit", ], ) diff --git a/ortools/base/BUILD b/ortools/base/BUILD index b35c45feb7..c779706693 100644 --- a/ortools/base/BUILD +++ b/ortools/base/BUILD @@ -322,7 +322,7 @@ cc_library( "adjustable_priority_queue-inl.h", ], deps = [ - "//base", + ":base", ], ) diff --git a/ortools/bop/BUILD b/ortools/bop/BUILD index 8df10091a0..c1a86311fc 100644 --- a/ortools/bop/BUILD +++ b/ortools/bop/BUILD @@ -14,9 +14,9 @@ cc_library( name = "bop_types", hdrs = ["bop_types.h"], deps = [ - "//base", - "//base:int_type", - "//base:int_type_indexed_vector", + "//ortools/base", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", ], ) @@ -28,20 +28,20 @@ cc_library( ":bop_parameters_cc_proto", ":bop_solution", ":bop_types", - "//base", - "//base:int_type", - "//base:int_type_indexed_vector", - # "//glop:lp_solver", - "//glop", - "//lp_data:base", - "//sat:boolean_problem", - "//sat:boolean_problem_cc_proto", - "//sat:clause", - "//sat:sat_base", - "//sat:sat_solver", - # "//thread", - "//util:stats", - "//util:time_limit", + "//ortools/base", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + # "//ortools/glop:lp_solver", + "//ortools/glop", + "//ortools/lp_data:base", + "//ortools/sat:boolean_problem", + "//ortools/sat:boolean_problem_cc_proto", + "//ortools/sat:clause", + "//ortools/sat:sat_base", + "//ortools/sat:sat_solver", + # "//ortools/thread", + "//ortools/util:stats", + "//ortools/util:time_limit", ], ) @@ -52,9 +52,9 @@ cc_library( deps = [ ":bop_base", ":bop_solution", - "//base", - "//sat:boolean_problem", - "//sat:sat_solver", + "//ortools/base", + "//ortools/sat:boolean_problem", + "//ortools/sat:sat_solver", ], ) @@ -64,11 +64,11 @@ cc_library( hdrs = ["bop_solution.h"], deps = [ ":bop_types", - "//base", - "//base:int_type", - "//base:int_type_indexed_vector", - "//sat:boolean_problem", - "//sat:boolean_problem_cc_proto", + "//ortools/base", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/sat:boolean_problem", + "//ortools/sat:boolean_problem_cc_proto", ], ) @@ -82,24 +82,24 @@ cc_library( ":bop_solution", ":bop_types", ":bop_util", - "//algorithms:sparse_permutation", - "//base", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:random", - "//base:stl_util", - # "//glop:lp_solver", - "//glop", - "//lp_data:lp_print_utils", - "//sat:boolean_problem", - "//sat:boolean_problem_cc_proto", - "//sat:lp_utils", - "//sat:sat_solver", - "//sat:symmetry", - "//sat:util", - "//util:bitset", - "//util:stats", - "//util:time_limit", + "//ortools/algorithms:sparse_permutation", + "//ortools/base", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:random", + "//ortools/base:stl_util", + # "//ortools/glop:lp_solver", + "//ortools/glop", + "//ortools/lp_data:lp_print_utils", + "//ortools/sat:boolean_problem", + "//ortools/sat:boolean_problem_cc_proto", + "//ortools/sat:lp_utils", + "//ortools/sat:sat_solver", + "//ortools/sat:symmetry", + "//ortools/sat:util", + "//ortools/util:bitset", + "//ortools/util:stats", + "//ortools/util:time_limit", "@com_google_protobuf_cc//:protobuf", ], ) @@ -114,22 +114,22 @@ cc_library( ":bop_solution", ":bop_types", ":bop_util", - "//base", - "//base:cleanup", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:random", - "//base:stl_util", - # "//glop:lp_solver", - "//glop", - "//lp_data:lp_print_utils", - "//sat:boolean_problem", - "//sat:boolean_problem_cc_proto", - "//sat:lp_utils", - "//sat:sat_solver", - "//util:bitset", - "//util:stats", - "//util:time_limit", + "//ortools/base", + "//ortools/base:cleanup", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:random", + "//ortools/base:stl_util", + # "//ortools/glop:lp_solver", + "//ortools/glop", + "//ortools/lp_data:lp_print_utils", + "//ortools/sat:boolean_problem", + "//ortools/sat:boolean_problem_cc_proto", + "//ortools/sat:lp_utils", + "//ortools/sat:sat_solver", + "//ortools/util:bitset", + "//ortools/util:stats", + "//ortools/util:time_limit", "@com_google_protobuf_cc//:protobuf", ], ) @@ -143,16 +143,16 @@ cc_library( ":bop_solution", ":bop_types", ":bop_util", - "//base", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:stl_util", - "//sat:boolean_problem", - "//sat:boolean_problem_cc_proto", - "//sat:encoding", - "//sat:optimization", - "//sat:sat_solver", - "//util:time_limit", + "//ortools/base", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:stl_util", + "//ortools/sat:boolean_problem", + "//ortools/sat:boolean_problem_cc_proto", + "//ortools/sat:encoding", + "//ortools/sat:optimization", + "//ortools/sat:sat_solver", + "//ortools/util:time_limit", ], ) @@ -165,15 +165,15 @@ cc_library( ":bop_solution", ":bop_types", ":bop_util", - "//base", - "//base:hash", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:random", - "//base:statusor", - "//sat:boolean_problem", - "//sat:boolean_problem_cc_proto", - "//sat:sat_solver", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:random", + "//ortools/base:statusor", + "//ortools/sat:boolean_problem", + "//ortools/sat:boolean_problem_cc_proto", + "//ortools/sat:sat_solver", ], ) @@ -191,20 +191,20 @@ cc_library( ":bop_types", ":bop_util", ":complete_optimizer", - "//base", - "//base:hash", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:statusor", - "//base:stl_util", - # "//glop:lp_solver", - "//glop", - "//sat:boolean_problem", - "//sat:boolean_problem_cc_proto", - "//sat:sat_solver", - "//sat:symmetry", - "//util:stats", - "//util:time_limit", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:statusor", + "//ortools/base:stl_util", + # "//ortools/glop:lp_solver", + "//ortools/glop", + "//ortools/sat:boolean_problem", + "//ortools/sat:boolean_problem_cc_proto", + "//ortools/sat:sat_solver", + "//ortools/sat:symmetry", + "//ortools/util:stats", + "//ortools/util:time_limit", ], ) @@ -223,22 +223,22 @@ cc_library( ":bop_types", ":bop_util", ":complete_optimizer", - "//base", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:random", - "//base:stl_util", - # "//glop:lp_solver", - "//glop", - "//lp_data:lp_print_utils", - "//sat:boolean_problem", - "//sat:boolean_problem_cc_proto", - "//sat:lp_utils", - "//sat:sat_solver", - # "//thread", - "//util:bitset", - "//util:stats", - "//util:time_limit", + "//ortools/base", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:random", + "//ortools/base:stl_util", + # "//ortools/glop:lp_solver", + "//ortools/glop", + "//ortools/lp_data:lp_print_utils", + "//ortools/sat:boolean_problem", + "//ortools/sat:boolean_problem_cc_proto", + "//ortools/sat:lp_utils", + "//ortools/sat:sat_solver", + # "//ortools/thread", + "//ortools/util:bitset", + "//ortools/util:stats", + "//ortools/util:time_limit", "@com_google_protobuf_cc//:protobuf", ], ) @@ -257,21 +257,21 @@ cc_library( ":bop_solver", ":bop_types", ":bop_util", - "//base", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:random", - "//base:stl_util", - "//glop", - "//lp_data", - "//lp_data:lp_decomposer", - "//lp_data:lp_utils", - "//sat:boolean_problem", - "//sat:lp_utils", - "//sat:sat_solver", - "//util:bitset", - "//util:stats", - "//util:time_limit", + "//ortools/base", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:random", + "//ortools/base:stl_util", + "//ortools/glop", + "//ortools/lp_data", + "//ortools/lp_data:lp_decomposer", + "//ortools/lp_data:lp_utils", + "//ortools/sat:boolean_problem", + "//ortools/sat:lp_utils", + "//ortools/sat:sat_solver", + "//ortools/util:bitset", + "//ortools/util:stats", + "//ortools/util:time_limit", "@com_google_protobuf_cc//:protobuf", ], ) diff --git a/ortools/constraint_solver/BUILD b/ortools/constraint_solver/BUILD index f31f6ea565..b63ec96303 100644 --- a/ortools/constraint_solver/BUILD +++ b/ortools/constraint_solver/BUILD @@ -108,40 +108,40 @@ cc_library( ":model_cc_proto", ":search_limit_cc_proto", ":solver_parameters_cc_proto", - "//base", - "//base:callback", - "//base:file", - "//base:hash", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:map_util", - "//base:mathutil", - "//base:random", - "//base:recordio", - "//base:small_map", - "//base:status", - "//base:stl_util", - "//base:strings", - # "//base:strings:human_readable", - "//graph:hamiltonian_path", - "//sat:sat_solver", - "//util:bitset", - "//util:cached_log", - "//util:iterators", - "//util:monoid_operation_tree", - "//util:piecewise_linear_function", - "//util:range_minimum_query", - "//util:saturated_arithmetic", - "//util:sorted_interval_list", - "//util:string_array", - "//util:tuple_set", - "//util:vector_map", - "//util:xml_helper", - "//base:bitmap", - # "//util/regexp/re2", - # "//util/textprogressbar", - # "//util/time:clock", - # "//util/time:datetime", + "//ortools/base", + "//ortools/base:callback", + "//ortools/base:file", + "//ortools/base:hash", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:map_util", + "//ortools/base:mathutil", + "//ortools/base:random", + "//ortools/base:recordio", + "//ortools/base:small_map", + "//ortools/base:status", + "//ortools/base:stl_util", + "//ortools/base:strings", + # "//ortools/base:strings:human_readable", + "//ortools/graph:hamiltonian_path", + "//ortools/sat:sat_solver", + "//ortools/util:bitset", + "//ortools/util:cached_log", + "//ortools/util:iterators", + "//ortools/util:monoid_operation_tree", + "//ortools/util:piecewise_linear_function", + "//ortools/util:range_minimum_query", + "//ortools/util:saturated_arithmetic", + "//ortools/util:sorted_interval_list", + "//ortools/util:string_array", + "//ortools/util:tuple_set", + "//ortools/util:vector_map", + "//ortools/util:xml_helper", + "//ortools/base:bitmap", + # "//ortools/util/regexp/re2", + # "//ortools/util/textprogressbar", + # "//ortools/util/time:clock", + # "//ortools/util/time:datetime", ], ) @@ -184,8 +184,8 @@ cc_library( deps = [ ":cp", ":routing_parameters_cc_proto", - "//base", - "//base:map_util", + "//ortools/base", + "//ortools/base:map_util", ], ) @@ -197,8 +197,8 @@ cc_library( "-Wno-deprecated", ], deps = [ - "//base", - "//base:int_type", + "//ortools/base", + "//ortools/base:int_type", ], ) @@ -232,24 +232,24 @@ cc_library( ":routing_neighborhoods", ":routing_parameters_cc_proto", ":routing_types", - "//base", - "//base:adjustable_priority_queue", - "//base:hash", - "//base:int_type_indexed_vector", - "//base:map_util", - "//base:small_map", - "//base:small_ordered_set", - "//base:stl_util", - "//base:strings", - "//constraint_solver:cp", - "//graph", - "//graph:christofides", - "//graph:connectivity", - "//graph:linear_assignment", - "//util:bitset", - "//util:range_query_function", - "//util:saturated_arithmetic", - "//util:sorted_interval_list", + "//ortools/base", + "//ortools/base:adjustable_priority_queue", + "//ortools/base:hash", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:map_util", + "//ortools/base:small_map", + "//ortools/base:small_ordered_set", + "//ortools/base:stl_util", + "//ortools/base:strings", + "//ortools/constraint_solver:cp", + "//ortools/graph", + "//ortools/graph:christofides", + "//ortools/graph:connectivity", + "//ortools/graph:linear_assignment", + "//ortools/util:bitset", + "//ortools/util:range_query_function", + "//ortools/util:saturated_arithmetic", + "//ortools/util:sorted_interval_list", "@com_google_protobuf_cc//:protobuf", ], ) diff --git a/ortools/flatzinc/BUILD b/ortools/flatzinc/BUILD index 94192df587..7abab672ef 100644 --- a/ortools/flatzinc/BUILD +++ b/ortools/flatzinc/BUILD @@ -5,7 +5,7 @@ cc_library( srcs = ["logging.cc"], hdrs = ["logging.h"], deps = [ - "//base", + "//ortools/base", ], ) @@ -15,13 +15,13 @@ cc_library( hdrs = ["model.h"], deps = [ ":logging", - "//base", - "//base:hash", - "//base:map_util", - "//base:stl_util", - "//base:strings", - "//util:iterators", - "//util:string_array", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:map_util", + "//ortools/base:stl_util", + "//ortools/base:strings", + "//ortools/util:iterators", + "//ortools/util:string_array", ], ) @@ -49,11 +49,11 @@ cc_library( ], deps = [ ":model", - "//base", - "//base:map_util", - "//base:stl_util", - "//base:strings", - "//util:string_array", + "//ortools/base", + "//ortools/base:map_util", + "//ortools/base:stl_util", + "//ortools/base:strings", + "//ortools/util:string_array", ], ) @@ -66,7 +66,7 @@ cc_library( ], deps = [ ":parser_yacc_lib", - "//base", + "//ortools/base", ], ) @@ -94,8 +94,8 @@ cc_library( # ":model", # ":parser_lib", # "//@gtest//:main", -# "//base:file", -# "//base:file:path", +# "//ortools/base:file", +# "//ortools/base:file:path", # ], #) @@ -106,13 +106,13 @@ cc_library( deps = [ ":logging", ":model", - "//base", - "//base:hash", - "//base:map_util", - "//base:strings", - "//graph:cliques", - "//util:saturated_arithmetic", - "//util:vector_map", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:map_util", + "//ortools/base:strings", + "//ortools/graph:cliques", + "//ortools/util:saturated_arithmetic", + "//ortools/util:vector_map", ], ) @@ -124,8 +124,8 @@ cc_library( # ":model", # ":presolve", # "//@gtest//:main", -# "//base:file", -# "//base:file:path", +# "//ortools/base:file", +# "//ortools/base:file:path", # ], #) @@ -136,10 +136,10 @@ cc_library( deps = [ ":logging", ":model", - "//base", - "//base:hash", - "//base:map_util", - "//base:strings", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:map_util", + "//ortools/base:strings", ], ) @@ -149,16 +149,16 @@ cc_library( hdrs = ["sat_constraint.h"], deps = [ ":logging", - "//base", - "//base:hash", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:map_util", - "//constraint_solver:cp", - "//sat:pb_constraint", - "//sat:sat_base", - "//sat:sat_solver", - "//util:string_array", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:map_util", + "//ortools/constraint_solver:cp", + "//ortools/sat:pb_constraint", + "//ortools/sat:sat_base", + "//ortools/sat:sat_solver", + "//ortools/util:string_array", ], ) @@ -168,10 +168,10 @@ cc_library( hdrs = ["flatzinc_constraints.h"], deps = [ ":logging", - "//base", - "//base:hash", - "//constraint_solver:cp", - "//util:string_array", + "//ortools/base", + "//ortools/base:hash", + "//ortools/constraint_solver:cp", + "//ortools/util:string_array", ], ) @@ -181,9 +181,9 @@ cc_library( hdrs = ["reporting.h"], deps = [ ":logging", - "//base", - "//base:mutex", - "//constraint_solver:cp", + "//ortools/base", + "//ortools/base:mutex", + "//ortools/constraint_solver:cp", ], ) @@ -194,8 +194,8 @@ cc_library( deps = [ ":logging", ":model", - "//base", - "//constraint_solver:cp", + "//ortools/base", + "//ortools/constraint_solver:cp", ], ) @@ -207,8 +207,8 @@ cc_library( ":logging", ":model", ":sat_constraint", - "//base", - "//constraint_solver:cp", + "//ortools/base", + "//ortools/constraint_solver:cp", ], ) @@ -222,10 +222,10 @@ cc_library( ":model", ":sat_constraint", ":solver_data", - "//base", - "//base:hash", - "//constraint_solver:cp", - "//util:string_array", + "//ortools/base", + "//ortools/base:hash", + "//ortools/constraint_solver:cp", + "//ortools/util:string_array", ], ) @@ -246,16 +246,16 @@ cc_library( ":sat_constraint", ":solver_data", ":solver_util", - "//base", - "//base:hash", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:map_util", - "//constraint_solver:cp", - "//sat:pb_constraint", - "//sat:sat_base", - "//sat:sat_solver", - "//util:string_array", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:map_util", + "//ortools/constraint_solver:cp", + "//ortools/sat:pb_constraint", + "//ortools/sat:sat_base", + "//ortools/sat:sat_solver", + "//ortools/util:string_array", ], ) @@ -268,21 +268,21 @@ cc_library( ":logging", ":model", ":solver", - "//base", - "//base:map_util", - "//sat:cp_constraints", - "//sat:cumulative", - "//sat:disjunctive", - "//sat:flow_costs", - "//sat:integer", - "//sat:integer_expr", - "//sat:intervals", - "//sat:linear_programming_constraint", - "//sat:model", - "//sat:optimization", - "//sat:sat_solver", - "//sat:table", - "//util:sorted_interval_list", + "//ortools/base", + "//ortools/base:map_util", + "//ortools/sat:cp_constraints", + "//ortools/sat:cumulative", + "//ortools/sat:disjunctive", + "//ortools/sat:flow_costs", + "//ortools/sat:integer", + "//ortools/sat:integer_expr", + "//ortools/sat:intervals", + "//ortools/sat:linear_programming_constraint", + "//ortools/sat:model", + "//ortools/sat:optimization", + "//ortools/sat:sat_solver", + "//ortools/sat:table", + "//ortools/util:sorted_interval_list", ], ) @@ -299,7 +299,7 @@ cc_binary( ":sat_fz_solver", ":solver", ":solver_util", - "//base", - "//base:threadpool", + "//ortools/base", + "//ortools/base:threadpool", ], ) diff --git a/ortools/glop/BUILD b/ortools/glop/BUILD index 0b1e844e7e..b6a6081fd0 100644 --- a/ortools/glop/BUILD +++ b/ortools/glop/BUILD @@ -58,26 +58,26 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":parameters_cc_proto", - "//base", - "//base:hash", - "//base:random", - "//base:stl_util", - "//base:strings", - "//linear_solver:linear_solver_cc_proto", - "//lp_data", - "//lp_data:base", - "//lp_data:lp_print_utils", - "//lp_data:lp_utils", - "//lp_data:matrix_scaler", - "//lp_data:matrix_utils", - "//lp_data:proto_utils", - "//lp_data:sparse", - "//lp_data:sparse_row", - "//util:bitset", - "//util:fp_utils", - "//util:iterators", - "//util:proto_tools", - "//util:stats", - "//util:time_limit", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:random", + "//ortools/base:stl_util", + "//ortools/base:strings", + "//ortools/linear_solver:linear_solver_cc_proto", + "//ortools/lp_data", + "//ortools/lp_data:base", + "//ortools/lp_data:lp_print_utils", + "//ortools/lp_data:lp_utils", + "//ortools/lp_data:matrix_scaler", + "//ortools/lp_data:matrix_utils", + "//ortools/lp_data:proto_utils", + "//ortools/lp_data:sparse", + "//ortools/lp_data:sparse_row", + "//ortools/util:bitset", + "//ortools/util:fp_utils", + "//ortools/util:iterators", + "//ortools/util:proto_tools", + "//ortools/util:stats", + "//ortools/util:time_limit", ], ) diff --git a/ortools/graph/BUILD b/ortools/graph/BUILD index 6764cc00b3..741318bd09 100644 --- a/ortools/graph/BUILD +++ b/ortools/graph/BUILD @@ -4,8 +4,8 @@ cc_library( name = "graph", hdrs = ["graph.h"], deps = [ - "//base", - "//util:iterators", + "//ortools/base", + "//ortools/util:iterators", ], ) @@ -24,8 +24,8 @@ cc_library( hdrs = ["util.h"], deps = [ ":graph", - "//base:hash", - "//base:map_util", + "//ortools/base:hash", + "//ortools/base:map_util", ], ) @@ -34,10 +34,10 @@ cc_library( hdrs = ["io.h"], deps = [ ":graph", - "//base:status", - "//base:statusor", - "//base:strings", - "//util:filelineiter", + "//ortools/base:status", + "//ortools/base:statusor", + "//ortools/base:strings", + "//ortools/util:filelineiter", ], ) @@ -46,9 +46,9 @@ cc_library( # srcs = ["digraph.cc"], # hdrs = ["digraph.h"], # deps = [ -# "//base", -# "//base:int_type", -# "//base:int_type_indexed_vector", +# "//ortools/base", +# "//ortools/base:int_type", +# "//ortools/base:int_type_indexed_vector", # ], #) @@ -73,18 +73,18 @@ cc_library( deps = [ ":graph", # ":paths_cc_proto", - "//base", - "//base:adjustable_priority_queue", - "//base:file", - "//base:hash", - "//base:int_type", - # "//base:int_type_indexed_bitmap", - "//base:int_type_indexed_vector", - "//base:recordio", - "//base:sparsetable", - "//base:strings", - # "//thread", - # "//util/coding:prefixvarint", + "//ortools/base", + "//ortools/base:adjustable_priority_queue", + "//ortools/base:file", + "//ortools/base:hash", + "//ortools/base:int_type", + # "//ortools/base:int_type_indexed_bitmap", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:recordio", + "//ortools/base:sparsetable", + "//ortools/base:strings", + # "//ortools/thread", + # "//ortools/util/coding:prefixvarint", ], ) @@ -92,8 +92,8 @@ cc_library( # name = "arc_dijkstra", # hdrs = ["arc_dijkstra.h"], # deps = [ -# "//base", -# "//base:iterator_adaptors", +# "//ortools/base", +# "//ortools/base:iterator_adaptors", # ], #) @@ -101,9 +101,9 @@ cc_library( # name = "bounded_dijkstra", # hdrs = ["bounded_dijkstra.h"], # deps = [ -# "//base", -# "//base:iterator_adaptors", -# "//thread", +# "//ortools/base", +# "//ortools/base:iterator_adaptors", +# "//ortools/thread", # ], #) @@ -111,10 +111,10 @@ cc_library( # name = "bidirectional_dijkstra", # hdrs = ["bidirectional_dijkstra.h"], # deps = [ -# "//base", -# "//base:iterator_adaptors", -# "//base:strings", -# "//thread", +# "//ortools/base", +# "//ortools/base:iterator_adaptors", +# "//ortools/base:strings", +# "//ortools/thread", # ], #) @@ -123,12 +123,12 @@ cc_library( srcs = ["cliques.cc"], hdrs = ["cliques.h"], deps = [ - "//base", - "//base:hash", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:strings", - "//util:time_limit", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:strings", + "//ortools/util:time_limit", ], ) @@ -136,10 +136,10 @@ cc_library( name = "hamiltonian_path", hdrs = ["hamiltonian_path.h"], deps = [ - "//base", - "//util:bitset", - "//util:saturated_arithmetic", - "//util:vector_or_function", + "//ortools/base", + "//ortools/util:bitset", + "//ortools/util:saturated_arithmetic", + "//ortools/util:vector_or_function", ], ) @@ -149,9 +149,9 @@ cc_library( deps = [ ":eulerian_path", ":minimum_spanning_tree", - "//base", - "//linear_solver", - "//linear_solver:linear_solver_cc_proto", + "//ortools/base", + "//ortools/linear_solver", + "//ortools/linear_solver:linear_solver_cc_proto", ], ) @@ -159,7 +159,7 @@ cc_library( name = "eulerian_path", hdrs = ["eulerian_path.h"], deps = [ - "//base", + "//ortools/base", ], ) @@ -169,9 +169,9 @@ cc_library( deps = [ ":connectivity", ":graph", - "//base", - "//base:adjustable_priority_queue", - "//util:vector_or_function", + "//ortools/base", + "//ortools/base:adjustable_priority_queue", + "//ortools/util:vector_or_function", ], ) @@ -181,8 +181,8 @@ cc_library( deps = [ ":christofides", ":minimum_spanning_tree", - "//base", - "//base:strings", + "//ortools/base", + "//ortools/base:strings", ], ) @@ -190,10 +190,10 @@ cc_library( name = "ebert_graph", hdrs = ["ebert_graph.h"], deps = [ - "//base", - # "//testing/production_stub/public:gunit_prod", - "//util:permutation", - "//util:zvector", + "//ortools/base", + # "//ortools/testing/production_stub/public:gunit_prod", + "//ortools/util:permutation", + "//ortools/util:zvector", ], ) @@ -204,9 +204,9 @@ cc_library( # deps = [ # ":digraph", # ":ebert_graph", -# "//base", -# "//base:int_type", -# "//base:int_type_indexed_vector", +# "//ortools/base", +# "//ortools/base:int_type", +# "//ortools/base:int_type_indexed_vector", # ], #) @@ -217,14 +217,14 @@ cc_library( # deps = [ # ":ebert_graph", # ":graph", -# "//base", -# "//base:adjustable_priority_queue", -# "//base:dense_hash_map", -# "//base:file", -# "//base:map_util", -# "//base:stl_util", -# "//thread", -# "//util:zvector", +# "//ortools/base", +# "//ortools/base:adjustable_priority_queue", +# "//ortools/base:dense_hash_map", +# "//ortools/base:file", +# "//ortools/base:map_util", +# "//ortools/base:stl_util", +# "//ortools/thread", +# "//ortools/util:zvector", # ], #) @@ -232,7 +232,7 @@ cc_library( name = "connectivity", hdrs = ["connectivity.h"], deps = [ - "//base", + "//ortools/base", ], ) @@ -255,9 +255,9 @@ cc_library( ":flow_problem_cc_proto", ":graph", ":graphs", - "//base", - "//util:stats", - "//util:zvector", + "//ortools/base", + "//ortools/util:stats", + "//ortools/util:zvector", ], ) @@ -271,10 +271,10 @@ cc_library( ":graph", ":graphs", ":max_flow", - "//base", - "//base:mathutil", - "//util:stats", - "//util:zvector", + "//ortools/base", + "//ortools/base:mathutil", + "//ortools/util:stats", + "//ortools/util:zvector", ], ) @@ -285,7 +285,7 @@ cc_library( deps = [ ":ebert_graph", ":linear_assignment", - "//base", + "//ortools/base", ], ) @@ -295,11 +295,11 @@ cc_library( hdrs = ["linear_assignment.h"], deps = [ ":ebert_graph", - "//base", - "//base:strings", - # "//testing/production_stub/public:gunit_prod", - "//util:permutation", - "//util:zvector", + "//ortools/base", + "//ortools/base:strings", + # "//ortools/testing/production_stub/public:gunit_prod", + "//ortools/util:permutation", + "//ortools/util:zvector", ], ) @@ -309,8 +309,8 @@ cc_library( # hdrs = ["biconnected.h"], # deps = [ # ":ebert_graph", -# "//base", -# "//util:packed_array", +# "//ortools/base", +# "//ortools/util:packed_array", # ], #) @@ -325,8 +325,8 @@ cc_library( # srcs = ["dag_connectivity.cc"], # hdrs = ["dag_connectivity.h"], # deps = [ -# "//base", -# "//util:bitset", -# "//util/graph:topologicalsorter", +# "//ortools/base", +# "//ortools/util:bitset", +# "//ortools/util/graph:topologicalsorter", # ], #) diff --git a/ortools/linear_solver/BUILD b/ortools/linear_solver/BUILD index bfb809c35c..9d8fc6cb08 100644 --- a/ortools/linear_solver/BUILD +++ b/ortools/linear_solver/BUILD @@ -51,23 +51,22 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":linear_solver_cc_proto", - "//base:timer", - "//base", - "//base:file", - "//base:hash", - "//base:map_util", - "//base:stl_util", - "//base:random", - "//bop:bop_parameters_cc_proto", - "//bop:integral_solver", - "//glop", - "//glop:parameters_cc_proto", - "//lp_data", - "//util:fp_utils", - "//util:proto_tools", + "//ortools/base:timer", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:hash", + "//ortools/base:map_util", + "//ortools/base:stl_util", + "//ortools/base:random", + "//ortools/bop:bop_parameters_cc_proto", + "//ortools/bop:integral_solver", + "//ortools/glop", + "//ortools/glop:parameters_cc_proto", + "//ortools/lp_data", + "//ortools/util:fp_utils", + "//ortools/util:proto_tools", ] + select({ ":with_glpk": ["@glpk//:glpk"], "//conditions:default": [], }), ) - diff --git a/ortools/lp_data/BUILD b/ortools/lp_data/BUILD index 8217deefa2..1ed1865934 100644 --- a/ortools/lp_data/BUILD +++ b/ortools/lp_data/BUILD @@ -14,11 +14,11 @@ cc_library( srcs = ["lp_types.cc"], hdrs = ["lp_types.h"], deps = [ - "//base", - "//base:hash", - "//base:int_type", - "//base:int_type_indexed_vector", - "//util:bitset", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/util:bitset", ], ) @@ -28,8 +28,8 @@ cc_library( copts = SAFE_FP_CODE, deps = [ ":base", - "//base", - "//util:return_macros", + "//ortools/base", + "//ortools/util:return_macros", ], ) @@ -40,10 +40,10 @@ cc_library( deps = [ ":base", ":permutation", - "//base", - "//base:strings", - "//util:iterators", - "//util:return_macros", + "//ortools/base", + "//ortools/base:strings", + "//ortools/util:iterators", + "//ortools/util:return_macros", ], ) @@ -55,7 +55,7 @@ cc_library( deps = [ ":base", ":sparse_vector", - "//base", + "//ortools/base", ], ) @@ -66,7 +66,7 @@ cc_library( deps = [ ":base", ":sparse_vector", - "//base", + "//ortools/base", ], ) @@ -82,13 +82,13 @@ cc_library( ":matrix_scaler_hdr", ":permutation", ":sparse_column", - "//base", - "//base:hash", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:strings", - "//util:fp_utils", - "//util:return_macros", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:strings", + "//ortools/util:fp_utils", + "//ortools/util:return_macros", ], ) @@ -101,10 +101,10 @@ cc_library( ":base", ":lp_utils", ":sparse", - "//base", - "//base:hash", - "//base:int_type_indexed_vector", - "//util:fp_utils", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:int_type_indexed_vector", + "//ortools/util:fp_utils", ], ) @@ -113,8 +113,8 @@ cc_library( hdrs = ["matrix_scaler.h"], deps = [ ":base", - "//base", - "//base:int_type_indexed_vector", + "//ortools/base", + "//ortools/base:int_type_indexed_vector", ], ) @@ -131,12 +131,12 @@ cc_library( ":matrix_utils", ":permutation", ":sparse", - "//base", - "//base:hash", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:strings", - "//util:fp_utils", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:strings", + "//ortools/util:fp_utils", ], ) @@ -148,8 +148,8 @@ cc_library( deps = [ ":base", ":sparse_column", - "//base", - "//base:accurate_sum", + "//ortools/base", + "//ortools/base:accurate_sum", ], ) @@ -161,8 +161,8 @@ cc_library( deps = [ ":base", ":sparse", - "//base", - "//base:hash", + "//ortools/base", + "//ortools/base:hash", ], ) @@ -175,9 +175,9 @@ cc_library( # deps = [ # ":base", # ":lp_data", -# "//base", -# "//base:strings", -# "//util/regexp/re2", +# "//ortools/base", +# "//ortools/base:strings", +# "//ortools/util/regexp/re2", # ], #) @@ -188,7 +188,7 @@ cc_library( # copts = SAFE_FP_CODE, # deps = [ # ":lp_data", -# "//util:fp_utils", +# "//ortools/util:fp_utils", # ], #) @@ -199,9 +199,9 @@ cc_library( copts = SAFE_FP_CODE, deps = [ ":base", - "//base", - "//base:strings", - "//util:rational_approximation", + "//ortools/base", + "//ortools/base:strings", + "//ortools/util:rational_approximation", ], ) @@ -213,8 +213,8 @@ cc_library( deps = [ ":base", ":lp_data", - "//base", - "//linear_solver:linear_solver_cc_proto", + "//ortools/base", + "//ortools/linear_solver:linear_solver_cc_proto", ], ) @@ -227,19 +227,19 @@ cc_library( ":base", ":lp_data", ":lp_print_utils", - "//base", - "//base:file", - # "//base:file:path", - "//base:filelinereader", - "//base:hash", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:map_util", - "//base:status", - "//base:strings", - # "//file/localfile", - # "//file/memfile", - # "//file/zipfile", + "//ortools/base", + "//ortools/base:file", + # "//ortools/base:file:path", + "//ortools/base:filelinereader", + "//ortools/base:hash", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:map_util", + "//ortools/base:status", + "//ortools/base:strings", + # "//ortools/file/localfile", + # "//ortools/file/memfile", + # "//ortools/file/zipfile", ], ) @@ -252,9 +252,9 @@ cc_library( ":base", ":lp_data", ":lp_utils", - "//algorithms:dynamic_partition", - "//base", - "//base:hash", - "//base:mutex", + "//ortools/algorithms:dynamic_partition", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:mutex", ], ) diff --git a/ortools/sat/BUILD b/ortools/sat/BUILD index 335f10efff..64f4bafb72 100644 --- a/ortools/sat/BUILD +++ b/ortools/sat/BUILD @@ -36,9 +36,9 @@ proto_library( # visibility = ["//visibility:public"], # deps = [ # ":cp_model_proto", -# "//base", -# "//util/gtl:stl_util", -# "//util/operations_research/util:sorted_interval_list", +# "//ortools/base", +# "//ortools/util/gtl:stl_util", +# "//ortools/util/operations_research/util:sorted_interval_list", # ], #) @@ -50,12 +50,12 @@ proto_library( # deps = [ # ":cp_model_proto", # ":cp_model_utils", -# "//base", -# "//strings", -# "//third_party/absl/strings", -# "//util/gtl:map_util", -# "//util/operations_research/util:saturated_arithmetic", -# "//util/operations_research/util:sorted_interval_list", +# "//ortools/base", +# "//ortools/strings", +# "//ortools/third_party/absl/strings", +# "//ortools/util/gtl:map_util", +# "//ortools/util/operations_research/util:saturated_arithmetic", +# "//ortools/util/operations_research/util:sorted_interval_list", # ], #) @@ -78,11 +78,11 @@ proto_library( # ":optimization", # ":sat_solver", # ":table", -# "//base", -# "//strings", -# "//third_party/absl/strings", -# "//util/gtl:stl_util", -# "//util/operations_research/graph:connectivity", +# "//ortools/base", +# "//ortools/strings", +# "//ortools/third_party/absl/strings", +# "//ortools/util/gtl:stl_util", +# "//ortools/util/operations_research/graph:connectivity", # ], #) @@ -95,12 +95,12 @@ proto_library( # ":cp_model_checker", # ":cp_model_proto", # ":cp_model_utils", -# "//base", -# "//strings", -# "//util/gtl:map_util", -# "//util/gtl:stl_util", -# "//util/operations_research/util:bitset", -# "//util/operations_research/util:sorted_interval_list", +# "//ortools/base", +# "//ortools/strings", +# "//ortools/util/gtl:map_util", +# "//ortools/util/gtl:stl_util", +# "//ortools/util/operations_research/util:bitset", +# "//ortools/util/operations_research/util:sorted_interval_list", # ], #) @@ -108,9 +108,9 @@ cc_library( name = "model", hdrs = ["model.h"], deps = [ - "//base", - "//base:map_util", - "//base:typeid", + "//ortools/base", + "//ortools/base:map_util", + "//ortools/base:typeid", ], ) @@ -119,11 +119,11 @@ cc_library( hdrs = ["sat_base.h"], deps = [ ":model", - "//base", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:strings", - "//util:bitset", + "//ortools/base", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:strings", + "//ortools/util:bitset", ], ) @@ -144,20 +144,20 @@ cc_library( ":pb_constraint", ":sat_base", ":sat_parameters_cc_proto", - "//base", - "//base:adjustable_priority_queue", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:map_util", - "//base:random", - "//base:stl_util", - "//base:strings", - "//util:bitset", - "//util:running_stat", - "//util:saturated_arithmetic", - "//util:stats", - "//util:time_limit", - # "//util/time:clock", + "//ortools/base", + "//ortools/base:adjustable_priority_queue", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:map_util", + "//ortools/base:random", + "//ortools/base:stl_util", + "//ortools/base:strings", + "//ortools/util:bitset", + "//ortools/util:running_stat", + "//ortools/util:saturated_arithmetic", + "//ortools/util:stats", + "//ortools/util:time_limit", + # "//ortools/util/time:clock", "@com_google_protobuf_cc//:protobuf", ], ) @@ -170,17 +170,17 @@ cc_library( deps = [ ":sat_base", ":sat_parameters_cc_proto", - "//base", - "//base:hash", - # "//base:inlined_vector", - "//base:int_type", - "//base:int_type_indexed_vector", - "//base:stl_util", - "//base:strings", - "//util:bitset", - "//util:stats", - "//util:time_limit", - "//base:random", + "//ortools/base", + "//ortools/base:hash", + # "//ortools/base:inlined_vector", + "//ortools/base:int_type", + "//ortools/base:int_type_indexed_vector", + "//ortools/base:stl_util", + "//ortools/base:strings", + "//ortools/util:bitset", + "//ortools/util:stats", + "//ortools/util:time_limit", + "//ortools/base:random", ], ) @@ -195,12 +195,12 @@ cc_library( ":sat_parameters_cc_proto", ":sat_solver", ":util", - "//algorithms:dynamic_partition", - "//base", - "//base:adjustable_priority_queue", - "//base:random", - "//base:stl_util", - "//base:strongly_connected_components", + "//ortools/algorithms:dynamic_partition", + "//ortools/base", + "//ortools/base:adjustable_priority_queue", + "//ortools/base:random", + "//ortools/base:stl_util", + "//ortools/base:strongly_connected_components", ], ) @@ -212,9 +212,9 @@ cc_library( deps = [ ":sat_base", ":sat_parameters_cc_proto", - "//base:hash", - "//util:saturated_arithmetic", - "//util:stats", + "//ortools/base:hash", + "//ortools/util:saturated_arithmetic", + "//ortools/util:stats", ], ) @@ -225,9 +225,9 @@ cc_library( copts = [W_FLOAT_CONVERSION], deps = [ ":sat_base", - "//algorithms:sparse_permutation", - "//base:hash", - "//util:stats", + "//ortools/algorithms:sparse_permutation", + "//ortools/base:hash", + "//ortools/util:stats", ], ) @@ -240,7 +240,7 @@ cc_library( ":model", ":sat_base", ":sat_solver", - "//base:stl_util", + "//ortools/base:stl_util", ], ) @@ -253,18 +253,18 @@ cc_library( ":model", ":sat_base", ":sat_solver", - "//base", - # "//base:inlined_vector", - "//base:int_type", - # "//base:iterator_adaptors", - "//base:map_util", - "//base:stl_util", - "//base:strings", - "//util:bitset", - "//util:iterators", - "//util:rev", - "//util:saturated_arithmetic", - "//util:sorted_interval_list", + "//ortools/base", + # "//ortools/base:inlined_vector", + "//ortools/base:int_type", + # "//ortools/base:iterator_adaptors", + "//ortools/base:map_util", + "//ortools/base:stl_util", + "//ortools/base:strings", + "//ortools/util:bitset", + "//ortools/util:iterators", + "//ortools/util:rev", + "//ortools/util:saturated_arithmetic", + "//ortools/util:sorted_interval_list", ], ) @@ -281,7 +281,7 @@ cc_library( ":precedences", ":sat_base", ":sat_solver", - "//util:sort", + "//ortools/util:sort", ], ) @@ -295,9 +295,9 @@ cc_library( ":model", ":sat_base", ":sat_solver", - "//base:cleanup", - "//base:stl_util", - "//util:bitset", + "//ortools/base:cleanup", + "//ortools/base:stl_util", + "//ortools/util:bitset", ], ) @@ -327,8 +327,8 @@ cc_library( ":precedences", ":sat_base", ":sat_solver", - # "//base:iterator_adaptors", - "//util:stats", + # "//ortools/base:iterator_adaptors", + "//ortools/util:stats", ], ) @@ -345,7 +345,7 @@ cc_library( ":precedences", ":sat_base", ":sat_solver", - "//util:sort", + "//ortools/util:sort", ], ) @@ -360,8 +360,8 @@ cc_library( ":model", ":sat_base", ":sat_solver", - "//base:int_type", - "//util:sort", + "//ortools/base:int_type", + "//ortools/util:sort", ], ) @@ -394,9 +394,9 @@ cc_library( ":model", ":sat_base", ":sat_solver", - "//base", - # "//base:iterator_adaptors", - "//util:sort", + "//ortools/base", + # "//ortools/base:iterator_adaptors", + "//ortools/util:sort", ], ) @@ -409,16 +409,16 @@ cc_library( ":boolean_problem_cc_proto", ":sat_solver", ":simplification", - "//algorithms:find_graph_symmetries", - "//algorithms:sparse_permutation", - "//base", - "//base:hash", - "//base:map_util", - "//base:status", - "//base:strings", - "//graph", - "//graph:io", - "//graph:util", + "//ortools/algorithms:find_graph_symmetries", + "//ortools/algorithms:sparse_permutation", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:map_util", + "//ortools/base:status", + "//ortools/base:strings", + "//ortools/graph", + "//ortools/graph:io", + "//ortools/graph:util", ], ) @@ -430,10 +430,10 @@ cc_library( ":integer", ":model", ":sat_base", - "//base", - "//glop", - "//lp_data", - "//util:time_limit", + "//ortools/base", + "//ortools/glop", + "//ortools/lp_data", + "//ortools/util:time_limit", ], ) @@ -447,12 +447,12 @@ cc_library( ":boolean_problem_cc_proto", # ":cp_model_cc_proto", ":sat_solver", - "//base:strings", - "//glop", - "//linear_solver:linear_solver_cc_proto", - "//lp_data", - "//lp_data:lp_print_utils", - "//util:fp_utils", + "//ortools/base:strings", + "//ortools/glop", + "//ortools/linear_solver:linear_solver_cc_proto", + "//ortools/lp_data", + "//ortools/lp_data:lp_print_utils", + "//ortools/util:fp_utils", ], ) @@ -468,8 +468,8 @@ cc_library( ":model", ":sat_solver", ":util", - "//base", - "//base:strings", + "//ortools/base", + "//ortools/base:strings", "@com_google_protobuf_cc//:protobuf", ], ) @@ -481,9 +481,9 @@ cc_library( copts = [W_FLOAT_CONVERSION], deps = [ ":sat_parameters_cc_proto", - "//base", - "//base:random", - "//base:strings", + "//ortools/base", + "//ortools/base:random", + "//ortools/base:strings", ], ) @@ -495,10 +495,10 @@ cc_library( deps = [ ":integer", ":model", - "//base", - "//base:map_util", - "//base:stl_util", - "//base:strings", + "//ortools/base", + "//ortools/base:map_util", + "//ortools/base:stl_util", + "//ortools/base:strings", ], ) @@ -510,10 +510,10 @@ cc_library( deps = [ ":integer", ":model", - "//base", - "//base:map_util", - "//util:sort", - "//util:sorted_interval_list", + "//ortools/base", + "//ortools/base:map_util", + "//ortools/util:sort", + "//ortools/util:sorted_interval_list", ], ) @@ -526,7 +526,7 @@ cc_library( ":integer", ":model", ":sat_base", - "//linear_solver", + "//ortools/linear_solver", ], ) @@ -538,8 +538,8 @@ cc_library( deps = [ ":boolean_problem_cc_proto", ":sat_solver", - "//base", - "//base:strings", + "//ortools/base", + "//ortools/base:strings", ], ) @@ -551,9 +551,9 @@ cc_library( deps = [ ":model", ":sat_base", - "//base", - "//base:file", - "//base:hash", - "//base:strings", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:hash", + "//ortools/base:strings", ], ) diff --git a/ortools/util/BUILD b/ortools/util/BUILD index 1cd521f1c2..970f3f72e8 100644 --- a/ortools/util/BUILD +++ b/ortools/util/BUILD @@ -4,24 +4,24 @@ cc_library( name = "filelineiter", hdrs = ["filelineiter.h"], deps = [ - "//base", - "//base:file", - "//base:status", - "//base:strings", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:status", + "//ortools/base:strings", ], ) cc_library( name = "vector_map", hdrs = ["vector_map.h"], - deps = ["//base:map_util"], + deps = ["//ortools/base:map_util"], ) cc_library( name = "bitset", srcs = ["bitset.cc"], hdrs = ["bitset.h"], - deps = ["//base"], + deps = ["//ortools/base"], ) cc_library( @@ -29,7 +29,7 @@ cc_library( srcs = ["cached_log.cc"], hdrs = ["cached_log.h"], deps = [ - "//base", + "//ortools/base", ], ) @@ -38,9 +38,9 @@ cc_library( srcs = ["graph_export.cc"], hdrs = ["graph_export.h"], deps = [ - "//base", - "//base:file", - "//base:status", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:status", ], ) @@ -52,13 +52,13 @@ cc_library( cc_library( name = "zvector", hdrs = ["zvector.h"], - deps = ["//base"], + deps = ["//ortools/base"], ) cc_library( name = "permutation", hdrs = ["permutation.h"], - deps = ["//base"], + deps = ["//ortools/base"], ) cc_library( @@ -66,8 +66,8 @@ cc_library( srcs = ["xml_helper.cc"], hdrs = ["xml_helper.h"], deps = [ - "//base", - "//base:strings", + "//ortools/base", + "//ortools/base:strings", ], ) @@ -76,9 +76,9 @@ cc_library( # srcs = ["step_function.cc"], # hdrs = ["step_function.h"], # deps = [ -# "//base:strings", +# "//ortools/base:strings", # ":iterators", -# "//base", +# "//ortools/base", # ], #) @@ -87,8 +87,8 @@ cc_library( hdrs = ["saturated_arithmetic.h"], deps = [ ":bitset", - "//base", - "//base:strings", + "//ortools/base", + "//ortools/base:strings", ], ) @@ -98,8 +98,8 @@ cc_library( hdrs = ["piecewise_linear_function.h"], deps = [ ":saturated_arithmetic", - "//base", - "//base:strings", + "//ortools/base", + "//ortools/base:strings", ], ) @@ -108,8 +108,8 @@ cc_library( srcs = ["rational_approximation.cc"], hdrs = ["rational_approximation.h"], deps = [ - "//base", - "//base:strings", + "//ortools/base", + "//ortools/base:strings", ], ) @@ -119,8 +119,8 @@ cc_library( hdrs = ["sorted_interval_list.h"], deps = [ ":saturated_arithmetic", - "//base", - "//base:strings", + "//ortools/base", + "//ortools/base:strings", ], ) @@ -133,9 +133,9 @@ cc_library( name = "tuple_set", hdrs = ["tuple_set.h"], deps = [ - "//base", - "//base:hash", - "//base:map_util", + "//ortools/base", + "//ortools/base:hash", + "//ortools/base:map_util", ], ) @@ -144,13 +144,13 @@ cc_library( srcs = ["stats.cc"], hdrs = ["stats.h"], deps = [ - "//base", - "//base:stl_util", - "//base:strings", - # "//base:strings:human_readable", - "//base:sysinfo", - "//base:timer", - "//base:encodingutils", # To replace by port when we export them. + "//ortools/base", + "//ortools/base:stl_util", + "//ortools/base:strings", + # "//ortools/base:strings:human_readable", + "//ortools/base:sysinfo", + "//ortools/base:timer", + "//ortools/base:encodingutils", # To replace by port when we export them. ], ) @@ -160,9 +160,9 @@ cc_library( hdrs = ["time_limit.h"], deps = [ ":running_stat", - "//base", - "//base:strings", - "//base:timer", + "//ortools/base", + "//ortools/base:strings", + "//ortools/base:timer", ], ) @@ -176,7 +176,7 @@ cc_library( copts = ["-frounding-math"], deps = [ ":bitset", - "//base", + "//ortools/base", ], ) @@ -184,19 +184,19 @@ cc_library( name = "monoid_operation_tree", srcs = [], hdrs = ["monoid_operation_tree.h"], - deps = ["//base"], + deps = ["//ortools/base"], ) cc_library( name = "return_macros", hdrs = ["return_macros.h"], - deps = ["//base"], + deps = ["//ortools/base"], ) cc_library( name = "running_stat", hdrs = ["running_stat.h"], - deps = ["//base"], + deps = ["//ortools/base"], ) cc_library( @@ -204,10 +204,10 @@ cc_library( srcs = ["proto_tools.cc"], hdrs = ["proto_tools.h"], deps = [ - "//base:strings", - "//base", - "//base:file", - "//base:hash", + "//ortools/base:strings", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:hash", # "//net/proto2/io/public", # "//net/proto2/io/public:io", # "//net/proto2/public", @@ -221,7 +221,7 @@ cc_library( hdrs = [ "functions_swig_helpers.h", ], - deps = ["//base"], + deps = ["//ortools/base"], ) cc_library( @@ -230,7 +230,7 @@ cc_library( hdrs = [ "functions_swig_test_helpers.h", ], - deps = ["//base"], + deps = ["//ortools/base"], ) cc_library( @@ -245,7 +245,7 @@ cc_library( hdrs = ["range_query_function.h"], deps = [ ":range_minimum_query", - "//base", + "//ortools/base", ], ) @@ -253,9 +253,9 @@ cc_library( name = "rev", hdrs = ["rev.h"], deps = [ - "//base", - "//base:map_util", - "//base:strings", + "//ortools/base", + "//ortools/base:map_util", + "//ortools/base:strings", ], ) @@ -264,7 +264,7 @@ cc_library( hdrs = ["vector_or_function.h"], visibility = ["//visibility:public"], deps = [ - "//base", + "//ortools/base", ], ) @@ -274,14 +274,14 @@ cc_library( # hdrs = ["tsplib_parser.h"], # visibility = ["//visibility:public"], # deps = [ -# "//base:strings", +# "//ortools/base:strings", # ":filelineiter", -# "//base", -# "//base:file", -# "//base:file:path", -# "//base:map_util", -# "//base:mathutil", -# "///base:strings", +# "//ortools/base", +# "//ortools/base:file", +# "//ortools/base:file:path", +# "//ortools/base:map_util", +# "//ortools/base:mathutil", +# "///ortools/base:strings", # "//file/zipfile", # "//util/regexp/re2", # ], @@ -293,12 +293,12 @@ cc_library( # hdrs = ["pdtsp_parser.h"], # visibility = ["//visibility:public"], # deps = [ -# "//base:strings", +# "//ortools/base:strings", # ":filelineiter", -# "//base", -# "//base:file", -# "//base:file:path", -# "//base:mathutil", +# "//ortools/base", +# "//ortools/base:file", +# "//ortools/base:file:path", +# "//ortools/base:mathutil", # ], #) @@ -308,10 +308,10 @@ cc_library( # hdrs = ["bp_parser.h"], # visibility = ["//visibility:public"], # deps = [ -# "//base:strings", +# "//ortools/base:strings", # ":filelineiter", -# "//base", -# "//base:file", +# "//ortools/base", +# "//ortools/base:file", # ], #) @@ -322,9 +322,9 @@ cc_library( visibility = ["//visibility:public"], deps = [ ":filelineiter", - "//base", - "//base:file", - "//base:strings", + "//ortools/base", + "//ortools/base:file", + "//ortools/base:strings", ], ) @@ -333,6 +333,6 @@ cc_library( hdrs = ["sort.h"], visibility = ["//visibility:public"], deps = [ - "//base", + "//ortools/base", ], )