Skip to content

Commit e33141d

Browse files
asmorkalovGitOps Bot
authored andcommitted
Merge pull request opencv#27897 from asmorkalov:as/alernative_win_arm_neon_check
Enabled fp16 conversions, but disabled NEON FP16 arithmetics on Windows for ARM for now opencv#27897 ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [ ] The PR is proposed to the proper branch - [ ] There is a reference to the original bug report and related work - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
1 parent 49180f5 commit e33141d

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

cmake/checks/cpu_neon_dotprod.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include <stdio.h>
22

3-
#if (defined __GNUC__ && (defined __arm__ || defined __aarch64__)) || (defined _MSC_VER && (defined _M_ARM64 || defined _M_ARM64EC))
3+
#if (defined __GNUC__ && (defined __arm__ || defined __aarch64__))/* || (defined _MSC_VER && (defined _M_ARM64 || defined _M_ARM64EC)) */
4+
// Windows + ARM64 case disabled: https://github.com/opencv/opencv/issues/25052
5+
46
#include "arm_neon.h"
57
int test()
68
{

cmake/checks/cpu_neon_fp16.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include <stdio.h>
22

3-
#if (defined __GNUC__ && (defined __arm__ || defined __aarch64__)) || (defined _MSC_VER && (defined _M_ARM64 || defined _M_ARM64EC))
3+
#if (defined __GNUC__ && (defined __arm__ || defined __aarch64__)) /* || (defined _MSC_VER && (defined _M_ARM64 || defined _M_ARM64EC)) */
4+
// Windows + ARM64 case disabled: https://github.com/opencv/opencv/issues/25052
45
#include "arm_neon.h"
56

67
float16x8_t vld1q_as_f16(const float* src)
@@ -36,7 +37,7 @@ void test()
3637
vprintreg("s1*s2[0]+s1*s2[1] + ... + s1*s2[7]", d);
3738
}
3839
#else
39-
#error "FP16 is not supported"
40+
#error "NEON FP16 is not supported"
4041
#endif
4142

4243
int main()

0 commit comments

Comments
 (0)