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
|
// Copyright Verizon Media. 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/value_codec.h>
#include <vespa/eval/eval/simple_tensor.h>
#include <vespa/eval/eval/simple_tensor_engine.h>
#include <vespa/eval/eval/value_codec.h>
#include <vespa/eval/instruction/generic_join.h>
#include <vespa/eval/eval/interpreted_function.h>
#include <vespa/eval/eval/test/tensor_model.hpp>
#include <vespa/vespalib/util/stringfmt.h>
#include <vespa/vespalib/gtest/gtest.h>
using namespace vespalib;
using namespace vespalib::eval;
using namespace vespalib::eval::instruction;
using namespace vespalib::eval::test;
using vespalib::make_string_short::fmt;
std::vector<Layout> concat_layouts = {
{}, {},
{}, {x(5)},
{x(5)}, {},
{x(2)}, {x(3)},
{x(2)}, {y(3)},
{y(2)}, {z(3)},
{x(5)}, {x(2),y(5)},
{y(3)}, {x(2),z(3)},
{x(3),y(5)}, {y(5),z(7)},
float_cells({x(3),y(5)}), {y(5),z(7)},
{x(3),y(5)}, float_cells({y(5),z(7)}),
float_cells({x(3),y(5)}), float_cells({y(5),z(7)}),
{y({"a","b","c"})}, {y({"a","b","c"})},
{y({"a","b","c"})}, {y({"a","b"})},
{y({"a","b","c"})}, {y({"b","c","d"})},
float_cells({y({"a","b","c"})}), {y({"b","c","d"})},
{y({"a","b","c"})}, float_cells({y({"b","c","d"})}),
float_cells({y({"a","b","c"})}), float_cells({z({"foo","bar","baz"})}),
{y({"a","b","c"})}, {y({"a","b","c"}),z({"foo","bar","baz"})},
{y({"a","b"}),z({"foo","bar","baz"})}, {y({"a","b","c"}),z({"foo","bar"})},
{x(2),y({"a","b","c"})}, {x(3),y({"b","c","d"})},
{x(2),y({"a","b"})}, {x(3),z({"c","d"})}
};
TensorSpec perform_simpletensor_concat(const TensorSpec &a, const TensorSpec &b, const std::string &dimension) {
auto lhs = SimpleTensor::create(a);
auto rhs = SimpleTensor::create(b);
auto out = SimpleTensor::concat(*lhs, *rhs, dimension);
return SimpleTensorEngine::ref().to_spec(*out);
}
bool concat_address(const TensorSpec::Address &me, const TensorSpec::Address &other,
const std::string &concat_dim, size_t my_offset,
TensorSpec::Address &my_out, TensorSpec::Address &other_out)
{
my_out.insert_or_assign(concat_dim, my_offset);
for (const auto &my_dim: me) {
const auto & name = my_dim.first;
const auto & label = my_dim.second;
if (name == concat_dim) {
my_out.insert_or_assign(name, label.index + my_offset);
} else {
auto pos = other.find(name);
if ((pos == other.end()) || (pos->second == label)) {
my_out.insert_or_assign(name, label);
other_out.insert_or_assign(name, label);
} else {
return false;
}
}
}
return true;
}
bool concat_addresses(const TensorSpec::Address &a, const TensorSpec::Address &b,
const std::string &concat_dim, size_t b_offset,
TensorSpec::Address &a_out, TensorSpec::Address &b_out)
{
return concat_address(a, b, concat_dim, 0, a_out, b_out) &&
concat_address(b, a, concat_dim, b_offset, b_out, a_out);
}
TensorSpec reference_concat(const TensorSpec &a, const TensorSpec &b, const std::string &concat_dim) {
ValueType a_type = ValueType::from_spec(a.type());
ValueType b_type = ValueType::from_spec(b.type());
size_t cc_dim_a_size = 1;
for (const auto & dim : a_type.dimensions()) {
if (dim.name == concat_dim) {
EXPECT_TRUE(dim.is_indexed());
cc_dim_a_size = dim.size;
}
}
ValueType res_type = ValueType::concat(a_type, b_type, concat_dim);
EXPECT_FALSE(res_type.is_error());
TensorSpec result(res_type.to_spec());
for (const auto &cell_a: a.cells()) {
for (const auto &cell_b: b.cells()) {
TensorSpec::Address addr_a;
TensorSpec::Address addr_b;
if (concat_addresses(cell_a.first, cell_b.first, concat_dim, cc_dim_a_size, addr_a, addr_b)) {
result.set(addr_a, cell_a.second);
result.set(addr_b, cell_b.second);
}
}
}
return result;
}
TEST(GenericConcatTest, generic_reference_concat_works) {
ASSERT_TRUE((concat_layouts.size() % 2) == 0);
for (size_t i = 0; i < concat_layouts.size(); i += 2) {
const TensorSpec lhs = spec(concat_layouts[i], N());
const TensorSpec rhs = spec(concat_layouts[i + 1], Div16(N()));
SCOPED_TRACE(fmt("\n===\nin LHS: %s\nin RHS: %s\n===\n", lhs.to_string().c_str(), rhs.to_string().c_str()));
auto expect = reference_concat(lhs, rhs, "x");
auto actual = perform_simpletensor_concat(lhs, rhs, "x");
// auto actual = perform_generic_concat(lhs, rhs, "x");
EXPECT_EQ(actual, expect);
}
}
GTEST_MAIN_RUN_ALL_TESTS()
|
