commit 5d0b5065085c8eadeaeceb7ebaf76ff606dfa9a2
author Baligh Uddin <baligh@google.com> Sat Oct 24 14:31:42 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Sat Oct 24 14:31:42 2020 +0000
tree a4ace5ec57c15c363a331ca0c900f94438312dee
parent c9951b461db296482f00c989f1dd70eb010b6101
parent 3fa9df4f14063795de1901232e1dabcabb018f93

Merge "Cleanup references to system/core/base -> system/libbase" am: 1833bc3c61 am: ceac2e6ba8 am: db969d73d3 am: 3fa9df4f14

Original change: https://android-review.googlesource.com/c/platform/frameworks/ml/+/1472303

Change-Id: I8e4b60a379bd4cc5a61ff913cd9d79438cef18fd

common/TypeUtils.cpp

diff --git a/common/TypeUtils.cpp b/common/TypeUtils.cpp
index 15b377b..f5bbe07 100644
--- a/common/TypeUtils.cpp
+++ b/common/TypeUtils.cpp
@@ -103,7 +103,6 @@
     switch (operandType) {
         case OperandType::SUBGRAPH:
         case OperandType::OEM:
-        case OperandType::TENSOR_OEM_BYTE:
             return 0;
         case OperandType::TENSOR_QUANT8_ASYMM:
         case OperandType::BOOL:
@@ -111,6 +110,7 @@
         case OperandType::TENSOR_QUANT8_SYMM_PER_CHANNEL:
         case OperandType::TENSOR_QUANT8_SYMM:
         case OperandType::TENSOR_QUANT8_ASYMM_SIGNED:
+        case OperandType::TENSOR_OEM_BYTE:
             return 1;
         case OperandType::TENSOR_QUANT16_SYMM:
         case OperandType::TENSOR_FLOAT16:

driver/sample/SampleDriverFloatXNNPACK.cpp

diff --git a/driver/sample/SampleDriverFloatXNNPACK.cpp b/driver/sample/SampleDriverFloatXNNPACK.cpp
index a09e914..3a8c0a2 100644
--- a/driver/sample/SampleDriverFloatXNNPACK.cpp
+++ b/driver/sample/SampleDriverFloatXNNPACK.cpp
@@ -1552,7 +1552,9 @@
    public:
     SamplePreparedModelXNNPACK(const Model& model, const SampleDriver* driver,
                                ExecutionPreference preference, uid_t userId, Priority priority)
-        : SamplePreparedModel(model, driver, preference, userId, priority) {}
+        : SamplePreparedModel(model, driver, preference, userId, priority),
+          mSubgraph(nullptr),
+          mThreadpool(nullptr) {}
     ~SamplePreparedModelXNNPACK() {
         delete mSubgraph;
         pthreadpool_destroy(mThreadpool);