Skip to content

android: make optional "cpufeatures", build fixes for NDK r15#8900

Merged
opencv-pushbot merged 1 commit intoopencv:masterfrom
alalek:update_android_build
Jun 23, 2017
Merged

android: make optional "cpufeatures", build fixes for NDK r15#8900
opencv-pushbot merged 1 commit intoopencv:masterfrom
alalek:update_android_build

Conversation

@alalek
Copy link
Copy Markdown
Member

@alalek alalek commented Jun 12, 2017

  • Added WITH_CPUFEATURES CMake option
  • fixed NEON detection for builds with CMake toolchain from Android NDK r15
  • fixed FP16 detection (but it is not available for Android AARCH64)
  • x86 / x86_64 Android builds pass
  • fixed NEON/FP16 for Linux AARCH64 (with fixes in carotene library)
  • fixed carotene library for GCC 5.x
  • resolves NEON doesn't get enabled on ARM #8945

@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jun 14, 2017

/cc @RyuheiMori Please take a look.

@tomoaki0705
Copy link
Copy Markdown
Contributor

My additional suggestion is to make dependency between the option flag FP16 and NEON, here

    ocv_update(CPU_FP16_FLAGS_ON "-mfpu=neon-fp16")
    ocv_update(CPU_FP16_IMPLIES "NEON")

The situation is very similar between FP16 and AVX on x86_64 around here

    ocv_update(CPU_FP16_IMPLIES "AVX")

@alalek
Copy link
Copy Markdown
Member Author

alalek commented Jun 21, 2017

@tomoaki0705 Thank you for review!
You are right! I have added mentioned line for both ARM/AARCH64 code paths.

@vpisarev vpisarev self-assigned this Jun 23, 2017
@vpisarev
Copy link
Copy Markdown
Contributor

👍

@opencv-pushbot opencv-pushbot merged commit 3e3e2dd into opencv:master Jun 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

NEON doesn't get enabled on ARM

4 participants