From db6a6ccaba59bb96fb6aafe41e6a589d461a2b92 Mon Sep 17 00:00:00 2001 From: Tomoaki Teshima Date: Tue, 2 Jul 2019 21:57:15 +0900 Subject: [PATCH] re-enable CPU_BASELINE=FP16 on Armv7 platform --- cmake/OpenCVCompilerOptimizations.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/cmake/OpenCVCompilerOptimizations.cmake b/cmake/OpenCVCompilerOptimizations.cmake index 11c13b2886..9e4691760c 100644 --- a/cmake/OpenCVCompilerOptimizations.cmake +++ b/cmake/OpenCVCompilerOptimizations.cmake @@ -329,7 +329,7 @@ elseif(ARM OR AARCH64) ocv_update(CPU_VFPV3_FLAGS_ON "-mfpu=vfpv3") ocv_update(CPU_NEON_FLAGS_ON "-mfpu=neon") 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=[^ ]*") endif() ocv_update(CPU_FP16_IMPLIES "NEON") @@ -617,9 +617,6 @@ macro(ocv_compiler_optimization_options) if(ENABLE_POWERPC) add_extra_compiler_option("-mcpu=G3 -mtune=G5") endif() - if(ARM) - add_extra_compiler_option("-mfp16-format=ieee") - endif(ARM) endmacro() macro(ocv_compiler_optimization_options_finalize)