提交 684d27fc 编写于 作者: B Bin Li 提交者: 叶剑武

Use the same Android API for cmake and bazel

上级 f76207d3
......@@ -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>();
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册