-
Notifications
You must be signed in to change notification settings - Fork 950
BatchFactor #2306
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
dellaert
wants to merge
11
commits into
develop
Choose a base branch
from
feature/batch_factor
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
BatchFactor #2306
Changes from 7 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
762d867
feat: introduce BatchFactor for efficient linearization of multiple i…
dellaert 5b59af0
feat: Add `BatchFactor` convenience constructor test and supporting `…
dellaert e618683
feat: Add generic BatchFactor constructor taking a container and fact…
dellaert b4a89e7
feat: Implement new BatchFactor constructors that accept measurement …
dellaert 4adc1a3
refactor: move `createFactor` helper to `detail` namespace and remove…
dellaert 64d4375
Fix Jacobian
dellaert 80486fc
Compare with batch version
dellaert 7c026d6
Fixed bug in timing [skip ci]
dellaert db9b656
Lots of experimentation, no clear win
dellaert 6a43119
Merge branch 'develop' into feature/batch_factor
dellaert 637cba8
No EXPORT
dellaert File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,351 @@ | ||
| /* ---------------------------------------------------------------------------- | ||
|
|
||
| * GTSAM Copyright 2010, Georgia Tech Research Corporation, | ||
| * Atlanta, Georgia 30332-0415 | ||
| * All Rights Reserved | ||
| * Authors: Frank Dellaert, et al. (see THANKS for the full author list) | ||
|
|
||
| * See LICENSE for the license information | ||
|
|
||
| * -------------------------------------------------------------------------- */ | ||
|
|
||
| /** | ||
| * @file BatchFactor.h | ||
| * @brief A batch of factors that linearizes to a single JacobianFactor | ||
| * @author Frank Dellaert | ||
| * @date Nov 2023 | ||
| */ | ||
|
|
||
| #pragma once | ||
|
|
||
| #include <gtsam/base/Testable.h> | ||
| #include <gtsam/linear/JacobianFactor.h> | ||
| #include <gtsam/linear/NoiseModel.h> | ||
| #include <gtsam/nonlinear/NonlinearFactor.h> | ||
|
|
||
| #include <Eigen/StdVector> | ||
| #include <algorithm> | ||
| #include <map> | ||
| #include <type_traits> | ||
| #include <vector> | ||
|
|
||
| namespace gtsam { | ||
|
|
||
| namespace detail { | ||
|
|
||
| /** | ||
| * @brief Helper to construct a factor by trying common signature patterns. | ||
| * | ||
| * Tries the following constructor signatures for FactorType: | ||
| * 1. (Key1, Key2, Measurement, Model, Args...) [Standard] | ||
| * 2. (Measurement, Model, Key1, Key2, Args...) [Projection/SFM] | ||
| * 3. (Key1, Key2, Measurement, Args..., Model) [MagFactor style] | ||
| */ | ||
| template <typename FactorType, typename K1, typename K2, typename Meas, | ||
| typename Model, typename... Args> | ||
| static FactorType createFactor(K1 k1, K2 k2, const Meas& z, const Model& model, | ||
| Args&&... args) { | ||
| if constexpr (std::is_constructible_v<FactorType, K1, K2, Meas, Model, | ||
| Args...>) { | ||
| return FactorType(k1, k2, z, model, std::forward<Args>(args)...); | ||
| } else if constexpr (std::is_constructible_v<FactorType, Meas, Model, K1, K2, | ||
| Args...>) { | ||
| return FactorType(z, model, k1, k2, std::forward<Args>(args)...); | ||
| } else if constexpr (std::is_constructible_v<FactorType, K1, K2, Meas, | ||
| Args..., Model>) { | ||
| return FactorType(k1, k2, z, std::forward<Args>(args)..., model); | ||
| } else { | ||
| // This static_assert will trigger if none of the above match. | ||
| // We repeat the check to produce a readable error message. | ||
| static_assert( | ||
| std::is_constructible_v<FactorType, K1, K2, Meas, Model, Args...>, | ||
| "BatchFactor: Could not find a matching constructor for FactorType. " | ||
| "Tried: (K1, K2, Z, Model, Args...), (Z, Model, K1, K2, Args...), (K1, " | ||
| "K2, Z, Args..., Model)"); | ||
| return FactorType(k1, k2, z, model, std::forward<Args>(args)...); | ||
| } | ||
| } | ||
|
|
||
| } // namespace detail | ||
|
|
||
| /** | ||
| * BatchFactor is a NonlinearFactor that wraps a collection of identical | ||
| * factors. It linearizes them all at once into a single JacobianFactor. | ||
| * | ||
| * This is useful for optimizing Structure-from-Motion (SfM) and SLAM graphs | ||
| * where we have many factors of the same type (e.g., projection factors) that | ||
| * can be grouped together to reduce overhead. | ||
| * | ||
| * @tparam FactorType The type of the individual factors (must derive from | ||
| * NoiseModelFactor) | ||
| * @tparam ErrorDim The dimension of the error vector for a single factor | ||
| */ | ||
| template <typename FactorType, int ErrorDim> | ||
| class BatchFactor : public NonlinearFactor { | ||
|
dellaert marked this conversation as resolved.
|
||
| public: | ||
| // Static assertion to ensure FactorType derives from NoiseModelFactor | ||
| static_assert(std::is_base_of<NoiseModelFactor, FactorType>::value, | ||
| "FactorType must derive from NoiseModelFactor"); | ||
|
|
||
| using Base = NonlinearFactor; | ||
| using This = BatchFactor<FactorType, ErrorDim>; | ||
| using shared_ptr = std::shared_ptr<This>; | ||
|
|
||
| private: | ||
| using Allocator = Eigen::aligned_allocator<FactorType>; | ||
| std::vector<FactorType, Allocator> factors_; ///< Contiguous storage | ||
|
|
||
| public: | ||
| /// @name Constructors | ||
| /// @{ | ||
|
|
||
| /** Default constructor */ | ||
| BatchFactor() = default; | ||
|
|
||
| /** Constructor from a vector of factors (moves the vector) */ | ||
| explicit BatchFactor(std::vector<FactorType, Allocator>&& factors) | ||
| : factors_(std::move(factors)) { | ||
| updateKeys(); | ||
| } | ||
|
dellaert marked this conversation as resolved.
|
||
|
|
||
| /** Constructor from a vector of factors (copies the vector) */ | ||
| explicit BatchFactor(const std::vector<FactorType, Allocator>& factors) | ||
| : factors_(factors) { | ||
| updateKeys(); | ||
| } | ||
|
dellaert marked this conversation as resolved.
|
||
|
|
||
| /** | ||
| * @brief Map-based Constructor (Varying Key2). | ||
| * Constructs factors from a map of measurements, where the map key is the | ||
| * second factor key. | ||
| * | ||
| * @param key1 The fixed first key (e.g., camera pose). | ||
| * @param measurements Map from Key (2nd key) to Measurement. | ||
| * @param model Noise model. | ||
| * @param args Extra arguments passed to the factor constructor. | ||
| */ | ||
| template <typename Measurement, typename... Args> | ||
| BatchFactor(Key key1, const std::map<Key, Measurement>& measurements, | ||
| const SharedNoiseModel& model, Args&&... args) { | ||
| factors_.reserve(measurements.size()); | ||
| for (const auto& [key2, z] : measurements) { | ||
| factors_.push_back(detail::createFactor<FactorType>( | ||
| key1, key2, z, model, std::forward<Args>(args)...)); | ||
| } | ||
| updateKeys(); | ||
| } | ||
|
|
||
| /** | ||
| * @brief Map-based Constructor (Varying Key1). | ||
| * Constructs factors from a map of measurements, where the map key is the | ||
| * first factor key. | ||
| * | ||
| * @param measurements Map from Key (1st key) to Measurement. | ||
| * @param key2 The fixed second key (e.g., landmark). | ||
| * @param model Noise model. | ||
| * @param args Extra arguments passed to the factor constructor. | ||
| */ | ||
| template <typename Measurement, typename... Args> | ||
| BatchFactor(const std::map<Key, Measurement>& measurements, Key key2, | ||
| const SharedNoiseModel& model, Args&&... args) { | ||
| factors_.reserve(measurements.size()); | ||
| for (const auto& [key1, z] : measurements) { | ||
| factors_.push_back(detail::createFactor<FactorType>( | ||
| key1, key2, z, model, std::forward<Args>(args)...)); | ||
| } | ||
| updateKeys(); | ||
| } | ||
|
|
||
| /// @} | ||
| /// @name Testable | ||
| /// @{ | ||
|
|
||
| /** print */ | ||
|
dellaert marked this conversation as resolved.
Outdated
|
||
| void print( | ||
| const std::string& s = "", | ||
| const KeyFormatter& keyFormatter = DefaultKeyFormatter) const override { | ||
| Base::print(s, keyFormatter); | ||
| std::cout << "BatchFactor with " << factors_.size() | ||
| << " factors:" << std::endl; | ||
| for (const auto& f : factors_) { | ||
| f.print("", keyFormatter); | ||
| } | ||
| } | ||
|
|
||
| /** equals */ | ||
|
dellaert marked this conversation as resolved.
Outdated
|
||
| bool equals(const NonlinearFactor& f, double tol = 1e-9) const override { | ||
| const This* p = dynamic_cast<const This*>(&f); | ||
| if (!p || factors_.size() != p->factors_.size()) return false; | ||
| for (size_t i = 0; i < factors_.size(); ++i) { | ||
| if (!factors_[i].equals(p->factors_[i], tol)) return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| /// @} | ||
| /// @name Standard Interface | ||
| /// @{ | ||
|
|
||
| /** | ||
| * Calculate the error of the factor. | ||
| * This is the sum of the errors of all internal factors. | ||
| */ | ||
|
dellaert marked this conversation as resolved.
|
||
| double error(const Values& c) const override { | ||
| double total_error = 0.0; | ||
| for (const auto& f : factors_) { | ||
| total_error += f.error(c); | ||
| } | ||
| return total_error; | ||
| } | ||
|
|
||
| /** get the dimension of the factor (number of rows on linearization) */ | ||
|
dellaert marked this conversation as resolved.
Outdated
|
||
| size_t dim() const override { return factors_.size() * ErrorDim; } | ||
|
|
||
| /** | ||
| * Linearize to a single JacobianFactor. | ||
| * | ||
| * Optimization: | ||
| * - Pre-calculates the total size required for the JacobianFactor. | ||
| * - Collects all unique Keys involved across all sub-factors. | ||
| * - Iterates linearly over factors_ (cache-friendly) to compute Jacobians. | ||
| * - Fills the pre-allocated JacobianFactor directly. | ||
| */ | ||
| std::shared_ptr<GaussianFactor> linearize(const Values& c) const override { | ||
| if (factors_.empty()) return std::make_shared<JacobianFactor>(); | ||
|
|
||
| // 1. Collect all unique keys and their dimensions | ||
| std::map<Key, size_t> key_dims; | ||
| for (const auto& factor : factors_) { | ||
| collectKeyDims<1>(factor, key_dims); | ||
| } | ||
|
|
||
| // 2. Prepare keys and dimensions for JacobianFactor construction | ||
| const size_t numKeys = key_dims.size(); | ||
| std::vector<size_t> dims; | ||
| dims.reserve(numKeys); | ||
| std::map<Key, DenseIndex> indices; | ||
| DenseIndex index = 0; | ||
| for (const auto& key : keys()) { | ||
| dims.push_back(key_dims.at(key)); | ||
| indices[key] = index++; | ||
| } | ||
|
|
||
| // 3. Allocate JacobianFactor | ||
| // We create a VerticalBlockMatrix with the correct dimensions. | ||
| // The total number of rows is the sum of the error dimensions of all | ||
| // factors. | ||
| size_t total_rows = factors_.size() * ErrorDim; | ||
| VerticalBlockMatrix Ab(dims, total_rows, true); | ||
| Ab.matrix() | ||
| .setZero(); // Important: Initialize to zero as we will fill blocks | ||
|
|
||
| // 4. Fill the JacobianFactor | ||
| // We reuse a vector of matrices for the Jacobians to avoid repeated | ||
| // allocations. | ||
| std::vector<Matrix> H(FactorType::N); | ||
|
|
||
| // Optimization: Allocate Eigen::Matrix<double, ErrorDim, 1> on the stack | ||
| // for the error vector computation to avoid heap fragmentation. | ||
| // Note: unwhitenedError returns a dynamic Vector, but we can use a | ||
| // fixed-size vector for intermediate storage if needed, or just rely on the | ||
| // fact that we are writing directly into the large matrix block. Here we | ||
| // use the return value of unwhitenedError directly to whiten. | ||
|
|
||
| for (size_t i = 0; i < factors_.size(); ++i) { | ||
| const auto& factor = factors_[i]; | ||
| size_t row_start = i * ErrorDim; | ||
|
|
||
| // Compute unwhitened error and Jacobians | ||
| // We use the factor's unwhitenedError method which fills H. | ||
| Vector raw_error = factor.unwhitenedError(c, H); | ||
|
|
||
| // Apply noise model (whitening) | ||
| // This modifies H and raw_error in place. | ||
| if (factor.noiseModel()) { | ||
| factor.noiseModel()->WhitenSystem(H, raw_error); | ||
| } | ||
|
|
||
| // Place Jacobians into the large matrix | ||
| for (size_t k = 0; k < FactorType::N; ++k) { | ||
| Key key = factor.keys()[k]; | ||
| // Find the block column index for this key. | ||
| DenseIndex index = indices.at(key); | ||
| Ab(index).block(row_start, 0, ErrorDim, H[k].cols()) = H[k]; | ||
| } | ||
|
|
||
| // Place the negative error into the RHS (last column) | ||
| // JacobianFactor stores Ax - b, so b = -error. | ||
| // Ab(size) gives the last block which is the RHS vector b. | ||
| // We use block() to access the segment as a matrix block. | ||
| Ab(indices.size()).block(row_start, 0, ErrorDim, 1) = -raw_error; | ||
| } | ||
|
|
||
| // 5. Create and return the JacobianFactor | ||
| // We pass a Unit noise model because we have already whitened the system. | ||
| return std::make_shared<JacobianFactor>( | ||
| keys(), std::move(Ab), noiseModel::Unit::Create(total_rows)); | ||
| } | ||
|
|
||
| private: | ||
| /** Helper to collect keys from factors */ | ||
|
dellaert marked this conversation as resolved.
Outdated
|
||
| void updateKeys() { | ||
| std::set<Key> unique_keys; | ||
| for (const auto& f : factors_) { | ||
| for (size_t i = 0; i < FactorType::N; ++i) { | ||
| // Access keys via the base NoiseModelFactor keys_ array if possible, | ||
| // or use the key() method. NoiseModelFactorN exposes key<I>(). | ||
| // We can also access the public keys() method from NonlinearFactor. | ||
| unique_keys.insert(f.keys()[i]); | ||
| } | ||
| } | ||
| this->keys_.assign(unique_keys.begin(), unique_keys.end()); | ||
| } | ||
|
|
||
| /** Helper to collect key dimensions recursively */ | ||
|
dellaert marked this conversation as resolved.
Outdated
|
||
| template <int I> | ||
| void collectKeyDims(const FactorType& f, | ||
| std::map<Key, size_t>& key_dims) const { | ||
| if constexpr (I <= FactorType::N) { | ||
| // Get key and dimension for the I-th variable | ||
| Key k = f.template key<I>(); | ||
| // Use traits to get dimension of the ValueType | ||
| using V = typename FactorType::template ValueType<I>; | ||
| key_dims[k] = traits<V>::dimension; | ||
|
|
||
| // Recurse | ||
| collectKeyDims<I + 1>(f, key_dims); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| } // namespace gtsam | ||
|
|
||
| /* | ||
| * Usage Example: | ||
| * | ||
| * // Assume we have GenericProjectionFactor<Pose3, Point3> | ||
| * using ProjectionFactor = GenericProjectionFactor<Pose3, Point3>; | ||
| * | ||
| * // Create a batch factor | ||
| * std::vector<Key> poses = {Symbol('x', 1)}; | ||
| * std::vector<Key> points; | ||
| * std::vector<Point2> measurements; | ||
| * for (int i = 0; i < 100; ++i) { | ||
| * points.push_back(Symbol('l', i)); | ||
| * measurements.push_back(Point2(10, 10)); // Dummy measurement | ||
| * } | ||
| * | ||
| * auto noise = noiseModel::Isotropic::Sigma(2, 1.0); | ||
| * | ||
| * // Construct using the helper (1 camera, 100 points) | ||
| * auto batch = std::make_shared<BatchFactor<ProjectionFactor, 2>>( | ||
| * poses, points, measurements, noise); | ||
| * | ||
| * // Add to graph | ||
| * NonlinearFactorGraph graph; | ||
| * graph.add(batch); | ||
| * | ||
| * // Optimize as usual | ||
| * LevenbergMarquardtOptimizer optimizer(graph, initial_values); | ||
| * Values result = optimizer.optimize(); | ||
| */ | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.