diff options
| author | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2018-04-17 09:54:37 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:49:37 +0000 |
| commit | f0cefbfcb1567b952860824a4767ed15f1a87594 (patch) | |
| tree | 283ee5d782abfb66cbb2cba24c7591261d961868 | |
| parent | 41c482d672ca971c9ff49c9aec32591fcffd7b1c (diff) | |
| download | ComputeLibrary-f0cefbfcb1567b952860824a4767ed15f1a87594.tar.gz | |
COMPMID-959 - Fixing subtensor validation
Change-Id: I51c878ec9f19da9d05777271d17ecb740387cac8
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/127934
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
| -rw-r--r-- | src/core/Validate.cpp | 4 | ||||
| -rw-r--r-- | tests/networks/AlexNetNetwork.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/core/Validate.cpp b/src/core/Validate.cpp index f5f9f1f8f7..d4fabd4a0f 100644 --- a/src/core/Validate.cpp +++ b/src/core/Validate.cpp @@ -167,9 +167,9 @@ arm_compute::Status arm_compute::error_on_invalid_subtensor(const char *function const TensorShape &parent_shape, const Coordinates &coords, const TensorShape &shape) { // Subtensor should not index in x, y dimensions. - ARM_COMPUTE_RETURN_ERROR_ON_LOC(((coords.x() != 0) && (coords.y() != 0)), function, file, line); + ARM_COMPUTE_RETURN_ERROR_ON_LOC(((coords.x() != 0) || (coords.y() != 0)), function, file, line); // Subtensor shape should match parent tensor in x, y dimensions. - ARM_COMPUTE_RETURN_ERROR_ON_LOC(((parent_shape.x() != shape.x()) && (parent_shape.y() != parent_shape.y())), function, file, line); + ARM_COMPUTE_RETURN_ERROR_ON_LOC(((parent_shape.x() != shape.x()) || (parent_shape.y() != parent_shape.y())), function, file, line); // Check dimensions for(unsigned int i = 0; i < TensorShape::num_max_dimensions; ++i) diff --git a/tests/networks/AlexNetNetwork.h b/tests/networks/AlexNetNetwork.h index 97991b0121..fa3734d106 100644 --- a/tests/networks/AlexNetNetwork.h +++ b/tests/networks/AlexNetNetwork.h @@ -90,18 +90,18 @@ public: w11 = std::unique_ptr<SubTensorType>(new SubTensorType(&w[1], TensorShape(5U, 5U, 48U, 128U), Coordinates())); w12 = std::unique_ptr<SubTensorType>(new SubTensorType(&w[1], TensorShape(5U, 5U, 48U, 128U), Coordinates(0, 0, 0, 128))); - b11 = std::unique_ptr<SubTensorType>(new SubTensorType(&b[1], TensorShape(128U), Coordinates())); - b12 = std::unique_ptr<SubTensorType>(new SubTensorType(&b[1], TensorShape(128U), Coordinates(128))); + b11 = std::unique_ptr<SubTensorType>(new SubTensorType(&b[1], TensorShape(128U), Coordinates(), true)); + b12 = std::unique_ptr<SubTensorType>(new SubTensorType(&b[1], TensorShape(128U), Coordinates(128), true)); w31 = std::unique_ptr<SubTensorType>(new SubTensorType(&w[3], TensorShape(3U, 3U, 192U, 192U), Coordinates())); w32 = std::unique_ptr<SubTensorType>(new SubTensorType(&w[3], TensorShape(3U, 3U, 192U, 192U), Coordinates(0, 0, 0, 192))); - b31 = std::unique_ptr<SubTensorType>(new SubTensorType(&b[3], TensorShape(192U), Coordinates())); - b32 = std::unique_ptr<SubTensorType>(new SubTensorType(&b[3], TensorShape(192U), Coordinates(192))); + b31 = std::unique_ptr<SubTensorType>(new SubTensorType(&b[3], TensorShape(192U), Coordinates(), true)); + b32 = std::unique_ptr<SubTensorType>(new SubTensorType(&b[3], TensorShape(192U), Coordinates(192), true)); w41 = std::unique_ptr<SubTensorType>(new SubTensorType(&w[4], TensorShape(3U, 3U, 192U, 128U), Coordinates())); w42 = std::unique_ptr<SubTensorType>(new SubTensorType(&w[4], TensorShape(3U, 3U, 192U, 128U), Coordinates(0, 0, 0, 128))); - b41 = std::unique_ptr<SubTensorType>(new SubTensorType(&b[4], TensorShape(128U), Coordinates())); - b42 = std::unique_ptr<SubTensorType>(new SubTensorType(&b[4], TensorShape(128U), Coordinates(128))); + b41 = std::unique_ptr<SubTensorType>(new SubTensorType(&b[4], TensorShape(128U), Coordinates(), true)); + b42 = std::unique_ptr<SubTensorType>(new SubTensorType(&b[4], TensorShape(128U), Coordinates(128), true)); } else { |