From 684d27fc9ff1957779c96a36e22072f18d14538c Mon Sep 17 00:00:00 2001
From: Bin Li <libin11@xiaomi.com>
Date: Tue, 24 Sep 2019 17:24:12 +0800
Subject: [PATCH] Use the same Android API for cmake and bazel

---
 mace/core/runtime/hexagon/hexagon_hta_wrapper.cc | 6 +++---
 tools/cmake/cmake-build-arm64-v8a.sh             | 2 +-
 tools/cmake/cmake-build-armeabi-v7a.sh           | 2 +-
 tools/python/transform/transformer.py            | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mace/core/runtime/hexagon/hexagon_hta_wrapper.cc b/mace/core/runtime/hexagon/hexagon_hta_wrapper.cc
index 08650c18..a568cd53 100644
--- a/mace/core/runtime/hexagon/hexagon_hta_wrapper.cc
+++ b/mace/core/runtime/hexagon/hexagon_hta_wrapper.cc
@@ -313,9 +313,9 @@ bool HexagonHTAWrapper::ExecuteGraphNew(
     }
     auto output_tensor = output_tensors->at(output_info_[i].name);
     MACE_CHECK(static_cast<index_t>(outputs[i].data_valid_len)
-                   == output_tensor->raw_size(),
-               outputs[i].data_valid_len, " vs ", output_tensor->raw_size(),
-               " wrong output bytes inferred.");
+                   == output_tensor->size(),
+               outputs[i].data_valid_len, " vs ", output_tensor->size(),
+               " wrong output size inferred.");
 
     const uint8_t *output_data_u8 = output_info_[i].tensor_u8->data<uint8_t>();
     float *output_data = output_tensor->mutable_data<float>();
diff --git a/tools/cmake/cmake-build-arm64-v8a.sh b/tools/cmake/cmake-build-arm64-v8a.sh
index 7212ba9c..e1efeed2 100755
--- a/tools/cmake/cmake-build-arm64-v8a.sh
+++ b/tools/cmake/cmake-build-arm64-v8a.sh
@@ -29,7 +29,7 @@ fi
 mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
 cmake -DANDROID_ABI="arm64-v8a" \
       -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
-      -DANDROID_NATIVE_API_LEVEL=28       \
+      -DANDROID_NATIVE_API_LEVEL=21       \
       -DCMAKE_BUILD_TYPE=Release          \
       -DANDROID_STL=c++_shared \
       -DMACE_ENABLE_NEON=ON               \
diff --git a/tools/cmake/cmake-build-armeabi-v7a.sh b/tools/cmake/cmake-build-armeabi-v7a.sh
index c953807f..12fab64f 100755
--- a/tools/cmake/cmake-build-armeabi-v7a.sh
+++ b/tools/cmake/cmake-build-armeabi-v7a.sh
@@ -31,7 +31,7 @@ mkdir -p ${BUILD_DIR} && cd ${BUILD_DIR}
 cmake -DANDROID_ABI="armeabi-v7a" \
       -DANDROID_ARM_NEON=ON \
       -DCMAKE_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \
-      -DANDROID_NATIVE_API_LEVEL=28                          \
+      -DANDROID_NATIVE_API_LEVEL=21                          \
       -DCMAKE_BUILD_TYPE=Release                             \
       -DANDROID_STL=c++_shared                               \
       -DMACE_ENABLE_NEON=ON                                  \
diff --git a/tools/python/transform/transformer.py b/tools/python/transform/transformer.py
index f4ec331a..69cdcbf2 100644
--- a/tools/python/transform/transformer.py
+++ b/tools/python/transform/transformer.py
@@ -887,7 +887,8 @@ class Transformer(base_converter.ConverterInterface):
 
     def flatten_atrous_conv(self):
         if self._option.device != DeviceType.GPU.value \
-               and self._option.device != DeviceType.APU.value:
+               and self._option.device != DeviceType.APU.value \
+               and self._option.device != DeviceType.HTA.value:
             return
 
         net = self._model
-- 
GitLab