Merge branch 'main' of github.com:google/or-tools

Author: lperron

Dependencies.txt

@@ -1,6 +1,6 @@
 ZLIB=1.3.1
 abseil-cpp=20240722.0
-Protobuf=v28.3
+Protobuf=v29.0
 Eigen=3.4.0
 Re2=2024-04-01
 CoinUtils=2.11.6

MODULE.bazel

@@ -24,7 +24,7 @@ bazel_dep(name = "google_benchmark", version = "1.8.5", repo_name = "com_google_
 bazel_dep(name = "googletest", version = "1.15.2", repo_name = "com_google_googletest")
 bazel_dep(name = "highs", version = "1.8.1")
 bazel_dep(name = "platforms", version = "0.0.10")
-bazel_dep(name = "protobuf", version = "28.3", repo_name = "com_google_protobuf")
+bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
 bazel_dep(name = "pybind11_abseil", version = "202402.0", repo_name = "org_pybind11_abseil")
 bazel_dep(name = "pybind11_bazel", version = "2.13.6")
 bazel_dep(name = "pybind11_protobuf", version = "0.0.0-20240524-1d7a729")

bazel/notebook_requirements.in

@@ -2,7 +2,7 @@
 absl-py==2.1.0
 immutabledict==3.0.0
 numpy==2.1.1
-protobuf==5.28.3
+protobuf==5.29.0
 requests==2.32.0
 scipy==1.14.1
 

bazel/notebook_requirements.txt

@@ -216,7 +216,7 @@ prometheus-client==0.17.1
     # via jupyter-server
 prompt-toolkit==3.0.39
     # via ipython
-protobuf==5.28.3
+protobuf==5.29.0
     # via
     #   -r bazel/notebook_requirements.in
     #   mypy-protobuf

bazel/ortools_requirements.in

@@ -2,7 +2,7 @@
 absl-py==2.1.0
 immutabledict==3.0.0
 numpy==2.1.1
-protobuf==5.28.3
+protobuf==5.29.0
 requests==2.32.3
 scipy==1.14.1
 

bazel/ortools_requirements.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.13
+# This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
 #    bazel run //bazel:ortools_requirements.update
@@ -45,7 +45,7 @@ platformdirs==3.10.0
     # via
     #   black
     #   virtualenv
-protobuf==5.28.3
+protobuf==5.29.0
     # via
     #   -r bazel/ortools_requirements.in
     #   mypy-protobuf

cmake/dependencies/CMakeLists.txt

@@ -108,10 +108,10 @@ if(BUILD_Protobuf)
   FetchContent_Declare(
     Protobuf
     GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-    GIT_TAG "v28.3"
+    GIT_TAG "v29.0"
     GIT_SHALLOW TRUE
     GIT_SUBMODULES ""
-    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v28.3.patch"
+    PATCH_COMMAND git apply --ignore-whitespace "${CMAKE_CURRENT_LIST_DIR}/../../patches/protobuf-v29.0.patch"
   )
   FetchContent_MakeAvailable(Protobuf)
   list(POP_BACK CMAKE_MESSAGE_INDENT)

cmake/host.CMakeLists.txt

@@ -121,9 +121,9 @@ set(protobuf_WITH_ZLIB OFF)
 FetchContent_Declare(
   protobuf
   GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
-  GIT_TAG "v28.3"
+  GIT_TAG "v29.0"
   GIT_SUBMODULES ""
-  PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v28.3.patch")
+  PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v29.0.patch")
 FetchContent_MakeAvailable(protobuf)
 list(POP_BACK CMAKE_MESSAGE_INDENT)
 message(CHECK_PASS "fetched")

ortools/algorithms/BUILD.bazel

@@ -533,36 +533,3 @@ cc_test(
         "//ortools/base:gmock_main",
     ],
 )
-
-cc_library(
-    name = "n_choose_k",
-    srcs = ["n_choose_k.cc"],
-    hdrs = ["n_choose_k.h"],
-    deps = [
-        ":binary_search",
-        "//ortools/base:mathutil",
-        "@com_google_absl//absl/log",
-        "@com_google_absl//absl/log:check",
-        "@com_google_absl//absl/numeric:int128",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-        "@com_google_absl//absl/strings:str_format",
-        "@com_google_absl//absl/time",
-    ],
-)
-
-cc_test(
-    name = "n_choose_k_test",
-    srcs = ["n_choose_k_test.cc"],
-    deps = [
-        ":n_choose_k",
-        "//ortools/base:dump_vars",
-        "//ortools/base:gmock_main",
-        "//ortools/util:flat_matrix",
-        "@com_google_absl//absl/numeric:int128",
-        "@com_google_absl//absl/random",
-        "@com_google_absl//absl/random:distributions",
-        "@com_google_absl//absl/status",
-        "@com_google_absl//absl/status:statusor",
-    ],
-)