Skip to content

[WIP] NNAPI EP Update #1540

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

Merged
Changming Sun (snnn) merged 15 commits into from
Aug 2, 2019
Merged

[WIP] NNAPI EP Update #1540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bd1f7fe
Add new android ci yml
daquexian Jul 31, 2019
e1e2e6d
Clone submodules manually, build with dnnlibrary
daquexian Jul 31, 2019
c902f1a
Disable dev mode for android
daquexian Jul 31, 2019
cb9d0e5
Add nnapi support in perftest
daquexian Jul 31, 2019
e9a3016
Build x86_64 in CI
daquexian Jul 31, 2019
b998468
Install cmake 3.14.4
daquexian Aug 1, 2019
7f60b5f
Use watch to wait emulator online
daquexian Aug 1, 2019
0ca27a5
Install coreutils for realpath
daquexian Aug 1, 2019
62623f5
Disable openmp
daquexian Aug 1, 2019
5e7aeac
Revert 'use watch to wait emulator online'
daquexian Aug 1, 2019
4f14dc1
alias timeout=gtimeout
daquexian Aug 1, 2019
5165c21
Relax timeout from 60 to 180s
daquexian Aug 1, 2019
ce983a7
disable onnx tests for the time being
daquexian Aug 1, 2019
5eb4654
no need to set TERM=xterm anymore, it is only needed for watch
daquexian Aug 1, 2019
68fcf53
Install cmake 3.13.2, consistent with other ci
daquexian Aug 1, 2019
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: 2 additions & 0 deletions onnxruntime/test/perftest/command_args_parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ namespace perftest {
test_config.machine_config.provider_type_name = onnxruntime::kTensorrtExecutionProvider;
} else if (!CompareCString(optarg, ORT_TSTR("openvino"))) {
test_config.machine_config.provider_type_name = onnxruntime::kOpenVINOExecutionProvider;
} else if (!CompareCString(optarg, ORT_TSTR("nnapi"))) {
test_config.machine_config.provider_type_name = onnxruntime::kNnapiExecutionProvider;
} else {
return false;
}
Expand Down
6 changes: 6 additions & 0 deletions onnxruntime/test/perftest/ort_test_session.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,12 @@ OnnxRuntimeTestSession::OnnxRuntimeTestSession(Ort::Env& env, std::random_device
ORT_THROW_ON_ERROR(OrtSessionOptionsAppendExecutionProvider_OpenVINO(session_options, "CPU"));
#else
ORT_THROW("OpenVINO is not supported in this build\n");
#endif
} else if (provider_name == onnxruntime::kNnapiExecutionProvider) {
#ifdef USE_NNAPI
ORT_THROW_ON_ERROR(OrtSessionOptionsAppendExecutionProvider_Nnapi(session_options));
#else
ORT_THROW("NNAPI is not supported in this build\n");
#endif
} else if (!provider_name.empty() && provider_name != onnxruntime::kCpuExecutionProvider) {
ORT_THROW("This backend is not included in perf test runner.\n");
Expand Down
4 changes: 2 additions & 2 deletions tools/ci_build/build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ def generate_build_tree(cmake_path, source_dir, build_dir, cuda_home, cudnn_home
cmake_args = [cmake_path, cmake_dir,
"-Donnxruntime_RUN_ONNX_TESTS=" + ("ON" if args.enable_onnx_tests else "OFF"),
"-Donnxruntime_GENERATE_TEST_REPORTS=ON",
"-Donnxruntime_DEV_MODE=ON",
"-Donnxruntime_DEV_MODE=" + ("OFF" if args.android else "ON"),
"-DPYTHON_EXECUTABLE=" + sys.executable,
"-Donnxruntime_USE_CUDA=" + ("ON" if args.use_cuda else "OFF"),
"-Donnxruntime_USE_NSYNC=" + ("OFF" if is_windows() or not args.use_nsync else "ON"),
Expand All @@ -342,7 +342,7 @@ def generate_build_tree(cmake_path, source_dir, build_dir, cuda_home, cudnn_home
"-Donnxruntime_USE_OPENVINO_CPU_FP32=" + ("ON" if args.use_openvino == "CPU_FP32" else "OFF"),
"-Donnxruntime_USE_OPENVINO_VAD_R=" + ("ON" if args.use_openvino == "VAD-R_FP16" else "OFF"),
"-Donnxruntime_USE_NNAPI=" + ("ON" if args.use_dnnlibrary else "OFF"),
"-Donnxruntime_USE_OPENMP=" + ("ON" if args.use_openmp and not args.use_mklml and not args.use_ngraph else "OFF"),
"-Donnxruntime_USE_OPENMP=" + ("ON" if args.use_openmp and not args.use_dnnlibrary and not args.use_mklml and not args.use_ngraph else "OFF"),
"-Donnxruntime_USE_TVM=" + ("ON" if args.use_tvm else "OFF"),
"-Donnxruntime_USE_LLVM=" + ("ON" if args.use_llvm else "OFF"),
"-Donnxruntime_ENABLE_MICROSOFT_INTERNAL=" + ("ON" if args.enable_msinternal else "OFF"),
Expand Down
4 changes: 1 addition & 3 deletions tools/ci_build/github/android/start_android_emulator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

set -e

export TERM=xterm

echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'system-images;android-28;google_apis;x86_64'

echo "no" | $ANDROID_HOME/tools/bin/avdmanager create avd -n android_emulator -k 'system-images;android-28;google_apis;x86_64' --force
Expand All @@ -19,7 +17,7 @@ $ANDROID_HOME/platform-tools/adb start-server

echo "Waiting for device to come online"
# Sometimes wait-for-device hangs, so add a timeout here
timeout 60 adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done; input keyevent 82'
timeout 180 adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed) ]]; do sleep 1; done; input keyevent 82'

echo "Emulator is online"

15 changes: 0 additions & 15 deletions tools/ci_build/github/azure-pipelines/android-arm64-crosscompile-ci-pipeline.yml
View file
Open in desktop

This file was deleted.

15 changes: 15 additions & 0 deletions tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
jobs:
- job: Android_CI
pool:
vmImage: 'macOS-10.14'

@snnn Changming Sun (snnn) Aug 1, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For building the android package on Mac? Why do we need to test it? Why not using Linux instead?

@daquexian daquexian (daquexian) Aug 2, 2019

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems macos has better Android emulator support: https://github.com/microsoft/azure-pipelines-image-generation/blob/master/images/macos/macos-10.14-Readme.md, and since we are doing cross-compile via official Android NDK, macos or linux doesn't matter a lot.

steps:
# cmake 3.15 breaks Android NDK https://gitlab.kitware.com/cmake/cmake/issues/19515. pip install cmake==3.13.2 installs 3.12.2
- script: pip install cmake==3.13.2.post1 && alias cmake=/usr/local/bin/cmake && cmake --version && brew install coreutils && alias time=gtimeout
displayName: Install cmake 3.14 and coreutils
- script: 'git submodule update --init --recursive --progress'
displayName: Clone submodules
- script: echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'ndk-bundle'
displayName: Install Android NDK
- script: tools/ci_build/build.py --android --build_dir build --android_ndk $ANDROID_HOME/ndk-bundle --android_abi=x86_64 --skip_submodule_sync --parallel --use_dnnlibrary
displayName: Build and Test on Android Emulator