Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Restructure manyToManySearch for parallelization

Browse Source
This commit is contained in:
Michael Krasnyk 2017-08-29 14:48:22 +02:00
parent c065335882
commit 67c85ffa4c
2 changed files with 37 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/engine/routing_algorithms/many_to_many.hpp
View File

@ -20,8 +20,8 @@ template <typename Algorithm>
std::vector<EdgeWeight> manyToManySearch(SearchEngineData<Algorithm> &engine_working_data, std::vector<EdgeWeight> manyToManySearch(SearchEngineData<Algorithm> &engine_working_data,
const DataFacade<Algorithm> &facade, const DataFacade<Algorithm> &facade,
const std::vector<PhantomNode> &phantom_nodes, const std::vector<PhantomNode> &phantom_nodes,
const std::vector<std::size_t> &source_indices, std::vector<std::size_t> source_indices,
const std::vector<std::size_t> &target_indices); std::vector<std::size_t> target_indices);
} // namespace routing_algorithms } // namespace routing_algorithms
} // namespace engine } // namespace engine

90
src/engine/routing_algorithms/many_to_many.cpp
View File

@ -301,27 +301,38 @@ template <typename Algorithm>
std::vector<EdgeWeight> manyToManySearch(SearchEngineData<Algorithm> &engine_working_data, std::vector<EdgeWeight> manyToManySearch(SearchEngineData<Algorithm> &engine_working_data,
const DataFacade<Algorithm> &facade, const DataFacade<Algorithm> &facade,
const std::vector<PhantomNode> &phantom_nodes, const std::vector<PhantomNode> &phantom_nodes,
const std::vector<std::size_t> &source_indices, std::vector<std::size_t> source_indices,
const std::vector<std::size_t> &target_indices) std::vector<std::size_t> target_indices)
{ {
const auto number_of_sources = if (source_indices.empty())
source_indices.empty() ? phantom_nodes.size() : source_indices.size(); {
const auto number_of_targets = source_indices.resize(phantom_nodes.size());
target_indices.empty() ? phantom_nodes.size() : target_indices.size(); std::iota(source_indices.begin(), source_indices.end(), 0);
}
if (target_indices.empty())
{
target_indices.resize(phantom_nodes.size());
std::iota(target_indices.begin(), target_indices.end(), 0);
}
const auto number_of_sources = source_indices.size();
const auto number_of_targets = target_indices.size();
const auto number_of_entries = number_of_sources * number_of_targets; const auto number_of_entries = number_of_sources * number_of_targets;
std::vector<EdgeWeight> weights_table(number_of_entries, INVALID_EDGE_WEIGHT); std::vector<EdgeWeight> weights_table(number_of_entries, INVALID_EDGE_WEIGHT);
std::vector<EdgeWeight> durations_table(number_of_entries, MAXIMAL_EDGE_DURATION); std::vector<EdgeWeight> durations_table(number_of_entries, MAXIMAL_EDGE_DURATION);
engine_working_data.InitializeOrClearManyToManyThreadLocalStorage(facade.GetNumberOfNodes());
auto &query_heap = *(engine_working_data.many_to_many_heap);
SearchSpaceWithBuckets search_space_with_buckets; SearchSpaceWithBuckets search_space_with_buckets;
unsigned column_idx = 0; engine_working_data.InitializeOrClearManyToManyThreadLocalStorage(facade.GetNumberOfNodes());
const auto search_target_phantom = [&](const PhantomNode &phantom) { auto &query_heap = *(engine_working_data.many_to_many_heap);
// clear heap and insert target nodes
// Backward search for target phantoms
for (const auto column_idx : util::irange<std::size_t>(0u, target_indices.size()))
{
const auto index = target_indices[column_idx];
const auto &phantom = phantom_nodes[index];
query_heap.Clear(); query_heap.Clear();
insertTargetInHeap(query_heap, phantom); insertTargetInHeap(query_heap, phantom);
@ -330,12 +341,14 @@ std::vector<EdgeWeight> manyToManySearch(SearchEngineData<Algorithm> &engine_wor
{ {
backwardRoutingStep(facade, column_idx, query_heap, search_space_with_buckets, phantom); backwardRoutingStep(facade, column_idx, query_heap, search_space_with_buckets, phantom);
} }
++column_idx; }
};
// For each source do forward search
for (const auto row_idx : util::irange<std::size_t>(0, source_indices.size()))
{
const auto index = source_indices[row_idx];
const auto &phantom = phantom_nodes[index];
// for each source do forward search
unsigned row_idx = 0;
const auto search_source_phantom = [&](const PhantomNode &phantom) {
// clear heap and insert source nodes // clear heap and insert source nodes
query_heap.Clear(); query_heap.Clear();
insertSourceInHeap(query_heap, phantom); insertSourceInHeap(query_heap, phantom);
@ -352,39 +365,6 @@ std::vector<EdgeWeight> manyToManySearch(SearchEngineData<Algorithm> &engine_wor
durations_table, durations_table,
phantom); phantom);
} }
++row_idx;
};
if (target_indices.empty())
{
for (const auto &phantom : phantom_nodes)
{
search_target_phantom(phantom);
}
}
else
{
for (const auto index : target_indices)
{
const auto &phantom = phantom_nodes[index];
search_target_phantom(phantom);
}
}
if (source_indices.empty())
{
for (const auto &phantom : phantom_nodes)
{
search_source_phantom(phantom);
}
}
else
{
for (const auto index : source_indices)
{
const auto &phantom = phantom_nodes[index];
search_source_phantom(phantom);
}
} }
return durations_table; return durations_table;
@ -394,15 +374,15 @@ template std::vector<EdgeWeight>
manyToManySearch(SearchEngineData<ch::Algorithm> &engine_working_data, manyToManySearch(SearchEngineData<ch::Algorithm> &engine_working_data,
const DataFacade<ch::Algorithm> &facade, const DataFacade<ch::Algorithm> &facade,
const std::vector<PhantomNode> &phantom_nodes, const std::vector<PhantomNode> &phantom_nodes,
const std::vector<std::size_t> &source_indices, std::vector<std::size_t> source_indices,
const std::vector<std::size_t> &target_indices); std::vector<std::size_t> target_indices);
template std::vector<EdgeWeight> template std::vector<EdgeWeight>
manyToManySearch(SearchEngineData<mld::Algorithm> &engine_working_data, manyToManySearch(SearchEngineData<mld::Algorithm> &engine_working_data,
const DataFacade<mld::Algorithm> &facade, const DataFacade<mld::Algorithm> &facade,
const std::vector<PhantomNode> &phantom_nodes, const std::vector<PhantomNode> &phantom_nodes,
const std::vector<std::size_t> &source_indices, std::vector<std::size_t> source_indices,
const std::vector<std::size_t> &target_indices); std::vector<std::size_t> target_indices);
} // namespace routing_algorithms } // namespace routing_algorithms
} // namespace engine } // namespace engine