diff options
author | Håvard Pettersen <havardpe@oath.com> | 2021-04-16 11:55:00 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@oath.com> | 2021-04-16 12:29:40 +0000 |
commit | df33d5d83ecb1d25b87fec79250329715a38d5ae (patch) | |
tree | d68f9493a062b3b581c1f1f4cb3755fea41974d0 /eval | |
parent | 95162715532714931a379f35f29fba6836e57daa (diff) |
remove deprecated tensor model
fix and extend tests to also verify unstable cell types
Diffstat (limited to 'eval')
-rw-r--r-- | eval/src/apps/tensor_conformance/generate.cpp | 1 | ||||
-rw-r--r-- | eval/src/vespa/eval/eval/test/CMakeLists.txt | 1 | ||||
-rw-r--r-- | eval/src/vespa/eval/eval/test/tensor_model.cpp | 52 | ||||
-rw-r--r-- | eval/src/vespa/eval/eval/test/tensor_model.h | 71 |
4 files changed, 0 insertions, 125 deletions
diff --git a/eval/src/apps/tensor_conformance/generate.cpp b/eval/src/apps/tensor_conformance/generate.cpp index 7c577ef0086..11e602dfeb3 100644 --- a/eval/src/apps/tensor_conformance/generate.cpp +++ b/eval/src/apps/tensor_conformance/generate.cpp @@ -3,7 +3,6 @@ #include "generate.h" #include <vespa/vespalib/testkit/test_kit.h> #include <vespa/eval/eval/test/gen_spec.h> -#include <vespa/eval/eval/test/tensor_model.h> #include <vespa/eval/eval/value_type_spec.h> #include <vespa/eval/eval/aggr.h> #include <vespa/vespalib/util/stringfmt.h> diff --git a/eval/src/vespa/eval/eval/test/CMakeLists.txt b/eval/src/vespa/eval/eval/test/CMakeLists.txt index de628244523..aeccc00a01c 100644 --- a/eval/src/vespa/eval/eval/test/CMakeLists.txt +++ b/eval/src/vespa/eval/eval/test/CMakeLists.txt @@ -7,7 +7,6 @@ vespa_add_library(eval_eval_test OBJECT gen_spec.cpp reference_evaluation.cpp reference_operations.cpp - tensor_model.cpp test_io.cpp value_compare.cpp ) diff --git a/eval/src/vespa/eval/eval/test/tensor_model.cpp b/eval/src/vespa/eval/eval/test/tensor_model.cpp deleted file mode 100644 index b7ad4d0071f..00000000000 --- a/eval/src/vespa/eval/eval/test/tensor_model.cpp +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#include "tensor_model.h" -#include <vespa/eval/eval/value_type.h> - -namespace vespalib::eval::test { - -Layout float_cells(const Layout &layout) { - return Layout(CellType::FLOAT, layout.domains); -} - -Domain x() { return Domain("x", {}); } -Domain x(size_t size) { return Domain("x", size); } -Domain x(const std::vector<vespalib::string> &keys) { return Domain("x", keys); } - -Domain y() { return Domain("y", {}); } -Domain y(size_t size) { return Domain("y", size); } -Domain y(const std::vector<vespalib::string> &keys) { return Domain("y", keys); } - -Domain z() { return Domain("z", {}); } -Domain z(size_t size) { return Domain("z", size); } -Domain z(const std::vector<vespalib::string> &keys) { return Domain("z", keys); } - -vespalib::string infer_type(const Layout &layout) { - return GenSpec(layout.domains).cells(layout.cell_type).type().to_spec(); -} - -TensorSpec spec(const Layout &layout, const Sequence &seq) { - return GenSpec(layout.domains).cells(layout.cell_type).seq(seq); -} -TensorSpec spec(const Domain &domain, const Sequence &seq) { - return spec(Layout({domain}), seq); -} -TensorSpec spec(double value) { - return GenSpec(value); -} - -TensorSpec spec(const vespalib::string &type, - const std::vector<std::pair<TensorSpec::Address, TensorSpec::Value>> &cells) { - TensorSpec spec("tensor(" + type + ")"); - - for (const auto &cell : cells) { - spec.add(cell.first, cell.second); - } - return spec; -} - -TensorSpec spec(const vespalib::string &value_expr) { - return TensorSpec::from_expr(value_expr); -} - -} diff --git a/eval/src/vespa/eval/eval/test/tensor_model.h b/eval/src/vespa/eval/eval/test/tensor_model.h deleted file mode 100644 index 85f6e5ccfa4..00000000000 --- a/eval/src/vespa/eval/eval/test/tensor_model.h +++ /dev/null @@ -1,71 +0,0 @@ -// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. - -#pragma once - -#include "gen_spec.h" - -namespace vespalib::eval::test { - -// custom op1 -struct MyOp { - static double f(double a) { - return ((a + 1) * 2); - } -}; - -// 'a in [1,5,7,13,42]' -struct MyIn { - static double f(double a) { - if ((a == 1) || - (a == 5) || - (a == 7) || - (a == 13) || - (a == 42)) - { - return 1.0; - } else { - return 0.0; - } - } -}; - -using Domain = DimSpec; - -struct Layout { - CellType cell_type; - std::vector<Domain> domains; - Layout(std::initializer_list<Domain> domains_in) - : cell_type(CellType::DOUBLE), domains(domains_in) {} - Layout(CellType cell_type_in, std::vector<Domain> domains_in) - : cell_type(cell_type_in), domains(std::move(domains_in)) {} - auto begin() const { return domains.begin(); } - auto end() const { return domains.end(); } - auto size() const { return domains.size(); } - auto operator[](size_t idx) const { return domains[idx]; } -}; - -Layout float_cells(const Layout &layout); - -Domain x(); -Domain x(size_t size); -Domain x(const std::vector<vespalib::string> &keys); - -Domain y(); -Domain y(size_t size); -Domain y(const std::vector<vespalib::string> &keys); - -Domain z(); -Domain z(size_t size); -Domain z(const std::vector<vespalib::string> &keys); - -// Infer the tensor type implied by the given layout -vespalib::string infer_type(const Layout &layout); - -TensorSpec spec(const Layout &layout, const Sequence &seq); -TensorSpec spec(const Domain &domain, const Sequence &seq); -TensorSpec spec(double value); -TensorSpec spec(const vespalib::string &type, - const std::vector<std::pair<TensorSpec::Address, TensorSpec::Value>> &cells); -TensorSpec spec(const vespalib::string &value_expr); - -} |