From 2de7d6fbacad9cd82fcd8a548c52b906c51e6704 Mon Sep 17 00:00:00 2001 From: Mizux Seiha Date: Sat, 1 Apr 2023 02:42:04 +0200 Subject: [PATCH] bazel: Fix build --- WORKSPACE | 7 +++---- examples/python/code_samples.bzl | 2 +- ortools/bop/BUILD.bazel | 14 ++++++++------ ortools/constraint_solver/BUILD.bazel | 4 +++- ortools/glop/BUILD.bazel | 17 +++++++++-------- ortools/graph/samples/code_samples.bzl | 2 +- ortools/linear_solver/python/BUILD.bazel | 2 +- ortools/linear_solver/samples/code_samples.bzl | 2 +- ortools/pdlp/BUILD.bazel | 13 +++++++------ ortools/pdlp/python/BUILD.bazel | 2 +- ortools/sat/BUILD.bazel | 15 ++++++--------- ortools/sat/python/BUILD.bazel | 2 +- ortools/sat/samples/code_samples.bzl | 2 +- 13 files changed, 43 insertions(+), 41 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 6481e714b4..181f710ddd 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -175,16 +175,15 @@ git_repository( load("@rules_python//python:repositories.bzl", "py_repositories") py_repositories() -# Create a central external repo, @ortools_deps, that contains Bazel targets for all the +# Create a central external repo, @pip_deps, that contains Bazel targets for all the # third-party packages specified in the python_deps.txt file. load("@rules_python//python:pip.bzl", "pip_parse") - pip_parse( - name = "ortools_deps", + name = "pip_deps", requirements = "//bazel:ortools_requirements.txt", ) -load("@ortools_deps//:requirements.bzl", "install_deps") +load("@pip_deps//:requirements.bzl", "install_deps") install_deps() # Add a second repo @ortools_notebook_deps for jupyter notebooks. diff --git a/examples/python/code_samples.bzl b/examples/python/code_samples.bzl index 1caf212385..c34cac43c4 100644 --- a/examples/python/code_samples.bzl +++ b/examples/python/code_samples.bzl @@ -13,7 +13,7 @@ """Helper macro to compile and test code samples.""" -load("@ortools_deps//:requirements.bzl", "requirement") +load("@pip_deps//:requirements.bzl", "requirement") PYTHON_DEPS = [ "//ortools/linear_solver/python:model_builder", diff --git a/ortools/bop/BUILD.bazel b/ortools/bop/BUILD.bazel index b34ffcc2f5..70b0ef60c6 100644 --- a/ortools/bop/BUILD.bazel +++ b/ortools/bop/BUILD.bazel @@ -11,20 +11,22 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_cc//cc:defs.bzl", "cc_proto_library") +load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library") +load("@rules_proto//proto:defs.bzl", "proto_library") +load("@rules_python//python:proto.bzl", "py_proto_library") package(default_visibility = ["//visibility:public"]) -cc_proto_library( - name = "bop_parameters_cc_proto", - deps = ["bop_parameters_proto"], -) - proto_library( name = "bop_parameters_proto", srcs = ["bop_parameters.proto"], ) +cc_proto_library( + name = "bop_parameters_cc_proto", + deps = ["bop_parameters_proto"], +) + cc_library( name = "bop_types", hdrs = ["bop_types.h"], diff --git a/ortools/constraint_solver/BUILD.bazel b/ortools/constraint_solver/BUILD.bazel index 0fb6e32b74..6d7566786d 100644 --- a/ortools/constraint_solver/BUILD.bazel +++ b/ortools/constraint_solver/BUILD.bazel @@ -13,7 +13,9 @@ # Home of constraint solver constraint_solver -load("@rules_cc//cc:defs.bzl", "cc_proto_library") +load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library") +load("@rules_proto//proto:defs.bzl", "proto_library") +load("@rules_python//python:proto.bzl", "py_proto_library") package(default_visibility = ["//visibility:public"]) diff --git a/ortools/glop/BUILD.bazel b/ortools/glop/BUILD.bazel index 38b619a557..4238020b54 100644 --- a/ortools/glop/BUILD.bazel +++ b/ortools/glop/BUILD.bazel @@ -11,8 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_cc//cc:defs.bzl", "cc_proto_library") -load("@com_google_protobuf//:protobuf.bzl", "py_proto_library") +load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library") +load("@rules_proto//proto:defs.bzl", "proto_library") +load("@rules_python//python:proto.bzl", "py_proto_library") package( default_visibility = ["//visibility:public"], @@ -233,6 +234,11 @@ cc_library( # Glop parameters. +proto_library( + name = "parameters_proto", + srcs = ["parameters.proto"], +) + cc_proto_library( name = "parameters_cc_proto", deps = [":parameters_proto"], @@ -240,12 +246,7 @@ cc_proto_library( py_proto_library( name = "parameters_py_pb2", - srcs = ["parameters.proto"], -) - -proto_library( - name = "parameters_proto", - srcs = ["parameters.proto"], + deps = [":parameters_proto"], ) # Dual edge norms. diff --git a/ortools/graph/samples/code_samples.bzl b/ortools/graph/samples/code_samples.bzl index 0ed075a35c..e9da788f2c 100644 --- a/ortools/graph/samples/code_samples.bzl +++ b/ortools/graph/samples/code_samples.bzl @@ -13,7 +13,7 @@ """Helper macro to compile and test code samples.""" -load("@ortools_deps//:requirements.bzl", "requirement") +load("@pip_deps//:requirements.bzl", "requirement") def code_sample_cc(name): native.cc_binary( diff --git a/ortools/linear_solver/python/BUILD.bazel b/ortools/linear_solver/python/BUILD.bazel index ab7ad54a27..4f552d203e 100644 --- a/ortools/linear_solver/python/BUILD.bazel +++ b/ortools/linear_solver/python/BUILD.bazel @@ -12,7 +12,7 @@ # limitations under the License. # Python wrapper for model_builder. -load("@ortools_deps//:requirements.bzl", "requirement") +load("@pip_deps//:requirements.bzl", "requirement") load("@pybind11_bazel//:build_defs.bzl", "pybind_extension") load("@rules_python//python:defs.bzl", "py_library", "py_test") diff --git a/ortools/linear_solver/samples/code_samples.bzl b/ortools/linear_solver/samples/code_samples.bzl index f928aa0be7..146b0ae4b6 100644 --- a/ortools/linear_solver/samples/code_samples.bzl +++ b/ortools/linear_solver/samples/code_samples.bzl @@ -13,7 +13,7 @@ """Helper macro to compile and test code samples.""" -load("@ortools_deps//:requirements.bzl", "requirement") +load("@pip_deps//:requirements.bzl", "requirement") def code_sample_cc(name): native.cc_binary( diff --git a/ortools/pdlp/BUILD.bazel b/ortools/pdlp/BUILD.bazel index 3e97de8b9a..8a56b48152 100644 --- a/ortools/pdlp/BUILD.bazel +++ b/ortools/pdlp/BUILD.bazel @@ -11,8 +11,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_cc//cc:defs.bzl", "cc_proto_library") -load("@com_google_protobuf//:protobuf.bzl", "py_proto_library") +load("@rules_cc//cc:defs.bzl", "cc_library", "cc_proto_library") +load("@rules_proto//proto:defs.bzl", "proto_library") +load("@rules_python//python:proto.bzl", "py_proto_library") package(default_visibility = ["//visibility:public"]) @@ -29,8 +30,7 @@ cc_proto_library( py_proto_library( name = "solve_log_py_pb2", - srcs = ["solve_log.proto"], - deps = [":solvers_py_pb2"], + deps = [":solve_log_proto"], ) proto_library( @@ -46,8 +46,9 @@ cc_proto_library( py_proto_library( name = "solvers_py_pb2", - srcs = ["solvers.proto"], - deps = ["//ortools/glop:parameters_py_pb2"], + deps = [ + ":solvers_proto", + ], ) cc_library( diff --git a/ortools/pdlp/python/BUILD.bazel b/ortools/pdlp/python/BUILD.bazel index 7c448b6e25..e1e3b4bcee 100644 --- a/ortools/pdlp/python/BUILD.bazel +++ b/ortools/pdlp/python/BUILD.bazel @@ -15,7 +15,7 @@ load("@pybind11_bazel//:build_defs.bzl", "pybind_extension") load("@rules_python//python:defs.bzl", "py_test") -load("@ortools_deps//:requirements.bzl", "requirement") +load("@pip_deps//:requirements.bzl", "requirement") pybind_extension( name = "pywrap_pdlp", diff --git a/ortools/sat/BUILD.bazel b/ortools/sat/BUILD.bazel index 8b9691c74b..d04db98693 100644 --- a/ortools/sat/BUILD.bazel +++ b/ortools/sat/BUILD.bazel @@ -35,26 +35,24 @@ cc_proto_library( py_proto_library( name = "sat_parameters_py_pb2", - visibility = ["//visibility:public"], deps = [":sat_parameters_proto"], ) java_proto_library( name = "sat_parameters_java_proto", - visibility = ["//visibility:public"], deps = [":sat_parameters_proto"], ) -cc_proto_library( - name = "boolean_problem_cc_proto", - deps = [":boolean_problem_proto"], -) - proto_library( name = "boolean_problem_proto", srcs = ["boolean_problem.proto"], ) +cc_proto_library( + name = "boolean_problem_cc_proto", + deps = [":boolean_problem_proto"], +) + proto_library( name = "cp_model_proto", srcs = ["cp_model.proto"], @@ -67,7 +65,6 @@ cc_proto_library( py_proto_library( name = "cp_model_py_pb2", - visibility = ["//visibility:public"], deps = [":cp_model_proto"], ) @@ -277,7 +274,7 @@ cc_library( ":drat_checker", ":drat_proof_handler", ":feasibility_jump", - ":feasibility_pump", + ":feasibility_pump", ":integer", ":integer_expr", ":integer_search", diff --git a/ortools/sat/python/BUILD.bazel b/ortools/sat/python/BUILD.bazel index 9135266109..cf2f6486f0 100644 --- a/ortools/sat/python/BUILD.bazel +++ b/ortools/sat/python/BUILD.bazel @@ -13,7 +13,7 @@ # Python wrapper for cp_model. -load("@ortools_deps//:requirements.bzl", "requirement") +load("@pip_deps//:requirements.bzl", "requirement") load("@pybind11_bazel//:build_defs.bzl", "pybind_extension") load("@rules_python//python:defs.bzl", "py_library") diff --git a/ortools/sat/samples/code_samples.bzl b/ortools/sat/samples/code_samples.bzl index 8592521faf..f5a94e202c 100644 --- a/ortools/sat/samples/code_samples.bzl +++ b/ortools/sat/samples/code_samples.bzl @@ -13,7 +13,7 @@ """Helper macro to compile and test code samples.""" -load("@ortools_deps//:requirements.bzl", "requirement") +load("@pip_deps//:requirements.bzl", "requirement") def code_sample_cc(name): native.cc_binary(