diff --git a/mace/core/runtime/hexagon/hexagon_hta_wrapper.cc b/mace/core/runtime/hexagon/hexagon_hta_wrapper.cc index 08650c18830cad213898cded7a9dd83f093a3eee..a568cd5305e19c5590fd92526cdb74dd61a84fc3 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(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(); float *output_data = output_tensor->mutable_data(); diff --git a/tools/cmake/cmake-build-arm64-v8a.sh b/tools/cmake/cmake-build-arm64-v8a.sh index 7212ba9c55c0089b31e0537761ec6296ce9a4995..e1efeed241a8a6c3cbff6567664f5f7b7606cbd1 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 c953807f927811b5bf1a2516e6a80219a16ebfe5..12fab64f8dce0f9474a0a3cea2f8d1905f06a4fc 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 f4ec331ab131227ad591560dd793ae5a90cf0970..69cdcbf26bddb6c6a9e3866354d210c6a08016e6 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