From bd1f7fe7e2e99786c567976bdb8fddb25b998497 Mon Sep 17 00:00:00 2001 From: daquexian Date: Wed, 31 Jul 2019 16:54:48 +0800 Subject: [PATCH 01/15] Add new android ci yml --- .../android-arm64-crosscompile-ci-pipeline.yml | 15 --------------- .../android-x86_64-crosscompile-ci-pipeline.yml | 10 ++++++++++ 2 files changed, 10 insertions(+), 15 deletions(-) delete mode 100644 tools/ci_build/github/azure-pipelines/android-arm64-crosscompile-ci-pipeline.yml create mode 100644 tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml diff --git a/tools/ci_build/github/azure-pipelines/android-arm64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-arm64-crosscompile-ci-pipeline.yml deleted file mode 100644 index 64dd6160fcc4b..0000000000000 --- a/tools/ci_build/github/azure-pipelines/android-arm64-crosscompile-ci-pipeline.yml +++ /dev/null @@ -1,15 +0,0 @@ -jobs: -- job: Linux_CI_Dev - pool: Linux-CPU - steps: - - template: templates/set-test-data-variables-step.yml - - - script: 'tools/ci_build/github/linux/run_dockerbuild.sh -o android -r $(Build.BinariesDirectory) -d nnapi -x "--build_wheel"' - displayName: 'Command Line Script' - - - task: ms.vss-governance-buildtask.governance-build-task-component-detection.ComponentGovernanceComponentDetection@0 - displayName: 'Component Detection' - condition: and(succeeded(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI')) - - - template: templates/clean-agent-build-directory-step.yml - diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml new file mode 100644 index 0000000000000..ec8bb995b643a --- /dev/null +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -0,0 +1,10 @@ +jobs: +- job: Android_CI + pool: + vmImage: 'macOS-10.14' + steps: + - 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 --skip_submodule_sync --enable_onnx_tests --parallel --use_openmp + displayName: Build and Test on Android Emulator + From e1e2e6df445119c484f8937ee7fb05dbf2721c8f Mon Sep 17 00:00:00 2001 From: daquexian Date: Wed, 31 Jul 2019 17:05:08 +0800 Subject: [PATCH 02/15] Clone submodules manually, build with dnnlibrary --- .../android-x86_64-crosscompile-ci-pipeline.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index ec8bb995b643a..6409d6c3c892f 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -3,8 +3,9 @@ jobs: pool: vmImage: 'macOS-10.14' steps: + - script: 'git submodule update --init --recursive --progress' - 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 --skip_submodule_sync --enable_onnx_tests --parallel --use_openmp + - script: tools/ci_build/build.py --android --build_dir build --android_ndk $ANDROID_HOME/ndk-bundle --skip_submodule_sync --enable_onnx_tests --parallel --use_openmp --use_dnnlibrary displayName: Build and Test on Android Emulator From c902f1ac20a12faca9b18aefef0704a5605eb575 Mon Sep 17 00:00:00 2001 From: daquexian Date: Wed, 31 Jul 2019 17:20:11 +0800 Subject: [PATCH 03/15] Disable dev mode for android --- tools/ci_build/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py index 9da8b5d002e99..69417a5a32fdb 100755 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py @@ -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"), From cb9d0e53a679f108799deeb922a5c80e51e431ec Mon Sep 17 00:00:00 2001 From: daquexian Date: Wed, 31 Jul 2019 17:20:28 +0800 Subject: [PATCH 04/15] Add nnapi support in perftest --- onnxruntime/test/perftest/command_args_parser.cc | 2 ++ onnxruntime/test/perftest/ort_test_session.cc | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/onnxruntime/test/perftest/command_args_parser.cc b/onnxruntime/test/perftest/command_args_parser.cc index 9b1437e327dfe..849e4f1723431 100644 --- a/onnxruntime/test/perftest/command_args_parser.cc +++ b/onnxruntime/test/perftest/command_args_parser.cc @@ -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; } diff --git a/onnxruntime/test/perftest/ort_test_session.cc b/onnxruntime/test/perftest/ort_test_session.cc index 906ba5693ea70..f863c61a179e6 100644 --- a/onnxruntime/test/perftest/ort_test_session.cc +++ b/onnxruntime/test/perftest/ort_test_session.cc @@ -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"); From e9a3016bc7128423e20e510c275791adc0ef2d65 Mon Sep 17 00:00:00 2001 From: daquexian Date: Wed, 31 Jul 2019 19:37:08 +0800 Subject: [PATCH 05/15] Build x86_64 in CI --- .../azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 6409d6c3c892f..ee3f0e0ee4dc9 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -6,6 +6,6 @@ jobs: - script: 'git submodule update --init --recursive --progress' - 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 --skip_submodule_sync --enable_onnx_tests --parallel --use_openmp --use_dnnlibrary + - script: tools/ci_build/build.py --android --build_dir build --android_ndk $ANDROID_HOME/ndk-bundle --android_abi=x86_64 --skip_submodule_sync --enable_onnx_tests --parallel --use_openmp --use_dnnlibrary displayName: Build and Test on Android Emulator From b998468785b4e87215a1fab4c49b1bf8a01f8c15 Mon Sep 17 00:00:00 2001 From: daquexian Date: Thu, 1 Aug 2019 10:19:26 +0800 Subject: [PATCH 06/15] Install cmake 3.14.4 --- .../android-x86_64-crosscompile-ci-pipeline.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index ee3f0e0ee4dc9..19f081382d4ae 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -3,7 +3,11 @@ jobs: pool: vmImage: 'macOS-10.14' steps: + # cmake 3.15 breaks Android NDK https://gitlab.kitware.com/cmake/cmake/issues/19515 + - script: pip install cmake==3.14.4 && alias cmake=/usr/local/bin/cmake && cmake --version + displayName: Install cmake 3.14 - 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 --enable_onnx_tests --parallel --use_openmp --use_dnnlibrary From 7f60b5f6d916e25b5aea14e5b9a31640b53a157c Mon Sep 17 00:00:00 2001 From: daquexian Date: Thu, 1 Aug 2019 12:33:27 +0800 Subject: [PATCH 07/15] Use watch to wait emulator online --- tools/ci_build/github/android/start_android_emulator.sh | 7 ++++--- .../android-x86_64-crosscompile-ci-pipeline.yml | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/ci_build/github/android/start_android_emulator.sh b/tools/ci_build/github/android/start_android_emulator.sh index d6e12e1bb0e13..0f465807d45cf 100755 --- a/tools/ci_build/github/android/start_android_emulator.sh +++ b/tools/ci_build/github/android/start_android_emulator.sh @@ -17,9 +17,10 @@ nohup $ANDROID_HOME/emulator/emulator -avd android_emulator -no-snapshot -no-aud # start server in advance, so that the result of watch will only change when device gets online $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' +watch -g -n 1 '$ANDROID_HOME/platform-tools/adb devices | grep -c device$' echo "Emulator is online" +$ANDROID_HOME/platform-tools/adb devices + +echo "Emulator started" diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 19f081382d4ae..5839f648b5bd1 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -4,8 +4,8 @@ jobs: vmImage: 'macOS-10.14' steps: # cmake 3.15 breaks Android NDK https://gitlab.kitware.com/cmake/cmake/issues/19515 - - script: pip install cmake==3.14.4 && alias cmake=/usr/local/bin/cmake && cmake --version - displayName: Install cmake 3.14 + - script: pip install cmake==3.14.4 && alias cmake=/usr/local/bin/cmake && cmake --version && brew install watch + displayName: Install cmake 3.14 and watch - script: 'git submodule update --init --recursive --progress' displayName: Clone submodules - script: echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'ndk-bundle' From 0ca27a53d56fde0f874573ff89a9642162772e99 Mon Sep 17 00:00:00 2001 From: daquexian Date: Thu, 1 Aug 2019 13:04:14 +0800 Subject: [PATCH 08/15] Install coreutils for realpath --- .../android-x86_64-crosscompile-ci-pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 5839f648b5bd1..eead0e8dd7424 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -4,8 +4,8 @@ jobs: vmImage: 'macOS-10.14' steps: # cmake 3.15 breaks Android NDK https://gitlab.kitware.com/cmake/cmake/issues/19515 - - script: pip install cmake==3.14.4 && alias cmake=/usr/local/bin/cmake && cmake --version && brew install watch - displayName: Install cmake 3.14 and watch + - script: pip install cmake==3.14.4 && alias cmake=/usr/local/bin/cmake && cmake --version && brew install watch coreutils + displayName: Install cmake 3.14, watch and coreutils - script: 'git submodule update --init --recursive --progress' displayName: Clone submodules - script: echo "y" | $ANDROID_HOME/tools/bin/sdkmanager --install 'ndk-bundle' From 62623f5a310962b14bf5b99a2a38864f9fe9f02b Mon Sep 17 00:00:00 2001 From: daquexian Date: Thu, 1 Aug 2019 13:44:18 +0800 Subject: [PATCH 09/15] Disable openmp --- tools/ci_build/build.py | 2 +- .../azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ci_build/build.py b/tools/ci_build/build.py index 69417a5a32fdb..dd1fab19a2edb 100755 --- a/tools/ci_build/build.py +++ b/tools/ci_build/build.py @@ -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"), diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index eead0e8dd7424..1807b150b2cb1 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -10,6 +10,6 @@ jobs: 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 --enable_onnx_tests --parallel --use_openmp --use_dnnlibrary + - script: tools/ci_build/build.py --android --build_dir build --android_ndk $ANDROID_HOME/ndk-bundle --android_abi=x86_64 --skip_submodule_sync --enable_onnx_tests --parallel --use_dnnlibrary displayName: Build and Test on Android Emulator From 5e7aeac28623d1ec6b16ffa804ebf3c3fe150b31 Mon Sep 17 00:00:00 2001 From: daquexian Date: Thu, 1 Aug 2019 16:55:20 +0800 Subject: [PATCH 10/15] Revert 'use watch to wait emulator online' --- tools/ci_build/github/android/start_android_emulator.sh | 7 +++---- .../android-x86_64-crosscompile-ci-pipeline.yml | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/tools/ci_build/github/android/start_android_emulator.sh b/tools/ci_build/github/android/start_android_emulator.sh index 0f465807d45cf..d6e12e1bb0e13 100755 --- a/tools/ci_build/github/android/start_android_emulator.sh +++ b/tools/ci_build/github/android/start_android_emulator.sh @@ -17,10 +17,9 @@ nohup $ANDROID_HOME/emulator/emulator -avd android_emulator -no-snapshot -no-aud # start server in advance, so that the result of watch will only change when device gets online $ANDROID_HOME/platform-tools/adb start-server -watch -g -n 1 '$ANDROID_HOME/platform-tools/adb devices | grep -c device$' +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' echo "Emulator is online" -$ANDROID_HOME/platform-tools/adb devices - -echo "Emulator started" diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 1807b150b2cb1..8479f6b975a1a 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -4,8 +4,8 @@ jobs: vmImage: 'macOS-10.14' steps: # cmake 3.15 breaks Android NDK https://gitlab.kitware.com/cmake/cmake/issues/19515 - - script: pip install cmake==3.14.4 && alias cmake=/usr/local/bin/cmake && cmake --version && brew install watch coreutils - displayName: Install cmake 3.14, watch and coreutils + - script: pip install cmake==3.14.4 && alias cmake=/usr/local/bin/cmake && cmake --version && brew install coreutils + 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' From 4f14dc1693d14aa1d84472d10ea623f4856093f9 Mon Sep 17 00:00:00 2001 From: daquexian Date: Thu, 1 Aug 2019 17:50:55 +0800 Subject: [PATCH 11/15] alias timeout=gtimeout --- .../azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 8479f6b975a1a..29eb1db947f32 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -4,7 +4,7 @@ jobs: vmImage: 'macOS-10.14' steps: # cmake 3.15 breaks Android NDK https://gitlab.kitware.com/cmake/cmake/issues/19515 - - script: pip install cmake==3.14.4 && alias cmake=/usr/local/bin/cmake && cmake --version && brew install coreutils + - script: pip install cmake==3.14.4 && 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 From 5165c2195e402f1b0e72efe48b1ed4fbdfbd8e8c Mon Sep 17 00:00:00 2001 From: daquexian Date: Thu, 1 Aug 2019 17:51:07 +0800 Subject: [PATCH 12/15] Relax timeout from 60 to 180s --- tools/ci_build/github/android/start_android_emulator.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/github/android/start_android_emulator.sh b/tools/ci_build/github/android/start_android_emulator.sh index d6e12e1bb0e13..5d2163001ac2b 100755 --- a/tools/ci_build/github/android/start_android_emulator.sh +++ b/tools/ci_build/github/android/start_android_emulator.sh @@ -19,7 +19,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" From ce983a7fe7b50e254d8ad050be7bc4f8ed548190 Mon Sep 17 00:00:00 2001 From: daquexian Date: Thu, 1 Aug 2019 17:51:18 +0800 Subject: [PATCH 13/15] disable onnx tests for the time being --- .../azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 29eb1db947f32..5600492906bce 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -10,6 +10,6 @@ jobs: 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 --enable_onnx_tests --parallel --use_dnnlibrary + - 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 From 5eb4654bc949fe8d44b83d1b53f01f75fbdc959b Mon Sep 17 00:00:00 2001 From: daquexian Date: Thu, 1 Aug 2019 18:27:14 +0800 Subject: [PATCH 14/15] no need to set TERM=xterm anymore, it is only needed for watch --- tools/ci_build/github/android/start_android_emulator.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/tools/ci_build/github/android/start_android_emulator.sh b/tools/ci_build/github/android/start_android_emulator.sh index 5d2163001ac2b..31e68ddf30ca6 100755 --- a/tools/ci_build/github/android/start_android_emulator.sh +++ b/tools/ci_build/github/android/start_android_emulator.sh @@ -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 From 68fcf535f279d49b4597fc3ac0836228aacbb53c Mon Sep 17 00:00:00 2001 From: daquexian Date: Thu, 1 Aug 2019 18:30:57 +0800 Subject: [PATCH 15/15] Install cmake 3.13.2, consistent with other ci --- .../android-x86_64-crosscompile-ci-pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 5600492906bce..60761c61637d4 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -3,8 +3,8 @@ jobs: pool: vmImage: 'macOS-10.14' steps: - # cmake 3.15 breaks Android NDK https://gitlab.kitware.com/cmake/cmake/issues/19515 - - script: pip install cmake==3.14.4 && alias cmake=/usr/local/bin/cmake && cmake --version && brew install coreutils && alias time=gtimeout + # 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