Commit db6a6cca authored by Tomoaki Teshima's avatar Tomoaki Teshima

re-enable CPU_BASELINE=FP16 on Armv7 platform

parent edf2cbd5
...@@ -329,7 +329,7 @@ elseif(ARM OR AARCH64) ...@@ -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) ...@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment