mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14958 from tomoaki0705:fixArmFp16Behavior

Browse Source
This commit is contained in:
Alexander Alekhin 2019-07-02 16:40:21 +00:00
commit e3e8a58799
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmake/OpenCVCompilerOptimizations.cmake
View File

@ -329,7 +329,7 @@ elseif(ARM OR AARCH64)
ocv_update(CPU_VFPV3_FLAGS_ON "-mfpu=vfpv3") ocv_update(CPU_VFPV3_FLAGS_ON "-mfpu=vfpv3")
ocv_update(CPU_NEON_FLAGS_ON "-mfpu=neon") ocv_update(CPU_NEON_FLAGS_ON "-mfpu=neon")
ocv_update(CPU_NEON_FLAGS_CONFLICT "-mfpu=[^ ]*") ocv_update(CPU_NEON_FLAGS_CONFLICT "-mfpu=[^ ]*")
ocv_update(CPU_FP16_FLAGS_ON "-mfpu=neon-fp16") ocv_update(CPU_FP16_FLAGS_ON "-mfpu=neon-fp16 -mfp16-format=ieee")
ocv_update(CPU_FP16_FLAGS_CONFLICT "-mfpu=[^ ]*") ocv_update(CPU_FP16_FLAGS_CONFLICT "-mfpu=[^ ]*")
endif() endif()
ocv_update(CPU_FP16_IMPLIES "NEON") ocv_update(CPU_FP16_IMPLIES "NEON")
@ -617,9 +617,6 @@ macro(ocv_compiler_optimization_options)
if(ENABLE_POWERPC) if(ENABLE_POWERPC)
add_extra_compiler_option("-mcpu=G3 -mtune=G5") add_extra_compiler_option("-mcpu=G3 -mtune=G5")
endif() endif()
if(ARM)
add_extra_compiler_option("-mfp16-format=ieee")
endif(ARM)
endmacro() endmacro()
macro(ocv_compiler_optimization_options_finalize) macro(ocv_compiler_optimization_options_finalize)