Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the building error in android_deploy #1262

Merged
merged 2 commits into from
Jun 12, 2018
Merged

Fix the building error in android_deploy #1262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a5ea23
Fix a link in android_deploy/README.md and a error while building and…
Jun 6, 2018
e7003fe
revert and change APP_STL in Application.mk
Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/android_deploy/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

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)

Expand Down
2 changes: 1 addition & 1 deletion apps/android_deploy/app/src/main/jni/Application.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ endif

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
ifeq ($(USE_OPENCL), 1)
Expand Down
2 changes: 2 additions & 0 deletions src/runtime/thread_pool.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ class ParallelLauncher {
tvm::runtime::threading::Yield();
}
if (!has_error_.load()) return 0;
// the following is intended to use string due to
// security issue raised in SGX backend
std::string err("");
for (size_t i = 0; i < par_errors_.size(); ++i) {
if (par_errors_[i].length() != 0) {
Expand Down