[cpu-features][opencv4] Re-enable CpuFeatures of OpenCV4 on Android via vcpkg #48311
+83
−5
Conversation
This file contains hidden or 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
CpuFeatures::ndk_compat’s generated target never populated INTERFACE_INCLUDE_DIRECTORIES, so consumers could not include cpu-features.h. Add an patch that sets an INSTALL_INTERFACE include dir for ndk_compat so CMake writes the correct metadata.
OpenCV now requires NEON on armeabi-v7a, but the port disabled cpu_features in Feburary 2022 due to symbol clashes with libwebp. Turn WITH_CPUFEATURES back on, consume cpu-features from vcpkg (`CpuFeatures::ndk_compat`) instead of the vendored copy, and add it as Android-only dependency so downstream Android apps can link successfully.
bc-lee
force-pushed
the
cpu-features-opencv-fix
branch
3 times, most recently
from
1fcf0c6 to
7b96f66
Compare
/Users/vcpkg/Data/work/1/s/scripts/azure-pipelines/../ci.feature.baseline.txt:203:9: error: opencv4[core,openvino]:arm64-osx was unexpectedly a cascading failure because the following dependencies are unavailable: openvino[auto,core,cpu,hetero]:arm64-osx /Users/vcpkg/Data/work/1/s/scripts/azure-pipelines/../ci.feature.baseline.txt:203:9: note: consider changing this to =cascade instead
bc-lee
force-pushed
the
cpu-features-opencv-fix
branch
from
7b96f66 to
85c5854
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
This PR modifies two ports,
cpu-featuresandopencv4, to re-enableCpuFeaturessupport for OpenCV4 on Android using the vcpkg-managedcpu-featureslibrary instead of the vendored copy.The first commit fixes the
cpu-featuresport by exporting thendk_compattarget with a properINSTALL_INTERFACEinclude directory,allowing consumers to include
cpu-features.hcorrectly.The second commit updates the
opencv4port to turnWITH_CPUFEATURESback on (disabled since February 2022 due to symbol clashes with libraries
like
libwebp) and link againstCpuFeatures::ndk_compatfrom vcpkg.Without this fix, OpenCV4 on Android armeabi-v7a is effectively broken:
it fails to detect NEON support (which is almost mandatory on that arch), causing
a runtime crash with “Missing support for required CPU baseline features.”
Fixes #48265
./vcpkg x-add-version --alland committing the result.