8000 Add callbacks by move by ahojnnes · Pull Request #2734 · colmap/colmap · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Add callbacks by move #2734

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Aug 26, 2024
Merged

Add callbacks by move #2734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b546bb
Add callbacks by move
ahojnnes Aug 26, 2024
42ee243
d
ahojnnes Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions src/colmap/util/base_controller.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,10 @@ namespace colmap {

BaseController::BaseController() {}

void BaseController::AddCallback(const int id,
const std::function<void()>& func) {
void BaseController::AddCallback(const int id, std::function<void()> func) {
CHECK(func);
CHECK_GT(callbacks_.count(id), 0) << "Callback not registered";
callbacks_.at(id).push_back(func);
callbacks_.at(id).push_back(std::move(func));
}

void BaseController::RegisterCallback(const int id) {
Expand All @@ -53,8 +52,8 @@ void BaseController::Callback(const int id) const {
}
}

void BaseController::SetCheckIfStoppedFunc(const std::function<bool()>& func) {
check_if_stopped_fn_ = func;
void BaseController::SetCheckIfStoppedFunc(std::function<bool()> func) {
check_if_stopped_fn_ = std::move(func);
}

bool BaseController::CheckIfStopped() {
Expand Down
4 changes: 2 additions & 2 deletions src/colmap/util/base_controller.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class BaseController {
virtual ~BaseController() = default;

// Set callbacks that can be triggered within the main run function.
void AddCallback(int id, const std::function<void()>& func);
void AddCallback(int id, std::function<void()> func);

// Call back to the function with the specified name, if it exists.
void Callback(int id) const;
Expand All @@ -57,7 +57,7 @@ class BaseController {
virtual void Run() = 0;

// check if the thread is stopped
void SetCheckIfStoppedFunc(const std::function<bool()>& func);
void SetCheckIfStoppedFunc(std::function<bool()> func);
bool CheckIfStopped();

protected:
Expand Down
4 changes: 2 additions & 2 deletions src/colmap/util/threading.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ bool Thread::IsFinished() {
return finished_;
}

void Thread::AddCallback(const int id, const std::function<void()>& func) {
void Thread::AddCallback(const int id, std::function<void()> func) {
THROW_CHECK(func);
THROW_CHECK_GT(callbacks_.count(id), 0) << "Callback not registered";
callbacks_.at(id).push_back(func);
callbacks_.at(id).push_back(std::move(func));
}

void Thread::RegisterCallback(const int id) {
Expand Down
2 changes: 1 addition & 1 deletion src/colmap/util/threading.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class Thread {
bool CheckValidSetup();

// Set callbacks that can be triggered within the main run function.
void AddCallback(int id, const std::function<void()>& func);
void AddCallback(int id, std::function<void()> func);

// Get timing information of the thread, properly accounting for pause times.
const Timer& GetTimer() const;
Expand Down
24 changes: 13 additions & 11 deletions src/pycolmap/pipeline/sfm.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ std::map<size_t, std::shared_ptr<Reconstruction>> IncrementalMapping(
const std::string& output_path,
const IncrementalPipelineOptions& options,
const std::string& input_path,
const std::function<void()>& initial_image_pair_callback,
const std::function<void()>& next_image_callback) {
std::function<void()> initial_image_pair_callback,
std::function<void()> next_image_callback) {
THROW_CHECK_FILE_EXISTS(database_path);
THROW_CHECK_DIR_EXISTS(image_path);
CreateDirIfNotExists(output_path);
Expand All @@ -64,17 +64,19 @@ std::map<size_t, std::shared_ptr<Reconstruction>> IncrementalMapping(
options_, image_path, database_path, reconstruction_manager);

PyInterrupt py_interrupt(1.0); // Check for interrupts every second
mapper.AddCallback(IncrementalPipeline::NEXT_IMAGE_REG_CALLBACK, [&]() {
if (py_interrupt.Raised()) {
throw py::error_already_set();
}
if (next_image_callback) {
next_image_callback();
}
});
mapper.AddCallback(
IncrementalPipeline::NEXT_IMAGE_REG_CALLBACK,
[&py_interrupt, next_image_callback = std::move(next_image_callback)]() {
if (py_interrupt.Raised()) {
throw py::error_already_set();
}
if (next_image_callback) {
next_image_callback();
}
});
if (initial_image_pair_callback) {
mapper.AddCallback(IncrementalPipeline::INITIAL_IMAGE_PAIR_REG_CALLBACK,
initial_image_pair_callback);
std::move(initial_image_pair_callback));
}

mapper.Run();
Expand Down
Loading
0