Skip to content

DPL Analysis: as<T>(cfg) for adjusting the types of configurables in expressions #14276

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 1 commit into from
May 19, 2025
Merged

DPL Analysis: as<T>(cfg) for adjusting the types of configurables in expressions #14276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 15 additions & 7 deletions Framework/Core/include/Framework/Expressions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
#define O2_FRAMEWORK_EXPRESSIONS_H_

#include "Framework/BasicOps.h"
#include "Framework/CompilerBuiltins.h"
#include "Framework/Pack.h"
#include "Framework/Configurable.h"
#include "Framework/Variant.h"
#include "Framework/InitContext.h"
#include "Framework/ConfigParamRegistry.h"
#include "Framework/RuntimeError.h"
#include <arrow/type_fwd.h>
#include <gandiva/gandiva_aliases.h>
#include <arrow/type.h>
Expand Down Expand Up @@ -143,13 +141,17 @@ struct OpNode {
/// A placeholder node for simple type configurable
struct PlaceholderNode : LiteralNode {
template <typename T>
requires(variant_trait_v<typename std::decay<T>::type> != VariantType::Unknown)
PlaceholderNode(Configurable<T> const& v) : LiteralNode{v.value}, name{v.name}
{
if constexpr (variant_trait_v<typename std::decay<T>::type> != VariantType::Unknown) {
retrieve = [](InitContext& context, char const* name) { return LiteralNode::var_t{context.options().get<T>(name)}; };
} else {
unknownParameterUsed(name.c_str());
}
retrieve = [](InitContext& context, char const* name) { return LiteralNode::var_t{context.options().get<T>(name)}; };
}

template <typename T, typename AT>
requires((std::convertible_to<T, AT>) && (variant_trait_v<typename std::decay<T>::type> != VariantType::Unknown))
PlaceholderNode(Configurable<T> const& v, AT*) : LiteralNode{static_cast<AT>(v.value)}, name{v.name}
{
retrieve = [](InitContext& context, char const* name) { return LiteralNode::var_t{static_cast<AT>(context.options().get<T>(name))}; };
}

PlaceholderNode(PlaceholderNode const& other) = default;
Expand All @@ -163,6 +165,12 @@ struct PlaceholderNode : LiteralNode {
LiteralNode::var_t (*retrieve)(InitContext&, char const*);
};

template <typename AT, typename T>
PlaceholderNode as(Configurable<T> const& v)
{
return PlaceholderNode(v, (AT*)nullptr);
}

/// A placeholder node for parameters taken from an array
struct ParameterNode : LiteralNode {
ParameterNode(int index_ = -1)
Expand Down
9 changes: 9 additions & 0 deletions Framework/Core/test/test_Expressions.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,15 @@ TEST_CASE("TestTreeParsing")
REQUIRE(ptfilterspecs2[0].left == (DatumSpec{std::string{"fPt"}, typeid(o2::aod::track::Pt).hash_code(), atype::FLOAT}));
REQUIRE(ptfilterspecs2[0].right == (DatumSpec{LiteralNode::var_t{1.0f}, atype::FLOAT}));
REQUIRE(ptfilterspecs2[0].result == (DatumSpec{0u, atype::BOOL}));

Configurable<int> cvalue{"cvalue", 1, "test value"};
Filter testFilter = o2::aod::track::tpcNClsShared < as<uint8_t>(cvalue);
REQUIRE(testFilter.node->self.index() == 2);
REQUIRE(testFilter.node->left->self.index() == 1);
REQUIRE(testFilter.node->right->self.index() == 3);
REQUIRE(std::get<PlaceholderNode>(testFilter.node->right->self).name == "cvalue");
auto testSpecs = createOperations(testFilter);
REQUIRE(testSpecs[0].right == (DatumSpec{LiteralNode::var_t{(uint8_t)1}, atype::UINT8}));
}

TEST_CASE("TestGandivaTreeCreation")
Expand Down