Commit c1abce62 by Tatsuya Nishiyama Committed by Tianqi Chen

Fix the building error in android_deploy (#1262)

* Fix a link in android_deploy/README.md and a error while building android_deploy.

* revert and change APP_STL in Application.mk
parent 280c4c3d
...@@ -99,7 +99,7 @@ If everything goes well, you will find compile tools in `/opt/android-toolchain- ...@@ -99,7 +99,7 @@ If everything goes well, you will find compile tools in `/opt/android-toolchain-
### Place compiled model on Android application assets folder ### Place compiled model on Android application assets folder
Follow instruction to get compiled version model for android target [here.](https://tvm.ai/deploy/android.html) Follow instruction to get compiled version model for android target [here.](http://docs.tvm.ai/deploy/android.html)
Copied these compiled model deploy_lib.so, deploy_graph.json and deploy_param.params to apps/android_deploy/app/src/main/assets/ and modify TVM flavor changes on [java](https://github.com/dmlc/tvm/blob/master/apps/android_deploy/app/src/main/java/ml/dmlc/tvm/android/demo/MainActivity.java#L81) Copied these compiled model deploy_lib.so, deploy_graph.json and deploy_param.params to apps/android_deploy/app/src/main/assets/ and modify TVM flavor changes on [java](https://github.com/dmlc/tvm/blob/master/apps/android_deploy/app/src/main/java/ml/dmlc/tvm/android/demo/MainActivity.java#L81)
......
...@@ -8,7 +8,7 @@ endif ...@@ -8,7 +8,7 @@ endif
include $(config) include $(config)
APP_STL := gnustl_static APP_STL := c++_static
APP_CPPFLAGS += -DDMLC_LOG_STACK_TRACE=0 -DTVM4J_ANDROID=1 -std=c++11 -Oz -frtti APP_CPPFLAGS += -DDMLC_LOG_STACK_TRACE=0 -DTVM4J_ANDROID=1 -std=c++11 -Oz -frtti
ifeq ($(USE_OPENCL), 1) ifeq ($(USE_OPENCL), 1)
......
...@@ -69,6 +69,8 @@ class ParallelLauncher { ...@@ -69,6 +69,8 @@ class ParallelLauncher {
tvm::runtime::threading::Yield(); tvm::runtime::threading::Yield();
} }
if (!has_error_.load()) return 0; if (!has_error_.load()) return 0;
// the following is intended to use string due to
// security issue raised in SGX backend
std::string err(""); std::string err("");
for (size_t i = 0; i < par_errors_.size(); ++i) { for (size_t i = 0; i < par_errors_.size(); ++i) {
if (par_errors_[i].length() != 0) { if (par_errors_[i].length() != 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment