Skip to content

5.x merge 4.x #3688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 18 commits into from
Closed

5.x merge 4.x #3688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
927aff6
Enable AscendC kernel operator
hipudding Dec 21, 2023
09ed18d
Remove redundant code
MengqingCao Feb 21, 2024
bbce2ef
Merge pull request #3614 from hipudding:ascendc
asmorkalov Feb 29, 2024
1ad3ad5
Merge pull request #3646 from Dhanwanth1803:latch
Dhanwanth1803 Mar 5, 2024
1aaf6e1
Merge pull request #3638 from mshabunin:doc-upgrade
mshabunin Mar 5, 2024
6b5142f
Merge pull request #3647 from AleksandrPanov:add_to_mcc_detect_and_in…
Mar 7, 2024
b9a9931
remove false from findDataFile
AleksandrPanov Mar 15, 2024
bf95e79
Merge pull request #3695 from vpisarev:disabled_aruco_tutorial_tests
alalek Mar 15, 2024
d75a1c3
Two simple fixes to We Char QR Code module:
ylatkin Mar 15, 2024
3157cc1
Exclude "2_qrcodes.png" for `opencv_perf_wechat_qrcode` test,
ylatkin Mar 19, 2024
b42682b
Merge pull request #3698 from elatkin:4.x_wechat_qrcode_fix_dims_and_…
alalek Mar 20, 2024
35f0b6e
Fix data corruption in WeChatQRCode::impl::decode
ylatkin Mar 20, 2024
270d2aa
wechat: fix uninitialized values in tests
mshabunin Mar 20, 2024
db093af
Add `const` qualifier to `candidate_points` at WeChatQRCode::impl::de…
ylatkin Mar 21, 2024
56869b7
rename cv::float16_t to cv::hfloat (#3697)
fengyuentau Mar 21, 2024
c8fb2f2
Merge pull request #3702 from mshabunin:fix-wechat-test
alalek Mar 22, 2024
9373b72
Merge pull request #3701 from elatkin:4.x_fix_data_corruption_wechat_…
alalek Mar 22, 2024
37e63d4
Merge branch 4.x
asmorkalov Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions modules/aruco/test/test_aruco_tutorial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace opencv_test { namespace {

TEST(CV_ArucoTutorial, can_find_singlemarkersoriginal)
{
string img_path = cvtest::findDataFile("aruco/singlemarkersoriginal.jpg", false);
string img_path = cvtest::findDataFile("aruco/singlemarkersoriginal.jpg");
Mat image = imread(img_path);
aruco::ArucoDetector detector(aruco::getPredefinedDictionary(aruco::DICT_6X6_250));

Expand Down Expand Up @@ -44,9 +44,9 @@ TEST(CV_ArucoTutorial, can_find_singlemarkersoriginal)

TEST(CV_ArucoTutorial, can_find_gboriginal)
{
string imgPath = cvtest::findDataFile("aruco/gboriginal.jpg", false);
string imgPath = cvtest::findDataFile("aruco/gboriginal.jpg");
Mat image = imread(imgPath);
string dictPath = cvtest::findDataFile("aruco/tutorial_dict.yml", false);
string dictPath = cvtest::findDataFile("aruco/tutorial_dict.yml");
aruco::Dictionary dictionary;

FileStorage fs(dictPath, FileStorage::READ);
Expand Down Expand Up @@ -99,7 +99,7 @@ TEST(CV_ArucoTutorial, can_find_gboriginal)

TEST(CV_ArucoTutorial, can_find_choriginal)
{
string imgPath = cvtest::findDataFile("aruco/choriginal.jpg", false);
string imgPath = cvtest::findDataFile("aruco/choriginal.jpg");
Mat image = imread(imgPath);
aruco::ArucoDetector detector(aruco::getPredefinedDictionary(aruco::DICT_6X6_250));

Expand Down Expand Up @@ -138,7 +138,7 @@ TEST(CV_ArucoTutorial, can_find_choriginal)

TEST(CV_ArucoTutorial, can_find_chocclusion)
{
string imgPath = cvtest::findDataFile("aruco/chocclusion_original.jpg", false);
string imgPath = cvtest::findDataFile("aruco/chocclusion_original.jpg");
Mat image = imread(imgPath);
aruco::ArucoDetector detector(aruco::getPredefinedDictionary(aruco::DICT_6X6_250));

Expand Down Expand Up @@ -176,15 +176,15 @@ TEST(CV_ArucoTutorial, can_find_chocclusion)

TEST(CV_ArucoTutorial, can_find_diamondmarkers)
{
string imgPath = cvtest::findDataFile("aruco/diamondmarkers.jpg", false);
string imgPath = cvtest::findDataFile("aruco/diamondmarkers.jpg");
Mat image = imread(imgPath);

string dictPath = cvtest::findDataFile("aruco/tutorial_dict.yml", false);
string dictPath = cvtest::findDataFile("aruco/tutorial_dict.yml");
aruco::Dictionary dictionary;
FileStorage fs(dictPath, FileStorage::READ);
dictionary.aruco::Dictionary::readDictionary(fs.root()); // set marker from tutorial_dict.yml

string detectorPath = cvtest::findDataFile("aruco/detector_params.yml", false);
string detectorPath = cvtest::findDataFile("aruco/detector_params.yml");
fs = FileStorage(detectorPath, FileStorage::READ);
aruco::DetectorParameters detectorParams;
detectorParams.readDetectorParameters(fs.root());
Expand Down
6 changes: 6 additions & 0 deletions modules/cannops/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ ocv_include_directories(${CMAKE_SOURCE_DIR}/modules/ts/include)
ocv_add_accuracy_tests(DEPENDS_ON opencv_cannops)
ocv_add_perf_tests(DEPENDS_ON opencv_cannops)
ocv_add_samples(opencv_cannops)

# compile ascnedc kernels.
add_subdirectory(ascendc_kernels)
ocv_include_directories(${CMAKE_BINARY_DIR}/include/ascendc_kernels)
ocv_target_link_libraries(opencv_cannops PRIVATE ascendc_kernels)
ocv_target_link_libraries(opencv_test_cannops PRIVATE ascendc_kernels)
17 changes: 17 additions & 0 deletions modules/cannops/ascendc_kernels/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
set(SOC_VERSION "ascend310p3" CACHE STRING "system on chip type")
set(ASCEND_CANN_PACKAGE_PATH "/usr/local/Ascend/ascend-toolkit/latest" CACHE PATH "ASCEND CANN package installation directory")
set(RUN_MODE "npu" CACHE STRING "run mode: npu/sim/cpu")

if(EXISTS ${ASCEND_CANN_PACKAGE_PATH}/compiler/tikcpp/ascendc_kernel_cmake)
set(ASCENDC_CMAKE_DIR ${ASCEND_CANN_PACKAGE_PATH}/compiler/tikcpp/ascendc_kernel_cmake)
elseif(EXISTS ${ASCEND_CANN_PACKAGE_PATH}/ascendc_devkit/tikcpp/samples/cmake)
set(ASCENDC_CMAKE_DIR ${ASCEND_CANN_PACKAGE_PATH}/ascendc_devkit/tikcpp/samples/cmake)
else()
message(FATAL_ERROR "ascendc_kernel_cmake does not exist, please check whether the compiler package is installed.")
endif()

include(${ASCENDC_CMAKE_DIR}/ascendc.cmake)

ascendc_library(ascendc_kernels STATIC
threshold_opencv_kernel.cpp
)
22 changes: 22 additions & 0 deletions modules/cannops/ascendc_kernels/kernel_tiling_types.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#ifndef KERNEL_TILING_H
#define KERNEL_TILING_H

/*
* threshType:
* THRESH_BINARY = 0,
* THRESH_BINARY_INV = 1,
* THRESH_TRUNC = 2,
* THRESH_TOZERO = 3,
* THRESH_TOZERO_INV = 4,
*/
#pragma pack(push, 8)
struct ThresholdOpencvTilingData
{
float maxVal;
float thresh;
uint32_t totalLength;
uint8_t threshType;
uint8_t dtype;
};
#pragma pack(pop)
#endif // KERNEL_TILING_H
Loading
Loading