summaryrefslogtreecommitdiffstats
path: root/eval
diff options
context:
space:
mode:
authorArne H Juul <arnej27959@users.noreply.github.com>2021-03-09 13:31:14 +0100
committerGitHub <noreply@github.com>2021-03-09 13:31:14 +0100
commit8e05097bae38fe4a7d8abb0341eb61e5b98b1832 (patch)
tree7248109eabf648172c94b144371e7ba7a320b8d8 /eval
parent551b40f0c7d89d207e058abdf697f61a76c1d557 (diff)
parent171aa80e4f9fbe5b8af21a7147046d3b0705e6db (diff)
Merge pull request #16852 from vespa-engine/arnej/use-valuetype-peek
Arnej/use valuetype peek
Diffstat (limited to 'eval')
-rw-r--r--eval/src/vespa/eval/eval/test/reference_operations.cpp2
-rw-r--r--eval/src/vespa/eval/instruction/dense_tensor_peek_function.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/eval/src/vespa/eval/eval/test/reference_operations.cpp b/eval/src/vespa/eval/eval/test/reference_operations.cpp
index f09c74ca009..58c90de65a2 100644
--- a/eval/src/vespa/eval/eval/test/reference_operations.cpp
+++ b/eval/src/vespa/eval/eval/test/reference_operations.cpp
@@ -213,7 +213,7 @@ TensorSpec ReferenceOperations::peek(const PeekSpec &peek_spec, const std::vecto
}
TensorSpec param = children[0].normalize();
ValueType param_type = ValueType::from_spec(param.type());
- ValueType result_type = param_type.reduce(peek_dims);
+ ValueType result_type = param_type.peek(peek_dims);
TensorSpec result(result_type.to_spec());
if (result_type.is_error()) {
return result;
diff --git a/eval/src/vespa/eval/instruction/dense_tensor_peek_function.cpp b/eval/src/vespa/eval/instruction/dense_tensor_peek_function.cpp
index 2edf05dfef8..b5f99ad6c8b 100644
--- a/eval/src/vespa/eval/instruction/dense_tensor_peek_function.cpp
+++ b/eval/src/vespa/eval/instruction/dense_tensor_peek_function.cpp
@@ -30,7 +30,7 @@ void my_tensor_peek_op(InterpretedFunction::State &state, uint64_t param) {
}
auto cells = state.peek(0).cells().typify<CT>();
state.stack.pop_back();
- const Value &result = state.stash.create<DoubleValue>(valid ? cells[idx] : 0.0);
+ const Value &result = state.stash.create<DoubleValue>(valid ? double(cells[idx]) : 0.0);
state.stack.emplace_back(result);
}