mirror of
https://github.com/ceres-solver/ceres-solver.git
synced 2026-08-29 16:40:38 +08:00
Mike Vitus
f0c3b23684
Previously, the thread ID was acquired and released on every iteration of the for loop. The C++11 concurrent queue implementation is much slower than TBB's version and consequently this was a huge bottleneck. This introduces another ParallelFor API which takes the thread ID as a parameter in the evaluation function. This allows us to acquire and release the thread ID for each block of work which drastically improves the performance. This change brings us on par with OpenMP and TBB. See below for a timing comparison. Note: in this example this CLs C++11 version is faster to compute the residuals because TBB still must acquire the thread ID on every iteration, which has some overhead. Tested by building and running tests for no threading, OpenMP, TBB, and C++11 threads. Also ran bazel tests. ./bin/bundle_adjuster --input=problem-744-543562-pre.txt --num_threads=8 C++11 @Head Time (in seconds): Residual only evaluation 7.819692 (5) Jacobian & residual evaluation 11.606063 (6) Linear solver 47.860195 (5) Minimizer 70.877072 Total 90.806338 --------------------------------------------------- C++11 (This CL) Time (in seconds): Residual only evaluation 1.217500 (5) Jacobian & residual evaluation 5.796112 (6) Linear solver 44.080873 (5) Minimizer 54.635524 Total 77.640072 --------------------------------------------------- OpenMP Time (in seconds): Residual only evaluation 0.797023 (5) Jacobian & residual evaluation 5.633916 (6) Linear solver 43.280020 (5) Minimizer 53.199058 Total 76.250861 --------------------------------------------------- TBB Time (in seconds): Residual only evaluation 1.911095 (5) Jacobian & residual evaluation 5.557807 (6) Linear solver 44.074680 (5) Minimizer 55.002688 Total 78.052687 --------------------------------------------------- No Threads Time (in seconds): Residual only evaluation 2.939212 (5) Jacobian & residual evaluation 18.519874 (6) Linear solver 74.017837 (5) Minimizer 98.980080 Total 122.216391 Change-Id: I3af959b0771bbdfe8cad8c13896191d6ac903181
112 lines
4.2 KiB
C++
112 lines
4.2 KiB
C++
// Ceres Solver - A fast non-linear least squares minimizer
|
|
// Copyright 2017 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: yp@photonscore.de (Yury Prokazov)
|
|
|
|
#ifndef CERES_INTERNAL_THREAD_TOKEN_PROVIDER_H_
|
|
#define CERES_INTERNAL_THREAD_TOKEN_PROVIDER_H_
|
|
|
|
#include "ceres/internal/config.h"
|
|
#include "ceres/internal/port.h"
|
|
|
|
#ifdef CERES_USE_TBB
|
|
#include <tbb/concurrent_queue.h>
|
|
#endif
|
|
|
|
#ifdef CERES_USE_CXX11_THREADS
|
|
#include "ceres/concurrent_queue.h"
|
|
#endif
|
|
|
|
namespace ceres {
|
|
namespace internal {
|
|
|
|
// Helper for TBB and C++11 thread number identification that is similar to
|
|
// omp_get_thread_num() behaviour. This is necessary to support TBB and C++11
|
|
// threading with a sequential thread id. This is used to access preallocated
|
|
// resources in the parallelized code parts. The sequence of tokens varies from
|
|
// 0 to num_threads - 1 that can be acquired to identify the thread in a thread
|
|
// pool.
|
|
//
|
|
// If CERES_NO_THREADS is defined, Acquire() always returns 0 and Release()
|
|
// takes no action.
|
|
//
|
|
// If CERES_USE_OPENMP, omp_get_thread_num() is used to Acquire() with no action
|
|
// in Release()
|
|
//
|
|
//
|
|
// Example usage pseudocode:
|
|
//
|
|
// ThreadTokenProvider ttp(N); // allocate N tokens
|
|
// Spawn N threads {
|
|
// int token = ttp.Acquire(); // get unique token
|
|
// ...
|
|
// ... use token to access resources bound to the thread
|
|
// ...
|
|
// ttp.Release(token); // return token to the pool
|
|
// }
|
|
//
|
|
class ThreadTokenProvider {
|
|
public:
|
|
ThreadTokenProvider(int num_threads);
|
|
|
|
// Returns the first token from the queue. The acquired value must be
|
|
// given back by Release().
|
|
//
|
|
// With TBB this function will block if all the tokens are aquired by
|
|
// concurent threads.
|
|
int Acquire();
|
|
|
|
// Makes previously acquired token available for other threads.
|
|
void Release(int thread_id);
|
|
|
|
private:
|
|
#ifdef CERES_USE_TBB
|
|
// This queue initially holds a sequence from 0..num_threads-1. Every
|
|
// Acquire() call the first number is removed from here. When the token is not
|
|
// needed anymore it shall be given back with corresponding Release() call.
|
|
tbb::concurrent_bounded_queue<int> pool_;
|
|
#endif
|
|
|
|
#ifdef CERES_USE_CXX11_THREADS
|
|
// This queue initially holds a sequence from 0..num_threads-1. Every
|
|
// Acquire() call the first number is removed from here. When the token is not
|
|
// needed anymore it shall be given back with corresponding Release()
|
|
// call. This concurrent queue is more expensive than TBB's version, so you
|
|
// should not acquire the thread ID on every for loop iteration.
|
|
ConcurrentQueue<int> pool_;
|
|
#endif
|
|
|
|
ThreadTokenProvider(ThreadTokenProvider&);
|
|
ThreadTokenProvider& operator=(ThreadTokenProvider&);
|
|
};
|
|
|
|
} // namespace internal
|
|
} // namespace ceres
|
|
|
|
#endif // CERES_INTERNAL_THREAD_TOKEN_PROVIDER_H_
|