diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-05-15 21:12:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-05-15 21:12:39 +0000 |
| commit | 3ec6cb1500e72c1405e5ed8d6d806755019f1f24 (patch) | |
| tree | 90535378d0f0539569c2c634c68ee478922bb095 | |
| parent | 75b49d08a640c10f7c70a391ea49d8c808485807 (diff) | |
| parent | 8dfc56fe6314d39fedfcc60b76a48c78329c2f4d (diff) | |
| download | ml-3ec6cb1500e72c1405e5ed8d6d806755019f1f24.tar.gz | |
Merge "Validate output quantization parameters in ROI_POOLING." into qt-dev
| -rw-r--r-- | nn/common/operations/RoiPooling.cpp | 3 | ||||
| -rw-r--r-- | nn/runtime/test/fuzzing/operation_signatures/BoundingBox.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/nn/common/operations/RoiPooling.cpp b/nn/common/operations/RoiPooling.cpp index 7edbd8123..37914fdc9 100644 --- a/nn/common/operations/RoiPooling.cpp +++ b/nn/common/operations/RoiPooling.cpp @@ -235,8 +235,7 @@ bool prepare(IOperationExecutionContext* context) { NN_RET_CHECK_EQ(roiShape.offset, 0); } - Shape output = context->getOutputShape(kOutputTensor); - output.type = input.type; + Shape output = input; if (useNchw) { output.dimensions = {numRois, inDepth, static_cast<uint32_t>(outputHeight), static_cast<uint32_t>(outputWidth)}; diff --git a/nn/runtime/test/fuzzing/operation_signatures/BoundingBox.cpp b/nn/runtime/test/fuzzing/operation_signatures/BoundingBox.cpp index afc19c3ee..101e2f707 100644 --- a/nn/runtime/test/fuzzing/operation_signatures/BoundingBox.cpp +++ b/nn/runtime/test/fuzzing/operation_signatures/BoundingBox.cpp @@ -57,6 +57,10 @@ static void roiConstructor(Type, uint32_t rank, RandomOperation* op) { } else { op->outputs[0]->dimensions = {outBatch, outHeight, outWidth, outDepth}; } + + if (op->opType == ANEURALNETWORKS_ROI_POOLING) { + setSameQuantization(op->outputs[0], op->inputs[0]); + } } template <typename T> |