From 19c4d9763828239ca92618b03407eb86cf203f25 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com> Date: Fri, 25 Apr 2025 14:56:42 +0300 Subject: [PATCH] Merge pull request #27252 from asmorkalov:as/extract_hal Extract all HALs from 3rdparty to dedicated folder. #27252 ### 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 --- CMakeLists.txt | 14 +++--- cmake/OpenCVFindLibsPerf.cmake | 2 +- {3rdparty => hal}/carotene/.gitignore | 0 {3rdparty => hal}/carotene/CMakeLists.txt | 0 {3rdparty => hal}/carotene/README.md | 0 {3rdparty => hal}/carotene/hal/CMakeLists.txt | 0 {3rdparty => hal}/carotene/hal/dummy.cpp | 0 {3rdparty => hal}/carotene/hal/tegra_hal.hpp | 0 .../carotene/include/carotene/definitions.hpp | 0 .../carotene/include/carotene/functions.hpp | 4 +- .../carotene/include/carotene/types.hpp | 0 {3rdparty => hal}/carotene/src/absdiff.cpp | 0 {3rdparty => hal}/carotene/src/accumulate.cpp | 0 {3rdparty => hal}/carotene/src/add.cpp | 0 .../carotene/src/add_weighted.cpp | 0 {3rdparty => hal}/carotene/src/bitwise.cpp | 0 {3rdparty => hal}/carotene/src/blur.cpp | 0 {3rdparty => hal}/carotene/src/canny.cpp | 0 .../carotene/src/channel_extract.cpp | 2 +- .../carotene/src/channels_combine.cpp | 0 {3rdparty => hal}/carotene/src/cmp.cpp | 0 .../carotene/src/colorconvert.cpp | 0 {3rdparty => hal}/carotene/src/common.cpp | 0 {3rdparty => hal}/carotene/src/common.hpp | 0 {3rdparty => hal}/carotene/src/convert.cpp | 0 .../carotene/src/convert_depth.cpp | 0 .../carotene/src/convert_scale.cpp | 0 .../carotene/src/convolution.cpp | 0 .../carotene/src/count_nonzero.cpp | 0 {3rdparty => hal}/carotene/src/div.cpp | 0 .../carotene/src/dot_product.cpp | 0 {3rdparty => hal}/carotene/src/dummy.cpp | 0 {3rdparty => hal}/carotene/src/fast.cpp | 0 .../carotene/src/fill_minmaxloc.cpp | 0 {3rdparty => hal}/carotene/src/flip.cpp | 0 .../carotene/src/gaussian_blur.cpp | 0 {3rdparty => hal}/carotene/src/in_range.cpp | 0 {3rdparty => hal}/carotene/src/integral.cpp | 0 {3rdparty => hal}/carotene/src/intrinsics.hpp | 0 {3rdparty => hal}/carotene/src/laplacian.cpp | 0 {3rdparty => hal}/carotene/src/magnitude.cpp | 0 {3rdparty => hal}/carotene/src/meanstddev.cpp | 0 .../carotene/src/median_filter.cpp | 0 {3rdparty => hal}/carotene/src/min_max.cpp | 0 {3rdparty => hal}/carotene/src/minmaxloc.cpp | 0 {3rdparty => hal}/carotene/src/morph.cpp | 0 {3rdparty => hal}/carotene/src/mul.cpp | 0 {3rdparty => hal}/carotene/src/norm.cpp | 0 .../carotene/src/opticalflow.cpp | 0 {3rdparty => hal}/carotene/src/phase.cpp | 0 {3rdparty => hal}/carotene/src/pyramid.cpp | 0 {3rdparty => hal}/carotene/src/reduce.cpp | 0 {3rdparty => hal}/carotene/src/remap.cpp | 0 {3rdparty => hal}/carotene/src/remap.hpp | 0 {3rdparty => hal}/carotene/src/resize.cpp | 0 .../carotene/src/saturate_cast.hpp | 0 {3rdparty => hal}/carotene/src/scharr.cpp | 0 .../carotene/src/separable_filter.cpp | 0 .../carotene/src/separable_filter.hpp | 0 {3rdparty => hal}/carotene/src/sobel.cpp | 0 {3rdparty => hal}/carotene/src/sub.cpp | 0 {3rdparty => hal}/carotene/src/sum.cpp | 0 .../carotene/src/template_matching.cpp | 0 {3rdparty => hal}/carotene/src/threshold.cpp | 0 .../carotene/src/vround_helper.hpp | 0 {3rdparty => hal}/carotene/src/vtransform.hpp | 0 .../carotene/src/warp_affine.cpp | 0 .../carotene/src/warp_perspective.cpp | 0 {3rdparty => hal}/fastcv/CMakeLists.txt | 0 .../fastcv/include/fastcv_hal_core.hpp | 0 .../fastcv/include/fastcv_hal_imgproc.hpp | 0 .../fastcv/include/fastcv_hal_utils.hpp | 0 .../fastcv/src/fastcv_hal_core.cpp | 3 +- .../fastcv/src/fastcv_hal_imgproc.cpp | 4 +- .../fastcv/src/fastcv_hal_utils.cpp | 0 {3rdparty/ipphal => hal/ipp}/CMakeLists.txt | 0 .../ipp}/include/ipp_hal_core.hpp | 0 .../ipphal => hal/ipp}/include/ipp_utils.hpp | 0 .../ipphal => hal/ipp}/src/cart_polar_ipp.cpp | 0 {3rdparty/ipphal => hal/ipp}/src/mean_ipp.cpp | 0 .../ipphal => hal/ipp}/src/minmax_ipp.cpp | 0 {3rdparty/ipphal => hal/ipp}/src/norm_ipp.cpp | 0 .../ipphal => hal/ipp}/src/transforms_ipp.cpp | 0 {3rdparty => hal}/kleidicv/CMakeLists.txt | 0 {3rdparty => hal}/kleidicv/kleidicv.cmake | 0 {3rdparty => hal}/ndsrvp/CMakeLists.txt | 0 {3rdparty => hal}/ndsrvp/include/core.hpp | 0 .../ndsrvp/include/features2d.hpp | 2 +- {3rdparty => hal}/ndsrvp/include/imgproc.hpp | 0 {3rdparty => hal}/ndsrvp/ndsrvp_hal.hpp | 0 .../ndsrvp/src/bilateralFilter.cpp | 0 {3rdparty => hal}/ndsrvp/src/cvutils.cpp | 2 +- {3rdparty => hal}/ndsrvp/src/cvutils.hpp | 2 +- {3rdparty => hal}/ndsrvp/src/filter.cpp | 0 {3rdparty => hal}/ndsrvp/src/integral.cpp | 4 +- {3rdparty => hal}/ndsrvp/src/medianBlur.cpp | 2 +- {3rdparty => hal}/ndsrvp/src/remap.cpp | 0 {3rdparty => hal}/ndsrvp/src/threshold.cpp | 6 +-- {3rdparty => hal}/ndsrvp/src/warpAffine.cpp | 2 +- .../ndsrvp/src/warpPerspective.cpp | 2 +- {3rdparty => hal}/openvx/CMakeLists.txt | 0 {3rdparty => hal}/openvx/README.md | 46 +++++++++---------- {3rdparty => hal}/openvx/hal/CMakeLists.txt | 0 {3rdparty => hal}/openvx/hal/README.md | 0 {3rdparty => hal}/openvx/hal/openvx_hal.cpp | 0 {3rdparty => hal}/openvx/hal/openvx_hal.hpp | 0 {3rdparty => hal}/openvx/include/ivx.hpp | 0 .../openvx/include/ivx_lib_debug.hpp | 0 .../hal_rvv => hal/riscv-rvv}/CMakeLists.txt | 0 .../hal_rvv => hal/riscv-rvv}/hal_rvv.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/atan.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/cart_to_polar.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/cholesky.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/color.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/common.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/compare.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/convert_scale.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/copy_mask.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/div.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/dotprod.hpp | 1 - .../riscv-rvv}/hal_rvv_1p0/dxt.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/exp.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/filter.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/flip.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/histogram.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/integral.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/log.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/lu.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/lut.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/magnitude.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/mean.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/merge.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/minmax.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/moments.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/norm.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/norm_diff.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/norm_hamming.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/polar_to_cart.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/pyramids.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/qr.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/resize.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/sincos.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/split.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/sqrt.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/svd.hpp | 2 +- .../riscv-rvv}/hal_rvv_1p0/thresh.hpp | 8 ++-- .../riscv-rvv}/hal_rvv_1p0/transpose.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/types.hpp | 0 .../riscv-rvv}/hal_rvv_1p0/warp.hpp | 2 +- .../riscv-rvv}/version/hal_rvv_071.hpp | 0 150 files changed, 54 insertions(+), 56 deletions(-) rename {3rdparty => hal}/carotene/.gitignore (100%) rename {3rdparty => hal}/carotene/CMakeLists.txt (100%) rename {3rdparty => hal}/carotene/README.md (100%) rename {3rdparty => hal}/carotene/hal/CMakeLists.txt (100%) rename {3rdparty => hal}/carotene/hal/dummy.cpp (100%) rename {3rdparty => hal}/carotene/hal/tegra_hal.hpp (100%) rename {3rdparty => hal}/carotene/include/carotene/definitions.hpp (100%) rename {3rdparty => hal}/carotene/include/carotene/functions.hpp (99%) rename {3rdparty => hal}/carotene/include/carotene/types.hpp (100%) rename {3rdparty => hal}/carotene/src/absdiff.cpp (100%) rename {3rdparty => hal}/carotene/src/accumulate.cpp (100%) rename {3rdparty => hal}/carotene/src/add.cpp (100%) rename {3rdparty => hal}/carotene/src/add_weighted.cpp (100%) rename {3rdparty => hal}/carotene/src/bitwise.cpp (100%) rename {3rdparty => hal}/carotene/src/blur.cpp (100%) rename {3rdparty => hal}/carotene/src/canny.cpp (100%) rename {3rdparty => hal}/carotene/src/channel_extract.cpp (99%) rename {3rdparty => hal}/carotene/src/channels_combine.cpp (100%) rename {3rdparty => hal}/carotene/src/cmp.cpp (100%) rename {3rdparty => hal}/carotene/src/colorconvert.cpp (100%) rename {3rdparty => hal}/carotene/src/common.cpp (100%) rename {3rdparty => hal}/carotene/src/common.hpp (100%) rename {3rdparty => hal}/carotene/src/convert.cpp (100%) rename {3rdparty => hal}/carotene/src/convert_depth.cpp (100%) rename {3rdparty => hal}/carotene/src/convert_scale.cpp (100%) rename {3rdparty => hal}/carotene/src/convolution.cpp (100%) rename {3rdparty => hal}/carotene/src/count_nonzero.cpp (100%) rename {3rdparty => hal}/carotene/src/div.cpp (100%) rename {3rdparty => hal}/carotene/src/dot_product.cpp (100%) rename {3rdparty => hal}/carotene/src/dummy.cpp (100%) rename {3rdparty => hal}/carotene/src/fast.cpp (100%) rename {3rdparty => hal}/carotene/src/fill_minmaxloc.cpp (100%) rename {3rdparty => hal}/carotene/src/flip.cpp (100%) rename {3rdparty => hal}/carotene/src/gaussian_blur.cpp (100%) rename {3rdparty => hal}/carotene/src/in_range.cpp (100%) rename {3rdparty => hal}/carotene/src/integral.cpp (100%) rename {3rdparty => hal}/carotene/src/intrinsics.hpp (100%) rename {3rdparty => hal}/carotene/src/laplacian.cpp (100%) rename {3rdparty => hal}/carotene/src/magnitude.cpp (100%) rename {3rdparty => hal}/carotene/src/meanstddev.cpp (100%) rename {3rdparty => hal}/carotene/src/median_filter.cpp (100%) rename {3rdparty => hal}/carotene/src/min_max.cpp (100%) rename {3rdparty => hal}/carotene/src/minmaxloc.cpp (100%) rename {3rdparty => hal}/carotene/src/morph.cpp (100%) rename {3rdparty => hal}/carotene/src/mul.cpp (100%) rename {3rdparty => hal}/carotene/src/norm.cpp (100%) rename {3rdparty => hal}/carotene/src/opticalflow.cpp (100%) rename {3rdparty => hal}/carotene/src/phase.cpp (100%) rename {3rdparty => hal}/carotene/src/pyramid.cpp (100%) rename {3rdparty => hal}/carotene/src/reduce.cpp (100%) rename {3rdparty => hal}/carotene/src/remap.cpp (100%) rename {3rdparty => hal}/carotene/src/remap.hpp (100%) rename {3rdparty => hal}/carotene/src/resize.cpp (100%) rename {3rdparty => hal}/carotene/src/saturate_cast.hpp (100%) rename {3rdparty => hal}/carotene/src/scharr.cpp (100%) rename {3rdparty => hal}/carotene/src/separable_filter.cpp (100%) rename {3rdparty => hal}/carotene/src/separable_filter.hpp (100%) rename {3rdparty => hal}/carotene/src/sobel.cpp (100%) rename {3rdparty => hal}/carotene/src/sub.cpp (100%) rename {3rdparty => hal}/carotene/src/sum.cpp (100%) rename {3rdparty => hal}/carotene/src/template_matching.cpp (100%) rename {3rdparty => hal}/carotene/src/threshold.cpp (100%) rename {3rdparty => hal}/carotene/src/vround_helper.hpp (100%) rename {3rdparty => hal}/carotene/src/vtransform.hpp (100%) rename {3rdparty => hal}/carotene/src/warp_affine.cpp (100%) rename {3rdparty => hal}/carotene/src/warp_perspective.cpp (100%) rename {3rdparty => hal}/fastcv/CMakeLists.txt (100%) rename {3rdparty => hal}/fastcv/include/fastcv_hal_core.hpp (100%) rename {3rdparty => hal}/fastcv/include/fastcv_hal_imgproc.hpp (100%) rename {3rdparty => hal}/fastcv/include/fastcv_hal_utils.hpp (100%) rename {3rdparty => hal}/fastcv/src/fastcv_hal_core.cpp (99%) rename {3rdparty => hal}/fastcv/src/fastcv_hal_imgproc.cpp (99%) rename {3rdparty => hal}/fastcv/src/fastcv_hal_utils.cpp (100%) rename {3rdparty/ipphal => hal/ipp}/CMakeLists.txt (100%) rename {3rdparty/ipphal => hal/ipp}/include/ipp_hal_core.hpp (100%) rename {3rdparty/ipphal => hal/ipp}/include/ipp_utils.hpp (100%) rename {3rdparty/ipphal => hal/ipp}/src/cart_polar_ipp.cpp (100%) rename {3rdparty/ipphal => hal/ipp}/src/mean_ipp.cpp (100%) rename {3rdparty/ipphal => hal/ipp}/src/minmax_ipp.cpp (100%) rename {3rdparty/ipphal => hal/ipp}/src/norm_ipp.cpp (100%) rename {3rdparty/ipphal => hal/ipp}/src/transforms_ipp.cpp (100%) rename {3rdparty => hal}/kleidicv/CMakeLists.txt (100%) rename {3rdparty => hal}/kleidicv/kleidicv.cmake (100%) rename {3rdparty => hal}/ndsrvp/CMakeLists.txt (100%) rename {3rdparty => hal}/ndsrvp/include/core.hpp (100%) rename {3rdparty => hal}/ndsrvp/include/features2d.hpp (76%) rename {3rdparty => hal}/ndsrvp/include/imgproc.hpp (100%) rename {3rdparty => hal}/ndsrvp/ndsrvp_hal.hpp (100%) rename {3rdparty => hal}/ndsrvp/src/bilateralFilter.cpp (100%) rename {3rdparty => hal}/ndsrvp/src/cvutils.cpp (98%) rename {3rdparty => hal}/ndsrvp/src/cvutils.hpp (99%) rename {3rdparty => hal}/ndsrvp/src/filter.cpp (100%) rename {3rdparty => hal}/ndsrvp/src/integral.cpp (99%) rename {3rdparty => hal}/ndsrvp/src/medianBlur.cpp (99%) rename {3rdparty => hal}/ndsrvp/src/remap.cpp (100%) rename {3rdparty => hal}/ndsrvp/src/threshold.cpp (96%) rename {3rdparty => hal}/ndsrvp/src/warpAffine.cpp (97%) rename {3rdparty => hal}/ndsrvp/src/warpPerspective.cpp (98%) rename {3rdparty => hal}/openvx/CMakeLists.txt (100%) rename {3rdparty => hal}/openvx/README.md (77%) rename {3rdparty => hal}/openvx/hal/CMakeLists.txt (100%) rename {3rdparty => hal}/openvx/hal/README.md (100%) rename {3rdparty => hal}/openvx/hal/openvx_hal.cpp (100%) rename {3rdparty => hal}/openvx/hal/openvx_hal.hpp (100%) rename {3rdparty => hal}/openvx/include/ivx.hpp (100%) rename {3rdparty => hal}/openvx/include/ivx_lib_debug.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/CMakeLists.txt (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/atan.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/cart_to_polar.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/cholesky.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/color.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/common.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/compare.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/convert_scale.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/copy_mask.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/div.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/dotprod.hpp (99%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/dxt.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/exp.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/filter.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/flip.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/histogram.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/integral.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/log.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/lu.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/lut.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/magnitude.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/mean.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/merge.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/minmax.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/moments.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/norm.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/norm_diff.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/norm_hamming.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/polar_to_cart.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/pyramids.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/qr.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/resize.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/sincos.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/split.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/sqrt.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/svd.hpp (99%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/thresh.hpp (99%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/transpose.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/types.hpp (100%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/hal_rvv_1p0/warp.hpp (99%) rename {3rdparty/hal_rvv => hal/riscv-rvv}/version/hal_rvv_071.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca402b65c9..870bfdd723 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1005,7 +1005,7 @@ endif() foreach(hal ${OpenCV_HAL}) if(hal STREQUAL "carotene") if(";${CPU_BASELINE_FINAL};" MATCHES ";NEON;") - add_subdirectory(3rdparty/carotene/hal) + add_subdirectory(hal/carotene/hal) ocv_hal_register(CAROTENE_HAL_LIBRARIES CAROTENE_HAL_HEADERS CAROTENE_HAL_INCLUDE_DIRS) list(APPEND OpenCV_USED_HAL "carotene (ver ${CAROTENE_HAL_VERSION})") else() @@ -1013,19 +1013,19 @@ foreach(hal ${OpenCV_HAL}) endif() elseif(hal STREQUAL "fastcv") if((ARM OR AARCH64) AND (ANDROID OR (UNIX AND NOT APPLE AND NOT IOS AND NOT XROS))) - add_subdirectory(3rdparty/fastcv) + add_subdirectory(hal/fastcv) ocv_hal_register(FASTCV_HAL_LIBRARIES FASTCV_HAL_HEADERS FASTCV_HAL_INCLUDE_DIRS) list(APPEND OpenCV_USED_HAL "fastcv (ver ${FASTCV_HAL_VERSION})") else() message(STATUS "FastCV: fastcv is not available, disabling fastcv...") endif() elseif(hal STREQUAL "kleidicv") - add_subdirectory(3rdparty/kleidicv) + add_subdirectory(hal/kleidicv) ocv_hal_register(KLEIDICV_HAL_LIBRARIES KLEIDICV_HAL_HEADERS KLEIDICV_HAL_INCLUDE_DIRS) list(APPEND OpenCV_USED_HAL "KleidiCV (ver ${KLEIDICV_HAL_VERSION})") elseif(hal STREQUAL "ndsrvp") if(CMAKE_C_FLAGS MATCHES "-mext-dsp" AND CMAKE_CXX_FLAGS MATCHES "-mext-dsp" AND NOT ";${CPU_BASELINE_FINAL};" MATCHES ";RVV;") - add_subdirectory(3rdparty/ndsrvp) + add_subdirectory(hal/ndsrvp) ocv_hal_register(NDSRVP_HAL_LIBRARIES NDSRVP_HAL_HEADERS NDSRVP_HAL_INCLUDE_DIRS) list(APPEND OpenCV_USED_HAL "ndsrvp (ver ${NDSRVP_HAL_VERSION})") else() @@ -1033,18 +1033,18 @@ foreach(hal ${OpenCV_HAL}) endif() elseif(hal STREQUAL "halrvv") if(";${CPU_BASELINE_FINAL};" MATCHES ";RVV;") - add_subdirectory(3rdparty/hal_rvv/) + add_subdirectory(hal/riscv-rvv) ocv_hal_register(RVV_HAL_LIBRARIES RVV_HAL_HEADERS RVV_HAL_INCLUDE_DIRS) list(APPEND OpenCV_USED_HAL "HAL RVV (ver ${RVV_HAL_VERSION})") else() message(STATUS "HAL RVV: RVV is not available, disabling halrvv...") endif() elseif(hal STREQUAL "ipp") - add_subdirectory(3rdparty/ipphal) + add_subdirectory(hal/ipp) ocv_hal_register(IPP_HAL_LIBRARIES IPP_HAL_HEADERS IPP_HAL_INCLUDE_DIRS) list(APPEND OpenCV_USED_HAL "ipp (ver ${IPP_HAL_VERSION})") elseif(hal STREQUAL "openvx") - add_subdirectory(3rdparty/openvx) + add_subdirectory(hal/openvx) ocv_hal_register(OPENVX_HAL_LIBRARIES OPENVX_HAL_HEADERS OPENVX_HAL_INCLUDE_DIRS) list(APPEND OpenCV_USED_HAL "openvx (ver ${OPENVX_HAL_VERSION})") else() diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake index 012b80a182..6d1d786517 100644 --- a/cmake/OpenCVFindLibsPerf.cmake +++ b/cmake/OpenCVFindLibsPerf.cmake @@ -169,7 +169,7 @@ if(WITH_KLEIDICV) set(HAVE_KLEIDICV ON) endif() if(NOT HAVE_KLEIDICV) - include("${OpenCV_SOURCE_DIR}/3rdparty/kleidicv/kleidicv.cmake") + include("${OpenCV_SOURCE_DIR}/hal/kleidicv/kleidicv.cmake") download_kleidicv(KLEIDICV_SOURCE_PATH) if(KLEIDICV_SOURCE_PATH) set(HAVE_KLEIDICV ON) diff --git a/3rdparty/carotene/.gitignore b/hal/carotene/.gitignore similarity index 100% rename from 3rdparty/carotene/.gitignore rename to hal/carotene/.gitignore diff --git a/3rdparty/carotene/CMakeLists.txt b/hal/carotene/CMakeLists.txt similarity index 100% rename from 3rdparty/carotene/CMakeLists.txt rename to hal/carotene/CMakeLists.txt diff --git a/3rdparty/carotene/README.md b/hal/carotene/README.md similarity index 100% rename from 3rdparty/carotene/README.md rename to hal/carotene/README.md diff --git a/3rdparty/carotene/hal/CMakeLists.txt b/hal/carotene/hal/CMakeLists.txt similarity index 100% rename from 3rdparty/carotene/hal/CMakeLists.txt rename to hal/carotene/hal/CMakeLists.txt diff --git a/3rdparty/carotene/hal/dummy.cpp b/hal/carotene/hal/dummy.cpp similarity index 100% rename from 3rdparty/carotene/hal/dummy.cpp rename to hal/carotene/hal/dummy.cpp diff --git a/3rdparty/carotene/hal/tegra_hal.hpp b/hal/carotene/hal/tegra_hal.hpp similarity index 100% rename from 3rdparty/carotene/hal/tegra_hal.hpp rename to hal/carotene/hal/tegra_hal.hpp diff --git a/3rdparty/carotene/include/carotene/definitions.hpp b/hal/carotene/include/carotene/definitions.hpp similarity index 100% rename from 3rdparty/carotene/include/carotene/definitions.hpp rename to hal/carotene/include/carotene/definitions.hpp diff --git a/3rdparty/carotene/include/carotene/functions.hpp b/hal/carotene/include/carotene/functions.hpp similarity index 99% rename from 3rdparty/carotene/include/carotene/functions.hpp rename to hal/carotene/include/carotene/functions.hpp index 8a4fa3efdd..06f1adf3b3 100644 --- a/3rdparty/carotene/include/carotene/functions.hpp +++ b/hal/carotene/include/carotene/functions.hpp @@ -359,7 +359,7 @@ namespace CAROTENE_NS { /* For each point `p` within `size`, do: - dst[p] = src0[p] * scale / src1[p] + dst[p] = src0[p] * scale / src1[p] NOTE: ROUND_TO_ZERO convert policy is used */ @@ -420,7 +420,7 @@ namespace CAROTENE_NS { /* For each point `p` within `size`, do: - dst[p] = scale / src[p] + dst[p] = scale / src[p] NOTE: ROUND_TO_ZERO convert policy is used */ diff --git a/3rdparty/carotene/include/carotene/types.hpp b/hal/carotene/include/carotene/types.hpp similarity index 100% rename from 3rdparty/carotene/include/carotene/types.hpp rename to hal/carotene/include/carotene/types.hpp diff --git a/3rdparty/carotene/src/absdiff.cpp b/hal/carotene/src/absdiff.cpp similarity index 100% rename from 3rdparty/carotene/src/absdiff.cpp rename to hal/carotene/src/absdiff.cpp diff --git a/3rdparty/carotene/src/accumulate.cpp b/hal/carotene/src/accumulate.cpp similarity index 100% rename from 3rdparty/carotene/src/accumulate.cpp rename to hal/carotene/src/accumulate.cpp diff --git a/3rdparty/carotene/src/add.cpp b/hal/carotene/src/add.cpp similarity index 100% rename from 3rdparty/carotene/src/add.cpp rename to hal/carotene/src/add.cpp diff --git a/3rdparty/carotene/src/add_weighted.cpp b/hal/carotene/src/add_weighted.cpp similarity index 100% rename from 3rdparty/carotene/src/add_weighted.cpp rename to hal/carotene/src/add_weighted.cpp diff --git a/3rdparty/carotene/src/bitwise.cpp b/hal/carotene/src/bitwise.cpp similarity index 100% rename from 3rdparty/carotene/src/bitwise.cpp rename to hal/carotene/src/bitwise.cpp diff --git a/3rdparty/carotene/src/blur.cpp b/hal/carotene/src/blur.cpp similarity index 100% rename from 3rdparty/carotene/src/blur.cpp rename to hal/carotene/src/blur.cpp diff --git a/3rdparty/carotene/src/canny.cpp b/hal/carotene/src/canny.cpp similarity index 100% rename from 3rdparty/carotene/src/canny.cpp rename to hal/carotene/src/canny.cpp diff --git a/3rdparty/carotene/src/channel_extract.cpp b/hal/carotene/src/channel_extract.cpp similarity index 99% rename from 3rdparty/carotene/src/channel_extract.cpp rename to hal/carotene/src/channel_extract.cpp index ff4fb3770c..904a047b7e 100644 --- a/3rdparty/carotene/src/channel_extract.cpp +++ b/hal/carotene/src/channel_extract.cpp @@ -378,7 +378,7 @@ void extract4(const Size2D &size, vst1q_##sgn##bits(dst1 + d1j, vals.v4.val[3]); \ } -#endif +#endif #define SPLIT4ALPHA(sgn,bits) void split4(const Size2D &_size, \ const sgn##bits * srcBase, ptrdiff_t srcStride, \ diff --git a/3rdparty/carotene/src/channels_combine.cpp b/hal/carotene/src/channels_combine.cpp similarity index 100% rename from 3rdparty/carotene/src/channels_combine.cpp rename to hal/carotene/src/channels_combine.cpp diff --git a/3rdparty/carotene/src/cmp.cpp b/hal/carotene/src/cmp.cpp similarity index 100% rename from 3rdparty/carotene/src/cmp.cpp rename to hal/carotene/src/cmp.cpp diff --git a/3rdparty/carotene/src/colorconvert.cpp b/hal/carotene/src/colorconvert.cpp similarity index 100% rename from 3rdparty/carotene/src/colorconvert.cpp rename to hal/carotene/src/colorconvert.cpp diff --git a/3rdparty/carotene/src/common.cpp b/hal/carotene/src/common.cpp similarity index 100% rename from 3rdparty/carotene/src/common.cpp rename to hal/carotene/src/common.cpp diff --git a/3rdparty/carotene/src/common.hpp b/hal/carotene/src/common.hpp similarity index 100% rename from 3rdparty/carotene/src/common.hpp rename to hal/carotene/src/common.hpp diff --git a/3rdparty/carotene/src/convert.cpp b/hal/carotene/src/convert.cpp similarity index 100% rename from 3rdparty/carotene/src/convert.cpp rename to hal/carotene/src/convert.cpp diff --git a/3rdparty/carotene/src/convert_depth.cpp b/hal/carotene/src/convert_depth.cpp similarity index 100% rename from 3rdparty/carotene/src/convert_depth.cpp rename to hal/carotene/src/convert_depth.cpp diff --git a/3rdparty/carotene/src/convert_scale.cpp b/hal/carotene/src/convert_scale.cpp similarity index 100% rename from 3rdparty/carotene/src/convert_scale.cpp rename to hal/carotene/src/convert_scale.cpp diff --git a/3rdparty/carotene/src/convolution.cpp b/hal/carotene/src/convolution.cpp similarity index 100% rename from 3rdparty/carotene/src/convolution.cpp rename to hal/carotene/src/convolution.cpp diff --git a/3rdparty/carotene/src/count_nonzero.cpp b/hal/carotene/src/count_nonzero.cpp similarity index 100% rename from 3rdparty/carotene/src/count_nonzero.cpp rename to hal/carotene/src/count_nonzero.cpp diff --git a/3rdparty/carotene/src/div.cpp b/hal/carotene/src/div.cpp similarity index 100% rename from 3rdparty/carotene/src/div.cpp rename to hal/carotene/src/div.cpp diff --git a/3rdparty/carotene/src/dot_product.cpp b/hal/carotene/src/dot_product.cpp similarity index 100% rename from 3rdparty/carotene/src/dot_product.cpp rename to hal/carotene/src/dot_product.cpp diff --git a/3rdparty/carotene/src/dummy.cpp b/hal/carotene/src/dummy.cpp similarity index 100% rename from 3rdparty/carotene/src/dummy.cpp rename to hal/carotene/src/dummy.cpp diff --git a/3rdparty/carotene/src/fast.cpp b/hal/carotene/src/fast.cpp similarity index 100% rename from 3rdparty/carotene/src/fast.cpp rename to hal/carotene/src/fast.cpp diff --git a/3rdparty/carotene/src/fill_minmaxloc.cpp b/hal/carotene/src/fill_minmaxloc.cpp similarity index 100% rename from 3rdparty/carotene/src/fill_minmaxloc.cpp rename to hal/carotene/src/fill_minmaxloc.cpp diff --git a/3rdparty/carotene/src/flip.cpp b/hal/carotene/src/flip.cpp similarity index 100% rename from 3rdparty/carotene/src/flip.cpp rename to hal/carotene/src/flip.cpp diff --git a/3rdparty/carotene/src/gaussian_blur.cpp b/hal/carotene/src/gaussian_blur.cpp similarity index 100% rename from 3rdparty/carotene/src/gaussian_blur.cpp rename to hal/carotene/src/gaussian_blur.cpp diff --git a/3rdparty/carotene/src/in_range.cpp b/hal/carotene/src/in_range.cpp similarity index 100% rename from 3rdparty/carotene/src/in_range.cpp rename to hal/carotene/src/in_range.cpp diff --git a/3rdparty/carotene/src/integral.cpp b/hal/carotene/src/integral.cpp similarity index 100% rename from 3rdparty/carotene/src/integral.cpp rename to hal/carotene/src/integral.cpp diff --git a/3rdparty/carotene/src/intrinsics.hpp b/hal/carotene/src/intrinsics.hpp similarity index 100% rename from 3rdparty/carotene/src/intrinsics.hpp rename to hal/carotene/src/intrinsics.hpp diff --git a/3rdparty/carotene/src/laplacian.cpp b/hal/carotene/src/laplacian.cpp similarity index 100% rename from 3rdparty/carotene/src/laplacian.cpp rename to hal/carotene/src/laplacian.cpp diff --git a/3rdparty/carotene/src/magnitude.cpp b/hal/carotene/src/magnitude.cpp similarity index 100% rename from 3rdparty/carotene/src/magnitude.cpp rename to hal/carotene/src/magnitude.cpp diff --git a/3rdparty/carotene/src/meanstddev.cpp b/hal/carotene/src/meanstddev.cpp similarity index 100% rename from 3rdparty/carotene/src/meanstddev.cpp rename to hal/carotene/src/meanstddev.cpp diff --git a/3rdparty/carotene/src/median_filter.cpp b/hal/carotene/src/median_filter.cpp similarity index 100% rename from 3rdparty/carotene/src/median_filter.cpp rename to hal/carotene/src/median_filter.cpp diff --git a/3rdparty/carotene/src/min_max.cpp b/hal/carotene/src/min_max.cpp similarity index 100% rename from 3rdparty/carotene/src/min_max.cpp rename to hal/carotene/src/min_max.cpp diff --git a/3rdparty/carotene/src/minmaxloc.cpp b/hal/carotene/src/minmaxloc.cpp similarity index 100% rename from 3rdparty/carotene/src/minmaxloc.cpp rename to hal/carotene/src/minmaxloc.cpp diff --git a/3rdparty/carotene/src/morph.cpp b/hal/carotene/src/morph.cpp similarity index 100% rename from 3rdparty/carotene/src/morph.cpp rename to hal/carotene/src/morph.cpp diff --git a/3rdparty/carotene/src/mul.cpp b/hal/carotene/src/mul.cpp similarity index 100% rename from 3rdparty/carotene/src/mul.cpp rename to hal/carotene/src/mul.cpp diff --git a/3rdparty/carotene/src/norm.cpp b/hal/carotene/src/norm.cpp similarity index 100% rename from 3rdparty/carotene/src/norm.cpp rename to hal/carotene/src/norm.cpp diff --git a/3rdparty/carotene/src/opticalflow.cpp b/hal/carotene/src/opticalflow.cpp similarity index 100% rename from 3rdparty/carotene/src/opticalflow.cpp rename to hal/carotene/src/opticalflow.cpp diff --git a/3rdparty/carotene/src/phase.cpp b/hal/carotene/src/phase.cpp similarity index 100% rename from 3rdparty/carotene/src/phase.cpp rename to hal/carotene/src/phase.cpp diff --git a/3rdparty/carotene/src/pyramid.cpp b/hal/carotene/src/pyramid.cpp similarity index 100% rename from 3rdparty/carotene/src/pyramid.cpp rename to hal/carotene/src/pyramid.cpp diff --git a/3rdparty/carotene/src/reduce.cpp b/hal/carotene/src/reduce.cpp similarity index 100% rename from 3rdparty/carotene/src/reduce.cpp rename to hal/carotene/src/reduce.cpp diff --git a/3rdparty/carotene/src/remap.cpp b/hal/carotene/src/remap.cpp similarity index 100% rename from 3rdparty/carotene/src/remap.cpp rename to hal/carotene/src/remap.cpp diff --git a/3rdparty/carotene/src/remap.hpp b/hal/carotene/src/remap.hpp similarity index 100% rename from 3rdparty/carotene/src/remap.hpp rename to hal/carotene/src/remap.hpp diff --git a/3rdparty/carotene/src/resize.cpp b/hal/carotene/src/resize.cpp similarity index 100% rename from 3rdparty/carotene/src/resize.cpp rename to hal/carotene/src/resize.cpp diff --git a/3rdparty/carotene/src/saturate_cast.hpp b/hal/carotene/src/saturate_cast.hpp similarity index 100% rename from 3rdparty/carotene/src/saturate_cast.hpp rename to hal/carotene/src/saturate_cast.hpp diff --git a/3rdparty/carotene/src/scharr.cpp b/hal/carotene/src/scharr.cpp similarity index 100% rename from 3rdparty/carotene/src/scharr.cpp rename to hal/carotene/src/scharr.cpp diff --git a/3rdparty/carotene/src/separable_filter.cpp b/hal/carotene/src/separable_filter.cpp similarity index 100% rename from 3rdparty/carotene/src/separable_filter.cpp rename to hal/carotene/src/separable_filter.cpp diff --git a/3rdparty/carotene/src/separable_filter.hpp b/hal/carotene/src/separable_filter.hpp similarity index 100% rename from 3rdparty/carotene/src/separable_filter.hpp rename to hal/carotene/src/separable_filter.hpp diff --git a/3rdparty/carotene/src/sobel.cpp b/hal/carotene/src/sobel.cpp similarity index 100% rename from 3rdparty/carotene/src/sobel.cpp rename to hal/carotene/src/sobel.cpp diff --git a/3rdparty/carotene/src/sub.cpp b/hal/carotene/src/sub.cpp similarity index 100% rename from 3rdparty/carotene/src/sub.cpp rename to hal/carotene/src/sub.cpp diff --git a/3rdparty/carotene/src/sum.cpp b/hal/carotene/src/sum.cpp similarity index 100% rename from 3rdparty/carotene/src/sum.cpp rename to hal/carotene/src/sum.cpp diff --git a/3rdparty/carotene/src/template_matching.cpp b/hal/carotene/src/template_matching.cpp similarity index 100% rename from 3rdparty/carotene/src/template_matching.cpp rename to hal/carotene/src/template_matching.cpp diff --git a/3rdparty/carotene/src/threshold.cpp b/hal/carotene/src/threshold.cpp similarity index 100% rename from 3rdparty/carotene/src/threshold.cpp rename to hal/carotene/src/threshold.cpp diff --git a/3rdparty/carotene/src/vround_helper.hpp b/hal/carotene/src/vround_helper.hpp similarity index 100% rename from 3rdparty/carotene/src/vround_helper.hpp rename to hal/carotene/src/vround_helper.hpp diff --git a/3rdparty/carotene/src/vtransform.hpp b/hal/carotene/src/vtransform.hpp similarity index 100% rename from 3rdparty/carotene/src/vtransform.hpp rename to hal/carotene/src/vtransform.hpp diff --git a/3rdparty/carotene/src/warp_affine.cpp b/hal/carotene/src/warp_affine.cpp similarity index 100% rename from 3rdparty/carotene/src/warp_affine.cpp rename to hal/carotene/src/warp_affine.cpp diff --git a/3rdparty/carotene/src/warp_perspective.cpp b/hal/carotene/src/warp_perspective.cpp similarity index 100% rename from 3rdparty/carotene/src/warp_perspective.cpp rename to hal/carotene/src/warp_perspective.cpp diff --git a/3rdparty/fastcv/CMakeLists.txt b/hal/fastcv/CMakeLists.txt similarity index 100% rename from 3rdparty/fastcv/CMakeLists.txt rename to hal/fastcv/CMakeLists.txt diff --git a/3rdparty/fastcv/include/fastcv_hal_core.hpp b/hal/fastcv/include/fastcv_hal_core.hpp similarity index 100% rename from 3rdparty/fastcv/include/fastcv_hal_core.hpp rename to hal/fastcv/include/fastcv_hal_core.hpp diff --git a/3rdparty/fastcv/include/fastcv_hal_imgproc.hpp b/hal/fastcv/include/fastcv_hal_imgproc.hpp similarity index 100% rename from 3rdparty/fastcv/include/fastcv_hal_imgproc.hpp rename to hal/fastcv/include/fastcv_hal_imgproc.hpp diff --git a/3rdparty/fastcv/include/fastcv_hal_utils.hpp b/hal/fastcv/include/fastcv_hal_utils.hpp similarity index 100% rename from 3rdparty/fastcv/include/fastcv_hal_utils.hpp rename to hal/fastcv/include/fastcv_hal_utils.hpp diff --git a/3rdparty/fastcv/src/fastcv_hal_core.cpp b/hal/fastcv/src/fastcv_hal_core.cpp similarity index 99% rename from 3rdparty/fastcv/src/fastcv_hal_core.cpp rename to hal/fastcv/src/fastcv_hal_core.cpp index bc7459bcf4..5bb35817f3 100644 --- a/3rdparty/fastcv/src/fastcv_hal_core.cpp +++ b/hal/fastcv/src/fastcv_hal_core.cpp @@ -704,7 +704,6 @@ int fastcv_hal_gemm32f( fcvMatrixMultiplyf32_v2(src2p, m, k, src2_step, src1p, n, src1_step, dst_temp2.ptr(), dst_temp2.step[0]); fcvTransposef32_v2(dst_temp2.ptr(), n, k, dst_temp2.step[0], dstp, dst_stride); - } else { @@ -738,4 +737,4 @@ int fastcv_hal_gemm32f( } CV_HAL_RETURN(status,hal_gemm32f); -} \ No newline at end of file +} diff --git a/3rdparty/fastcv/src/fastcv_hal_imgproc.cpp b/hal/fastcv/src/fastcv_hal_imgproc.cpp similarity index 99% rename from 3rdparty/fastcv/src/fastcv_hal_imgproc.cpp rename to hal/fastcv/src/fastcv_hal_imgproc.cpp index c04998cc44..34d1e8f41c 100644 --- a/3rdparty/fastcv/src/fastcv_hal_imgproc.cpp +++ b/hal/fastcv/src/fastcv_hal_imgproc.cpp @@ -452,7 +452,7 @@ int fastcv_hal_boxFilter( nStripes = nThreads; stripeHeight = src.rows/nThreads; } - + cv::parallel_for_(cv::Range(0, nStripes), FcvBoxLoop_Invoker(src, width, height, dst_temp, border_type, ksize_width, normalize, stripeHeight, nStripes, src_depth), nStripes); @@ -1139,4 +1139,4 @@ int fastcv_hal_canny( CV_HAL_RETURN_NOT_IMPLEMENTED(cv::format("Ksize:%d is not supported", ksize)); } CV_HAL_RETURN(status, hal_canny); -} \ No newline at end of file +} diff --git a/3rdparty/fastcv/src/fastcv_hal_utils.cpp b/hal/fastcv/src/fastcv_hal_utils.cpp similarity index 100% rename from 3rdparty/fastcv/src/fastcv_hal_utils.cpp rename to hal/fastcv/src/fastcv_hal_utils.cpp diff --git a/3rdparty/ipphal/CMakeLists.txt b/hal/ipp/CMakeLists.txt similarity index 100% rename from 3rdparty/ipphal/CMakeLists.txt rename to hal/ipp/CMakeLists.txt diff --git a/3rdparty/ipphal/include/ipp_hal_core.hpp b/hal/ipp/include/ipp_hal_core.hpp similarity index 100% rename from 3rdparty/ipphal/include/ipp_hal_core.hpp rename to hal/ipp/include/ipp_hal_core.hpp diff --git a/3rdparty/ipphal/include/ipp_utils.hpp b/hal/ipp/include/ipp_utils.hpp similarity index 100% rename from 3rdparty/ipphal/include/ipp_utils.hpp rename to hal/ipp/include/ipp_utils.hpp diff --git a/3rdparty/ipphal/src/cart_polar_ipp.cpp b/hal/ipp/src/cart_polar_ipp.cpp similarity index 100% rename from 3rdparty/ipphal/src/cart_polar_ipp.cpp rename to hal/ipp/src/cart_polar_ipp.cpp diff --git a/3rdparty/ipphal/src/mean_ipp.cpp b/hal/ipp/src/mean_ipp.cpp similarity index 100% rename from 3rdparty/ipphal/src/mean_ipp.cpp rename to hal/ipp/src/mean_ipp.cpp diff --git a/3rdparty/ipphal/src/minmax_ipp.cpp b/hal/ipp/src/minmax_ipp.cpp similarity index 100% rename from 3rdparty/ipphal/src/minmax_ipp.cpp rename to hal/ipp/src/minmax_ipp.cpp diff --git a/3rdparty/ipphal/src/norm_ipp.cpp b/hal/ipp/src/norm_ipp.cpp similarity index 100% rename from 3rdparty/ipphal/src/norm_ipp.cpp rename to hal/ipp/src/norm_ipp.cpp diff --git a/3rdparty/ipphal/src/transforms_ipp.cpp b/hal/ipp/src/transforms_ipp.cpp similarity index 100% rename from 3rdparty/ipphal/src/transforms_ipp.cpp rename to hal/ipp/src/transforms_ipp.cpp diff --git a/3rdparty/kleidicv/CMakeLists.txt b/hal/kleidicv/CMakeLists.txt similarity index 100% rename from 3rdparty/kleidicv/CMakeLists.txt rename to hal/kleidicv/CMakeLists.txt diff --git a/3rdparty/kleidicv/kleidicv.cmake b/hal/kleidicv/kleidicv.cmake similarity index 100% rename from 3rdparty/kleidicv/kleidicv.cmake rename to hal/kleidicv/kleidicv.cmake diff --git a/3rdparty/ndsrvp/CMakeLists.txt b/hal/ndsrvp/CMakeLists.txt similarity index 100% rename from 3rdparty/ndsrvp/CMakeLists.txt rename to hal/ndsrvp/CMakeLists.txt diff --git a/3rdparty/ndsrvp/include/core.hpp b/hal/ndsrvp/include/core.hpp similarity index 100% rename from 3rdparty/ndsrvp/include/core.hpp rename to hal/ndsrvp/include/core.hpp diff --git a/3rdparty/ndsrvp/include/features2d.hpp b/hal/ndsrvp/include/features2d.hpp similarity index 76% rename from 3rdparty/ndsrvp/include/features2d.hpp rename to hal/ndsrvp/include/features2d.hpp index 1f6180a795..d0f9ddd31e 100644 --- a/3rdparty/ndsrvp/include/features2d.hpp +++ b/hal/ndsrvp/include/features2d.hpp @@ -1,6 +1,6 @@ // This file is part of OpenCV project. // It is subject to the license terms in the LICENSE file found in the top-level directory -// of this distribution and at http://opencv.org/license.html. +// of this distribution and at http://opencv.org/license.html. #ifndef OPENCV_NDSRVP_FEATURES2D_HPP #define OPENCV_NDSRVP_FEATURES2D_HPP diff --git a/3rdparty/ndsrvp/include/imgproc.hpp b/hal/ndsrvp/include/imgproc.hpp similarity index 100% rename from 3rdparty/ndsrvp/include/imgproc.hpp rename to hal/ndsrvp/include/imgproc.hpp diff --git a/3rdparty/ndsrvp/ndsrvp_hal.hpp b/hal/ndsrvp/ndsrvp_hal.hpp similarity index 100% rename from 3rdparty/ndsrvp/ndsrvp_hal.hpp rename to hal/ndsrvp/ndsrvp_hal.hpp diff --git a/3rdparty/ndsrvp/src/bilateralFilter.cpp b/hal/ndsrvp/src/bilateralFilter.cpp similarity index 100% rename from 3rdparty/ndsrvp/src/bilateralFilter.cpp rename to hal/ndsrvp/src/bilateralFilter.cpp diff --git a/3rdparty/ndsrvp/src/cvutils.cpp b/hal/ndsrvp/src/cvutils.cpp similarity index 98% rename from 3rdparty/ndsrvp/src/cvutils.cpp rename to hal/ndsrvp/src/cvutils.cpp index 6afac5136d..ba1e4daaaa 100644 --- a/3rdparty/ndsrvp/src/cvutils.cpp +++ b/hal/ndsrvp/src/cvutils.cpp @@ -1,6 +1,6 @@ // This file is part of OpenCV project. // It is subject to the license terms in the LICENSE file found in the top-level directory -// of this distribution and at http://opencv.org/license.html. +// of this distribution and at http://opencv.org/license.html. #include "cvutils.hpp" diff --git a/3rdparty/ndsrvp/src/cvutils.hpp b/hal/ndsrvp/src/cvutils.hpp similarity index 99% rename from 3rdparty/ndsrvp/src/cvutils.hpp rename to hal/ndsrvp/src/cvutils.hpp index 78bb11d95f..d1b38b4bd6 100644 --- a/3rdparty/ndsrvp/src/cvutils.hpp +++ b/hal/ndsrvp/src/cvutils.hpp @@ -1,6 +1,6 @@ // This file is part of OpenCV project. // It is subject to the license terms in the LICENSE file found in the top-level directory -// of this distribution and at http://opencv.org/license.html. +// of this distribution and at http://opencv.org/license.html. #ifndef OPENCV_NDSRVP_CVUTILS_HPP #define OPENCV_NDSRVP_CVUTILS_HPP diff --git a/3rdparty/ndsrvp/src/filter.cpp b/hal/ndsrvp/src/filter.cpp similarity index 100% rename from 3rdparty/ndsrvp/src/filter.cpp rename to hal/ndsrvp/src/filter.cpp diff --git a/3rdparty/ndsrvp/src/integral.cpp b/hal/ndsrvp/src/integral.cpp similarity index 99% rename from 3rdparty/ndsrvp/src/integral.cpp rename to hal/ndsrvp/src/integral.cpp index e1dd993a90..8fc7f367a7 100644 --- a/3rdparty/ndsrvp/src/integral.cpp +++ b/hal/ndsrvp/src/integral.cpp @@ -1,6 +1,6 @@ // This file is part of OpenCV project. // It is subject to the license terms in the LICENSE file found in the top-level directory -// of this distribution and at http://opencv.org/license.html. +// of this distribution and at http://opencv.org/license.html. #include "ndsrvp_hal.hpp" #include "opencv2/imgproc/hal/interface.h" @@ -49,7 +49,7 @@ int integral(int depth, int sdepth, int sqdepth, int j = 0; for (; j + 8 <= width; j += 8) { - unsigned long vs8x8 = *(unsigned long*)(src_row + j); + unsigned long vs8x8 = *(unsigned long*)(src_row + j); unsigned long vs810 = __nds__zunpkd810(vs8x8); unsigned long vs832 = __nds__zunpkd832(vs8x8); diff --git a/3rdparty/ndsrvp/src/medianBlur.cpp b/hal/ndsrvp/src/medianBlur.cpp similarity index 99% rename from 3rdparty/ndsrvp/src/medianBlur.cpp rename to hal/ndsrvp/src/medianBlur.cpp index c511367f31..286a30dc82 100644 --- a/3rdparty/ndsrvp/src/medianBlur.cpp +++ b/hal/ndsrvp/src/medianBlur.cpp @@ -287,7 +287,7 @@ int medianBlur(const uchar* src_data, size_t src_step, medianBlur_SortNet( src_data_rep, src_step, dst_data, dst_step, width, height, cn, ksize ); else if( depth == CV_16S ) medianBlur_SortNet( src_data_rep, src_step, dst_data, dst_step, width, height, cn, ksize ); - else + else return CV_HAL_ERROR_NOT_IMPLEMENTED; return CV_HAL_ERROR_OK; diff --git a/3rdparty/ndsrvp/src/remap.cpp b/hal/ndsrvp/src/remap.cpp similarity index 100% rename from 3rdparty/ndsrvp/src/remap.cpp rename to hal/ndsrvp/src/remap.cpp diff --git a/3rdparty/ndsrvp/src/threshold.cpp b/hal/ndsrvp/src/threshold.cpp similarity index 96% rename from 3rdparty/ndsrvp/src/threshold.cpp rename to hal/ndsrvp/src/threshold.cpp index 0812100311..43c65114f7 100644 --- a/3rdparty/ndsrvp/src/threshold.cpp +++ b/hal/ndsrvp/src/threshold.cpp @@ -1,6 +1,6 @@ // This file is part of OpenCV project. // It is subject to the license terms in the LICENSE file found in the top-level directory -// of this distribution and at http://opencv.org/license.html. +// of this distribution and at http://opencv.org/license.html. #include "ndsrvp_hal.hpp" #include "opencv2/imgproc/hal/interface.h" @@ -129,13 +129,13 @@ int threshold(const uchar* src_data, size_t src_step, { threshold_op, threshold_op, - threshold_op, + threshold_op, threshold_op, threshold_op }, { threshold_op, threshold_op, - threshold_op, + threshold_op, threshold_op, threshold_op }, { diff --git a/3rdparty/ndsrvp/src/warpAffine.cpp b/hal/ndsrvp/src/warpAffine.cpp similarity index 97% rename from 3rdparty/ndsrvp/src/warpAffine.cpp rename to hal/ndsrvp/src/warpAffine.cpp index 4257361d1d..dbb7f4e238 100644 --- a/3rdparty/ndsrvp/src/warpAffine.cpp +++ b/hal/ndsrvp/src/warpAffine.cpp @@ -1,6 +1,6 @@ // This file is part of OpenCV project. // It is subject to the license terms in the LICENSE file found in the top-level directory -// of this distribution and at http://opencv.org/license.html. +// of this distribution and at http://opencv.org/license.html. #include "ndsrvp_hal.hpp" #include "opencv2/imgproc/hal/interface.h" diff --git a/3rdparty/ndsrvp/src/warpPerspective.cpp b/hal/ndsrvp/src/warpPerspective.cpp similarity index 98% rename from 3rdparty/ndsrvp/src/warpPerspective.cpp rename to hal/ndsrvp/src/warpPerspective.cpp index 40e44729d9..70f3ede134 100644 --- a/3rdparty/ndsrvp/src/warpPerspective.cpp +++ b/hal/ndsrvp/src/warpPerspective.cpp @@ -1,6 +1,6 @@ // This file is part of OpenCV project. // It is subject to the license terms in the LICENSE file found in the top-level directory -// of this distribution and at http://opencv.org/license.html. +// of this distribution and at http://opencv.org/license.html. #include "ndsrvp_hal.hpp" #include "opencv2/imgproc/hal/interface.h" diff --git a/3rdparty/openvx/CMakeLists.txt b/hal/openvx/CMakeLists.txt similarity index 100% rename from 3rdparty/openvx/CMakeLists.txt rename to hal/openvx/CMakeLists.txt diff --git a/3rdparty/openvx/README.md b/hal/openvx/README.md similarity index 77% rename from 3rdparty/openvx/README.md rename to hal/openvx/README.md index 3c89ba4bee..bcb7943547 100644 --- a/3rdparty/openvx/README.md +++ b/hal/openvx/README.md @@ -19,33 +19,33 @@ The following short sample gives basic knowledge on the wrappers usage: int main() { - vx_uint32 width = 640, height = 480; - try - { - ivx::Context context = ivx::Context::create(); - ivx::Graph graph = ivx::Graph::create(context); - ivx::Image - gray = ivx::Image::create(context, width, height, VX_DF_IMAGE_U8), - gb = ivx::Image::createVirtual(graph), - res = ivx::Image::create(context, width, height, VX_DF_IMAGE_U8); + vx_uint32 width = 640, height = 480; + try + { + ivx::Context context = ivx::Context::create(); + ivx::Graph graph = ivx::Graph::create(context); + ivx::Image + gray = ivx::Image::create(context, width, height, VX_DF_IMAGE_U8), + gb = ivx::Image::createVirtual(graph), + res = ivx::Image::create(context, width, height, VX_DF_IMAGE_U8); - context.loadKernels("openvx-debug"); // ivx::debug::* + context.loadKernels("openvx-debug"); // ivx::debug::* - ivx::debug::fReadImage(context, inputPath, gray); + ivx::debug::fReadImage(context, inputPath, gray); - ivx::Node::create(graph, VX_KERNEL_GAUSSIAN_3x3, gray, gb); - ivx::Node::create( - graph, - VX_KERNEL_THRESHOLD, - gb, - ivx::Threshold::createBinary(context, VX_TYPE_UINT8, 50), - res - ); + ivx::Node::create(graph, VX_KERNEL_GAUSSIAN_3x3, gray, gb); + ivx::Node::create( + graph, + VX_KERNEL_THRESHOLD, + gb, + ivx::Threshold::createBinary(context, VX_TYPE_UINT8, 50), + res + ); - graph.verify(); - graph.process(); + graph.verify(); + graph.process(); - ivx::debug::fWriteImage(context, res, "ovx-res-cpp.pgm"); + ivx::debug::fWriteImage(context, res, "ovx-res-cpp.pgm"); } catch (const ivx::RuntimeError& e) { @@ -65,7 +65,7 @@ int main() return 0; } - + ``` ## C++ API overview diff --git a/3rdparty/openvx/hal/CMakeLists.txt b/hal/openvx/hal/CMakeLists.txt similarity index 100% rename from 3rdparty/openvx/hal/CMakeLists.txt rename to hal/openvx/hal/CMakeLists.txt diff --git a/3rdparty/openvx/hal/README.md b/hal/openvx/hal/README.md similarity index 100% rename from 3rdparty/openvx/hal/README.md rename to hal/openvx/hal/README.md diff --git a/3rdparty/openvx/hal/openvx_hal.cpp b/hal/openvx/hal/openvx_hal.cpp similarity index 100% rename from 3rdparty/openvx/hal/openvx_hal.cpp rename to hal/openvx/hal/openvx_hal.cpp diff --git a/3rdparty/openvx/hal/openvx_hal.hpp b/hal/openvx/hal/openvx_hal.hpp similarity index 100% rename from 3rdparty/openvx/hal/openvx_hal.hpp rename to hal/openvx/hal/openvx_hal.hpp diff --git a/3rdparty/openvx/include/ivx.hpp b/hal/openvx/include/ivx.hpp similarity index 100% rename from 3rdparty/openvx/include/ivx.hpp rename to hal/openvx/include/ivx.hpp diff --git a/3rdparty/openvx/include/ivx_lib_debug.hpp b/hal/openvx/include/ivx_lib_debug.hpp similarity index 100% rename from 3rdparty/openvx/include/ivx_lib_debug.hpp rename to hal/openvx/include/ivx_lib_debug.hpp diff --git a/3rdparty/hal_rvv/CMakeLists.txt b/hal/riscv-rvv/CMakeLists.txt similarity index 100% rename from 3rdparty/hal_rvv/CMakeLists.txt rename to hal/riscv-rvv/CMakeLists.txt diff --git a/3rdparty/hal_rvv/hal_rvv.hpp b/hal/riscv-rvv/hal_rvv.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv.hpp rename to hal/riscv-rvv/hal_rvv.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/atan.hpp b/hal/riscv-rvv/hal_rvv_1p0/atan.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/atan.hpp rename to hal/riscv-rvv/hal_rvv_1p0/atan.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/cart_to_polar.hpp b/hal/riscv-rvv/hal_rvv_1p0/cart_to_polar.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/cart_to_polar.hpp rename to hal/riscv-rvv/hal_rvv_1p0/cart_to_polar.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/cholesky.hpp b/hal/riscv-rvv/hal_rvv_1p0/cholesky.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/cholesky.hpp rename to hal/riscv-rvv/hal_rvv_1p0/cholesky.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/color.hpp b/hal/riscv-rvv/hal_rvv_1p0/color.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/color.hpp rename to hal/riscv-rvv/hal_rvv_1p0/color.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/common.hpp b/hal/riscv-rvv/hal_rvv_1p0/common.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/common.hpp rename to hal/riscv-rvv/hal_rvv_1p0/common.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/compare.hpp b/hal/riscv-rvv/hal_rvv_1p0/compare.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/compare.hpp rename to hal/riscv-rvv/hal_rvv_1p0/compare.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/convert_scale.hpp b/hal/riscv-rvv/hal_rvv_1p0/convert_scale.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/convert_scale.hpp rename to hal/riscv-rvv/hal_rvv_1p0/convert_scale.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/copy_mask.hpp b/hal/riscv-rvv/hal_rvv_1p0/copy_mask.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/copy_mask.hpp rename to hal/riscv-rvv/hal_rvv_1p0/copy_mask.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/div.hpp b/hal/riscv-rvv/hal_rvv_1p0/div.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/div.hpp rename to hal/riscv-rvv/hal_rvv_1p0/div.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/dotprod.hpp b/hal/riscv-rvv/hal_rvv_1p0/dotprod.hpp similarity index 99% rename from 3rdparty/hal_rvv/hal_rvv_1p0/dotprod.hpp rename to hal/riscv-rvv/hal_rvv_1p0/dotprod.hpp index 1f53aa56b1..e16a97cf6a 100644 --- a/3rdparty/hal_rvv/hal_rvv_1p0/dotprod.hpp +++ b/hal/riscv-rvv/hal_rvv_1p0/dotprod.hpp @@ -231,4 +231,3 @@ inline int dotprod(const uchar *a_data, size_t a_step, const uchar *b_data, size }}} // cv::cv_hal_rvv::dotprod #endif // OPENCV_HAL_RVV_DOTPROD_HPP_INCLUDED - diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/dxt.hpp b/hal/riscv-rvv/hal_rvv_1p0/dxt.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/dxt.hpp rename to hal/riscv-rvv/hal_rvv_1p0/dxt.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/exp.hpp b/hal/riscv-rvv/hal_rvv_1p0/exp.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/exp.hpp rename to hal/riscv-rvv/hal_rvv_1p0/exp.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/filter.hpp b/hal/riscv-rvv/hal_rvv_1p0/filter.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/filter.hpp rename to hal/riscv-rvv/hal_rvv_1p0/filter.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/flip.hpp b/hal/riscv-rvv/hal_rvv_1p0/flip.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/flip.hpp rename to hal/riscv-rvv/hal_rvv_1p0/flip.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/histogram.hpp b/hal/riscv-rvv/hal_rvv_1p0/histogram.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/histogram.hpp rename to hal/riscv-rvv/hal_rvv_1p0/histogram.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/integral.hpp b/hal/riscv-rvv/hal_rvv_1p0/integral.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/integral.hpp rename to hal/riscv-rvv/hal_rvv_1p0/integral.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/log.hpp b/hal/riscv-rvv/hal_rvv_1p0/log.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/log.hpp rename to hal/riscv-rvv/hal_rvv_1p0/log.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/lu.hpp b/hal/riscv-rvv/hal_rvv_1p0/lu.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/lu.hpp rename to hal/riscv-rvv/hal_rvv_1p0/lu.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/lut.hpp b/hal/riscv-rvv/hal_rvv_1p0/lut.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/lut.hpp rename to hal/riscv-rvv/hal_rvv_1p0/lut.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/magnitude.hpp b/hal/riscv-rvv/hal_rvv_1p0/magnitude.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/magnitude.hpp rename to hal/riscv-rvv/hal_rvv_1p0/magnitude.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/mean.hpp b/hal/riscv-rvv/hal_rvv_1p0/mean.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/mean.hpp rename to hal/riscv-rvv/hal_rvv_1p0/mean.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/merge.hpp b/hal/riscv-rvv/hal_rvv_1p0/merge.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/merge.hpp rename to hal/riscv-rvv/hal_rvv_1p0/merge.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/minmax.hpp b/hal/riscv-rvv/hal_rvv_1p0/minmax.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/minmax.hpp rename to hal/riscv-rvv/hal_rvv_1p0/minmax.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/moments.hpp b/hal/riscv-rvv/hal_rvv_1p0/moments.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/moments.hpp rename to hal/riscv-rvv/hal_rvv_1p0/moments.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/norm.hpp b/hal/riscv-rvv/hal_rvv_1p0/norm.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/norm.hpp rename to hal/riscv-rvv/hal_rvv_1p0/norm.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/norm_diff.hpp b/hal/riscv-rvv/hal_rvv_1p0/norm_diff.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/norm_diff.hpp rename to hal/riscv-rvv/hal_rvv_1p0/norm_diff.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/norm_hamming.hpp b/hal/riscv-rvv/hal_rvv_1p0/norm_hamming.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/norm_hamming.hpp rename to hal/riscv-rvv/hal_rvv_1p0/norm_hamming.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/polar_to_cart.hpp b/hal/riscv-rvv/hal_rvv_1p0/polar_to_cart.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/polar_to_cart.hpp rename to hal/riscv-rvv/hal_rvv_1p0/polar_to_cart.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/pyramids.hpp b/hal/riscv-rvv/hal_rvv_1p0/pyramids.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/pyramids.hpp rename to hal/riscv-rvv/hal_rvv_1p0/pyramids.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/qr.hpp b/hal/riscv-rvv/hal_rvv_1p0/qr.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/qr.hpp rename to hal/riscv-rvv/hal_rvv_1p0/qr.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/resize.hpp b/hal/riscv-rvv/hal_rvv_1p0/resize.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/resize.hpp rename to hal/riscv-rvv/hal_rvv_1p0/resize.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/sincos.hpp b/hal/riscv-rvv/hal_rvv_1p0/sincos.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/sincos.hpp rename to hal/riscv-rvv/hal_rvv_1p0/sincos.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/split.hpp b/hal/riscv-rvv/hal_rvv_1p0/split.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/split.hpp rename to hal/riscv-rvv/hal_rvv_1p0/split.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/sqrt.hpp b/hal/riscv-rvv/hal_rvv_1p0/sqrt.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/sqrt.hpp rename to hal/riscv-rvv/hal_rvv_1p0/sqrt.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/svd.hpp b/hal/riscv-rvv/hal_rvv_1p0/svd.hpp similarity index 99% rename from 3rdparty/hal_rvv/hal_rvv_1p0/svd.hpp rename to hal/riscv-rvv/hal_rvv_1p0/svd.hpp index dfe644ad06..2ecad0671e 100644 --- a/3rdparty/hal_rvv/hal_rvv_1p0/svd.hpp +++ b/hal/riscv-rvv/hal_rvv_1p0/svd.hpp @@ -243,7 +243,7 @@ inline int SVD(T* src, size_t src_step, T* w, T*, size_t, T* vt, size_t vt_step, } } } - + auto vec_sum = RVV_T::vmv(0, vlmax); for( k = 0; k < m; k += vl ) { diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/thresh.hpp b/hal/riscv-rvv/hal_rvv_1p0/thresh.hpp similarity index 99% rename from 3rdparty/hal_rvv/hal_rvv_1p0/thresh.hpp rename to hal/riscv-rvv/hal_rvv_1p0/thresh.hpp index 5842540c35..738e3d5012 100644 --- a/3rdparty/hal_rvv/hal_rvv_1p0/thresh.hpp +++ b/hal/riscv-rvv/hal_rvv_1p0/thresh.hpp @@ -298,9 +298,9 @@ static inline int adaptiveThreshold(int start, int end, const uchar* src_data, s { if (i >= 0 && i < height) { - for (int j = 0; j < left; j++) + for (int j = 0; j < left; j++) process(i, j); - for (int j = right; j < width; j++) + for (int j = right; j < width; j++) process(i, j); int vl; @@ -378,9 +378,9 @@ static inline int adaptiveThreshold(int start, int end, const uchar* src_data, s { if (i >= 0 && i < height) { - for (int j = 0; j < left; j++) + for (int j = 0; j < left; j++) process(i, j); - for (int j = right; j < width; j++) + for (int j = right; j < width; j++) process(i, j); int vl; diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/transpose.hpp b/hal/riscv-rvv/hal_rvv_1p0/transpose.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/transpose.hpp rename to hal/riscv-rvv/hal_rvv_1p0/transpose.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/types.hpp b/hal/riscv-rvv/hal_rvv_1p0/types.hpp similarity index 100% rename from 3rdparty/hal_rvv/hal_rvv_1p0/types.hpp rename to hal/riscv-rvv/hal_rvv_1p0/types.hpp diff --git a/3rdparty/hal_rvv/hal_rvv_1p0/warp.hpp b/hal/riscv-rvv/hal_rvv_1p0/warp.hpp similarity index 99% rename from 3rdparty/hal_rvv/hal_rvv_1p0/warp.hpp rename to hal/riscv-rvv/hal_rvv_1p0/warp.hpp index d9fcf9c109..f207c7cb95 100644 --- a/3rdparty/hal_rvv/hal_rvv_1p0/warp.hpp +++ b/hal/riscv-rvv/hal_rvv_1p0/warp.hpp @@ -834,7 +834,7 @@ inline int remap32f(int src_type, const uchar *src_data, size_t src_step, int sr case CV_HAL_INTER_NEAREST*100 + CV_32FC1: case CV_HAL_INTER_LINEAR*100 + CV_32FC1: return invoke(dst_width, dst_height, {remap32fC1}, s16, src_data, src_step, src_width, src_height, dst_data, dst_step, dst_width, mapx, mapx_step, mapy, mapy_step, interpolation, border_type, border_value); - + case CV_HAL_INTER_CUBIC*100 + CV_8UC1: return invoke(dst_width, dst_height, {remap32fCubic}, s16, src_data, src_step, src_width, src_height, dst_data, dst_step, dst_width, mapx, mapx_step, mapy, mapy_step, interpolation, border_type, border_value); case CV_HAL_INTER_CUBIC*100 + CV_16UC1: diff --git a/3rdparty/hal_rvv/version/hal_rvv_071.hpp b/hal/riscv-rvv/version/hal_rvv_071.hpp similarity index 100% rename from 3rdparty/hal_rvv/version/hal_rvv_071.hpp rename to hal/riscv-rvv/version/hal_rvv_071.hpp