Functions: introduce multi-function namespace
This moves all multi-function related code in the `functions` module into a new `multi_function` namespace. This is similar to how there is a `lazy_function` namespace. The main benefit of this is that many types names that were prefixed with `MF` (for "multi function") can be simplified. There is also a common shorthand for the `multi_function` namespace: `mf`. This is also similar to lazy-functions where the shortened namespace is called `lf`.
This commit is contained in:
@@ -13,7 +13,7 @@ TEST(field, ConstantFunction)
|
||||
{
|
||||
/* TODO: Figure out how to not use another "FieldOperation(" inside of std::make_shared. */
|
||||
GField constant_field{std::make_shared<FieldOperation>(
|
||||
FieldOperation(std::make_unique<CustomMF_Constant<int>>(10), {})),
|
||||
FieldOperation(std::make_unique<mf::CustomMF_Constant<int>>(10), {})),
|
||||
0};
|
||||
|
||||
Array<int> result(4);
|
||||
@@ -104,7 +104,7 @@ TEST(field, InputAndFunction)
|
||||
{
|
||||
GField index_field{std::make_shared<IndexFieldInput>()};
|
||||
|
||||
auto add_fn = build_mf::SI2_SO<int, int, int>("add", [](int a, int b) { return a + b; });
|
||||
auto add_fn = mf::build::SI2_SO<int, int, int>("add", [](int a, int b) { return a + b; });
|
||||
GField output_field{
|
||||
std::make_shared<FieldOperation>(FieldOperation(add_fn, {index_field, index_field})), 0};
|
||||
|
||||
@@ -127,11 +127,11 @@ TEST(field, TwoFunctions)
|
||||
{
|
||||
GField index_field{std::make_shared<IndexFieldInput>()};
|
||||
|
||||
auto add_fn = build_mf::SI2_SO<int, int, int>("add", [](int a, int b) { return a + b; });
|
||||
auto add_fn = mf::build::SI2_SO<int, int, int>("add", [](int a, int b) { return a + b; });
|
||||
GField add_field{
|
||||
std::make_shared<FieldOperation>(FieldOperation(add_fn, {index_field, index_field})), 0};
|
||||
|
||||
auto add_10_fn = build_mf::SI1_SO<int, int>("add_10", [](int a) { return a + 10; });
|
||||
auto add_10_fn = mf::build::SI1_SO<int, int>("add_10", [](int a) { return a + 10; });
|
||||
GField result_field{std::make_shared<FieldOperation>(FieldOperation(add_10_fn, {add_field})), 0};
|
||||
|
||||
Array<int> result(10);
|
||||
@@ -149,14 +149,14 @@ TEST(field, TwoFunctions)
|
||||
EXPECT_EQ(result[8], 26);
|
||||
}
|
||||
|
||||
class TwoOutputFunction : public MultiFunction {
|
||||
class TwoOutputFunction : public mf::MultiFunction {
|
||||
private:
|
||||
MFSignature signature_;
|
||||
mf::Signature signature_;
|
||||
|
||||
public:
|
||||
TwoOutputFunction()
|
||||
{
|
||||
MFSignatureBuilder builder{"Two Outputs", signature_};
|
||||
mf::SignatureBuilder builder{"Two Outputs", signature_};
|
||||
builder.single_input<int>("In1");
|
||||
builder.single_input<int>("In2");
|
||||
builder.single_output<int>("Add");
|
||||
@@ -164,7 +164,7 @@ class TwoOutputFunction : public MultiFunction {
|
||||
this->set_signature(&signature_);
|
||||
}
|
||||
|
||||
void call(IndexMask mask, MFParams params, MFContext /*context*/) const override
|
||||
void call(IndexMask mask, mf::MFParams params, mf::Context /*context*/) const override
|
||||
{
|
||||
const VArray<int> &in1 = params.readonly_single_input<int>(0, "In1");
|
||||
const VArray<int> &in2 = params.readonly_single_input<int>(1, "In2");
|
||||
@@ -223,7 +223,7 @@ TEST(field, TwoFunctionsTwoOutputs)
|
||||
Field<int> result_field_1{fn, 0};
|
||||
Field<int> intermediate_field{fn, 1};
|
||||
|
||||
auto add_10_fn = build_mf::SI1_SO<int, int>("add_10", [](int a) { return a + 10; });
|
||||
auto add_10_fn = mf::build::SI1_SO<int, int>("add_10", [](int a) { return a + 10; });
|
||||
Field<int> result_field_2{
|
||||
std::make_shared<FieldOperation>(FieldOperation(add_10_fn, {intermediate_field})), 0};
|
||||
|
||||
@@ -248,7 +248,7 @@ TEST(field, TwoFunctionsTwoOutputs)
|
||||
TEST(field, SameFieldTwice)
|
||||
{
|
||||
GField constant_field{
|
||||
std::make_shared<FieldOperation>(std::make_unique<CustomMF_Constant<int>>(10)), 0};
|
||||
std::make_shared<FieldOperation>(std::make_unique<mf::CustomMF_Constant<int>>(10)), 0};
|
||||
|
||||
FieldContext field_context;
|
||||
IndexMask mask{IndexRange(2)};
|
||||
@@ -267,7 +267,7 @@ TEST(field, SameFieldTwice)
|
||||
|
||||
TEST(field, IgnoredOutput)
|
||||
{
|
||||
static OptionalOutputsFunction fn;
|
||||
static mf::tests::OptionalOutputsFunction fn;
|
||||
Field<int> field{std::make_shared<FieldOperation>(fn), 0};
|
||||
|
||||
FieldContext field_context;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "FN_multi_function_procedure_executor.hh"
|
||||
#include "FN_multi_function_test_common.hh"
|
||||
|
||||
namespace blender::fn::tests {
|
||||
namespace blender::fn::multi_function::tests {
|
||||
|
||||
TEST(multi_function_procedure, ConstantOutput)
|
||||
{
|
||||
@@ -19,10 +19,10 @@ TEST(multi_function_procedure, ConstantOutput)
|
||||
*/
|
||||
|
||||
CustomMF_Constant<int> constant_fn{5};
|
||||
auto add_fn = build_mf::SI2_SO<int, int, int>("Add", [](int a, int b) { return a + b; });
|
||||
auto add_fn = build::SI2_SO<int, int, int>("Add", [](int a, int b) { return a + b; });
|
||||
|
||||
MFProcedure procedure;
|
||||
MFProcedureBuilder builder{procedure};
|
||||
Procedure procedure;
|
||||
ProcedureBuilder builder{procedure};
|
||||
|
||||
auto [var1] = builder.add_call<1>(constant_fn);
|
||||
auto [var2] = builder.add_call<1>(add_fn, {var1, var1});
|
||||
@@ -32,10 +32,10 @@ TEST(multi_function_procedure, ConstantOutput)
|
||||
|
||||
EXPECT_TRUE(procedure.validate());
|
||||
|
||||
MFProcedureExecutor executor{procedure};
|
||||
ProcedureExecutor executor{procedure};
|
||||
|
||||
MFParamsBuilder params{executor, 2};
|
||||
MFContextBuilder context;
|
||||
ParamsBuilder params{executor, 2};
|
||||
ContextBuilder context;
|
||||
|
||||
Array<int> output_array(2);
|
||||
params.add_uninitialized_single_output(output_array.as_mutable_span());
|
||||
@@ -56,14 +56,14 @@ TEST(multi_function_procedure, SimpleTest)
|
||||
* }
|
||||
*/
|
||||
|
||||
auto add_fn = fn::build_mf::SI2_SO<int, int, int>("add", [](int a, int b) { return a + b; });
|
||||
auto add_10_fn = fn::build_mf::SM<int>("add_10", [](int &a) { a += 10; });
|
||||
auto add_fn = mf::build::SI2_SO<int, int, int>("add", [](int a, int b) { return a + b; });
|
||||
auto add_10_fn = mf::build::SM<int>("add_10", [](int &a) { a += 10; });
|
||||
|
||||
MFProcedure procedure;
|
||||
MFProcedureBuilder builder{procedure};
|
||||
Procedure procedure;
|
||||
ProcedureBuilder builder{procedure};
|
||||
|
||||
MFVariable *var1 = &builder.add_single_input_parameter<int>();
|
||||
MFVariable *var2 = &builder.add_single_input_parameter<int>();
|
||||
Variable *var1 = &builder.add_single_input_parameter<int>();
|
||||
Variable *var2 = &builder.add_single_input_parameter<int>();
|
||||
auto [var3] = builder.add_call<1>(add_fn, {var1, var2});
|
||||
auto [var4] = builder.add_call<1>(add_fn, {var2, var3});
|
||||
builder.add_call(add_10_fn, {var4});
|
||||
@@ -73,10 +73,10 @@ TEST(multi_function_procedure, SimpleTest)
|
||||
|
||||
EXPECT_TRUE(procedure.validate());
|
||||
|
||||
MFProcedureExecutor executor{procedure};
|
||||
ProcedureExecutor executor{procedure};
|
||||
|
||||
MFParamsBuilder params{executor, 3};
|
||||
MFContextBuilder context;
|
||||
ParamsBuilder params{executor, 3};
|
||||
ContextBuilder context;
|
||||
|
||||
Array<int> input_array = {1, 2, 3};
|
||||
params.add_readonly_single_input(input_array.as_span());
|
||||
@@ -106,16 +106,16 @@ TEST(multi_function_procedure, BranchTest)
|
||||
* }
|
||||
*/
|
||||
|
||||
auto add_10_fn = build_mf::SM<int>("add_10", [](int &a) { a += 10; });
|
||||
auto add_100_fn = build_mf::SM<int>("add_100", [](int &a) { a += 100; });
|
||||
auto add_10_fn = build::SM<int>("add_10", [](int &a) { a += 10; });
|
||||
auto add_100_fn = build::SM<int>("add_100", [](int &a) { a += 100; });
|
||||
|
||||
MFProcedure procedure;
|
||||
MFProcedureBuilder builder{procedure};
|
||||
Procedure procedure;
|
||||
ProcedureBuilder builder{procedure};
|
||||
|
||||
MFVariable *var1 = &builder.add_single_mutable_parameter<int>();
|
||||
MFVariable *var2 = &builder.add_single_input_parameter<bool>();
|
||||
Variable *var1 = &builder.add_single_mutable_parameter<int>();
|
||||
Variable *var2 = &builder.add_single_input_parameter<bool>();
|
||||
|
||||
MFProcedureBuilder::Branch branch = builder.add_branch(*var2);
|
||||
ProcedureBuilder::Branch branch = builder.add_branch(*var2);
|
||||
branch.branch_false.add_call(add_10_fn, {var1});
|
||||
branch.branch_true.add_call(add_100_fn, {var1});
|
||||
builder.set_cursor_after_branch(branch);
|
||||
@@ -125,8 +125,8 @@ TEST(multi_function_procedure, BranchTest)
|
||||
|
||||
EXPECT_TRUE(procedure.validate());
|
||||
|
||||
MFProcedureExecutor procedure_fn{procedure};
|
||||
MFParamsBuilder params(procedure_fn, 5);
|
||||
ProcedureExecutor procedure_fn{procedure};
|
||||
ParamsBuilder params(procedure_fn, 5);
|
||||
|
||||
Array<int> values_a = {1, 5, 3, 6, 2};
|
||||
Array<bool> values_cond = {true, false, true, true, false};
|
||||
@@ -134,7 +134,7 @@ TEST(multi_function_procedure, BranchTest)
|
||||
params.add_single_mutable(values_a.as_mutable_span());
|
||||
params.add_readonly_single_input(values_cond.as_span());
|
||||
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
procedure_fn.call({1, 2, 3, 4}, params, context);
|
||||
|
||||
EXPECT_EQ(values_a[0], 1);
|
||||
@@ -153,28 +153,28 @@ TEST(multi_function_procedure, EvaluateOne)
|
||||
*/
|
||||
|
||||
int tot_evaluations = 0;
|
||||
const auto add_10_fn = fn::build_mf::SI1_SO<int, int>("add_10", [&](int a) {
|
||||
const auto add_10_fn = mf::build::SI1_SO<int, int>("add_10", [&](int a) {
|
||||
tot_evaluations++;
|
||||
return a + 10;
|
||||
});
|
||||
|
||||
MFProcedure procedure;
|
||||
MFProcedureBuilder builder{procedure};
|
||||
Procedure procedure;
|
||||
ProcedureBuilder builder{procedure};
|
||||
|
||||
MFVariable *var1 = &builder.add_single_input_parameter<int>();
|
||||
Variable *var1 = &builder.add_single_input_parameter<int>();
|
||||
auto [var2] = builder.add_call<1>(add_10_fn, {var1});
|
||||
builder.add_destruct(*var1);
|
||||
builder.add_return();
|
||||
builder.add_output_parameter(*var2);
|
||||
|
||||
MFProcedureExecutor procedure_fn{procedure};
|
||||
MFParamsBuilder params{procedure_fn, 5};
|
||||
ProcedureExecutor procedure_fn{procedure};
|
||||
ParamsBuilder params{procedure_fn, 5};
|
||||
|
||||
Array<int> values_out = {1, 2, 3, 4, 5};
|
||||
params.add_readonly_single_input_value(1);
|
||||
params.add_uninitialized_single_output(values_out.as_mutable_span());
|
||||
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
procedure_fn.call({0, 1, 3, 4}, params, context);
|
||||
|
||||
EXPECT_EQ(values_out[0], 11);
|
||||
@@ -205,25 +205,25 @@ TEST(multi_function_procedure, SimpleLoop)
|
||||
|
||||
CustomMF_Constant<int> const_1_fn{1};
|
||||
CustomMF_Constant<int> const_0_fn{0};
|
||||
auto greater_or_equal_fn = fn::build_mf::SI2_SO<int, int, bool>(
|
||||
auto greater_or_equal_fn = mf::build::SI2_SO<int, int, bool>(
|
||||
"greater or equal", [](int a, int b) { return a >= b; });
|
||||
auto double_fn = build_mf::SM<int>("double", [](int &a) { a *= 2; });
|
||||
auto add_1000_fn = build_mf::SM<int>("add 1000", [](int &a) { a += 1000; });
|
||||
auto add_1_fn = build_mf::SM<int>("add 1", [](int &a) { a += 1; });
|
||||
auto double_fn = build::SM<int>("double", [](int &a) { a *= 2; });
|
||||
auto add_1000_fn = build::SM<int>("add 1000", [](int &a) { a += 1000; });
|
||||
auto add_1_fn = build::SM<int>("add 1", [](int &a) { a += 1; });
|
||||
|
||||
MFProcedure procedure;
|
||||
MFProcedureBuilder builder{procedure};
|
||||
Procedure procedure;
|
||||
ProcedureBuilder builder{procedure};
|
||||
|
||||
MFVariable *var_count = &builder.add_single_input_parameter<int>("count");
|
||||
Variable *var_count = &builder.add_single_input_parameter<int>("count");
|
||||
auto [var_out] = builder.add_call<1>(const_1_fn);
|
||||
var_out->set_name("out");
|
||||
auto [var_index] = builder.add_call<1>(const_0_fn);
|
||||
var_index->set_name("index");
|
||||
|
||||
MFProcedureBuilder::Loop loop = builder.add_loop();
|
||||
ProcedureBuilder::Loop loop = builder.add_loop();
|
||||
auto [var_condition] = builder.add_call<1>(greater_or_equal_fn, {var_index, var_count});
|
||||
var_condition->set_name("condition");
|
||||
MFProcedureBuilder::Branch branch = builder.add_branch(*var_condition);
|
||||
ProcedureBuilder::Branch branch = builder.add_branch(*var_condition);
|
||||
branch.branch_true.add_destruct(*var_condition);
|
||||
branch.branch_true.add_loop_break(loop);
|
||||
branch.branch_false.add_destruct(*var_condition);
|
||||
@@ -239,8 +239,8 @@ TEST(multi_function_procedure, SimpleLoop)
|
||||
|
||||
EXPECT_TRUE(procedure.validate());
|
||||
|
||||
MFProcedureExecutor procedure_fn{procedure};
|
||||
MFParamsBuilder params{procedure_fn, 5};
|
||||
ProcedureExecutor procedure_fn{procedure};
|
||||
ParamsBuilder params{procedure_fn, 5};
|
||||
|
||||
Array<int> counts = {4, 3, 7, 6, 4};
|
||||
Array<int> results(5, -1);
|
||||
@@ -248,7 +248,7 @@ TEST(multi_function_procedure, SimpleLoop)
|
||||
params.add_readonly_single_input(counts.as_span());
|
||||
params.add_uninitialized_single_output(results.as_mutable_span());
|
||||
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
procedure_fn.call({0, 1, 3, 4}, params, context);
|
||||
|
||||
EXPECT_EQ(results[0], 1016);
|
||||
@@ -277,11 +277,11 @@ TEST(multi_function_procedure, Vectors)
|
||||
SumVectorFunction sum_elements_fn;
|
||||
CustomMF_Constant<int> constant_5_fn{5};
|
||||
|
||||
MFProcedure procedure;
|
||||
MFProcedureBuilder builder{procedure};
|
||||
Procedure procedure;
|
||||
ProcedureBuilder builder{procedure};
|
||||
|
||||
MFVariable *var_v1 = &builder.add_input_parameter(MFDataType::ForVector<int>());
|
||||
MFVariable *var_v2 = &builder.add_parameter(MFParamType::ForMutableVector(CPPType::get<int>()));
|
||||
Variable *var_v1 = &builder.add_input_parameter(DataType::ForVector<int>());
|
||||
Variable *var_v2 = &builder.add_parameter(ParamType::ForMutableVector(CPPType::get<int>()));
|
||||
builder.add_call(extend_fn, {var_v1, var_v2});
|
||||
auto [var_constant] = builder.add_call<1>(constant_5_fn);
|
||||
builder.add_call(append_fn, {var_v2, var_constant});
|
||||
@@ -295,8 +295,8 @@ TEST(multi_function_procedure, Vectors)
|
||||
|
||||
EXPECT_TRUE(procedure.validate());
|
||||
|
||||
MFProcedureExecutor procedure_fn{procedure};
|
||||
MFParamsBuilder params{procedure_fn, 5};
|
||||
ProcedureExecutor procedure_fn{procedure};
|
||||
ParamsBuilder params{procedure_fn, 5};
|
||||
|
||||
Array<int> v1 = {5, 2, 3};
|
||||
GVectorArray v2{CPPType::get<int>(), 5};
|
||||
@@ -310,7 +310,7 @@ TEST(multi_function_procedure, Vectors)
|
||||
params.add_vector_mutable(v2);
|
||||
params.add_vector_output(v3);
|
||||
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
procedure_fn.call({0, 1, 3, 4}, params, context);
|
||||
|
||||
EXPECT_EQ(v2[0].size(), 6);
|
||||
@@ -338,12 +338,12 @@ TEST(multi_function_procedure, BufferReuse)
|
||||
* }
|
||||
*/
|
||||
|
||||
auto add_10_fn = build_mf::SI1_SO<int, int>("add 10", [](int a) { return a + 10; });
|
||||
auto add_10_fn = build::SI1_SO<int, int>("add 10", [](int a) { return a + 10; });
|
||||
|
||||
MFProcedure procedure;
|
||||
MFProcedureBuilder builder{procedure};
|
||||
Procedure procedure;
|
||||
ProcedureBuilder builder{procedure};
|
||||
|
||||
MFVariable *var_a = &builder.add_single_input_parameter<int>();
|
||||
Variable *var_a = &builder.add_single_input_parameter<int>();
|
||||
auto [var_b] = builder.add_call<1>(add_10_fn, {var_a});
|
||||
builder.add_destruct(*var_a);
|
||||
auto [var_c] = builder.add_call<1>(add_10_fn, {var_b});
|
||||
@@ -359,16 +359,16 @@ TEST(multi_function_procedure, BufferReuse)
|
||||
|
||||
EXPECT_TRUE(procedure.validate());
|
||||
|
||||
MFProcedureExecutor procedure_fn{procedure};
|
||||
ProcedureExecutor procedure_fn{procedure};
|
||||
|
||||
Array<int> inputs = {4, 1, 6, 2, 3};
|
||||
Array<int> results(5, -1);
|
||||
|
||||
MFParamsBuilder params{procedure_fn, 5};
|
||||
ParamsBuilder params{procedure_fn, 5};
|
||||
params.add_readonly_single_input(inputs.as_span());
|
||||
params.add_uninitialized_single_output(results.as_mutable_span());
|
||||
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
procedure_fn.call({0, 2, 3, 4}, params, context);
|
||||
|
||||
EXPECT_EQ(results[0], 54);
|
||||
@@ -380,12 +380,12 @@ TEST(multi_function_procedure, BufferReuse)
|
||||
|
||||
TEST(multi_function_procedure, OutputBufferReplaced)
|
||||
{
|
||||
MFProcedure procedure;
|
||||
MFProcedureBuilder builder{procedure};
|
||||
Procedure procedure;
|
||||
ProcedureBuilder builder{procedure};
|
||||
|
||||
const int output_value = 42;
|
||||
CustomMF_GenericConstant constant_fn(CPPType::get<int>(), &output_value, false);
|
||||
MFVariable &var_o = procedure.new_variable(MFDataType::ForSingle<int>());
|
||||
Variable &var_o = procedure.new_variable(DataType::ForSingle<int>());
|
||||
builder.add_output_parameter(var_o);
|
||||
builder.add_call_with_all_variables(constant_fn, {&var_o});
|
||||
builder.add_destruct(var_o);
|
||||
@@ -394,13 +394,13 @@ TEST(multi_function_procedure, OutputBufferReplaced)
|
||||
|
||||
EXPECT_TRUE(procedure.validate());
|
||||
|
||||
MFProcedureExecutor procedure_fn{procedure};
|
||||
ProcedureExecutor procedure_fn{procedure};
|
||||
|
||||
Array<int> output(3, 0);
|
||||
fn::MFParamsBuilder params(procedure_fn, output.size());
|
||||
mf::ParamsBuilder params(procedure_fn, output.size());
|
||||
params.add_uninitialized_single_output(output.as_mutable_span());
|
||||
|
||||
fn::MFContextBuilder context;
|
||||
mf::ContextBuilder context;
|
||||
procedure_fn.call(IndexMask(output.size()), params, context);
|
||||
|
||||
EXPECT_EQ(output[0], output_value);
|
||||
@@ -408,4 +408,4 @@ TEST(multi_function_procedure, OutputBufferReplaced)
|
||||
EXPECT_EQ(output[2], output_value);
|
||||
}
|
||||
|
||||
} // namespace blender::fn::tests
|
||||
} // namespace blender::fn::multi_function::tests
|
||||
|
||||
@@ -6,28 +6,28 @@
|
||||
#include "FN_multi_function_builder.hh"
|
||||
#include "FN_multi_function_test_common.hh"
|
||||
|
||||
namespace blender::fn::tests {
|
||||
namespace blender::fn::multi_function::tests {
|
||||
namespace {
|
||||
|
||||
class AddFunction : public MultiFunction {
|
||||
public:
|
||||
AddFunction()
|
||||
{
|
||||
static MFSignature signature = create_signature();
|
||||
static Signature signature = create_signature();
|
||||
this->set_signature(&signature);
|
||||
}
|
||||
|
||||
static MFSignature create_signature()
|
||||
static Signature create_signature()
|
||||
{
|
||||
MFSignature signature;
|
||||
MFSignatureBuilder builder("Add", signature);
|
||||
Signature signature;
|
||||
SignatureBuilder builder("Add", signature);
|
||||
builder.single_input<int>("A");
|
||||
builder.single_input<int>("B");
|
||||
builder.single_output<int>("Result");
|
||||
return signature;
|
||||
}
|
||||
|
||||
void call(IndexMask mask, MFParams params, MFContext /*context*/) const override
|
||||
void call(IndexMask mask, MFParams params, Context /*context*/) const override
|
||||
{
|
||||
const VArray<int> &a = params.readonly_single_input<int>(0, "A");
|
||||
const VArray<int> &b = params.readonly_single_input<int>(1, "B");
|
||||
@@ -47,12 +47,12 @@ TEST(multi_function, AddFunction)
|
||||
Array<int> input2 = {10, 20, 30};
|
||||
Array<int> output(3, -1);
|
||||
|
||||
MFParamsBuilder params(fn, 3);
|
||||
ParamsBuilder params(fn, 3);
|
||||
params.add_readonly_single_input(input1.as_span());
|
||||
params.add_readonly_single_input(input2.as_span());
|
||||
params.add_uninitialized_single_output(output.as_mutable_span());
|
||||
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
|
||||
fn.call({0, 2}, params, context);
|
||||
|
||||
@@ -74,11 +74,11 @@ TEST(multi_function, AddPrefixFunction)
|
||||
|
||||
std::string prefix = "AB";
|
||||
|
||||
MFParamsBuilder params(fn, strings.size());
|
||||
ParamsBuilder params(fn, strings.size());
|
||||
params.add_readonly_single_input(&prefix);
|
||||
params.add_single_mutable(strings.as_mutable_span());
|
||||
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
|
||||
fn.call({0, 2, 3}, params, context);
|
||||
|
||||
@@ -96,11 +96,11 @@ TEST(multi_function, CreateRangeFunction)
|
||||
GVectorArray_TypedMutableRef<int> ranges_ref{ranges};
|
||||
Array<int> sizes = {3, 0, 6, 1, 4};
|
||||
|
||||
MFParamsBuilder params(fn, ranges.size());
|
||||
ParamsBuilder params(fn, ranges.size());
|
||||
params.add_readonly_single_input(sizes.as_span());
|
||||
params.add_vector_output(ranges);
|
||||
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
|
||||
fn.call({0, 1, 2, 3}, params, context);
|
||||
|
||||
@@ -128,11 +128,11 @@ TEST(multi_function, GenericAppendFunction)
|
||||
vectors_ref.append(2, 6);
|
||||
Array<int> values = {5, 7, 3, 1};
|
||||
|
||||
MFParamsBuilder params(fn, vectors.size());
|
||||
ParamsBuilder params(fn, vectors.size());
|
||||
params.add_vector_mutable(vectors);
|
||||
params.add_readonly_single_input(values.as_span());
|
||||
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
|
||||
fn.call(IndexRange(vectors.size()), params, context);
|
||||
|
||||
@@ -156,10 +156,10 @@ TEST(multi_function, CustomMF_Constant)
|
||||
|
||||
Array<int> outputs(4, 0);
|
||||
|
||||
MFParamsBuilder params(fn, outputs.size());
|
||||
ParamsBuilder params(fn, outputs.size());
|
||||
params.add_uninitialized_single_output(outputs.as_mutable_span());
|
||||
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
|
||||
fn.call({0, 2, 3}, params, context);
|
||||
|
||||
@@ -176,10 +176,10 @@ TEST(multi_function, CustomMF_GenericConstant)
|
||||
|
||||
Array<int> outputs(4, 0);
|
||||
|
||||
MFParamsBuilder params(fn, outputs.size());
|
||||
ParamsBuilder params(fn, outputs.size());
|
||||
params.add_uninitialized_single_output(outputs.as_mutable_span());
|
||||
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
|
||||
fn.call({0, 1, 2}, params, context);
|
||||
|
||||
@@ -197,10 +197,10 @@ TEST(multi_function, CustomMF_GenericConstantArray)
|
||||
GVectorArray vector_array{CPPType::get<int32_t>(), 4};
|
||||
GVectorArray_TypedMutableRef<int> vector_array_ref{vector_array};
|
||||
|
||||
MFParamsBuilder params(fn, vector_array.size());
|
||||
ParamsBuilder params(fn, vector_array.size());
|
||||
params.add_vector_output(vector_array);
|
||||
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
|
||||
fn.call({1, 2, 3}, params, context);
|
||||
|
||||
@@ -220,20 +220,20 @@ TEST(multi_function, IgnoredOutputs)
|
||||
{
|
||||
OptionalOutputsFunction fn;
|
||||
{
|
||||
MFParamsBuilder params(fn, 10);
|
||||
ParamsBuilder params(fn, 10);
|
||||
params.add_ignored_single_output("Out 1");
|
||||
params.add_ignored_single_output("Out 2");
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
fn.call(IndexRange(10), params, context);
|
||||
}
|
||||
{
|
||||
Array<int> results_1(10);
|
||||
Array<std::string> results_2(10, NoInitialization());
|
||||
|
||||
MFParamsBuilder params(fn, 10);
|
||||
ParamsBuilder params(fn, 10);
|
||||
params.add_uninitialized_single_output(results_1.as_mutable_span(), "Out 1");
|
||||
params.add_uninitialized_single_output(results_2.as_mutable_span(), "Out 2");
|
||||
MFContextBuilder context;
|
||||
ContextBuilder context;
|
||||
fn.call(IndexRange(10), params, context);
|
||||
|
||||
EXPECT_EQ(results_1[0], 5);
|
||||
@@ -244,4 +244,4 @@ TEST(multi_function, IgnoredOutputs)
|
||||
}
|
||||
|
||||
} // namespace
|
||||
} // namespace blender::fn::tests
|
||||
} // namespace blender::fn::multi_function::tests
|
||||
|
||||
@@ -2,26 +2,26 @@
|
||||
|
||||
#include "FN_multi_function.hh"
|
||||
|
||||
namespace blender::fn::tests {
|
||||
namespace blender::fn::multi_function::tests {
|
||||
|
||||
class AddPrefixFunction : public MultiFunction {
|
||||
public:
|
||||
AddPrefixFunction()
|
||||
{
|
||||
static MFSignature signature = create_signature();
|
||||
static Signature signature = create_signature();
|
||||
this->set_signature(&signature);
|
||||
}
|
||||
|
||||
static MFSignature create_signature()
|
||||
static Signature create_signature()
|
||||
{
|
||||
MFSignature signature;
|
||||
MFSignatureBuilder builder{"Add Prefix", signature};
|
||||
Signature signature;
|
||||
SignatureBuilder builder{"Add Prefix", signature};
|
||||
builder.single_input<std::string>("Prefix");
|
||||
builder.single_mutable<std::string>("Strings");
|
||||
return signature;
|
||||
}
|
||||
|
||||
void call(IndexMask mask, MFParams params, MFContext /*context*/) const override
|
||||
void call(IndexMask mask, MFParams params, Context /*context*/) const override
|
||||
{
|
||||
const VArray<std::string> &prefixes = params.readonly_single_input<std::string>(0, "Prefix");
|
||||
MutableSpan<std::string> strings = params.single_mutable<std::string>(1, "Strings");
|
||||
@@ -36,20 +36,20 @@ class CreateRangeFunction : public MultiFunction {
|
||||
public:
|
||||
CreateRangeFunction()
|
||||
{
|
||||
static MFSignature signature = create_signature();
|
||||
static Signature signature = create_signature();
|
||||
this->set_signature(&signature);
|
||||
}
|
||||
|
||||
static MFSignature create_signature()
|
||||
static Signature create_signature()
|
||||
{
|
||||
MFSignature signature;
|
||||
MFSignatureBuilder builder{"Create Range", signature};
|
||||
Signature signature;
|
||||
SignatureBuilder builder{"Create Range", signature};
|
||||
builder.single_input<int>("Size");
|
||||
builder.vector_output<int>("Range");
|
||||
return signature;
|
||||
}
|
||||
|
||||
void call(IndexMask mask, MFParams params, MFContext /*context*/) const override
|
||||
void call(IndexMask mask, MFParams params, Context /*context*/) const override
|
||||
{
|
||||
const VArray<int> &sizes = params.readonly_single_input<int>(0, "Size");
|
||||
GVectorArray &ranges = params.vector_output(1, "Range");
|
||||
@@ -65,18 +65,18 @@ class CreateRangeFunction : public MultiFunction {
|
||||
|
||||
class GenericAppendFunction : public MultiFunction {
|
||||
private:
|
||||
MFSignature signature_;
|
||||
Signature signature_;
|
||||
|
||||
public:
|
||||
GenericAppendFunction(const CPPType &type)
|
||||
{
|
||||
MFSignatureBuilder builder{"Append", signature_};
|
||||
SignatureBuilder builder{"Append", signature_};
|
||||
builder.vector_mutable("Vector", type);
|
||||
builder.single_input("Value", type);
|
||||
this->set_signature(&signature_);
|
||||
}
|
||||
|
||||
void call(IndexMask mask, MFParams params, MFContext /*context*/) const override
|
||||
void call(IndexMask mask, MFParams params, Context /*context*/) const override
|
||||
{
|
||||
GVectorArray &vectors = params.vector_mutable(0, "Vector");
|
||||
const GVArray &values = params.readonly_single_input(1, "Value");
|
||||
@@ -94,20 +94,20 @@ class ConcatVectorsFunction : public MultiFunction {
|
||||
public:
|
||||
ConcatVectorsFunction()
|
||||
{
|
||||
static MFSignature signature = create_signature();
|
||||
static Signature signature = create_signature();
|
||||
this->set_signature(&signature);
|
||||
}
|
||||
|
||||
static MFSignature create_signature()
|
||||
static Signature create_signature()
|
||||
{
|
||||
MFSignature signature;
|
||||
MFSignatureBuilder builder{"Concat Vectors", signature};
|
||||
Signature signature;
|
||||
SignatureBuilder builder{"Concat Vectors", signature};
|
||||
builder.vector_mutable<int>("A");
|
||||
builder.vector_input<int>("B");
|
||||
return signature;
|
||||
}
|
||||
|
||||
void call(IndexMask mask, MFParams params, MFContext /*context*/) const override
|
||||
void call(IndexMask mask, MFParams params, Context /*context*/) const override
|
||||
{
|
||||
GVectorArray &a = params.vector_mutable(0);
|
||||
const GVVectorArray &b = params.readonly_vector_input(1);
|
||||
@@ -119,20 +119,20 @@ class AppendFunction : public MultiFunction {
|
||||
public:
|
||||
AppendFunction()
|
||||
{
|
||||
static MFSignature signature = create_signature();
|
||||
static Signature signature = create_signature();
|
||||
this->set_signature(&signature);
|
||||
}
|
||||
|
||||
static MFSignature create_signature()
|
||||
static Signature create_signature()
|
||||
{
|
||||
MFSignature signature;
|
||||
MFSignatureBuilder builder{"Append", signature};
|
||||
Signature signature;
|
||||
SignatureBuilder builder{"Append", signature};
|
||||
builder.vector_mutable<int>("Vector");
|
||||
builder.single_input<int>("Value");
|
||||
return signature;
|
||||
}
|
||||
|
||||
void call(IndexMask mask, MFParams params, MFContext /*context*/) const override
|
||||
void call(IndexMask mask, MFParams params, Context /*context*/) const override
|
||||
{
|
||||
GVectorArray_TypedMutableRef<int> vectors = params.vector_mutable<int>(0);
|
||||
const VArray<int> &values = params.readonly_single_input<int>(1);
|
||||
@@ -147,20 +147,20 @@ class SumVectorFunction : public MultiFunction {
|
||||
public:
|
||||
SumVectorFunction()
|
||||
{
|
||||
static MFSignature signature = create_signature();
|
||||
static Signature signature = create_signature();
|
||||
this->set_signature(&signature);
|
||||
}
|
||||
|
||||
static MFSignature create_signature()
|
||||
static Signature create_signature()
|
||||
{
|
||||
MFSignature signature;
|
||||
MFSignatureBuilder builder{"Sum Vectors", signature};
|
||||
Signature signature;
|
||||
SignatureBuilder builder{"Sum Vectors", signature};
|
||||
builder.vector_input<int>("Vector");
|
||||
builder.single_output<int>("Sum");
|
||||
return signature;
|
||||
}
|
||||
|
||||
void call(IndexMask mask, MFParams params, MFContext /*context*/) const override
|
||||
void call(IndexMask mask, MFParams params, Context /*context*/) const override
|
||||
{
|
||||
const VVectorArray<int> &vectors = params.readonly_vector_input<int>(0);
|
||||
MutableSpan<int> sums = params.uninitialized_single_output<int>(1);
|
||||
@@ -179,20 +179,20 @@ class OptionalOutputsFunction : public MultiFunction {
|
||||
public:
|
||||
OptionalOutputsFunction()
|
||||
{
|
||||
static MFSignature signature = create_signature();
|
||||
static Signature signature = create_signature();
|
||||
this->set_signature(&signature);
|
||||
}
|
||||
|
||||
static MFSignature create_signature()
|
||||
static Signature create_signature()
|
||||
{
|
||||
MFSignature signature;
|
||||
MFSignatureBuilder builder{"Optional Outputs", signature};
|
||||
Signature signature;
|
||||
SignatureBuilder builder{"Optional Outputs", signature};
|
||||
builder.single_output<int>("Out 1");
|
||||
builder.single_output<std::string>("Out 2");
|
||||
return signature;
|
||||
}
|
||||
|
||||
void call(IndexMask mask, MFParams params, MFContext /*context*/) const override
|
||||
void call(IndexMask mask, MFParams params, Context /*context*/) const override
|
||||
{
|
||||
if (params.single_output_is_required(0, "Out 1")) {
|
||||
MutableSpan<int> values = params.uninitialized_single_output<int>(0, "Out 1");
|
||||
@@ -205,4 +205,4 @@ class OptionalOutputsFunction : public MultiFunction {
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace blender::fn::tests
|
||||
} // namespace blender::fn::multi_function::tests
|
||||
|
||||
Reference in New Issue
Block a user