[CI] [GHA] Introduce Android x64 workflow #26086
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
category: CI
.github/workflows/android_x64.yml
Outdated
| ANDROID_NDK_HOME: '/deps/android_tools/ndk-bundle' | ||
| ANDROID_SDK_VERSION: 29 | ||
| ANDROID_ABI_CONFIG: x86_64 | ||
| VCPKG_TARGET_TRIPLET: x86-android |
There was a problem hiding this comment.
Suggested change
| VCPKG_TARGET_TRIPLET: x86-android | |
| VCPKG_TARGET_TRIPLET: x64-android |
.github/workflows/android_x64.yml
Outdated
| git submodule update --init -- ${OPENVINO_REPO}/thirdparty/gtest | ||
| git submodule update --init -- ${OPENVINO_REPO}/thirdparty/gflags | ||
| git submodule update --init -- ${OPENVINO_REPO}/thirdparty/xbyak | ||
| git submodule update --init -- ${OPENVINO_REPO}/thirdparty/protobuf |
There was a problem hiding this comment.
I hope that list of extra fetched submodules should be the same as for arm64 Android.
.github/workflows/android_x64.yml
Outdated
| -DVCPKG_HOST_TRIPLET=x64-linux-release \ | ||
| -DCMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake \ | ||
| -DVCPKG_CHAINLOAD_TOOLCHAIN_FILE=${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake \ | ||
| -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ |
There was a problem hiding this comment.
we can temporary disable this flag
.github/workflows/android_x64.yml
Outdated
| -DENABLE_SYSTEM_PUGIXML=ON \ | ||
| -DENABLE_SYSTEM_SNAPPY=ON \ | ||
| -DENABLE_SYSTEM_TBB=ON \ | ||
| -DENABLE_INTEL_NPU=OFF \ |
There was a problem hiding this comment.
let's add a condition to cmake to enable NPU only Linux and Windows
There was a problem hiding this comment.
Done, please take a look.
|
@ilya-lavrenov, do we need to align the workflow with that of Jenkins or do we proceed with what is in the arm workflow? As I can see, there are quite a few differences: e.g., cmake options, compilers, NDK version, usage of VCPKG, ninja, etc. |
cmake/features.cmake
Outdated
| @@ -49,7 +49,7 @@ else() | |||
| set(ENABLE_INTEL_NPU_DEFAULT OFF) | |||
| endif() | |||
|
|
|||
| ov_dependent_option (ENABLE_INTEL_NPU "NPU plugin for OpenVINO runtime" ${ENABLE_INTEL_NPU_DEFAULT} "X86 OR X86_64;NOT APPLE" OFF) | |||
| ov_dependent_option (ENABLE_INTEL_NPU "NPU plugin for OpenVINO runtime" ${ENABLE_INTEL_NPU_DEFAULT} "(X86 OR X86_64) AND (WIN32 OR LINUX);NOT APPLE" OFF) | |||
There was a problem hiding this comment.
Suggested change
| ov_dependent_option (ENABLE_INTEL_NPU "NPU plugin for OpenVINO runtime" ${ENABLE_INTEL_NPU_DEFAULT} "(X86 OR X86_64) AND (WIN32 OR LINUX);NOT APPLE" OFF) | |
| ov_dependent_option (ENABLE_INTEL_NPU "NPU plugin for OpenVINO runtime" ON "X86_64;WIN32 OR LINUX" OFF) |
could you please also drop ENABLE_INTEL_NPU_DEFAULT definition?
ilya-lavrenov
approved these changes
Aug 20, 2024
auto-merge was automatically disabled
August 21, 2024 14:09
Pull Request is not mergeable
…envino into ci/gha/introduce-android-x64
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tickets: