Make operation validation return Result<Version>
Bug: N/A
Test: mma
Test: NeuralNetworksTest_static
Change-Id: I47c12e13fcb41f832e31043b3f14e7b93472b0f8
Merged-In: I47c12e13fcb41f832e31043b3f14e7b93472b0f8
(cherry picked from commit 83378c27535b08cae50f6dedcd5485b379466279)
diff --git a/common/OperationsUtils.cpp b/common/OperationsUtils.cpp
index d65566f..c5a71e9 100644
--- a/common/OperationsUtils.cpp
+++ b/common/OperationsUtils.cpp
@@ -86,8 +86,9 @@
[context](uint32_t index) { return context->getOutputType(index); });
}
-bool validateVersion(const IOperationValidationContext* context, Version minSupportedVersion) {
- if (context->getVersion() < minSupportedVersion) {
+bool validateVersion(const IOperationValidationContext* context, Version contextVersion,
+ Version minSupportedVersion) {
+ if (contextVersion < minSupportedVersion) {
std::ostringstream message;
message << "Operation " << context->getOperationName() << " with inputs {";
for (uint32_t i = 0, n = context->getNumInputs(); i < n; ++i) {
@@ -104,7 +105,7 @@
message << context->getOutputType(i);
}
message << "} is only supported since " << minSupportedVersion << " (validating using "
- << context->getVersion() << ")";
+ << contextVersion << ")";
NN_RET_CHECK_FAIL() << message.str();
}
return true;
diff --git a/common/Utils.cpp b/common/Utils.cpp
index da4dbc8..7417ed8 100644
--- a/common/Utils.cpp
+++ b/common/Utils.cpp
@@ -215,18 +215,15 @@
public:
OperationValidationContext(const char* operationName, uint32_t inputCount,
const uint32_t* inputIndexes, uint32_t outputCount,
- const uint32_t* outputIndexes, const Operand* operands,
- HalVersion halVersion)
+ const uint32_t* outputIndexes, const Operand* operands)
: operationName(operationName),
inputCount(inputCount),
inputIndexes(inputIndexes),
outputCount(outputCount),
outputIndexes(outputIndexes),
- operands(operands),
- version(convert(halVersion)) {}
+ operands(operands) {}
const char* getOperationName() const override;
- Version getVersion() const override;
uint32_t getNumInputs() const override;
OperandType getInputType(uint32_t index) const override;
@@ -254,10 +251,6 @@
return operationName;
}
-Version OperationValidationContext::getVersion() const {
- return version;
-}
-
const Operand* OperationValidationContext::getInputOperand(uint32_t index) const {
CHECK(index < static_cast<uint32_t>(inputCount));
return &operands[inputIndexes[index]];
@@ -1883,8 +1876,14 @@
}
OperationValidationContext context(operationRegistration->name, inputCount,
inputIndexes, outputCount, outputIndexes,
- operands.data(), halVersion);
- if (!operationRegistration->validate(&context)) {
+ operands.data());
+ const auto maybeVersion = operationRegistration->validate(&context);
+ if (!maybeVersion.has_value()) {
+ LOG(ERROR) << "Validation failed for operation " << opType << ": "
+ << maybeVersion.error();
+ return ANEURALNETWORKS_BAD_DATA;
+ }
+ if (!validateVersion(&context, convert(halVersion), maybeVersion.value())) {
LOG(ERROR) << "Validation failed for operation " << opType;
return ANEURALNETWORKS_BAD_DATA;
}
diff --git a/common/Validation.cpp b/common/Validation.cpp
index e49f073..d37c447 100644
--- a/common/Validation.cpp
+++ b/common/Validation.cpp
@@ -1181,15 +1181,13 @@
public:
OperationValidationContext(const char* operationName, const std::vector<uint32_t>& inputIndexes,
const std::vector<uint32_t>& outputIndexes,
- const std::vector<Operand>& operands, Version version)
+ const std::vector<Operand>& operands)
: operationName(operationName),
inputIndexes(inputIndexes),
outputIndexes(outputIndexes),
- operands(operands),
- version(version) {}
+ operands(operands) {}
const char* getOperationName() const override;
- Version getVersion() const override;
uint32_t getNumInputs() const override;
OperandType getInputType(uint32_t index) const override;
@@ -1208,17 +1206,12 @@
const std::vector<uint32_t>& inputIndexes;
const std::vector<uint32_t>& outputIndexes;
const std::vector<Operand>& operands;
- Version version;
};
const char* OperationValidationContext::getOperationName() const {
return operationName;
}
-Version OperationValidationContext::getVersion() const {
- return version;
-}
-
const Operand* OperationValidationContext::getInputOperand(uint32_t index) const {
return &operands.at(inputIndexes.at(index));
}
@@ -2521,20 +2514,9 @@
NN_VALIDATE(operationRegistration->validate != nullptr)
<< "Incomplete operation registration: " << opType;
- constexpr Version kVersions[] = {Version::ANDROID_OC_MR1, Version::ANDROID_P,
- Version::ANDROID_Q, Version::ANDROID_R,
- Version::CURRENT_RUNTIME};
-
- for (const auto version : kVersions) {
- OperationValidationContext context(operationRegistration->name, inputIndexes,
- outputIndexes, operands, version);
- auto valid = operationRegistration->validate(&context);
- if (valid) {
- return version;
- }
- }
-
- return NN_ERROR() << "Validation failed for operation " << opType;
+ OperationValidationContext context(operationRegistration->name, inputIndexes,
+ outputIndexes, operands);
+ return operationRegistration->validate(&context);
}
}
}
diff --git a/common/include/OperationResolver.h b/common/include/OperationResolver.h
index d2c066c..155341a 100644
--- a/common/include/OperationResolver.h
+++ b/common/include/OperationResolver.h
@@ -32,7 +32,7 @@
const char* name;
// Validates operand types, shapes, and any values known during graph creation.
- std::function<bool(const IOperationValidationContext*)> validate;
+ std::function<Result<Version>(const IOperationValidationContext*)> validate;
// prepare is called when the inputs this operation depends on have been
// computed. Typically, prepare does any remaining validation and sets
@@ -50,10 +50,11 @@
bool allowZeroSizedInput = false;
} flags;
- OperationRegistration(OperationType type, const char* name,
- std::function<bool(const IOperationValidationContext*)> validate,
- std::function<bool(IOperationExecutionContext*)> prepare,
- std::function<bool(IOperationExecutionContext*)> execute, Flag flags)
+ OperationRegistration(
+ OperationType type, const char* name,
+ std::function<Result<Version>(const IOperationValidationContext*)> validate,
+ std::function<bool(IOperationExecutionContext*)> prepare,
+ std::function<bool(IOperationExecutionContext*)> execute, Flag flags)
: type(type),
name(name),
validate(std::move(validate)),
diff --git a/common/include/OperationsUtils.h b/common/include/OperationsUtils.h
index 676bbb3..9123139 100644
--- a/common/include/OperationsUtils.h
+++ b/common/include/OperationsUtils.h
@@ -59,19 +59,6 @@
virtual const char* getOperationName() const = 0;
- // The version of the environment in which the operation is to be executed.
- //
- // Operation validation logic needs to handle all versions to support the following use cases
- // (assume in these examples that the latest version is Version::ANDROID_Q):
- // 1. Our runtime wants to distribute work to a driver implementing an older version and calls,
- // for example, compliantWithV1_0(const V1_2::Model&).
- // 2. A driver implements an older version and delegates model validation to, for example,
- // validateModel(const V1_0::Model&).
- //
- // If getVersion() returns Version::ANDROID_OC_MR1 and the operation is only supported since
- // Version::ANDROID_P, validation will fail.
- virtual Version getVersion() const = 0;
-
virtual uint32_t getNumInputs() const = 0;
virtual OperandType getInputType(uint32_t index) const = 0;
virtual Shape getInputShape(uint32_t index) const = 0;
@@ -130,7 +117,8 @@
// Verifies that the HAL version specified in the context is greater or equal
// than the minimal supported HAL version.
-bool validateVersion(const IOperationValidationContext* context, Version minSupportedVersion);
+bool validateVersion(const IOperationValidationContext* context, Version contextVersion,
+ Version minSupportedVersion);
// Verifies that the two shapes are the same.
bool SameShape(const Shape& in1, const Shape& in2);
diff --git a/common/include/nnapi/TypeUtils.h b/common/include/nnapi/TypeUtils.h
index 9dc67cf..56b62f9 100644
--- a/common/include/nnapi/TypeUtils.h
+++ b/common/include/nnapi/TypeUtils.h
@@ -198,6 +198,8 @@
operator bool() const { return false; }
+ operator Result<Version>() const { return error() << mBuffer.str(); }
+
private:
std::ostringstream mBuffer;
};
diff --git a/common/operations/Activation.cpp b/common/operations/Activation.cpp
index bcf846a..651cd02 100644
--- a/common/operations/Activation.cpp
+++ b/common/operations/Activation.cpp
@@ -353,7 +353,7 @@
} // namespace
-bool validate(OperationType opType, const IOperationValidationContext* context) {
+Result<Version> validate(OperationType opType, const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
auto inputType = context->getInputType(kInputTensor);
@@ -379,10 +379,10 @@
}
NN_RET_CHECK(validateInputTypes(context, {inputType}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
-bool validateHardSwish(const IOperationValidationContext* context) {
+Result<Version> validateHardSwish(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
auto inputType = context->getInputType(kInputTensor);
@@ -396,7 +396,7 @@
}
NN_RET_CHECK(validateInputTypes(context, {inputType}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(OperationType opType, IOperationExecutionContext* context) {
diff --git a/common/operations/BidirectionalSequenceRNN.cpp b/common/operations/BidirectionalSequenceRNN.cpp
index f6b4c30..5a020d1 100644
--- a/common/operations/BidirectionalSequenceRNN.cpp
+++ b/common/operations/BidirectionalSequenceRNN.cpp
@@ -313,7 +313,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
// Exact number is dependent on the mergeOutputs parameter and checked
// during preparation.
@@ -323,9 +323,8 @@
OperandType inputType = context->getInputType(kInputTensor);
if (inputType != OperandType::TENSOR_FLOAT16 && inputType != OperandType::TENSOR_FLOAT32) {
- LOG(ERROR) << "Unsupported input operand type for UNIDIRECTIONAL_SEQUENCE_RNN op: "
- << inputType;
- return false;
+ return NN_ERROR() << "Unsupported input operand type for UNIDIRECTIONAL_SEQUENCE_RNN op: "
+ << inputType;
}
NN_RET_CHECK(validateInputTypes(
context, {inputType, inputType, inputType, inputType, inputType, inputType, inputType,
@@ -339,7 +338,7 @@
if (numOutputs == kNumOutputsWithState || numOutputs == kNumOutputsMergedWithState) {
minSupportedVersion = Version::ANDROID_R;
}
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Broadcast.cpp b/common/operations/Broadcast.cpp
index e47bd21..a2d5b8a 100644
--- a/common/operations/Broadcast.cpp
+++ b/common/operations/Broadcast.cpp
@@ -434,7 +434,7 @@
} // namespace
-bool validate(OperationType opType, const IOperationValidationContext* context) {
+Result<Version> validate(OperationType opType, const IOperationValidationContext* context) {
auto minSupportedVersion = (opType == OperationType::DIV || opType == OperationType::SUB)
? Version::ANDROID_P
: Version::ANDROID_OC_MR1;
@@ -473,7 +473,7 @@
}
NN_RET_CHECK(validateInputTypes(context, {inputType, inputType, OperandType::INT32}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/ChannelShuffle.cpp b/common/operations/ChannelShuffle.cpp
index 59726fa..efa0873 100644
--- a/common/operations/ChannelShuffle.cpp
+++ b/common/operations/ChannelShuffle.cpp
@@ -57,7 +57,7 @@
return true;
}
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
auto inputType = context->getInputType(kInputTensor);
@@ -73,9 +73,9 @@
NN_RET_CHECK(validateInputTypes(context, {inputType, OperandType::INT32, OperandType::INT32}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
if (inputType == OperandType::TENSOR_QUANT8_ASYMM_SIGNED) {
- return validateVersion(context, Version::ANDROID_R);
+ return Version::ANDROID_R;
} else {
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
}
diff --git a/common/operations/Comparisons.cpp b/common/operations/Comparisons.cpp
index 8fdf72c..b490c92 100644
--- a/common/operations/Comparisons.cpp
+++ b/common/operations/Comparisons.cpp
@@ -123,7 +123,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor1);
@@ -136,9 +136,9 @@
NN_RET_CHECK(validateInputTypes(context, {inputType, inputType}));
NN_RET_CHECK(validateOutputTypes(context, {OperandType::TENSOR_BOOL8}));
if (inputType == OperandType::TENSOR_QUANT8_ASYMM_SIGNED) {
- return validateVersion(context, Version::ANDROID_R);
+ return Version::ANDROID_R;
} else {
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
}
diff --git a/common/operations/Concatenation.cpp b/common/operations/Concatenation.cpp
index 16a08d6..6b9007e 100644
--- a/common/operations/Concatenation.cpp
+++ b/common/operations/Concatenation.cpp
@@ -29,6 +29,7 @@
#include "CpuOperationUtils.h"
#include "OperationResolver.h"
#include "Tracing.h"
+#include "nnapi/Validation.h"
namespace android {
namespace nn {
@@ -135,7 +136,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
uint32_t inputCount = context->getNumInputs();
NN_RET_CHECK_GE(inputCount, 2);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
@@ -152,13 +153,13 @@
}
std::vector<OperandType> inExpectedTypes(inputCount - 1, inputType);
inExpectedTypes.push_back(OperandType::INT32);
- if (context->getVersion() < Version::ANDROID_Q &&
- inputType == OperandType::TENSOR_QUANT8_ASYMM) {
+ if (inputType == OperandType::TENSOR_QUANT8_ASYMM) {
const Shape& output = context->getOutputShape(kOutputTensor);
for (uint32_t i = 0; i < inputCount - 1; ++i) {
const Shape& input = context->getInputShape(i);
- NN_RET_CHECK_EQ(input.scale, output.scale);
- NN_RET_CHECK_EQ(input.offset, output.offset);
+ if (input.scale != output.scale || input.offset != output.offset) {
+ minSupportedVersion = combineVersions(minSupportedVersion, Version::ANDROID_Q);
+ }
}
}
for (uint32_t i = 0; i < inputCount - 1; ++i) {
@@ -169,7 +170,7 @@
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Conv2D.cpp b/common/operations/Conv2D.cpp
index d00da57..6d98982 100644
--- a/common/operations/Conv2D.cpp
+++ b/common/operations/Conv2D.cpp
@@ -526,7 +526,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
const uint32_t numInputs = context->getNumInputs();
NN_RET_CHECK(
std::binary_search(std::begin(kNumInputsArray), std::end(kNumInputsArray), numInputs));
@@ -624,7 +624,7 @@
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/DepthwiseConv2D.cpp b/common/operations/DepthwiseConv2D.cpp
index bb158b3..64bd7dd 100644
--- a/common/operations/DepthwiseConv2D.cpp
+++ b/common/operations/DepthwiseConv2D.cpp
@@ -413,7 +413,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
const uint32_t numInputs = context->getNumInputs();
NN_RET_CHECK(
std::binary_search(std::begin(kNumInputsArray), std::end(kNumInputsArray), numInputs));
@@ -507,7 +507,7 @@
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Dequantize.cpp b/common/operations/Dequantize.cpp
index f155eb2..b648ff1 100644
--- a/common/operations/Dequantize.cpp
+++ b/common/operations/Dequantize.cpp
@@ -75,7 +75,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
@@ -89,7 +89,7 @@
if (inputType == OperandType::TENSOR_QUANT8_ASYMM &&
outputType == OperandType::TENSOR_FLOAT32) {
- return validateVersion(context, Version::ANDROID_OC_MR1);
+ return Version::ANDROID_OC_MR1;
}
NN_RET_CHECK(inputType == OperandType::TENSOR_QUANT8_ASYMM ||
@@ -100,7 +100,7 @@
NN_RET_CHECK(outputType == OperandType::TENSOR_FLOAT16 ||
outputType == OperandType::TENSOR_FLOAT32)
<< "Unsupported output operand type for DEQUANTIZE op: " << outputType;
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Elementwise.cpp b/common/operations/Elementwise.cpp
index a0cd78f..8510003 100644
--- a/common/operations/Elementwise.cpp
+++ b/common/operations/Elementwise.cpp
@@ -82,7 +82,7 @@
}
}
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor);
@@ -91,10 +91,10 @@
<< "Unsupported tensor type for elementwise operation";
NN_RET_CHECK(validateInputTypes(context, {inputType}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
-bool validateAbs(const IOperationValidationContext* context) {
+Result<Version> validateAbs(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor);
@@ -103,11 +103,10 @@
<< "Unsupported tensor type for operation ABS";
NN_RET_CHECK(validateInputTypes(context, {inputType}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, (inputType == OperandType::TENSOR_INT32 ? Version::ANDROID_R
- : Version::ANDROID_Q));
+ return inputType == OperandType::TENSOR_INT32 ? Version::ANDROID_R : Version::ANDROID_Q;
}
-bool validateFloor(const IOperationValidationContext* context) {
+Result<Version> validateFloor(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
@@ -123,9 +122,7 @@
NN_RET_CHECK_LE(getNumberOfDimensions(input), 4);
}
- return validateVersion(context,
- (inputType == OperandType::TENSOR_FLOAT16 ? Version::ANDROID_Q
- : Version::ANDROID_OC_MR1));
+ return inputType == OperandType::TENSOR_FLOAT16 ? Version::ANDROID_Q : Version::ANDROID_OC_MR1;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Elu.cpp b/common/operations/Elu.cpp
index 105ef01..98e0662 100644
--- a/common/operations/Elu.cpp
+++ b/common/operations/Elu.cpp
@@ -52,7 +52,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
auto inputType = context->getInputType(kInputTensor);
@@ -66,7 +66,7 @@
inputType == OperandType::TENSOR_FLOAT16 ? OperandType::FLOAT16 : OperandType::FLOAT32;
NN_RET_CHECK(validateInputTypes(context, {inputType, scalarType}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Fill.cpp b/common/operations/Fill.cpp
index f3b470e..9af64f7 100644
--- a/common/operations/Fill.cpp
+++ b/common/operations/Fill.cpp
@@ -61,7 +61,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
// Check output type first because input value type is dependent on the
@@ -77,7 +77,7 @@
NN_RET_CHECK(getValueType(outputType, &valueType));
NN_RET_CHECK(validateInputTypes(context, {OperandType::TENSOR_INT32, valueType}));
- return validateVersion(context, Version::ANDROID_R);
+ return Version::ANDROID_R;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/FullyConnected.cpp b/common/operations/FullyConnected.cpp
index 873b64a..ab50d31 100644
--- a/common/operations/FullyConnected.cpp
+++ b/common/operations/FullyConnected.cpp
@@ -217,7 +217,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
auto inputType = context->getInputType(kInputTensor);
@@ -272,7 +272,6 @@
};
} else {
NN_RET_CHECK_FAIL() << "Unsupported input tensor type for operation " << kOperationName;
- return false;
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
@@ -284,7 +283,7 @@
NN_RET_CHECK(validateShapes(input, weights, bias));
}
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Gather.cpp b/common/operations/Gather.cpp
index 6707b6d..5571a65 100644
--- a/common/operations/Gather.cpp
+++ b/common/operations/Gather.cpp
@@ -59,7 +59,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor);
@@ -73,9 +73,9 @@
{inputType, OperandType::INT32, OperandType::TENSOR_INT32}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
if (inputType == OperandType::TENSOR_QUANT8_ASYMM_SIGNED) {
- return validateVersion(context, Version::ANDROID_R);
+ return Version::ANDROID_R;
} else {
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
}
diff --git a/common/operations/GenerateProposals.cpp b/common/operations/GenerateProposals.cpp
index edd7cb0..95e3676 100644
--- a/common/operations/GenerateProposals.cpp
+++ b/common/operations/GenerateProposals.cpp
@@ -197,7 +197,7 @@
constexpr uint32_t kNumOutputs = 1;
constexpr uint32_t kOutputTensor = 0;
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
std::vector<OperandType> inExpectedTypes;
@@ -211,16 +211,14 @@
inExpectedTypes = {OperandType::TENSOR_QUANT16_ASYMM, deltaInputType,
OperandType::TENSOR_INT32, OperandType::TENSOR_QUANT16_ASYMM};
} else {
- LOG(ERROR) << "Unsupported input tensor type for operation " << kOperationName;
- return false;
+ return NN_ERROR() << "Unsupported input tensor type for operation " << kOperationName;
}
} else {
- LOG(ERROR) << "Unsupported input tensor type for operation " << kOperationName;
- return false;
+ return NN_ERROR() << "Unsupported input tensor type for operation " << kOperationName;
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
bool prepare(IOperationExecutionContext* context) {
@@ -703,7 +701,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
std::vector<OperandType> inExpectedTypes;
@@ -742,9 +740,9 @@
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, outExpectedTypes));
if (inputType == OperandType::TENSOR_QUANT8_ASYMM_SIGNED) {
- return validateVersion(context, Version::ANDROID_R);
+ return Version::ANDROID_R;
} else {
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
}
@@ -1213,7 +1211,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
std::vector<OperandType> inExpectedTypes;
@@ -1268,9 +1266,9 @@
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, outExpectedTypes));
if (inputType == OperandType::TENSOR_QUANT8_ASYMM_SIGNED) {
- return validateVersion(context, Version::ANDROID_R);
+ return Version::ANDROID_R;
} else {
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
}
@@ -1569,7 +1567,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
std::vector<OperandType> inExpectedTypes;
@@ -1597,7 +1595,7 @@
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(
context, {inputType, inputType, OperandType::TENSOR_INT32, OperandType::TENSOR_INT32}));
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/HeatmapMaxKeypoint.cpp b/common/operations/HeatmapMaxKeypoint.cpp
index 1da7ed0..63fc597 100644
--- a/common/operations/HeatmapMaxKeypoint.cpp
+++ b/common/operations/HeatmapMaxKeypoint.cpp
@@ -224,7 +224,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
std::vector<OperandType> inExpectedTypes;
@@ -245,12 +245,11 @@
OperandType::TENSOR_QUANT16_ASYMM};
minSupportedVersion = Version::ANDROID_R;
} else {
- LOG(ERROR) << "Unsupported input tensor type for operation " << kOperationName;
- return false;
+ return NN_ERROR() << "Unsupported input tensor type for operation " << kOperationName;
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, outExpectedTypes));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/InstanceNormalization.cpp b/common/operations/InstanceNormalization.cpp
index 62b7728..1a0e488 100644
--- a/common/operations/InstanceNormalization.cpp
+++ b/common/operations/InstanceNormalization.cpp
@@ -99,7 +99,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
std::vector<OperandType> inExpectedTypes;
@@ -111,12 +111,11 @@
inExpectedTypes = {OperandType::TENSOR_FLOAT16, OperandType::FLOAT16, OperandType::FLOAT16,
OperandType::FLOAT16, OperandType::BOOL};
} else {
- LOG(ERROR) << "Unsupported input tensor type for operation " << kOperationName;
- return false;
+ return NN_ERROR() << "Unsupported input tensor type for operation " << kOperationName;
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/L2Normalization.cpp b/common/operations/L2Normalization.cpp
index 22f0cb3..05682ea 100644
--- a/common/operations/L2Normalization.cpp
+++ b/common/operations/L2Normalization.cpp
@@ -196,7 +196,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK(context->getNumInputs() == kNumInputs ||
context->getNumInputs() == kNumInputs - 1);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
@@ -225,7 +225,7 @@
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/LocalResponseNormalization.cpp b/common/operations/LocalResponseNormalization.cpp
index 435d602..ed16dec 100644
--- a/common/operations/LocalResponseNormalization.cpp
+++ b/common/operations/LocalResponseNormalization.cpp
@@ -130,7 +130,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK(context->getNumInputs() == kNumInputs ||
context->getNumInputs() == kNumInputs - 1);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
@@ -170,7 +170,7 @@
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/LogSoftmax.cpp b/common/operations/LogSoftmax.cpp
index 86a882f..6fe934a 100644
--- a/common/operations/LogSoftmax.cpp
+++ b/common/operations/LogSoftmax.cpp
@@ -70,7 +70,7 @@
return true;
}
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor);
@@ -83,12 +83,11 @@
inExpectedTypes = {OperandType::TENSOR_FLOAT16, OperandType::FLOAT16, OperandType::INT32};
outExpectedTypes = {OperandType::TENSOR_FLOAT16};
} else {
- LOG(ERROR) << "Unsupported input tensor type for operation " << kOperationName;
- return false;
+ return NN_ERROR() << "Unsupported input tensor type for operation " << kOperationName;
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, outExpectedTypes));
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/LogicalAndOr.cpp b/common/operations/LogicalAndOr.cpp
index 163aa54..e1927a5 100644
--- a/common/operations/LogicalAndOr.cpp
+++ b/common/operations/LogicalAndOr.cpp
@@ -60,7 +60,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor1);
@@ -68,7 +68,7 @@
<< "Unsupported tensor type for a logical operation";
NN_RET_CHECK(validateInputTypes(context, {inputType, inputType}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/LogicalNot.cpp b/common/operations/LogicalNot.cpp
index 2f6bb63..b93e71b 100644
--- a/common/operations/LogicalNot.cpp
+++ b/common/operations/LogicalNot.cpp
@@ -41,7 +41,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor);
@@ -49,7 +49,7 @@
<< "Unsupported tensor type for LOGICAL_NOT";
NN_RET_CHECK(validateInputTypes(context, {inputType}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Neg.cpp b/common/operations/Neg.cpp
index 1d042fc..39b58b9 100644
--- a/common/operations/Neg.cpp
+++ b/common/operations/Neg.cpp
@@ -47,7 +47,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor);
@@ -56,7 +56,7 @@
<< "Unsupported tensor type for operation " << kOperationName;
NN_RET_CHECK(validateInputTypes(context, {inputType}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/PRelu.cpp b/common/operations/PRelu.cpp
index db2f6d4..88e38fc 100644
--- a/common/operations/PRelu.cpp
+++ b/common/operations/PRelu.cpp
@@ -95,7 +95,7 @@
aData, aShape, bData, bShape, outputData, outputShape);
}
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
auto inputType = context->getInputType(kInputTensor);
@@ -107,9 +107,9 @@
NN_RET_CHECK(validateInputTypes(context, {inputType, inputType}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
if (inputType == OperandType::TENSOR_QUANT8_ASYMM_SIGNED) {
- return validateVersion(context, Version::ANDROID_R);
+ return Version::ANDROID_R;
} else {
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
}
diff --git a/common/operations/Pooling.cpp b/common/operations/Pooling.cpp
index e1c4cdc..6cd2864 100644
--- a/common/operations/Pooling.cpp
+++ b/common/operations/Pooling.cpp
@@ -288,7 +288,7 @@
} // namespace
-bool validate(OperationType opType, const IOperationValidationContext* context) {
+Result<Version> validate(OperationType opType, const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
auto inputCount = context->getNumInputs();
NN_RET_CHECK(inputCount == 11 || inputCount == 10 || inputCount == 8 || inputCount == 7);
@@ -349,7 +349,7 @@
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/QLSTM.cpp b/common/operations/QLSTM.cpp
index 0812e66..e8c4f90 100644
--- a/common/operations/QLSTM.cpp
+++ b/common/operations/QLSTM.cpp
@@ -101,7 +101,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
@@ -149,7 +149,7 @@
outExpectedTypes.push_back(OperandType::TENSOR_QUANT8_ASYMM_SIGNED);
NN_RET_CHECK(validateOutputTypes(context, outExpectedTypes));
- return validateVersion(context, Version::ANDROID_R);
+ return Version::ANDROID_R;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Quantize.cpp b/common/operations/Quantize.cpp
index c3f4812..b9d37b8 100644
--- a/common/operations/Quantize.cpp
+++ b/common/operations/Quantize.cpp
@@ -63,7 +63,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
@@ -77,9 +77,9 @@
outputType == OperandType::TENSOR_QUANT8_ASYMM_SIGNED)
<< "Unsupported output operand type for QUANTIZE op: " << outputType;
if (outputType == OperandType::TENSOR_QUANT8_ASYMM_SIGNED) {
- return validateVersion(context, Version::ANDROID_R);
+ return Version::ANDROID_R;
} else {
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
}
diff --git a/common/operations/Rank.cpp b/common/operations/Rank.cpp
index 71951d7..f636341 100644
--- a/common/operations/Rank.cpp
+++ b/common/operations/Rank.cpp
@@ -30,7 +30,7 @@
constexpr uint32_t kNumOutputs = 1;
constexpr uint32_t kOutputScalar = 0;
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor);
@@ -46,7 +46,7 @@
inputType == OperandType::TENSOR_QUANT8_ASYMM_SIGNED)
<< "Incorrect input type for a RANK op: " << inputType;
NN_RET_CHECK(validateOutputTypes(context, {OperandType::INT32}));
- return validateVersion(context, Version::ANDROID_R);
+ return Version::ANDROID_R;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Reduce.cpp b/common/operations/Reduce.cpp
index 0563a35..9eb1956 100644
--- a/common/operations/Reduce.cpp
+++ b/common/operations/Reduce.cpp
@@ -66,7 +66,7 @@
} // namespace
-bool validateProdSum(const IOperationValidationContext* context) {
+Result<Version> validateProdSum(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor);
@@ -80,10 +80,10 @@
if (hasKnownRank(input)) {
NN_RET_CHECK_LE(getNumberOfDimensions(input), 4);
}
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
-bool validateMaxMin(const IOperationValidationContext* context) {
+Result<Version> validateMaxMin(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor);
@@ -103,10 +103,10 @@
if (hasKnownRank(input)) {
NN_RET_CHECK_LE(getNumberOfDimensions(input), 4);
}
- return validateVersion(context, minVersion);
+ return minVersion;
}
-bool validateLogical(const IOperationValidationContext* context) {
+Result<Version> validateLogical(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor);
@@ -119,7 +119,7 @@
if (hasKnownRank(input)) {
NN_RET_CHECK_LE(getNumberOfDimensions(input), 4);
}
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/ResizeImageOps.cpp b/common/operations/ResizeImageOps.cpp
index 2c923f8..733bedb 100644
--- a/common/operations/ResizeImageOps.cpp
+++ b/common/operations/ResizeImageOps.cpp
@@ -169,7 +169,7 @@
} // namespace
-bool validate(OperationType opType, const IOperationValidationContext* context) {
+Result<Version> validate(OperationType opType, const IOperationValidationContext* context) {
const auto numInputs = context->getNumInputs();
if (opType == OperationType::RESIZE_BILINEAR) {
NN_RET_CHECK(numInputs >= kNumInputs - 1 && numInputs <= kNumInputs + kNumOptionalInputs);
@@ -218,7 +218,7 @@
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(OperationType opType, IOperationExecutionContext* context) {
diff --git a/common/operations/RoiAlign.cpp b/common/operations/RoiAlign.cpp
index 78049b8..3ca64f5 100644
--- a/common/operations/RoiAlign.cpp
+++ b/common/operations/RoiAlign.cpp
@@ -337,7 +337,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
std::vector<OperandType> inExpectedTypes;
@@ -367,15 +367,14 @@
OperandType::INT32,
OperandType::BOOL};
} else {
- LOG(ERROR) << "Unsupported input tensor type for operation " << kOperationName;
- return false;
+ return NN_ERROR() << "Unsupported input tensor type for operation " << kOperationName;
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
if (inputType == OperandType::TENSOR_QUANT8_ASYMM_SIGNED) {
- return validateVersion(context, Version::ANDROID_R);
+ return Version::ANDROID_R;
} else {
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
}
diff --git a/common/operations/RoiPooling.cpp b/common/operations/RoiPooling.cpp
index a011b4a..26e2213 100644
--- a/common/operations/RoiPooling.cpp
+++ b/common/operations/RoiPooling.cpp
@@ -184,7 +184,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
std::vector<OperandType> inExpectedTypes;
@@ -210,16 +210,14 @@
OperandType::FLOAT32,
OperandType::BOOL};
} else {
- LOG(ERROR) << "Unsupported input tensor type for operation " << kOperationName;
- return false;
+ return NN_ERROR() << "Unsupported input tensor type for operation " << kOperationName;
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
if (inputType == OperandType::TENSOR_QUANT8_ASYMM_SIGNED) {
- return validateVersion(context, Version::ANDROID_R);
- ;
+ return Version::ANDROID_R;
} else {
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
}
diff --git a/common/operations/Select.cpp b/common/operations/Select.cpp
index 0b7728a..f037b48 100644
--- a/common/operations/Select.cpp
+++ b/common/operations/Select.cpp
@@ -66,7 +66,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor1);
@@ -78,7 +78,7 @@
<< "Unsupported input operand type for select op: " << inputType;
NN_RET_CHECK(validateInputTypes(context, {OperandType::TENSOR_BOOL8, inputType, inputType}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, Version::ANDROID_Q);
+ return Version::ANDROID_Q;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Slice.cpp b/common/operations/Slice.cpp
index 882b0eb..db47419 100644
--- a/common/operations/Slice.cpp
+++ b/common/operations/Slice.cpp
@@ -78,7 +78,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
@@ -98,7 +98,7 @@
NN_RET_CHECK(validateInputTypes(
context, {inputType, OperandType::TENSOR_INT32, OperandType::TENSOR_INT32}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Softmax.cpp b/common/operations/Softmax.cpp
index e3c362f..3e65d85 100644
--- a/common/operations/Softmax.cpp
+++ b/common/operations/Softmax.cpp
@@ -227,7 +227,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK(context->getNumInputs() == kNumInputs ||
context->getNumInputs() == kNumInputs - 1);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
@@ -260,7 +260,7 @@
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Squeeze.cpp b/common/operations/Squeeze.cpp
index e9640b9..2fe8eb8 100644
--- a/common/operations/Squeeze.cpp
+++ b/common/operations/Squeeze.cpp
@@ -35,7 +35,7 @@
constexpr uint32_t kNumOutputs = 1;
constexpr uint32_t kOutputTensor = 0;
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor);
@@ -63,7 +63,7 @@
if (hasKnownRank(input)) {
NN_RET_CHECK_LE(getNumberOfDimensions(input), 4);
}
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/StridedSlice.cpp b/common/operations/StridedSlice.cpp
index 654659a..fd66ca7 100644
--- a/common/operations/StridedSlice.cpp
+++ b/common/operations/StridedSlice.cpp
@@ -96,7 +96,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor);
@@ -129,7 +129,7 @@
if (hasKnownRank(input)) {
NN_RET_CHECK_LE(getNumberOfDimensions(input), 4);
}
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/TopK_V2.cpp b/common/operations/TopK_V2.cpp
index d91c813..d19a309 100644
--- a/common/operations/TopK_V2.cpp
+++ b/common/operations/TopK_V2.cpp
@@ -73,7 +73,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
OperandType inputType = context->getInputType(kInputTensor);
@@ -89,7 +89,7 @@
if (inputType == OperandType::TENSOR_QUANT8_ASYMM_SIGNED) {
minSupportedVersion = Version::ANDROID_R;
}
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/Transpose.cpp b/common/operations/Transpose.cpp
index b964c39..0e61575 100644
--- a/common/operations/Transpose.cpp
+++ b/common/operations/Transpose.cpp
@@ -69,7 +69,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
@@ -90,7 +90,7 @@
}
NN_RET_CHECK(validateInputTypes(context, {inputType, OperandType::TENSOR_INT32}));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/TransposeConv2D.cpp b/common/operations/TransposeConv2D.cpp
index 9d6dbbb..002df27 100644
--- a/common/operations/TransposeConv2D.cpp
+++ b/common/operations/TransposeConv2D.cpp
@@ -433,7 +433,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
const uint32_t inputCount = context->getNumInputs();
NN_RET_CHECK(inputCount == kNumInputs1 || inputCount == kNumInputs2);
NN_RET_CHECK_EQ(context->getNumOutputs(), kNumOutputs);
@@ -476,7 +476,7 @@
inExpectedTypes.insert(inExpectedTypes.end(), argExpectedTypes.begin(), argExpectedTypes.end());
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, {inputType}));
- return validateVersion(context, minSupportedVersion);
+ return minSupportedVersion;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/UnidirectionalSequenceLSTM.cpp b/common/operations/UnidirectionalSequenceLSTM.cpp
index 02da158..dc734e8 100644
--- a/common/operations/UnidirectionalSequenceLSTM.cpp
+++ b/common/operations/UnidirectionalSequenceLSTM.cpp
@@ -112,7 +112,7 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
const uint32_t numOutputs = context->getNumOutputs();
NN_RET_CHECK(numOutputs == kNumOutputs || numOutputs == kNumOutputsWithState);
@@ -163,7 +163,7 @@
}
NN_RET_CHECK(validateInputTypes(context, inExpectedTypes));
NN_RET_CHECK(validateOutputTypes(context, outExpectedTypes));
- return validateVersion(context, minVersionSupported);
+ return minVersionSupported;
}
bool prepare(IOperationExecutionContext* context) {
diff --git a/common/operations/UnidirectionalSequenceRNN.cpp b/common/operations/UnidirectionalSequenceRNN.cpp
index 382aa58..eaf60ed 100644
--- a/common/operations/UnidirectionalSequenceRNN.cpp
+++ b/common/operations/UnidirectionalSequenceRNN.cpp
@@ -126,15 +126,14 @@
} // namespace
-bool validate(const IOperationValidationContext* context) {
+Result<Version> validate(const IOperationValidationContext* context) {
NN_RET_CHECK_EQ(context->getNumInputs(), kNumInputs);
const int numOutputs = context->getNumOutputs();
NN_RET_CHECK(numOutputs == kNumOutputs || numOutputs == kNumOutputsWithState);
OperandType inputType = context->getInputType(kInputTensor);
if (inputType != OperandType::TENSOR_FLOAT16 && inputType != OperandType::TENSOR_FLOAT32) {
- LOG(ERROR) << "Unsupported input operand type for UNIDIRECTIONAL_SEQUENCE_RNN op: "
- << inputType;
- return false;
+ return NN_ERROR() << "Unsupported input operand type for UNIDIRECTIONAL_SEQUENCE_RNN op: "
+ << inputType;
}
NN_RET_CHECK(validateInputTypes(context, {inputType, inputType, inputType, inputType, inputType,
OperandType::INT32, OperandType::INT32}));
@@ -145,7 +144,7 @@
outputTypes.push_back(inputType);
}
NN_RET_CHECK(validateOutputTypes(context, outputTypes));
- return validateVersion(context, minVersionSupported);
+ return minVersionSupported;
}
bool prepare(IOperationExecutionContext* context) {
