commit d734100dab54300140b66346cd9ac952259f6667
author Michael Butler <butlermichael@google.com> Sun Nov 01 23:47:40 2020 -0800
committer Michael Butler <butlermichael@google.com> Tue Nov 03 22:29:26 2020 +0000
tree 960d11f8b627fd2cefb2cdf1bf29671e629da432
parent d921396409a8252b92b3df1932a5deea408237dc

Update operation validation from HalVersion to Version

Bug: N/A
Test: mma
Test: NeuralNetworksTest_static
Change-Id: Ia1a10d9ee272a9c2c84a8f284df064c309e42a77

common/OperationsUtils.cpp

diff --git a/common/OperationsUtils.cpp b/common/OperationsUtils.cpp
index 9f2af22..d65566f 100644
--- a/common/OperationsUtils.cpp
+++ b/common/OperationsUtils.cpp
@@ -86,9 +86,8 @@
             [context](uint32_t index) { return context->getOutputType(index); });
 }
 
-bool validateHalVersion(const IOperationValidationContext* context,
-                        HalVersion minSupportedHalVersion) {
-    if (context->getHalVersion() < minSupportedHalVersion) {
+bool validateVersion(const IOperationValidationContext* context, Version minSupportedVersion) {
+    if (context->getVersion() < minSupportedVersion) {
         std::ostringstream message;
         message << "Operation " << context->getOperationName() << " with inputs {";
         for (uint32_t i = 0, n = context->getNumInputs(); i < n; ++i) {
@@ -104,8 +103,8 @@
             }
             message << context->getOutputType(i);
         }
-        message << "} is only supported since " << minSupportedHalVersion << " (validating using "
-                << context->getHalVersion() << ")";
+        message << "} is only supported since " << minSupportedVersion << " (validating using "
+                << context->getVersion() << ")";
         NN_RET_CHECK_FAIL() << message.str();
     }
     return true;