Skip to content
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

Jump to bottom

feat: add to_buffer and helper methods in layout builder #2766

Merged
merged 3 commits into from
Oct 23, 2023
Merged

feat: add to_buffer and helper methods in layout builder #2766

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a26a9bd
feat: layout builder `to_buffer` method
ManasviGoyal Oct 23, 2023
919bb93
feat: add helper funtions in layout builder
ManasviGoyal Oct 23, 2023
5e36dac
fix: remove helper function and fix braces
ManasviGoyal Oct 23, 2023
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
172 changes: 156 additions & 16 deletions header-only/layout-builder/awkward/LayoutBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,17 @@ namespace awkward {
to_buffers(std::map<std::string, void*>& buffers) const noexcept {
data_.concatenate(reinterpret_cast<PRIMITIVE*>(
buffers["node" + std::to_string(id_) + "-data"]));
}

/// @brief Copies and concatenates the accumulated data in the builder buffer to
/// a user-defined pointer if the given node name matches with the node associated
/// with the builder.
void
to_buffer(void* buffer, const char* name) const noexcept {
if (std::string(name) == std::string("node" + std::to_string(id_) + "-data")) {
data_.concatenate(reinterpret_cast<PRIMITIVE*>(buffer));
}
}

/// @brief Copies and concatenates all the accumulated data in the builder
/// to a map of user-allocated buffers.
Expand Down Expand Up @@ -322,6 +332,18 @@ namespace awkward {
content_.to_buffers(buffers);
}

/// @brief Copies and concatenates the accumulated data in the builder buffer to
/// a user-defined pointer if the given node name matches with the node associated
/// with the builder; otherwise, it searches the builder contents to locate a
/// matching node.
void
to_buffer(void* buffer, const char* name) const noexcept {
if (std::string(name) == std::string("node" + std::to_string(id_) + "-offsets")) {
offsets_.concatenate(reinterpret_cast<PRIMITIVE*>(buffer));
}
content_.to_buffer(buffer, name);
}

/// @brief Copies and concatenates all the accumulated data in the builder
/// to a map of user-allocated buffers.
///
Expand Down Expand Up @@ -404,6 +426,9 @@ namespace awkward {
void
to_buffers(std::map<std::string, void*>& /* buffers */) const noexcept {}

void
to_buffer(void* /* buffer */, const char* /* name */) const noexcept {}

/// @brief Copies and concatenates all the accumulated data in the builder
/// to a map of user-allocated buffers.
///
Expand Down Expand Up @@ -523,10 +548,11 @@ namespace awkward {
/// field of the record.
void
clear() noexcept {
for (size_t i = 0; i < fields_count_; i++)
for (size_t i = 0; i < fields_count_; i++) {
visit_at(contents, i, [](auto& content) {
content.builder.clear();
});
}
}

/// @brief Current number of records in first field.
Expand Down Expand Up @@ -568,10 +594,11 @@ namespace awkward {
void
buffer_nbytes(std::map<std::string, size_t>& names_nbytes) const
noexcept {
for (size_t i = 0; i < fields_count_; i++)
for (size_t i = 0; i < fields_count_; i++) {
visit_at(contents, i, [&names_nbytes](auto& content) {
content.builder.buffer_nbytes(names_nbytes);
});
}
}

/// @brief Copies and concatenates all the accumulated data in each of the
Expand All @@ -581,10 +608,23 @@ namespace awkward {
/// using the same names and sizes (in bytes) obtained from #buffer_nbytes.
void
to_buffers(std::map<std::string, void*>& buffers) const noexcept {
for (size_t i = 0; i < fields_count_; i++)
for (size_t i = 0; i < fields_count_; i++) {
visit_at(contents, i, [&buffers](auto& content) {
content.builder.to_buffers(buffers);
});
}
}

/// @brief Copies and concatenates the accumulated data in the buffers of the
/// builder contents to user-defined pointers if the given node name matches
/// with the node associated with that builder.
void
to_buffer(void* buffer, const char* name) const noexcept {
for (size_t i = 0; i < fields_count_; i++) {
visit_at(contents, i, [&buffer, &name](auto& content) {
content.builder.to_buffer(buffer, name);
});
}
}

/// @brief Copies and concatenates all the accumulated data in the builder
Expand All @@ -593,10 +633,11 @@ namespace awkward {
/// The map keys and the buffer sizes are obtained from #buffer_nbytes
void
to_char_buffers(std::map<std::string, uint8_t*>& buffers) const noexcept {
for (size_t i = 0; i < fields_count_; i++)
for (size_t i = 0; i < fields_count_; i++) {
visit_at(contents, i, [&buffers](auto& content) {
content.builder.to_char_buffers(buffers);
});
}
}

/// @brief Generates a unique description of the builder and its
Expand Down Expand Up @@ -732,10 +773,11 @@ namespace awkward {
/// Discards the accumulated data and the contents at each tuple index.
void
clear() noexcept {
for (size_t i = 0; i < fields_count_; i++)
for (size_t i = 0; i < fields_count_; i++) {
visit_at(contents, i, [](auto& content) {
content.clear();
});
}
}

/// @brief Current number of records in the first index of the tuple.
Expand Down Expand Up @@ -778,10 +820,11 @@ namespace awkward {
void
buffer_nbytes(std::map<std::string, size_t>& names_nbytes) const
noexcept {
for (size_t i = 0; i < fields_count_; i++)
for (size_t i = 0; i < fields_count_; i++) {
visit_at(contents, i, [&names_nbytes](auto& content) {
content.buffer_nbytes(names_nbytes);
});
}
}

/// @brief Copies and concatenates all the accumulated data in each of the
Expand All @@ -791,10 +834,23 @@ namespace awkward {
/// using the same names and sizes (in bytes) obtained from #buffer_nbytes.
void
to_buffers(std::map<std::string, void*>& buffers) const noexcept {
for (size_t i = 0; i < fields_count_; i++)
for (size_t i = 0; i < fields_count_; i++) {
visit_at(contents, i, [&buffers](auto& content) {
content.to_buffers(buffers);
});
}
}

/// @brief Copies and concatenates the accumulated data in the buffers of the
/// builder contents to user-defined pointers if the given node name matches
/// with the node associated with that builder.
void
to_buffer(void* buffer, const char* name) const noexcept {
for (size_t i = 0; i < fields_count_; i++) {
visit_at(contents, i, [&buffer, &name](auto& content) {
content.to_buffer(buffer, name);
});
}
}

/// @brief Copies and concatenates all the accumulated data in the builder
Expand All @@ -803,10 +859,11 @@ namespace awkward {
/// The map keys and the buffer sizes are obtained from #buffer_nbytes
void
to_char_buffers(std::map<std::string, uint8_t*>& buffers) const noexcept {
for (size_t i = 0; i < fields_count_; i++)
for (size_t i = 0; i < fields_count_; i++) {
visit_at(contents, i, [&buffers](auto& content) {
content.to_char_buffers(buffers);
});
}
}

/// @brief Generates a unique description of the builder and its
Expand Down Expand Up @@ -977,6 +1034,14 @@ namespace awkward {
content_.to_buffers(buffers);
}

/// @brief Copies and concatenates the accumulated data in the buffers of the
/// builder content to user-defined pointers if the given node name matches
/// with the node associated with that builder.
void
to_buffer(void* buffer, const char* name) const noexcept {
content_.to_buffer(buffer, name);
}

/// @brief Copies and concatenates all the accumulated data in the builder
/// to a map of user-allocated buffers.
///
Expand Down Expand Up @@ -1173,6 +1238,18 @@ namespace awkward {
content_.to_buffers(buffers);
}

/// @brief Copies and concatenates the accumulated data in the builder buffer to
/// a user-defined pointer if the given node name matches with the node associated
/// with the builder; otherwise, it searches the builder contents to locate a
/// matching node.
void
to_buffer(void* buffer, const char* name) const noexcept {
if (std::string(name) == std::string("node" + std::to_string(id_) + "-index")) {
index_.concatenate(reinterpret_cast<PRIMITIVE*>(buffer));
}
content_.to_buffer(buffer, name);
}

/// @brief Copies and concatenates all the accumulated data in the builder
/// to a map of user-allocated buffers.
///
Expand Down Expand Up @@ -1302,6 +1379,14 @@ namespace awkward {
content_.to_buffers(buffers);
}

/// @brief Copies and concatenates the accumulated data in the buffers of the
/// builder content to user-defined pointers if the given node name matches
/// with the node associated with that builder.
void
to_buffer(void* buffer, const char* name) const noexcept {
content_.to_buffer(buffer, name);
}

/// @brief Copies and concatenates all the accumulated data in the builder
/// to a map of user-allocated buffers.
///
Expand Down Expand Up @@ -1503,6 +1588,18 @@ namespace awkward {
content_.to_buffers(buffers);
}

/// @brief Copies and concatenates the accumulated data in the builder buffer to
/// a user-defined pointer if the given node name matches with the node associated
/// with the builder; otherwise, it searches the builder contents to locate a
/// matching node.
void
to_buffer(void* buffer, const char* name) const noexcept {
if (std::string(name) == std::string("node" + std::to_string(id_) + "-mask")) {
mask_.concatenate(reinterpret_cast<int8_t*>(buffer));
}
content_.to_buffer(buffer, name);
}

/// @brief Copies and concatenates all the accumulated data in the builder
/// to a map of user-allocated buffers.
///
Expand Down Expand Up @@ -1758,6 +1855,19 @@ namespace awkward {
content_.to_buffers(buffers);
}

/// @brief Copies and concatenates the accumulated data in the builder buffer to
/// a user-defined pointer if the given node name matches with the node associated
/// with the builder; otherwise, it searches the builder contents to locate a
/// matching node.
void
to_buffer(void* buffer, const char* name) const noexcept {
if (std::string(name) == std::string("node" + std::to_string(id_) + "-mask")) {
mask_.concatenate_from(reinterpret_cast<uint8_t*>(buffer), 0, 1);
mask_.append(reinterpret_cast<uint8_t*>(buffer), mask_.length() - 1, 0, 1);
}
content_.to_buffer(buffer, name);
}

/// @brief Copies and concatenates all the accumulated data in the builder
/// to a map of user-allocated buffers.
///
Expand Down Expand Up @@ -1883,8 +1993,9 @@ namespace awkward {
index_(awkward::GrowableBuffer<INDEX>(AWKWARD_LAYOUTBUILDER_DEFAULT_OPTIONS)) {
size_t id = 0;
set_id(id);
for (size_t i = 0; i < contents_count_; i++)
for (size_t i = 0; i < contents_count_; i++) {
last_valid_index_[i] = -1;
}
}

/// @brief Creates a new Union layout builder by allocating new tags and index
Expand All @@ -1897,8 +2008,9 @@ namespace awkward {
index_(awkward::GrowableBuffer<INDEX>(options)) {
size_t id = 0;
set_id(id);
for (size_t i = 0; i < contents_count_; i++)
for (size_t i = 0; i < contents_count_; i++) {
last_valid_index_[i] = -1;
}
}

template <std::size_t I>
Expand Down Expand Up @@ -1943,8 +2055,9 @@ namespace awkward {
auto contents_id = [&id](auto& content) {
content.set_id(id);
};
for (size_t i = 0; i < contents_count_; i++)
for (size_t i = 0; i < contents_count_; i++) {
visit_at(contents_, i, contents_id);
}
}

/// @brief Discards the accumulated tags and index, and clears
Expand All @@ -1953,15 +2066,17 @@ namespace awkward {
/// Also, resets the last valid index array to `-1`.
void
clear() noexcept {
for (size_t i = 0; i < contents_count_; i++)
for (size_t i = 0; i < contents_count_; i++) {
last_valid_index_[i] = -1;
}
tags_.clear();
index_.clear();
auto clear_contents = [](auto& content) {
content.clear();
};
for (size_t i = 0; i < contents_count_; i++)
for (size_t i = 0; i < contents_count_; i++) {
visit_at(contents_, i, clear_contents);
}
}

/// @brief Current length of the `tags` buffer.
Expand Down Expand Up @@ -2004,10 +2119,11 @@ namespace awkward {
names_nbytes["node" + std::to_string(id_) + "-tags"] = tags_.nbytes();
names_nbytes["node" + std::to_string(id_) + "-index"] = index_.nbytes();

for (size_t i = 0; i < contents_count_; i++)
for (size_t i = 0; i < contents_count_; i++) {
visit_at(contents_, i, [&names_nbytes](auto& content) {
content.buffer_nbytes(names_nbytes);
});
}
}

/// @brief Copies and concatenates all the accumulated data in each of the
Expand All @@ -2024,10 +2140,33 @@ namespace awkward {
index_.concatenate(reinterpret_cast<INDEX*>(
buffers["node" + std::to_string(id_) + "-index"]));

for (size_t i = 0; i < contents_count_; i++)
for (size_t i = 0; i < contents_count_; i++) {
visit_at(contents_, i, [&buffers](auto& content) {
content.to_buffers(buffers);
});
}
}

/// @brief Copies and concatenates the accumulated data in the builder buffers to
/// user-defined pointers if the given node name matches with any one of the nodes
/// associated with the builder; otherwise, it searches the builder contents to
/// locate a matching node.
void
to_buffer(void* buffer, const char* name) const noexcept {
auto index_sequence((std::index_sequence_for<BUILDERS...>()));

if (std::string(name) == std::string("node" + std::to_string(id_) + "-tags")) {
tags_.concatenate(reinterpret_cast<TAGS*>(buffer));
}
else if (std::string(name) == std::string("node" + std::to_string(id_) + "-index")) {
index_.concatenate(reinterpret_cast<INDEX*>(buffer));
}

for (size_t i = 0; i < contents_count_; i++) {
visit_at(contents_, i, [&buffer, &name](auto& content) {
content.to_buffer(buffer, name);
});
}
}

/// @brief Copies and concatenates all the accumulated data in the builder
Expand All @@ -2043,10 +2182,11 @@ namespace awkward {
index_.concatenate(reinterpret_cast<INDEX*>(
buffers["node" + std::to_string(id_) + "-index"]));

for (size_t i = 0; i < contents_count_; i++)
for (size_t i = 0; i < contents_count_; i++) {
visit_at(contents_, i, [&buffers](auto& content) {
content.to_char_buffers(buffers);
});
}
}

/// @brief Generates a unique description of the builder and its
Expand Down