1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
|
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
#include <vespa/eval/eval/simple_value.h>
#include <vespa/eval/eval/test/gen_spec.h>
#include <vespa/eval/eval/value_codec.h>
#include <vespa/document/update/tensor_partial_update.h>
#include <vespa/vespalib/util/stringfmt.h>
#include <vespa/vespalib/gtest/gtest.h>
#include <optional>
using namespace document;
using namespace vespalib;
using namespace vespalib::eval;
using namespace vespalib::eval::test;
using vespalib::make_string_short::fmt;
std::vector<std::pair<vespalib::string,vespalib::string>> modify_layouts = {
{ "x4_1", "x4_1" },
{ "x4_1", "x4_2" },
{ "x4", "x4_2" },
{ "x4_1y4_2", "x4_2y4_1" },
{ "x4y4_1z4", "x4_2y4_2z4_2" },
{ "x3y2", "x2_1y2_1" }
};
TensorSpec::Address sparsify(const TensorSpec::Address &input) {
TensorSpec::Address output;
for (const auto & kv : input) {
if (kv.second.is_indexed()) {
auto val = fmt("%zu", kv.second.index);
output.emplace(kv.first, val);
} else {
output.emplace(kv.first, kv.second);
}
}
return output;
}
TensorSpec reference_modify(const TensorSpec &a, const TensorSpec &b, join_fun_t fun) {
TensorSpec result(a.type());
auto end_iter = b.cells().end();
for (const auto &cell: a.cells()) {
double v = cell.second;
auto sparse_addr = sparsify(cell.first);
auto iter = b.cells().find(sparse_addr);
if (iter == end_iter) {
result.add(cell.first, v);
} else {
result.add(cell.first, fun(v, iter->second));
}
}
return result.normalize();
}
Value::UP try_partial_modify(const TensorSpec &a, const TensorSpec &b, join_fun_t fun) {
const auto &factory = SimpleValueBuilderFactory::get();
auto lhs = value_from_spec(a, factory);
auto rhs = value_from_spec(b, factory);
return TensorPartialUpdate::modify(*lhs, fun, *rhs, factory);
}
Value::UP try_partial_modify_with_defaults(const TensorSpec &a, const TensorSpec &b, join_fun_t fun, double default_cell_value) {
const auto &factory = SimpleValueBuilderFactory::get();
auto lhs = value_from_spec(a, factory);
auto rhs = value_from_spec(b, factory);
return TensorPartialUpdate::modify_with_defaults(*lhs, fun, *rhs, default_cell_value, factory);
}
TensorSpec perform_partial_modify(const TensorSpec &a, const TensorSpec &b, join_fun_t fun) {
auto up = try_partial_modify(a, b, fun);
EXPECT_TRUE(up);
return spec_from_value(*up);
}
TensorSpec perform_partial_modify_with_defaults(const TensorSpec &a, const TensorSpec &b, join_fun_t fun, double default_cell_value) {
auto up = try_partial_modify_with_defaults(a, b, fun, default_cell_value);
EXPECT_TRUE(up);
return spec_from_value(*up);
}
void expect_modify_with_defaults(const vespalib::string& lhs_expr, const vespalib::string& rhs_expr,
join_fun_t fun, double default_cell_value, const vespalib::string& exp_expr) {
auto lhs = TensorSpec::from_expr(lhs_expr);
auto rhs = TensorSpec::from_expr(rhs_expr);
auto exp = TensorSpec::from_expr(exp_expr);
auto act = perform_partial_modify_with_defaults(lhs, rhs, fun, default_cell_value);
SCOPED_TRACE(fmt("\n===\nLHS: %s\nRHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str()));
EXPECT_EQ(exp, act);
}
TEST(PartialModifyTest, partial_modify_works_for_simple_values) {
for (const auto &layouts: modify_layouts) {
for (auto lhs_ct: CellTypeUtils::list_types()) {
for (auto rhs_ct: CellTypeUtils::list_types()) {
TensorSpec lhs = GenSpec::from_desc(layouts.first).cells(lhs_ct).seq(N());
TensorSpec rhs = GenSpec::from_desc(layouts.second).cells(rhs_ct).seq(Div16(N()));
SCOPED_TRACE(fmt("\n===\nLHS: %s\nRHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str()));
for (auto fun: {operation::Add::f, operation::Mul::f, operation::Sub::f}) {
auto expect = reference_modify(lhs, rhs, fun);
auto actual = perform_partial_modify(lhs, rhs, fun);
EXPECT_EQ(actual, expect);
}
auto fun = [](double, double keep) { return keep; };
auto expect = reference_modify(lhs, rhs, fun);
auto actual = perform_partial_modify(lhs, rhs, fun);
EXPECT_EQ(actual, expect);
}
}
}
}
TEST(PartialModifyTest, partial_modify_with_defauls) {
expect_modify_with_defaults("tensor(x{}):{{x:\"a\"}:1,{x:\"b\"}:2}",
"tensor(x{}):{{x:\"b\"}:3}",
operation::Add::f, 0.0,
"tensor(x{}):{{x:\"a\"}:1,{x:\"b\"}:5}");
expect_modify_with_defaults("tensor(x{}):{{x:\"a\"}:1,{x:\"b\"}:2}",
"tensor(x{}):{{x:\"b\"}:3,{x:\"c\"}:4}",
operation::Add::f, 0.0,
"tensor(x{}):{{x:\"a\"}:1,{x:\"b\"}:5,{x:\"c\"}:4}");
expect_modify_with_defaults("tensor(x{},y[3]):{{x:\"a\",y:0}:3,{x:\"a\",y:1}:4,{x:\"a\",y:2}:5}",
"tensor(x{},y{}):{{x:\"a\",y:\"0\"}:6,"
"{x:\"b\",y:\"1\"}:7,{x:\"b\",y:\"2\"}:8,"
"{x:\"c\",y:\"0\"}:9}",
operation::Add::f, 1.0,
"tensor(x{},y[3]):{{x:\"a\",y:0}:9,{x:\"a\",y:1}:4,{x:\"a\",y:2}:5,"
"{x:\"b\",y:0}:1,{x:\"b\",y:1}:8,{x:\"b\",y:2}:9,"
"{x:\"c\",y:0}:10,{x:\"c\",y:1}:1,{x:\"c\",y:2}:1}");
// NOTE: The specified default cell value doesn't have any effect for tensors with only indexed dimensions,
// as the dense subspace is always represented (with default cell value 0.0).
expect_modify_with_defaults("tensor(x[3]):{{x:0}:2}", "tensor(x{}):{{x:\"1\"}:3}",
operation::Add::f, 2.0,
"tensor(x[3]):{{x:0}:2,{x:1}:3,{x:2}:0}");
}
std::vector<std::pair<vespalib::string,vespalib::string>> bad_layouts = {
{ "x3", "x3" },
{ "x3y4_1", "x3y4_1" },
{ "x4_1", "x4_1y4_1" },
{ "x4_1y4_1", "x4_1" },
{ "x4_1", "x4_1y1" }
};
TEST(PartialModifyTest, partial_modify_returns_nullptr_on_invalid_inputs) {
for (const auto &layouts: bad_layouts) {
TensorSpec lhs = GenSpec::from_desc(layouts.first).seq(N());
TensorSpec rhs = GenSpec::from_desc(layouts.second).seq(Div16(N()));
SCOPED_TRACE(fmt("\n===\nLHS: %s\nRHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str()));
for (auto fun: {operation::Add::f}) {
auto actual = try_partial_modify(lhs, rhs, fun);
auto expect = Value::UP();
EXPECT_EQ(actual, expect);
}
}
}
TEST(PartialModifyTest, partial_modify_with_defaults_returns_nullptr_on_invalid_inputs) {
for (const auto &layouts: bad_layouts) {
TensorSpec lhs = GenSpec::from_desc(layouts.first).seq(N());
TensorSpec rhs = GenSpec::from_desc(layouts.second).seq(Div16(N()));
SCOPED_TRACE(fmt("\n===\nLHS: %s\nRHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str()));
for (auto fun: {operation::Add::f}) {
auto actual = try_partial_modify_with_defaults(lhs, rhs, fun, 0.0);
auto expect = Value::UP();
EXPECT_EQ(actual, expect);
}
}
}
GTEST_MAIN_RUN_ALL_TESTS()
|
