Commit7867267

authored

Merge pull requestopencv#25793 from MaximMilashchenko:hal_rvv

Fixed build error hal_rvv_071opencv#25793Fixed bug with enabling vector header when vector extension is disabled (RVV=OFF) in hal_rvv_071

1 parent284a794 commit7867267Copy full SHA for 7867267

File tree

-2

lines changed

-2

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`#ifndef OPENCV_HAL_RVV_HPP_INCLUDED`
`6`	`6`	`#defineOPENCV_HAL_RVV_HPP_INCLUDED`
`7`	`7`
`8`		`-#include<riscv_vector.h>`
`9`		`-`
`10`	`8`	`#include"opencv2/core/hal/interface.h"`
`11`	`9`
`12`	`10`	`#ifndef CV_HAL_RVV_071_ENABLED`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`#ifndef OPENCV_HAL_RVV_071_HPP_INCLUDED`
`6`	`6`	`#defineOPENCV_HAL_RVV_071_HPP_INCLUDED`
`7`	`7`
	`8`	`+#include<riscv_vector.h>`
	`9`	`+`
`8`	`10`	`#include<limits>`
`9`	`11`
`10`	`12`	`namespacecv {namespacecv_hal_rvv {`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1037,9 +1037,13 @@ foreach(hal ${OpenCV_HAL})`
`1037`	`1037`	`message(STATUS"NDSRVP: Andes GNU Toolchain DSP extension is not open, disabling ndsrvp...")`
`1038`	`1038`	`endif()`
`1039`	`1039`	`elseif(halSTREQUAL"halrvv")`
	`1040`	`+ if(";${CPU_BASELINE_FINAL};"MATCHES";RVV;")`
`1040`	`1041`	`add_subdirectory(3rdparty/hal_rvv/)`
`1041`	`1042`	`ocv_hal_register(RVV_HAL_LIBRARIES RVV_HAL_HEADERS RVV_HAL_INCLUDE_DIRS)`
`1042`	`1043`	`list(APPEND OpenCV_USED_HAL"HAL RVV (ver${RVV_HAL_VERSION})")`
	`1044`	`+ else()`
	`1045`	`+ message(STATUS"HAL RVV: RVV is not available, disabling halrvv...")`
	`1046`	`+ endif()`
`1043`	`1047`	`elseif(halSTREQUAL"openvx")`
`1044`	`1048`	`add_subdirectory(3rdparty/openvx)`
`1045`	`1049`	`ocv_hal_register(OPENVX_HAL_LIBRARIES OPENVX_HAL_HEADERS OPENVX_HAL_INCLUDE_DIRS)`

Comments

(0)