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/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) {
