From 6aa7df96501058e3d0531db4ea19b0cd0e2ece93 Mon Sep 17 00:00:00 2001 From: Sameer Agarwal Date: Mon, 9 Sep 2024 08:45:27 -0700 Subject: [PATCH] Reduce the minimum required version of Abseil 1. The required version of Abseil is now 20240116.0 instead of 20240116.2. This was an oversight. Thanks to @NeroBurner for pointing this out. Both CMake and Bazel builds are updated. 2. Unbreak the Bazel build which had become stale. Change-Id: I274bbad2f94f7710387f9693de9c66b035758970 --- CMakeLists.txt | 4 ++-- MODULE.bazel | 3 ++- bazel/ceres.bzl | 4 +--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f266e9ca7..60f8f755b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,8 +157,8 @@ else() # For some reason unknown to me having the version number in the # find_package call fails. So we check for he minimum version # manually. - if (absl_VERSION VERSION_LESS 20240116.2) - message(FATAL_ERROR "The version of abseil installed on the system is " ${absl_VERSION} " need at least 20240116.2") + if (absl_VERSION VERSION_LESS 20240116) + message(FATAL_ERROR "The version of abseil installed on the system is " ${absl_VERSION} " need at least 20240116") endif() endif() diff --git a/MODULE.bazel b/MODULE.bazel index aedb0dd5b..e8e41c777 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,7 @@ + # MODULE.bazel -bazel_dep(name = "abseil-cpp", version = "20240116.2") +bazel_dep(name = "abseil-cpp", version = "20240116.0") bazel_dep(name = "googletest", version = "1.14.0") bazel_dep(name = "eigen", version = "3.4.0") bazel_dep(name = "google_benchmark", version = "1.8.4") diff --git a/bazel/ceres.bzl b/bazel/ceres.bzl index b0e4c5caa..029cb5234 100644 --- a/bazel/ceres.bzl +++ b/bazel/ceres.bzl @@ -68,9 +68,9 @@ CERES_SRCS = ["internal/ceres/" + filename for filename in [ "eigensparse.cc", "evaluation_callback.cc", "evaluator.cc", + "event_logger.cc", "file.cc", "first_order_function.cc", - "float_suitesparse.cc", "function_sample.cc", "gradient_checker.cc", "gradient_checking_cost_function.cc", @@ -121,7 +121,6 @@ CERES_SRCS = ["internal/ceres/" + filename for filename in [ "sparse_cholesky.cc", "sparse_matrix.cc", "sparse_normal_cholesky_solver.cc", - "stringprintf.cc", "subset_preconditioner.cc", "suitesparse.cc", "thread_pool.cc", @@ -134,7 +133,6 @@ CERES_SRCS = ["internal/ceres/" + filename for filename in [ "types.cc", "visibility_based_preconditioner.cc", "visibility.cc", - "wall_time.cc", ]] # TODO(rodrigoq): add support to configure Ceres into various permutations,