mirror of
https://github.com/ceres-solver/ceres-solver.git
synced 2026-08-29 16:40:38 +08:00
Sameer Agarwal
19ab2c1793
1. Add threading to all three subclasses of BlockRandomAccessMatrix. i.e. BlockRandomAccessDenseMatrix, BlockRandomAccessSparseMatrix and BlockRandomAccessDenseMatrix. For BlockRandomAccessDenseMatrix and BlockRandomAccessSparseMatrix this just means SetZero is parallelized. Which by itself is no big deal, but by doing so, the constructor for all three subclasses become uniform. BlockRandomAccessSparseMatrix::SymmetricRightMultiplyAndAccumulate maybe threaded in the future if needed. BlockRandomAccessDiagonalMatrix is the biggest beneficiary. SetZero Invert and RightMultiplyAndAccumulate are all threaded now. 2. Change the storage in BlockRandomAccessDiagonalMatrix from TripletSparseMatrix to CompressedRowSparseMatrix. This has no performance implications since we do not really use the capabilities of the underlying matrix indexing representation. This is a forward looking change when we decide to transfer this matrix to the GPU, a CompressedRowSparseMatrix will save on a data conversion. 3. Use std::unique_ptr as needed and eliminate the need for custom destructors. 4. Modify CompressedRowSparseMatrix::CreateBlockDiagonalMatrix to take a nullptr as the data vector. Fixes https://github.com/ceres-solver/ceres-solver/issues/936 Fixes https://github.com/ceres-solver/ceres-solver/issues/935 Change-Id: Ia6487f2d924fbe669835bdcc38abf2b451bda4ee
99 lines
3.8 KiB
C++
99 lines
3.8 KiB
C++
// Ceres Solver - A fast non-linear least squares minimizer
|
|
// Copyright 2015 Google Inc. All rights reserved.
|
|
// http://ceres-solver.org/
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without
|
|
// modification, are permitted provided that the following conditions are met:
|
|
//
|
|
// * Redistributions of source code must retain the above copyright notice,
|
|
// this list of conditions and the following disclaimer.
|
|
// * Redistributions in binary form must reproduce the above copyright notice,
|
|
// this list of conditions and the following disclaimer in the documentation
|
|
// and/or other materials provided with the distribution.
|
|
// * Neither the name of Google Inc. nor the names of its contributors may be
|
|
// used to endorse or promote products derived from this software without
|
|
// specific prior written permission.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
// ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
// LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
// POSSIBILITY OF SUCH DAMAGE.
|
|
//
|
|
// Author: sameeragarwal@google.com (Sameer Agarwal)
|
|
|
|
#ifndef CERES_INTERNAL_BLOCK_RANDOM_ACCESS_DENSE_MATRIX_H_
|
|
#define CERES_INTERNAL_BLOCK_RANDOM_ACCESS_DENSE_MATRIX_H_
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
|
|
#include "ceres/block_random_access_matrix.h"
|
|
#include "ceres/block_structure.h"
|
|
#include "ceres/context_impl.h"
|
|
#include "ceres/internal/disable_warnings.h"
|
|
#include "ceres/internal/export.h"
|
|
|
|
namespace ceres::internal {
|
|
|
|
// A square block random accessible matrix with the same row and
|
|
// column block structure. All cells are stored in the same single
|
|
// array, so that its also accessible as a dense matrix of size
|
|
// num_rows x num_cols.
|
|
//
|
|
// This class is NOT thread safe. Since all n^2 cells are stored,
|
|
// GetCell never returns nullptr for any (row_block_id, col_block_id)
|
|
// pair.
|
|
//
|
|
// ReturnCell is a nop.
|
|
class CERES_NO_EXPORT BlockRandomAccessDenseMatrix
|
|
: public BlockRandomAccessMatrix {
|
|
public:
|
|
// blocks is a vector of block sizes. The resulting matrix has
|
|
// blocks.size() * blocks.size() cells.
|
|
explicit BlockRandomAccessDenseMatrix(std::vector<Block> blocks,
|
|
ContextImpl* context,
|
|
int num_threads);
|
|
|
|
~BlockRandomAccessDenseMatrix() override = default;
|
|
|
|
// BlockRandomAccessMatrix interface.
|
|
CellInfo* GetCell(int row_block_id,
|
|
int col_block_id,
|
|
int* row,
|
|
int* col,
|
|
int* row_stride,
|
|
int* col_stride) final;
|
|
|
|
void SetZero() final;
|
|
|
|
// Since the matrix is square with the same row and column block
|
|
// structure, num_rows() = num_cols().
|
|
int num_rows() const final { return num_rows_; }
|
|
int num_cols() const final { return num_rows_; }
|
|
|
|
// The underlying matrix storing the cells.
|
|
const double* values() const { return values_.get(); }
|
|
double* mutable_values() { return values_.get(); }
|
|
|
|
private:
|
|
std::vector<Block> blocks_;
|
|
ContextImpl* context_ = nullptr;
|
|
int num_threads_ = -1;
|
|
int num_rows_ = -1;
|
|
std::unique_ptr<double[]> values_;
|
|
std::unique_ptr<CellInfo[]> cell_infos_;
|
|
};
|
|
|
|
} // namespace ceres::internal
|
|
|
|
#include "ceres/internal/reenable_warnings.h"
|
|
|
|
#endif // CERES_INTERNAL_BLOCK_RANDOM_ACCESS_DENSE_MATRIX_H_
|