big cleanup; rename bazel targets, move code around. Work on CP-SAT gates; LNS and LS model reductions when possible

Author: lperron

bazel/compilation_flags.bzl

@@ -0,0 +1,22 @@
+# Copyright 2010-2025 Google LLC
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Compilation flags for ORTools."""
+
+# Enable a warning to check for floating point to integer conversions.
+SAFE_FP_CODE = select({
+    "@platforms//os:android": [],
+    "@rules_cc//cc/compiler:gcc": ["-Wfloat-conversion"],
+    "@rules_cc//cc/compiler:clang": ["-Wfloat-conversion"],
+    "//conditions:default": [],
+})

ortools/algorithms/BUILD.bazel

@@ -18,7 +18,6 @@ package(default_visibility = ["//visibility:public"])
 
 cc_library(
     name = "binary_search",
-    srcs = [],
     hdrs = ["binary_search.h"],
     deps = [
         "//ortools/base:log_severity",
@@ -50,7 +49,6 @@ cc_test(
 
 cc_library(
     name = "radix_sort",
-    srcs = [],
     hdrs = ["radix_sort.h"],
     deps = [
         "//ortools/base:log_severity",
@@ -102,7 +100,6 @@ cc_library(
     ],
 )
 
-# Hungarian algorithm
 cc_library(
     name = "hungarian",
     srcs = ["hungarian.cc"],
@@ -171,12 +168,12 @@ cc_test(
 )
 
 cc_library(
-    name = "knapsack_solver_lib",
+    name = "knapsack_solver",
     srcs = ["knapsack_solver.cc"],
     hdrs = ["knapsack_solver.h"],
     deps = [
         "//ortools/base:stl_util",
-        "//ortools/linear_solver",
+        "//ortools/linear_solver:linear_solver_base",
         "//ortools/linear_solver:linear_solver_scip",
         "//ortools/sat:cp_model",
         "//ortools/sat:cp_model_cc_proto",
@@ -185,7 +182,7 @@ cc_library(
         "//ortools/util:time_limit",
         "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/log:check",
-        "@abseil-cpp//absl/strings",
+        "@abseil-cpp//absl/strings:string_view",
         "@abseil-cpp//absl/time",
     ],
 )
@@ -195,19 +192,14 @@ cc_test(
     size = "medium",
     srcs = ["knapsack_solver_test.cc"],
     deps = [
-        ":knapsack_solver_lib",
+        ":knapsack_solver",
         "//ortools/base:gmock_main",
         "//ortools/util:time_limit",
         "@abseil-cpp//absl/base:core_headers",
         "@abseil-cpp//absl/types:span",
     ],
 )
 
-# Partitioning and splitting of vector<int64_t>.
-
-# query matching library.
-
-# Graph automorphism libraries.
 cc_library(
     name = "dense_doubly_linked_list",
     hdrs = ["dense_doubly_linked_list.h"],
@@ -313,15 +305,6 @@ cc_library(
     ],
 )
 
-cc_test(
-    name = "dynamic_permutation_test",
-    srcs = ["dynamic_permutation_test.cc"],
-    deps = [
-        ":dynamic_permutation",
-        "//ortools/base:gmock_main",
-    ],
-)
-
 cc_library(
     name = "find_graph_symmetries",
     srcs = ["find_graph_symmetries.cc"],
@@ -383,6 +366,7 @@ cc_test(
         "@abseil-cpp//absl/status:statusor",
         "@abseil-cpp//absl/strings",
         "@abseil-cpp//absl/strings:str_format",
+        "@abseil-cpp//absl/strings:string_view",
         "@abseil-cpp//absl/time",
         "@abseil-cpp//absl/types:span",
     ],
@@ -391,9 +375,7 @@ cc_test(
 cc_library(
     name = "binary_indexed_tree",
     hdrs = ["binary_indexed_tree.h"],
-    deps = [
-        "@abseil-cpp//absl/log:check",
-    ],
+    deps = ["@abseil-cpp//absl/log:check"],
 )
 
 cc_test(
@@ -405,6 +387,15 @@ cc_test(
     ],
 )
 
+cc_test(
+    name = "dynamic_permutation_test",
+    srcs = ["dynamic_permutation_test.cc"],
+    deps = [
+        ":dynamic_permutation",
+        "//ortools/base:gmock_main",
+    ],
+)
+
 cc_library(
     name = "n_choose_k",
     srcs = ["n_choose_k.cc"],
@@ -435,6 +426,5 @@ cc_test(
         "@abseil-cpp//absl/random:distributions",
         "@abseil-cpp//absl/status",
         "@abseil-cpp//absl/status:statusor",
-        "@google_benchmark//:benchmark",
     ],
 )

ortools/algorithms/find_graph_symmetries.h

@@ -55,7 +55,7 @@ class GraphSymmetryFinder {
   // and bypass the need for reverse adjacency lists.
   //
   // If you don't know this in advance, you may use GraphIsSymmetric() from
-  // ortools/graph_base/util.h.
+  // util/graph/util.h.
   //
   // "graph" must not have multi-arcs.
   // TODO(user): support multi-arcs.

ortools/algorithms/java/BUILD.bazel

@@ -27,5 +27,5 @@ java_wrap_cc(
         "//ortools/util/java:vector.swig",
     ],
     visibility = ["//visibility:public"],
-    deps = ["//ortools/algorithms:knapsack_solver_lib"],
+    deps = ["//ortools/algorithms:knapsack_solver"],
 )

ortools/algorithms/python/BUILD.bazel

@@ -33,7 +33,7 @@ pybind_extension(
     visibility = ["//visibility:public"],
     deps = [
         ":knapsack_solver_doc",
-        "//ortools/algorithms:knapsack_solver_lib",
+        "//ortools/algorithms:knapsack_solver",
     ],
 )
 

ortools/algorithms/radix_sort_test.cc

@@ -347,7 +347,8 @@ void BM_Sort(benchmark::State& state) {
 }
 
 // For std::sort(), we don't benchmark with much detail past 32k, because it
-// reaches its "very" slow part where the item/s throuput is almost horizontal.
+// reaches its "very" slow part where the item/s throughput is almost
+// horizontal.
 BENCHMARK(BM_Sort<kStdSort, int, kRandom, 1, 1>)
     ->RangeMultiplier(2)
     ->Range(1, 32 << 10)

ortools/algorithms/samples/BUILD.bazel

@@ -22,7 +22,7 @@ cc_test(
     name = "simple_knapsack_program_test",
     srcs = ["simple_knapsack_program.cc"],
     deps = [
-        "//ortools/algorithms:knapsack_solver_lib",
+        "//ortools/algorithms:knapsack_solver",
         "//ortools/base",
         "//ortools/base:log_severity",
         "@abseil-cpp//absl/log",
@@ -41,7 +41,7 @@ cc_test(
     name = "knapsack_test",
     srcs = ["knapsack.cc"],
     deps = [
-        "//ortools/algorithms:knapsack_solver_lib",
+        "//ortools/algorithms:knapsack_solver",
         "//ortools/base",
         "//ortools/base:log_severity",
         "@abseil-cpp//absl/log",

ortools/algorithms/samples/simple_knapsack_program.py

@@ -14,7 +14,6 @@
 
 # [START program]
 """A simple knapsack problem."""
-
 # [START import]
 from ortools.algorithms.python import knapsack_solver
 

ortools/base/BUILD.bazel

@@ -36,35 +36,32 @@ cc_library(
 
 cc_library(
     name = "base",
-    srcs = ["version.cc"],
-    hdrs = [
-        "commandlineflags.h",
-        "init_google.h",
-        "types.h",
-        "version.h",
-    ],
-    copts = [
-        "-DOR_TOOLS_MAJOR=10",
-        "-DOR_TOOLS_MINOR=0",
-        "-DOR_TOOLS_PATCH=9999",
-    ],
+    hdrs = ["init_google.h"],
     linkopts = select({
         "@platforms//os:macos": ["-framework CoreFoundation"],
         "//conditions:default": [],
     }),
     deps = [
-        ":commandlineflags",
-        ":types",
         "@abseil-cpp//absl/flags:flag",
         "@abseil-cpp//absl/flags:parse",
         "@abseil-cpp//absl/flags:usage",
-        "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/log:initialize",
-        "@abseil-cpp//absl/strings",
         "@abseil-cpp//absl/strings:string_view",
     ],
 )
 
+cc_library(
+    name = "version",
+    srcs = ["version.cc"],
+    hdrs = ["version.h"],
+    copts = [
+        "-DOR_TOOLS_MAJOR=10",
+        "-DOR_TOOLS_MINOR=0",
+        "-DOR_TOOLS_PATCH=9999",
+    ],
+    deps = ["@abseil-cpp//absl/strings"],
+)
+
 cc_library(
     name = "base_export",
     hdrs = ["base_export.h"],

ortools/base/file.cc

@@ -27,7 +27,6 @@
 #include <unistd.h>
 #endif
 
-#include <bzlib.h>
 #include <zlib.h>
 
 #include <cstdio>
@@ -41,6 +40,7 @@
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
+#include "bzlib.h"
 #include "google/protobuf/io/tokenizer.h"
 #include "google/protobuf/message.h"
 #include "google/protobuf/text_format.h"