big includes cleanup

Author: lperron

ortools/algorithms/BUILD.bazel

@@ -237,9 +237,9 @@ cc_test(
     srcs = ["knapsack_solver_test.cc"],
     deps = [
         ":knapsack_solver_lib",  # buildcleaner: keep
-        "//ortools/base",
         "//ortools/base:gmock_main",
         "//ortools/util:time_limit",
+        "@com_google_absl//absl/base:core_headers",
     ],
 )
 
@@ -284,8 +284,10 @@ cc_test(
         ":dynamic_partition",
         "//ortools/base:gmock_main",
         "//ortools/base:stl_util",
+        "@com_google_absl//absl/base:log_severity",
         "@com_google_absl//absl/random",
         "@com_google_absl//absl/random:bit_gen_ref",
+        "@com_google_absl//absl/types:span",
     ],
 )
 

ortools/algorithms/adjustable_k_ary_heap_stress_test.cc

@@ -17,10 +17,10 @@
 
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/random/random.h"
 #include "gtest/gtest.h"
 #include "ortools/algorithms/adjustable_k_ary_heap.h"
-#include "ortools/base/logging.h"
 
 // Stress test for AdjustableKaryHeap.
 // The test generates a random heap of size num_elements. Then, it randomly

ortools/algorithms/dynamic_partition_test.cc

@@ -25,7 +25,6 @@
 #include "absl/types/span.h"
 #include "gtest/gtest.h"
 #include "ortools/base/gmock.h"
-#include "ortools/base/macros.h"  // for DEBUG_MODE.
 #include "ortools/base/stl_util.h"
 
 namespace operations_research {
@@ -251,8 +250,13 @@ TEST(DynamicPartitionTest, FingerprintStressTest) {
   // The size are just indicative (in opt mode, we stress it a bit more).
   //
   // Timing as of 2014-04-30, on forge: fastbuild=7.5s, opt=22s.
-  const int kNumPartitions = DEBUG_MODE ? 1000 : 4000;
-  const int kPartitionSize = DEBUG_MODE ? 10 : 12;
+#if defined(NDEBUG)
+  const int kNumPartitions = 4000;
+  const int kPartitionSize = 12;
+#else
+  const int kNumPartitions = 1000;
+  const int kPartitionSize = 10;
+#endif
   const int kMaxNumParts = 3;
   std::mt19937 random(12345);
   std::vector<std::unique_ptr<DynamicPartition>> partitions(kNumPartitions);

ortools/algorithms/find_graph_symmetries.cc

@@ -28,6 +28,7 @@
 #include "absl/container/flat_hash_set.h"
 #include "absl/flags/flag.h"
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/numeric/int128.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_format.h"
@@ -39,7 +40,6 @@
 #include "ortools/algorithms/dynamic_partition.h"
 #include "ortools/algorithms/dynamic_permutation.h"
 #include "ortools/algorithms/sparse_permutation.h"
-#include "ortools/base/logging.h"
 #include "ortools/graph/graph.h"
 #include "ortools/graph/iterators.h"
 #include "ortools/graph/util.h"

ortools/algorithms/n_choose_k.cc

@@ -19,14 +19,14 @@
 #include <vector>
 
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/numeric/int128.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_format.h"
 #include "absl/time/clock.h"
 #include "absl/time/time.h"
 #include "ortools/algorithms/binary_search.h"
-#include "ortools/base/logging.h"
 #include "ortools/base/mathutil.h"
 
 namespace operations_research {

ortools/algorithms/radix_sort.h

@@ -46,8 +46,8 @@
 #include "absl/algorithm/container.h"
 #include "absl/base/casts.h"
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/types/span.h"
-#include "ortools/base/logging.h"
 
 namespace operations_research {
 

ortools/algorithms/radix_sort_test.cc

@@ -24,6 +24,7 @@
 #include <vector>
 
 #include "absl/algorithm/container.h"
+#include "absl/log/log.h"
 #include "absl/random/bit_gen_ref.h"
 #include "absl/random/distributions.h"
 #include "absl/random/random.h"
@@ -32,7 +33,6 @@
 #include "gtest/gtest.h"
 #include "ortools/base/dump_vars.h"
 #include "ortools/base/gmock.h"
-#include "ortools/base/logging.h"
 #include "ortools/base/mathutil.h"
 
 namespace operations_research {

ortools/algorithms/samples/simple_knapsack_program.cc

@@ -21,8 +21,8 @@
 #include <sstream>
 #include <vector>
 
+#include "absl/log/log.h"
 #include "ortools/algorithms/knapsack_solver.h"
-#include "ortools/base/logging.h"
 // [END import]
 
 namespace operations_research {

ortools/base/file.cc

@@ -33,13 +33,13 @@
 #include <string>
 
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/string_view.h"
 #include "google/protobuf/io/tokenizer.h"
 #include "google/protobuf/message.h"
 #include "google/protobuf/text_format.h"
-#include "ortools/base/logging.h"
 
 File::File(FILE* descriptor, absl::string_view name)
     : f_(descriptor), name_(name) {}

ortools/base/fuzztest.h

@@ -14,19 +14,15 @@
 #ifndef OR_TOOLS_BASE_FUZZTEST_H_
 #define OR_TOOLS_BASE_FUZZTEST_H_
 
-#include <memory>
-#include <string>
 #include <string_view>
 #include <tuple>
 #include <vector>
 
+// #include "fuzztest/googletest_fixture_adapter.h"
 #include "fuzztest/domain.h"
 #include "fuzztest/fuzztest.h"
-#include "fuzztest/googletest_fixture_adapter.h"
 #include "fuzztest/init_fuzztest.h"
-#include "google/protobuf/message.h"
 #include "google/protobuf/text_format.h"
-#include "ortools/base/logging.h"
 
 namespace fuzztest {