diff options
author | Arne H Juul <arnej27959@users.noreply.github.com> | 2018-02-08 16:26:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-08 16:26:51 +0100 |
commit | 8fed2123d8bc62ceeddb0660f0c5a70719f8fff9 (patch) | |
tree | 8a1c1ecb53e40b0a9b5300182c34a4f15289587a /eval/src | |
parent | b9d9078e2aeeb0dce906f8c39b15537db9a7cf16 (diff) | |
parent | 97ad29eadcba38005fde3927c3275cdb59dbad27 (diff) |
Merge pull request #4976 from vespa-engine/havardpe/off-by-one-bug-in-dense-apply-right-address-iterator
Havardpe/off by one bug in dense apply right address iterator
Diffstat (limited to 'eval/src')
-rw-r--r-- | eval/src/vespa/eval/eval/test/tensor_conformance.cpp | 1 | ||||
-rw-r--r-- | eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/eval/src/vespa/eval/eval/test/tensor_conformance.cpp b/eval/src/vespa/eval/eval/test/tensor_conformance.cpp index f2b1e1e3c72..c2dd5a536d5 100644 --- a/eval/src/vespa/eval/eval/test/tensor_conformance.cpp +++ b/eval/src/vespa/eval/eval/test/tensor_conformance.cpp @@ -629,6 +629,7 @@ struct TestContext { {x(5)}, {x(3)}, {x(5)}, {y(5)}, {x(5)}, {x(5),y(5)}, + {y(3)}, {x(2),z(3)}, {x(3),y(5)}, {x(4),y(4)}, {x(3),y(5)}, {y(5),z(7)}, {x({"a","b","c"})}, {x({"a","b","c"})}, diff --git a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h index 325242bbd9b..3f6e347490c 100644 --- a/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h +++ b/eval/src/vespa/eval/tensor/dense/dense_tensor_address_combiner.h @@ -101,7 +101,7 @@ public: combinedCellIdx -= _combinedAddress.wholeDimStep(cdim); curDimension--; } else { - if (cindex < _rightAddress.dimSize(rdim)) { + if ((cindex + 1) < _rightAddress.dimSize(rdim)) { cindex++; rightCellIdx += _rightAddress._accumulatedSize[rdim]; combinedCellIdx += _combinedAddress._accumulatedSize[cdim]; |