Load data in two separate data regions
This commit is contained in:
committed by
Patrick Niklaus
parent
c7daa521ad
commit
fea07f343b
@@ -0,0 +1,82 @@
|
||||
#ifndef OSRM_STORAGE_SHARED_DATA_INDEX_HPP
|
||||
#define OSRM_STORAGE_SHARED_DATA_INDEX_HPP
|
||||
|
||||
#include "storage/shared_datatype.hpp"
|
||||
|
||||
#include <boost/function_output_iterator.hpp>
|
||||
|
||||
#include <unordered_map>
|
||||
|
||||
namespace osrm
|
||||
{
|
||||
namespace storage
|
||||
{
|
||||
|
||||
// This class wraps one or more shared memory regions with the associated data layout
|
||||
// to abstract away in which region a block of memory is stored.
|
||||
class SharedDataIndex
|
||||
{
|
||||
public:
|
||||
struct AllocatedRegion
|
||||
{
|
||||
char *memory_ptr;
|
||||
DataLayout layout;
|
||||
};
|
||||
|
||||
SharedDataIndex() = default;
|
||||
SharedDataIndex(std::vector<AllocatedRegion> regions_) : regions(std::move(regions_))
|
||||
{
|
||||
// Build mapping from block name to region
|
||||
for (auto index : util::irange<std::uint32_t>(0, regions.size()))
|
||||
{
|
||||
regions[index].layout.List("",
|
||||
boost::make_function_output_iterator([&](const auto &name) {
|
||||
block_to_region[name] = index;
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
template <typename OutIter> void List(const std::string &name_prefix, OutIter out) const
|
||||
{
|
||||
for (const auto ®ion : regions)
|
||||
{
|
||||
region.layout.List(name_prefix, out);
|
||||
}
|
||||
}
|
||||
|
||||
template <typename T> auto GetBlockPtr(const std::string &name) const
|
||||
{
|
||||
const auto index_iter = block_to_region.find(name);
|
||||
const auto ®ion = regions[index_iter->second];
|
||||
return region.layout.GetBlockPtr<T>(region.memory_ptr, name);
|
||||
}
|
||||
|
||||
template <typename T> auto GetBlockPtr(const std::string &name)
|
||||
{
|
||||
const auto index_iter = block_to_region.find(name);
|
||||
const auto ®ion = regions[index_iter->second];
|
||||
return region.layout.GetBlockPtr<T>(region.memory_ptr, name);
|
||||
}
|
||||
|
||||
std::size_t GetBlockEntries(const std::string &name) const
|
||||
{
|
||||
const auto index_iter = block_to_region.find(name);
|
||||
const auto ®ion = regions[index_iter->second];
|
||||
return region.layout.GetBlockEntries(name);
|
||||
}
|
||||
|
||||
std::size_t GetBlockSize(const std::string &name) const
|
||||
{
|
||||
const auto index_iter = block_to_region.find(name);
|
||||
const auto ®ion = regions[index_iter->second];
|
||||
return region.layout.GetBlockSize(name);
|
||||
}
|
||||
|
||||
private:
|
||||
std::vector<AllocatedRegion> regions;
|
||||
std::unordered_map<std::string, std::uint32_t> block_to_region;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@@ -29,6 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#define STORAGE_HPP
|
||||
|
||||
#include "storage/shared_datatype.hpp"
|
||||
#include "storage/shared_data_index.hpp"
|
||||
#include "storage/storage_config.hpp"
|
||||
|
||||
#include <boost/filesystem/path.hpp>
|
||||
@@ -46,8 +47,10 @@ class Storage
|
||||
|
||||
int Run(int max_wait, const std::string &name);
|
||||
|
||||
void PopulateLayout(DataLayout &layout);
|
||||
void PopulateData(const DataLayout &layout, char *memory_ptr);
|
||||
void PopulateStaticLayout(DataLayout &layout);
|
||||
void PopulateUpdatableLayout(DataLayout &layout);
|
||||
void PopulateStaticData(const SharedDataIndex &index);
|
||||
void PopulateUpdatableData(const SharedDataIndex &index);
|
||||
|
||||
private:
|
||||
StorageConfig config;
|
||||
|
||||
+101
-132
@@ -1,7 +1,7 @@
|
||||
#ifndef OSRM_STOARGE_VIEW_FACTORY_HPP
|
||||
#define OSRM_STOARGE_VIEW_FACTORY_HPP
|
||||
|
||||
#include "storage/shared_datatype.hpp"
|
||||
#include "storage/shared_data_index.hpp"
|
||||
|
||||
#include "contractor/contracted_metric.hpp"
|
||||
#include "contractor/query_graph.hpp"
|
||||
@@ -45,88 +45,78 @@ namespace storage
|
||||
{
|
||||
|
||||
template <typename T>
|
||||
util::vector_view<T>
|
||||
make_vector_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
util::vector_view<T> make_vector_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
return util::vector_view<T>(layout.GetBlockPtr<T>(memory_ptr, name),
|
||||
layout.GetBlockEntries(name));
|
||||
return util::vector_view<T>(index.GetBlockPtr<T>(name), index.GetBlockEntries(name));
|
||||
}
|
||||
|
||||
template <>
|
||||
inline util::vector_view<bool>
|
||||
make_vector_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
template<>
|
||||
inline util::vector_view<bool> make_vector_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
return util::vector_view<bool>(
|
||||
layout.GetBlockPtr<util::vector_view<bool>::Word>(memory_ptr, name),
|
||||
layout.GetBlockEntries(name));
|
||||
return util::vector_view<bool>(index.GetBlockPtr<util::vector_view<bool>::Word>(name),
|
||||
index.GetBlockEntries(name));
|
||||
}
|
||||
|
||||
template <typename T, std::size_t Bits>
|
||||
util::PackedVectorView<T, Bits>
|
||||
make_packed_vector_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
util::PackedVectorView<T, Bits> make_packed_vector_view(const SharedDataIndex &index,
|
||||
const std::string &name)
|
||||
{
|
||||
using V = util::PackedVectorView<T, Bits>;
|
||||
auto packed_internal = util::vector_view<typename V::block_type>(
|
||||
layout.GetBlockPtr<typename V::block_type>(memory_ptr, name + "/packed"),
|
||||
layout.GetBlockEntries(name + "/packed"));
|
||||
index.GetBlockPtr<typename V::block_type>(name + "/packed"),
|
||||
index.GetBlockEntries(name + "/packed"));
|
||||
// the real size needs to come from an external source
|
||||
return V{packed_internal, std::numeric_limits<std::size_t>::max()};
|
||||
}
|
||||
|
||||
inline auto
|
||||
make_name_table_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_name_table_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
auto blocks = make_vector_view<extractor::NameTableView::IndexedData::BlockReference>(
|
||||
memory_ptr, layout, name + "/blocks");
|
||||
auto values = make_vector_view<extractor::NameTableView::IndexedData::ValueType>(
|
||||
memory_ptr, layout, name + "/values");
|
||||
index, name + "/blocks");
|
||||
auto values =
|
||||
make_vector_view<extractor::NameTableView::IndexedData::ValueType>(index, name + "/values");
|
||||
|
||||
extractor::NameTableView::IndexedData index_data_view{std::move(blocks), std::move(values)};
|
||||
return extractor::NameTableView{index_data_view};
|
||||
}
|
||||
|
||||
inline auto make_lane_data_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_lane_data_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
return make_vector_view<util::guidance::LaneTupleIdPair>(memory_ptr, layout, name + "/data");
|
||||
return make_vector_view<util::guidance::LaneTupleIdPair>(index, name + "/data");
|
||||
}
|
||||
|
||||
inline auto make_turn_lane_description_views(char *memory_ptr,
|
||||
const DataLayout &layout,
|
||||
const std::string &name)
|
||||
inline auto make_turn_lane_description_views(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
auto offsets = make_vector_view<std::uint32_t>(memory_ptr, layout, name + "/offsets");
|
||||
auto masks =
|
||||
make_vector_view<extractor::TurnLaneType::Mask>(memory_ptr, layout, name + "/masks");
|
||||
auto offsets = make_vector_view<std::uint32_t>(index, name + "/offsets");
|
||||
auto masks = make_vector_view<extractor::TurnLaneType::Mask>(index, name + "/masks");
|
||||
|
||||
return std::make_tuple(offsets, masks);
|
||||
}
|
||||
|
||||
inline auto make_ebn_data_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_ebn_data_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
auto edge_based_node_data =
|
||||
make_vector_view<extractor::EdgeBasedNode>(memory_ptr, layout, name + "/nodes");
|
||||
auto annotation_data = make_vector_view<extractor::NodeBasedEdgeAnnotation>(
|
||||
memory_ptr, layout, name + "/annotations");
|
||||
auto edge_based_node_data = make_vector_view<extractor::EdgeBasedNode>(index, name + "/nodes");
|
||||
auto annotation_data =
|
||||
make_vector_view<extractor::NodeBasedEdgeAnnotation>(index, name + "/annotations");
|
||||
|
||||
return extractor::EdgeBasedNodeDataView(std::move(edge_based_node_data),
|
||||
std::move(annotation_data));
|
||||
}
|
||||
|
||||
inline auto make_turn_data_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_turn_data_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
auto lane_data_ids = make_vector_view<LaneDataID>(memory_ptr, layout, name + "/lane_data_ids");
|
||||
auto lane_data_ids = make_vector_view<LaneDataID>(index, name + "/lane_data_ids");
|
||||
|
||||
const auto turn_instructions = make_vector_view<guidance::TurnInstruction>(
|
||||
memory_ptr, layout, name + "/turn_instructions");
|
||||
const auto turn_instructions =
|
||||
make_vector_view<guidance::TurnInstruction>(index, name + "/turn_instructions");
|
||||
|
||||
const auto entry_class_ids =
|
||||
make_vector_view<EntryClassID>(memory_ptr, layout, name + "/entry_class_ids");
|
||||
const auto entry_class_ids = make_vector_view<EntryClassID>(index, name + "/entry_class_ids");
|
||||
|
||||
const auto pre_turn_bearings =
|
||||
make_vector_view<guidance::TurnBearing>(memory_ptr, layout, name + "/pre_turn_bearings");
|
||||
make_vector_view<guidance::TurnBearing>(index, name + "/pre_turn_bearings");
|
||||
|
||||
const auto post_turn_bearings =
|
||||
make_vector_view<guidance::TurnBearing>(memory_ptr, layout, name + "/post_turn_bearings");
|
||||
make_vector_view<guidance::TurnBearing>(index, name + "/post_turn_bearings");
|
||||
|
||||
return guidance::TurnDataView(std::move(turn_instructions),
|
||||
std::move(lane_data_ids),
|
||||
@@ -135,40 +125,39 @@ inline auto make_turn_data_view(char *memory_ptr, const DataLayout &layout, cons
|
||||
std::move(post_turn_bearings));
|
||||
}
|
||||
|
||||
inline auto
|
||||
make_segment_data_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_segment_data_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
auto geometry_begin_indices = make_vector_view<unsigned>(memory_ptr, layout, name + "/index");
|
||||
auto geometry_begin_indices = make_vector_view<unsigned>(index, name + "/index");
|
||||
|
||||
auto node_list = make_vector_view<NodeID>(memory_ptr, layout, name + "/nodes");
|
||||
auto node_list = make_vector_view<NodeID>(index, name + "/nodes");
|
||||
|
||||
auto num_entries = layout.GetBlockEntries(name + "/nodes");
|
||||
auto num_entries = index.GetBlockEntries(name + "/nodes");
|
||||
|
||||
extractor::SegmentDataView::SegmentWeightVector fwd_weight_list(
|
||||
make_vector_view<extractor::SegmentDataView::SegmentWeightVector::block_type>(
|
||||
memory_ptr, layout, name + "/forward_weights/packed"),
|
||||
index, name + "/forward_weights/packed"),
|
||||
num_entries);
|
||||
|
||||
extractor::SegmentDataView::SegmentWeightVector rev_weight_list(
|
||||
make_vector_view<extractor::SegmentDataView::SegmentWeightVector::block_type>(
|
||||
memory_ptr, layout, name + "/reverse_weights/packed"),
|
||||
index, name + "/reverse_weights/packed"),
|
||||
num_entries);
|
||||
|
||||
extractor::SegmentDataView::SegmentDurationVector fwd_duration_list(
|
||||
make_vector_view<extractor::SegmentDataView::SegmentDurationVector::block_type>(
|
||||
memory_ptr, layout, name + "/forward_durations/packed"),
|
||||
index, name + "/forward_durations/packed"),
|
||||
num_entries);
|
||||
|
||||
extractor::SegmentDataView::SegmentDurationVector rev_duration_list(
|
||||
make_vector_view<extractor::SegmentDataView::SegmentDurationVector::block_type>(
|
||||
memory_ptr, layout, name + "/reverse_durations/packed"),
|
||||
index, name + "/reverse_durations/packed"),
|
||||
num_entries);
|
||||
|
||||
auto fwd_datasources_list =
|
||||
make_vector_view<DatasourceID>(memory_ptr, layout, name + "/forward_data_sources");
|
||||
make_vector_view<DatasourceID>(index, name + "/forward_data_sources");
|
||||
|
||||
auto rev_datasources_list =
|
||||
make_vector_view<DatasourceID>(memory_ptr, layout, name + "/reverse_data_sources");
|
||||
make_vector_view<DatasourceID>(index, name + "/reverse_data_sources");
|
||||
|
||||
return extractor::SegmentDataView{std::move(geometry_begin_indices),
|
||||
std::move(node_list),
|
||||
@@ -180,52 +169,46 @@ make_segment_data_view(char *memory_ptr, const DataLayout &layout, const std::st
|
||||
std::move(rev_datasources_list)};
|
||||
}
|
||||
|
||||
inline auto
|
||||
make_coordinates_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_coordinates_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
return make_vector_view<util::Coordinate>(memory_ptr, layout, name);
|
||||
return make_vector_view<util::Coordinate>(index, name);
|
||||
}
|
||||
|
||||
inline auto make_osm_ids_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_osm_ids_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
return make_packed_vector_view<extractor::PackedOSMIDsView::value_type,
|
||||
extractor::PackedOSMIDsView::value_size>(
|
||||
memory_ptr, layout, name);
|
||||
extractor::PackedOSMIDsView::value_size>(index, name);
|
||||
}
|
||||
|
||||
inline auto make_nbn_data_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_nbn_data_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
return std::make_tuple(make_coordinates_view(memory_ptr, layout, name + "/coordinates"),
|
||||
make_osm_ids_view(memory_ptr, layout, name + "/osm_node_ids"));
|
||||
return std::make_tuple(make_coordinates_view(index, name + "/coordinates"),
|
||||
make_osm_ids_view(index, name + "/osm_node_ids"));
|
||||
}
|
||||
|
||||
inline auto
|
||||
make_turn_weight_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_turn_weight_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
return make_vector_view<TurnPenalty>(memory_ptr, layout, name + "/weight");
|
||||
return make_vector_view<TurnPenalty>(index, name + "/weight");
|
||||
}
|
||||
|
||||
inline auto
|
||||
make_turn_duration_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_turn_duration_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
return make_vector_view<TurnPenalty>(memory_ptr, layout, name + "/duration");
|
||||
return make_vector_view<TurnPenalty>(index, name + "/duration");
|
||||
}
|
||||
|
||||
inline auto
|
||||
make_search_tree_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_search_tree_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
using RTreeLeaf = extractor::EdgeBasedNodeSegment;
|
||||
using RTreeNode = util::StaticRTree<RTreeLeaf, storage::Ownership::View>::TreeNode;
|
||||
|
||||
const auto search_tree = make_vector_view<RTreeNode>(memory_ptr, layout, name + "/search_tree");
|
||||
const auto search_tree = make_vector_view<RTreeNode>(index, name + "/search_tree");
|
||||
|
||||
const auto rtree_level_starts =
|
||||
make_vector_view<std::uint64_t>(memory_ptr, layout, name + "/search_tree_level_starts");
|
||||
make_vector_view<std::uint64_t>(index, name + "/search_tree_level_starts");
|
||||
|
||||
const auto coordinates =
|
||||
make_coordinates_view(memory_ptr, layout, "/common/nbn_data/coordinates");
|
||||
const auto coordinates = make_coordinates_view(index, "/common/nbn_data/coordinates");
|
||||
|
||||
const char *path = layout.GetBlockPtr<char>(memory_ptr, name + "/file_index_path");
|
||||
const char *path = index.template GetBlockPtr<char>(name + "/file_index_path");
|
||||
|
||||
if (!boost::filesystem::exists(boost::filesystem::path{path}))
|
||||
{
|
||||
@@ -237,72 +220,63 @@ make_search_tree_view(char *memory_ptr, const DataLayout &layout, const std::str
|
||||
std::move(search_tree), std::move(rtree_level_starts), path, std::move(coordinates)};
|
||||
}
|
||||
|
||||
inline auto
|
||||
make_intersection_bearings_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_intersection_bearings_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
auto bearing_offsets =
|
||||
make_vector_view<unsigned>(memory_ptr, layout, name + "/class_id_to_ranges/block_offsets");
|
||||
make_vector_view<unsigned>(index, name + "/class_id_to_ranges/block_offsets");
|
||||
auto bearing_blocks = make_vector_view<util::RangeTable<16, storage::Ownership::View>::BlockT>(
|
||||
memory_ptr, layout, name + "/class_id_to_ranges/diff_blocks");
|
||||
auto bearing_values =
|
||||
make_vector_view<DiscreteBearing>(memory_ptr, layout, name + "/bearing_values");
|
||||
index, name + "/class_id_to_ranges/diff_blocks");
|
||||
auto bearing_values = make_vector_view<DiscreteBearing>(index, name + "/bearing_values");
|
||||
util::RangeTable<16, storage::Ownership::View> bearing_range_table(
|
||||
std::move(bearing_offsets),
|
||||
std::move(bearing_blocks),
|
||||
static_cast<unsigned>(bearing_values.size()));
|
||||
|
||||
auto bearing_class_id =
|
||||
make_vector_view<BearingClassID>(memory_ptr, layout, name + "/node_to_class_id");
|
||||
auto bearing_class_id = make_vector_view<BearingClassID>(index, name + "/node_to_class_id");
|
||||
return extractor::IntersectionBearingsView{
|
||||
std::move(bearing_values), std::move(bearing_class_id), std::move(bearing_range_table)};
|
||||
}
|
||||
|
||||
inline auto
|
||||
make_entry_classes_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_entry_classes_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
return make_vector_view<util::guidance::EntryClass>(memory_ptr, layout, name);
|
||||
return make_vector_view<util::guidance::EntryClass>(index, name);
|
||||
}
|
||||
|
||||
inline auto
|
||||
make_contracted_metric_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_contracted_metric_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
auto node_list = make_vector_view<contractor::QueryGraphView::NodeArrayEntry>(
|
||||
memory_ptr, layout, name + "/contracted_graph/node_array");
|
||||
index, name + "/contracted_graph/node_array");
|
||||
auto edge_list = make_vector_view<contractor::QueryGraphView::EdgeArrayEntry>(
|
||||
memory_ptr, layout, name + "/contracted_graph/edge_array");
|
||||
index, name + "/contracted_graph/edge_array");
|
||||
|
||||
std::vector<util::vector_view<bool>> edge_filter;
|
||||
layout.List(name + "/exclude",
|
||||
boost::make_function_output_iterator([&](const auto &filter_name) {
|
||||
edge_filter.push_back(make_vector_view<bool>(memory_ptr, layout, filter_name));
|
||||
}));
|
||||
index.List(name + "/exclude",
|
||||
boost::make_function_output_iterator([&](const auto &filter_name) {
|
||||
edge_filter.push_back(make_vector_view<bool>(index, filter_name));
|
||||
}));
|
||||
|
||||
return contractor::ContractedMetricView{{std::move(node_list), std::move(edge_list)},
|
||||
std::move(edge_filter)};
|
||||
}
|
||||
|
||||
inline auto make_partition_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_partition_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
auto level_data_ptr = layout.GetBlockPtr<partitioner::MultiLevelPartitionView::LevelData>(
|
||||
memory_ptr, name + "/level_data");
|
||||
auto partition = make_vector_view<PartitionID>(memory_ptr, layout, name + "/partition");
|
||||
auto cell_to_children =
|
||||
make_vector_view<CellID>(memory_ptr, layout, name + "/cell_to_children");
|
||||
auto level_data_ptr =
|
||||
index.template GetBlockPtr<partitioner::MultiLevelPartitionView::LevelData>(name +
|
||||
"/level_data");
|
||||
auto partition = make_vector_view<PartitionID>(index, name + "/partition");
|
||||
auto cell_to_children = make_vector_view<CellID>(index, name + "/cell_to_children");
|
||||
|
||||
return partitioner::MultiLevelPartitionView{
|
||||
level_data_ptr, std::move(partition), std::move(cell_to_children)};
|
||||
}
|
||||
|
||||
inline auto
|
||||
make_cell_storage_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_cell_storage_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
auto source_boundary = make_vector_view<NodeID>(memory_ptr, layout, name + "/source_boundary");
|
||||
auto destination_boundary =
|
||||
make_vector_view<NodeID>(memory_ptr, layout, name + "/destination_boundary");
|
||||
auto cells = make_vector_view<partitioner::CellStorageView::CellData>(
|
||||
memory_ptr, layout, name + "/cells");
|
||||
auto level_offsets =
|
||||
make_vector_view<std::uint64_t>(memory_ptr, layout, name + "/level_to_cell_offset");
|
||||
auto source_boundary = make_vector_view<NodeID>(index, name + "/source_boundary");
|
||||
auto destination_boundary = make_vector_view<NodeID>(index, name + "/destination_boundary");
|
||||
auto cells = make_vector_view<partitioner::CellStorageView::CellData>(index, name + "/cells");
|
||||
auto level_offsets = make_vector_view<std::uint64_t>(index, name + "/level_to_cell_offset");
|
||||
|
||||
return partitioner::CellStorageView{std::move(source_boundary),
|
||||
std::move(destination_boundary),
|
||||
@@ -310,8 +284,7 @@ make_cell_storage_view(char *memory_ptr, const DataLayout &layout, const std::st
|
||||
std::move(level_offsets)};
|
||||
}
|
||||
|
||||
inline auto make_filtered_cell_metric_view(char *memory_ptr,
|
||||
const DataLayout &layout,
|
||||
inline auto make_filtered_cell_metric_view(const SharedDataIndex &index,
|
||||
const std::string &name,
|
||||
const std::size_t exclude_index)
|
||||
{
|
||||
@@ -321,26 +294,25 @@ inline auto make_filtered_cell_metric_view(char *memory_ptr,
|
||||
auto weights_block_id = prefix + "/weights";
|
||||
auto durations_block_id = prefix + "/durations";
|
||||
|
||||
auto weights = make_vector_view<EdgeWeight>(memory_ptr, layout, weights_block_id);
|
||||
auto durations = make_vector_view<EdgeDuration>(memory_ptr, layout, durations_block_id);
|
||||
auto weights = make_vector_view<EdgeWeight>(index, weights_block_id);
|
||||
auto durations = make_vector_view<EdgeDuration>(index, durations_block_id);
|
||||
|
||||
return customizer::CellMetricView{std::move(weights), std::move(durations)};
|
||||
}
|
||||
|
||||
inline auto
|
||||
make_cell_metric_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_cell_metric_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
std::vector<customizer::CellMetricView> cell_metric_excludes;
|
||||
|
||||
std::vector<std::string> metric_prefix_names;
|
||||
layout.List(name + "/exclude/", std::back_inserter(metric_prefix_names));
|
||||
index.List(name + "/exclude/", std::back_inserter(metric_prefix_names));
|
||||
for (const auto &prefix : metric_prefix_names)
|
||||
{
|
||||
auto weights_block_id = prefix + "/weights";
|
||||
auto durations_block_id = prefix + "/durations";
|
||||
|
||||
auto weights = make_vector_view<EdgeWeight>(memory_ptr, layout, weights_block_id);
|
||||
auto durations = make_vector_view<EdgeDuration>(memory_ptr, layout, durations_block_id);
|
||||
auto weights = make_vector_view<EdgeWeight>(index, weights_block_id);
|
||||
auto durations = make_vector_view<EdgeDuration>(index, durations_block_id);
|
||||
|
||||
cell_metric_excludes.push_back(
|
||||
customizer::CellMetricView{std::move(weights), std::move(durations)});
|
||||
@@ -349,42 +321,39 @@ make_cell_metric_view(char *memory_ptr, const DataLayout &layout, const std::str
|
||||
return cell_metric_excludes;
|
||||
}
|
||||
|
||||
inline auto
|
||||
make_multi_level_graph_view(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_multi_level_graph_view(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
auto node_list = make_vector_view<customizer::MultiLevelEdgeBasedGraphView::NodeArrayEntry>(
|
||||
memory_ptr, layout, name + "/node_array");
|
||||
index, name + "/node_array");
|
||||
auto edge_list = make_vector_view<customizer::MultiLevelEdgeBasedGraphView::EdgeArrayEntry>(
|
||||
memory_ptr, layout, name + "/edge_array");
|
||||
index, name + "/edge_array");
|
||||
auto node_to_offset = make_vector_view<customizer::MultiLevelEdgeBasedGraphView::EdgeOffset>(
|
||||
memory_ptr, layout, name + "/node_to_edge_offset");
|
||||
index, name + "/node_to_edge_offset");
|
||||
|
||||
return customizer::MultiLevelEdgeBasedGraphView(
|
||||
std::move(node_list), std::move(edge_list), std::move(node_to_offset));
|
||||
}
|
||||
|
||||
inline auto
|
||||
make_maneuver_overrides_views(char *memory_ptr, const DataLayout &layout, const std::string &name)
|
||||
inline auto make_maneuver_overrides_views(const SharedDataIndex &index, const std::string &name)
|
||||
{
|
||||
auto maneuver_overrides = make_vector_view<extractor::StorageManeuverOverride>(
|
||||
memory_ptr, layout, name + "/overrides");
|
||||
auto maneuver_overrides =
|
||||
make_vector_view<extractor::StorageManeuverOverride>(index, name + "/overrides");
|
||||
auto maneuver_override_node_sequences =
|
||||
make_vector_view<NodeID>(memory_ptr, layout, name + "/node_sequences");
|
||||
make_vector_view<NodeID>(index, name + "/node_sequences");
|
||||
|
||||
return std::make_tuple(maneuver_overrides, maneuver_override_node_sequences);
|
||||
}
|
||||
|
||||
inline auto make_filtered_graph_view(char *memory_ptr,
|
||||
const DataLayout &layout,
|
||||
inline auto make_filtered_graph_view(const SharedDataIndex &index,
|
||||
const std::string &name,
|
||||
const std::size_t exclude_index)
|
||||
{
|
||||
auto exclude_prefix = name + "/exclude/" + std::to_string(exclude_index);
|
||||
auto edge_filter = make_vector_view<bool>(memory_ptr, layout, exclude_prefix + "/edge_filter");
|
||||
auto edge_filter = make_vector_view<bool>(index, exclude_prefix + "/edge_filter");
|
||||
auto node_list = make_vector_view<contractor::QueryGraphView::NodeArrayEntry>(
|
||||
memory_ptr, layout, name + "/contracted_graph/node_array");
|
||||
index, name + "/contracted_graph/node_array");
|
||||
auto edge_list = make_vector_view<contractor::QueryGraphView::EdgeArrayEntry>(
|
||||
memory_ptr, layout, name + "/contracted_graph/edge_array");
|
||||
index, name + "/contracted_graph/edge_array");
|
||||
|
||||
return util::FilteredGraphView<contractor::QueryGraphView>({node_list, edge_list}, edge_filter);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user