Skip to content

DPL Analysis: Improve tests for persistent and index columns #9295

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
ktf merged 2 commits into from
Jul 8, 2022
Merged

DPL Analysis: Improve tests for persistent and index columns #9295

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed0a568
Improve tests for persistent and index columns
saganatt Jun 29, 2022
933be9b
Remove leftover lines
saganatt Jul 6, 2022
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
31 changes: 25 additions & 6 deletions Framework/Core/include/Framework/ASoA.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,23 @@ struct Index : o2::soa::IndexColumn<Index<START, END>> {
template <typename T>
using is_dynamic_t = framework::is_specialization<typename T::base, DynamicColumn>;

namespace persistent_type_helper

@ktf ktf Jul 5, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I like the idea of such a specific namespace. Do you really need it?

@saganatt saganatt Jul 6, 2022

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then instead would you prefer the included functions to have a more specific name instead of test?

{
// This checks both for the existence of the ::persistent member in the class T as well as the value returned stored in it.
// Hack: a pointer to any field of type int inside persistent. Both true_type and false_type do not have any int field, but anyways we pass nullptr.
// The compiler picks the version with exact number of arguments when only it can, i.e., when T::persistent is defined.
template <class T>
typename T::persistent test(int T::persistent::*);

template <class>
std::false_type test(...);
} // namespace persistent_type_helper

template <typename T>
using is_persistent_t = typename std::decay_t<T>::persistent::type;
using is_persistent_t = decltype(persistent_type_helper::test<T>(nullptr));

template <typename T>
using is_persistent_v = typename is_persistent_t<T>::value;

template <typename T>
using is_external_index_t = typename std::conditional<is_index_column_v<T>, std::true_type, std::false_type>::type;
Expand Down Expand Up @@ -1112,10 +1127,12 @@ class Table
auto getId() const
{
using decayed = std::decay_t<TI>;
if constexpr (framework::has_type_v<decayed, bindings_pack_t>) {
if constexpr (framework::has_type_v<decayed, bindings_pack_t>) { // index to another table
constexpr auto idx = framework::has_type_at_v<decayed>(bindings_pack_t{});
return framework::pack_element_t<idx, external_index_columns_t>::getId();
} else if constexpr (std::is_same_v<decayed, Parent>) {
} else if constexpr (std::is_same_v<decayed, Parent>) { // self index
return this->globalIndex();
} else if constexpr (is_index_t<decayed>::value && decayed::mLabel == "Index") { // soa::Index<>
return this->globalIndex();
} else {
return static_cast<int32_t>(-1);
Expand Down Expand Up @@ -1505,14 +1522,14 @@ namespace row_helpers
template <typename... Cs>
std::array<arrow::ChunkedArray*, sizeof...(Cs)> getArrowColumns(arrow::Table* table, framework::pack<Cs...>)
{
static_assert(std::conjunction_v<typename Cs::persistent...>, "BinningPolicy: only persistent columns accepted (not dynamic and not index ones");
static_assert(std::conjunction_v<typename Cs::persistent...>, "Arrow columns: only persistent columns accepted (not dynamic and not index ones");
return std::array<arrow::ChunkedArray*, sizeof...(Cs)>{o2::soa::getIndexFromLabel(table, Cs::columnLabel())...};
}

template <typename... Cs>
std::array<std::shared_ptr<arrow::Array>, sizeof...(Cs)> getChunks(arrow::Table* table, framework::pack<Cs...>, uint64_t ci)
{
static_assert(std::conjunction_v<typename Cs::persistent...>, "BinningPolicy: only persistent columns accepted (not dynamic and not index ones");
static_assert(std::conjunction_v<typename Cs::persistent...>, "Arrow chunks: only persistent columns accepted (not dynamic and not index ones");
return std::array<std::shared_ptr<arrow::Array>, sizeof...(Cs)>{o2::soa::getIndexFromLabel(table, Cs::columnLabel())->chunk(ci)...};
}

Expand Down Expand Up @@ -1544,8 +1561,10 @@ typename C::type getSingleRowData(arrow::Table* table, T& rowIterator, uint64_t
return getSingleRowPersistentData<C>(table, ci, ai);
} else if constexpr (o2::soa::is_dynamic_t<decayed>()) {
return getSingleRowDynamicData<T, C>(rowIterator, globalIndex);
} else if constexpr (o2::soa::is_index_column_v<decayed>) {
} else if constexpr (o2::soa::is_index_t<decayed>::value) {
return getSingleRowIndexData<T, C>(rowIterator, globalIndex);
} else {
static_assert(!sizeof(decayed*), "Unrecognized column kind"); // A trick to delay static_assert until we actually instantiate this branch
}
}

Expand Down