diff options
author | Håvard Pettersen <havardpe@oath.com> | 2017-11-06 15:27:58 +0000 |
---|---|---|
committer | Håvard Pettersen <havardpe@oath.com> | 2017-11-07 14:47:34 +0000 |
commit | 0970129d98a386753e2fa24c559c77392691c633 (patch) | |
tree | aea271d8b97ff24fb3f4020b09d26901b978ddba /searchcore/src/apps | |
parent | f5957dbf63a5fcd7df5df9062ef0324a52ed8605 (diff) |
clean up tensor engine API
make Tensor a subclass of Value
Diffstat (limited to 'searchcore/src/apps')
-rw-r--r-- | searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp index 0347da0c52c..f60863ef0b0 100644 --- a/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp +++ b/searchcore/src/apps/verify_ranksetup/verify_ranksetup.cpp @@ -36,12 +36,9 @@ using vespa::config::search::core::RankingConstantsConfig; using vespalib::eval::ConstantValue; using vespalib::eval::ErrorValue; using vespalib::eval::TensorSpec; -using vespalib::eval::TensorValue; using vespalib::eval::ValueType; using vespalib::tensor::DefaultTensorEngine; - -using ErrorConstant = vespalib::eval::SimpleConstantValue<ErrorValue>; -using TensorConstant = vespalib::eval::SimpleConstantValue<TensorValue>; +using vespalib::eval::SimpleConstantValue; class App : public FastOS_Application { @@ -66,11 +63,11 @@ struct DummyConstantValueRepo : IConstantValueRepo { for (const auto &entry: cfg.constant) { if (entry.name == name) { const auto &engine = DefaultTensorEngine::ref(); - auto tensor = engine.create(TensorSpec(entry.type)); - return std::make_unique<TensorConstant>(engine.type_of(*tensor), std::move(tensor)); + auto tensor = engine.from_spec(TensorSpec(entry.type)); + return std::make_unique<SimpleConstantValue>(std::move(tensor)); } } - return std::make_unique<ErrorConstant>(ValueType::error_type()); + return std::make_unique<SimpleConstantValue>(std::make_unique<ErrorValue>()); } }; |