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

Reduce memory consumption during partition

Browse Source
This commit is contained in:
Michael Krasnyk 2017-06-29 16:31:39 +02:00 committed by Patrick Niklaus
parent 1e9806f872
commit 54367bfa98
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/partition/partitioner.cpp
View File

@ -95,7 +95,7 @@ void LogGeojson(const std::string &filename, const std::vector<std::uint32_t> &b
} }
} }
int Partitioner::Run(const PartitionConfig &config) auto getGraphBisection(const PartitionConfig &config)
{ {
auto compressed_node_based_graph = auto compressed_node_based_graph =
LoadCompressedNodeBasedGraph(config.compressed_node_based_graph_path.string()); LoadCompressedNodeBasedGraph(config.compressed_node_based_graph_path.string());
@ -122,6 +122,14 @@ int Partitioner::Run(const PartitionConfig &config)
config.num_optimizing_cuts, config.num_optimizing_cuts,
config.small_component_size); config.small_component_size);
// Return bisection ids, keyed by node based graph nodes
return recursive_bisection.BisectionIDs();
}
int Partitioner::Run(const PartitionConfig &config)
{
const std::vector<BisectionID> &node_based_partition_ids = getGraphBisection(config);
// Up until now we worked on the compressed node based graph. // Up until now we worked on the compressed node based graph.
// But what we actually need is a partition for the edge based graph to work on. // But what we actually need is a partition for the edge based graph to work on.
// The following loads a mapping from node based graph to edge based graph. // The following loads a mapping from node based graph to edge based graph.
@ -137,11 +145,6 @@ int Partitioner::Run(const PartitionConfig &config)
<< edge_based_graph.GetNumberOfEdges() << " edges, " << edge_based_graph.GetNumberOfEdges() << " edges, "
<< edge_based_graph.GetNumberOfNodes() << " nodes"; << edge_based_graph.GetNumberOfNodes() << " nodes";
// TODO: node based graph to edge based graph partition id mapping should be done split off.
// Partition ids, keyed by node based graph nodes
const auto &node_based_partition_ids = recursive_bisection.BisectionIDs();
// Partition ids, keyed by edge based graph nodes // Partition ids, keyed by edge based graph nodes
std::vector<NodeID> edge_based_partition_ids(edge_based_graph.GetNumberOfNodes(), std::vector<NodeID> edge_based_partition_ids(edge_based_graph.GetNumberOfNodes(),
SPECIAL_NODEID); SPECIAL_NODEID);