Skip to content

Bugfix/parallel exceptions #190

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
fontanf merged 2 commits into from
Apr 8, 2025
Merged

Bugfix/parallel exceptions #190

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
6208289
Update exceptions in irregular optimize
fontanf Apr 7, 2025
51f445d
Fix other optimize files
fontanf Apr 8, 2025
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
12 changes: 8 additions & 4 deletions src/boxstacks/optimize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,17 +187,21 @@ packingsolver::boxstacks::Output packingsolver::boxstacks::optimize(
<< " " << tssibs_output.maximum_size_of_the_queue;
algorithm_formatter.update_solution(solution, ss.str());
};
exception_ptr_list.push_front(std::exception_ptr());
if (parameters.optimization_mode != OptimizationMode::NotAnytimeSequential) {
exception_ptr_list.push_front(std::exception_ptr());
threads.push_back(std::thread(
wrapper<decltype(&treesearchsolver::iterative_beam_search_2<BranchingScheme>), treesearchsolver::iterative_beam_search_2<BranchingScheme>>,
std::ref(exception_ptr_list.front()),
std::ref(branching_schemes[i]),
ibs_parameters_list[i]));
} else {
treesearchsolver::iterative_beam_search_2<BranchingScheme>(
branching_schemes[i],
ibs_parameters_list[i]);
try {
treesearchsolver::iterative_beam_search_2<BranchingScheme>(
branching_schemes[i],
ibs_parameters_list[i]);
} catch (...) {
exception_ptr_list.front() = std::current_exception();
}
}
}
for (Counter i = 0; i < (Counter)threads.size(); ++i)
Expand Down
88 changes: 56 additions & 32 deletions src/irregular/optimize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,8 @@ void optimize_tree_search(
outputs[i].solution_pool.add(solution);
};
}
exception_ptr_list.push_front(std::exception_ptr());
if (parameters.optimization_mode != OptimizationMode::NotAnytimeSequential) {
exception_ptr_list.push_front(std::exception_ptr());
threads.push_back(std::thread(
wrapper<decltype(&optimize_tree_search_worker), optimize_tree_search_worker>,
std::ref(exception_ptr_list.front()),
Expand All @@ -196,12 +196,16 @@ void optimize_tree_search(
branching_scheme_parameters_list[i],
ibs_parameters_list[i]));
} else {
optimize_tree_search_worker(
instance,
parameters,
algorithm_formatter,
branching_scheme_parameters_list[i],
ibs_parameters_list[i]);
try {
optimize_tree_search_worker(
instance,
parameters,
algorithm_formatter,
branching_scheme_parameters_list[i],
ibs_parameters_list[i]);
} catch (...) {
exception_ptr_list.front() = std::current_exception();
}
}
}
for (Counter i = 0; i < (Counter)threads.size(); ++i)
Expand Down Expand Up @@ -580,92 +584,112 @@ packingsolver::irregular::Output packingsolver::irregular::optimize(
std::forward_list<std::exception_ptr> exception_ptr_list;
// Tree search.
if (use_tree_search) {
exception_ptr_list.push_front(std::exception_ptr());
if (parameters.optimization_mode != OptimizationMode::NotAnytimeSequential
&& last_algorithm != 0) {
exception_ptr_list.push_front(std::exception_ptr());
threads.push_back(std::thread(
wrapper<decltype(&optimize_tree_search), optimize_tree_search>,
std::ref(exception_ptr_list.front()),
std::ref(instance),
std::ref(parameters),
std::ref(algorithm_formatter)));
} else {
optimize_tree_search(
instance,
parameters,
algorithm_formatter);
try {
optimize_tree_search(
instance,
parameters,
algorithm_formatter);
} catch (...) {
exception_ptr_list.front() = std::current_exception();
}
}
}
// Sequential single knapsack.
if (use_sequential_single_knapsack) {
exception_ptr_list.push_front(std::exception_ptr());
if (parameters.optimization_mode != OptimizationMode::NotAnytimeSequential
&& last_algorithm != 1) {
exception_ptr_list.push_front(std::exception_ptr());
threads.push_back(std::thread(
wrapper<decltype(&optimize_sequential_single_knapsack), optimize_sequential_single_knapsack>,
std::ref(exception_ptr_list.front()),
std::ref(instance),
std::ref(parameters),
std::ref(algorithm_formatter)));
} else {
optimize_sequential_single_knapsack(
instance,
parameters,
algorithm_formatter);
try {
optimize_sequential_single_knapsack(
instance,
parameters,
algorithm_formatter);
} catch (...) {
exception_ptr_list.front() = std::current_exception();
}
}
}
// Sequential value correction.
if (use_sequential_value_correction) {
exception_ptr_list.push_front(std::exception_ptr());
if (parameters.optimization_mode != OptimizationMode::NotAnytimeSequential
&& last_algorithm != 2) {
exception_ptr_list.push_front(std::exception_ptr());
threads.push_back(std::thread(
wrapper<decltype(&optimize_sequential_value_correction), optimize_sequential_value_correction>,
std::ref(exception_ptr_list.front()),
std::ref(instance),
std::ref(parameters),
std::ref(algorithm_formatter)));
} else {
optimize_sequential_value_correction(
instance,
parameters,
algorithm_formatter);
try {
optimize_sequential_value_correction(
instance,
parameters,
algorithm_formatter);
} catch (...) {
exception_ptr_list.front() = std::current_exception();
}
}
}
// Dichotomic search.
if (use_dichotomic_search) {
exception_ptr_list.push_front(std::exception_ptr());
if (parameters.optimization_mode != OptimizationMode::NotAnytimeSequential
&& last_algorithm != 3) {
exception_ptr_list.push_front(std::exception_ptr());
threads.push_back(std::thread(
wrapper<decltype(&optimize_dichotomic_search), optimize_dichotomic_search>,
std::ref(exception_ptr_list.front()),
std::ref(instance),
std::ref(parameters),
std::ref(algorithm_formatter)));
} else {
optimize_dichotomic_search(
instance,
parameters,
algorithm_formatter);
try {
optimize_dichotomic_search(
instance,
parameters,
algorithm_formatter);
} catch (...) {
exception_ptr_list.front() = std::current_exception();
}
}
}
// Column generation.
if (use_column_generation) {
exception_ptr_list.push_front(std::exception_ptr());
if (parameters.optimization_mode != OptimizationMode::NotAnytimeSequential
&& last_algorithm != 4) {
exception_ptr_list.push_front(std::exception_ptr());
threads.push_back(std::thread(
wrapper<decltype(&optimize_column_generation), optimize_column_generation>,
std::ref(exception_ptr_list.front()),
std::ref(instance),
std::ref(parameters),
std::ref(algorithm_formatter)));
} else {
optimize_column_generation(
instance,
parameters,
algorithm_formatter);
try {
optimize_column_generation(
instance,
parameters,
algorithm_formatter);
} catch (...) {
exception_ptr_list.front() = std::current_exception();
}
}
}
for (Counter i = 0; i < (Counter)threads.size(); ++i)
Expand Down
82 changes: 53 additions & 29 deletions src/onedimensional/optimize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,17 +166,21 @@ void optimize_tree_search(
outputs[i].solution_pool.add(solution);
};
}
exception_ptr_list.push_front(std::exception_ptr());
if (parameters.optimization_mode != OptimizationMode::NotAnytimeSequential) {
exception_ptr_list.push_front(std::exception_ptr());
threads.push_back(std::thread(
wrapper<decltype(&treesearchsolver::iterative_beam_search_2<BranchingScheme>), treesearchsolver::iterative_beam_search_2<BranchingScheme>>,
std::ref(exception_ptr_list.front()),
std::ref(branching_schemes[i]),
ibs_parameters_list[i]));
} else {
treesearchsolver::iterative_beam_search_2<BranchingScheme>(
branching_schemes[i],
ibs_parameters_list[i]);
try {
treesearchsolver::iterative_beam_search_2<BranchingScheme>(
branching_schemes[i],
ibs_parameters_list[i]);
} catch (...) {
exception_ptr_list.front() = std::current_exception();
}
}
}
for (Counter i = 0; i < (Counter)threads.size(); ++i)
Expand Down Expand Up @@ -561,92 +565,112 @@ packingsolver::onedimensional::Output packingsolver::onedimensional::optimize(
std::forward_list<std::exception_ptr> exception_ptr_list;
// Tree search.
if (use_tree_search) {
exception_ptr_list.push_front(std::exception_ptr());
if (parameters.optimization_mode != OptimizationMode::NotAnytimeSequential
&& last_algorithm != 0) {
exception_ptr_list.push_front(std::exception_ptr());
threads.push_back(std::thread(
wrapper<decltype(&optimize_tree_search), optimize_tree_search>,
std::ref(exception_ptr_list.front()),
std::ref(instance),
std::ref(parameters),
std::ref(algorithm_formatter)));
} else {
optimize_tree_search(
instance,
parameters,
algorithm_formatter);
try {
optimize_tree_search(
instance,
parameters,
algorithm_formatter);
} catch (...) {
exception_ptr_list.front() = std::current_exception();
}
}
}
// Sequential single knapsack.
if (use_sequential_single_knapsack) {
exception_ptr_list.push_front(std::exception_ptr());
if (parameters.optimization_mode != OptimizationMode::NotAnytimeSequential
&& last_algorithm != 1) {
exception_ptr_list.push_front(std::exception_ptr());
threads.push_back(std::thread(
wrapper<decltype(&optimize_sequential_single_knapsack), optimize_sequential_single_knapsack>,
std::ref(exception_ptr_list.front()),
std::ref(instance),
std::ref(parameters),
std::ref(algorithm_formatter)));
} else {
optimize_sequential_single_knapsack(
instance,
parameters,
algorithm_formatter);
try {
optimize_sequential_single_knapsack(
instance,
parameters,
algorithm_formatter);
} catch (...) {
exception_ptr_list.front() = std::current_exception();
}
}
}
// Sequential value correction.
if (use_sequential_value_correction) {
exception_ptr_list.push_front(std::exception_ptr());
if (parameters.optimization_mode != OptimizationMode::NotAnytimeSequential
&& last_algorithm != 2) {
exception_ptr_list.push_front(std::exception_ptr());
threads.push_back(std::thread(
wrapper<decltype(&optimize_sequential_value_correction), optimize_sequential_value_correction>,
std::ref(exception_ptr_list.front()),
std::ref(instance),
std::ref(parameters),
std::ref(algorithm_formatter)));
} else {
optimize_sequential_value_correction(
instance,
parameters,
algorithm_formatter);
try {
optimize_sequential_value_correction(
instance,
parameters,
algorithm_formatter);
} catch (...) {
exception_ptr_list.front() = std::current_exception();
}
}
}
// Dichotomic search.
if (use_dichotomic_search) {
exception_ptr_list.push_front(std::exception_ptr());
if (parameters.optimization_mode != OptimizationMode::NotAnytimeSequential
&& last_algorithm != 3) {
exception_ptr_list.push_front(std::exception_ptr());
threads.push_back(std::thread(
wrapper<decltype(&optimize_dichotomic_search), optimize_dichotomic_search>,
std::ref(exception_ptr_list.front()),
std::ref(instance),
std::ref(parameters),
std::ref(algorithm_formatter)));
} else {
optimize_dichotomic_search(
instance,
parameters,
algorithm_formatter);
try {
optimize_dichotomic_search(
instance,
parameters,
algorithm_formatter);
} catch (...) {
exception_ptr_list.front() = std::current_exception();
}
}
}
// Column generation.
if (use_column_generation) {
exception_ptr_list.push_front(std::exception_ptr());
if (parameters.optimization_mode != OptimizationMode::NotAnytimeSequential
&& last_algorithm != 4) {
exception_ptr_list.push_front(std::exception_ptr());
threads.push_back(std::thread(
wrapper<decltype(&optimize_column_generation), optimize_column_generation>,
std::ref(exception_ptr_list.front()),
std::ref(instance),
std::ref(parameters),
std::ref(algorithm_formatter)));
} else {
optimize_column_generation(
instance,
parameters,
algorithm_formatter);
try {
optimize_column_generation(
instance,
parameters,
algorithm_formatter);
} catch (...) {
exception_ptr_list.front() = std::current_exception();
}
}
}
for (Counter i = 0; i < (Counter)threads.size(); ++i)
Expand Down
Loading
Loading