potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

attempt to add 0d/1d mat support to OpenCV (#23473)

Browse Source 
* attempt to add 0d/1d mat support to OpenCV

* revised the patch; now 1D mat is treated as 1xN 2D mat rather than Nx1.

* a step towards 'green' tests

* another little step towards 'green' tests

* calib test failures seem to be fixed now

* more fixes _core & _dnn

* another step towards green ci; even 0D mat's (a.k.a. scalars) are now partly supported!

* * fixed strange bug in aruco/charuco detector, not sure why it did not work
* also fixed a few remaining failures (hopefully) in dnn & core

* disabled failing GAPI tests - too complex to dig into this compiler pipeline

* hopefully fixed java tests

* trying to fix some more tests

* quick followup fix

* continue to fix test failures and warnings

* quick followup fix

* trying to fix some more tests

* partly fixed support for 0D/scalar UMat's

* use updated parseReduce() from upstream

* trying to fix the remaining test failures

* fixed [ch]aruco tests in Python

* still trying to fix tests

* revert "fix" in dnn's CUDA tensor

* trying to fix dnn+CUDA test failures

* fixed 1D umat creation

* hopefully fixed remaining cuda test failures

* removed training whitespaces
This commit is contained in:
Vadim Pisarevsky
2023-09-21 18:24:38 +03:00
committed by GitHub
parent fdab565711
commit 416bf3253d
80 changed files with 1013 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/ts/src/ts_func.cpp
+3 -3
View File
@@ -2264,7 +2264,7 @@ int cmpEps2( TS* ts, const Mat& a, const Mat& b, double success_err_level,
{
ts->printf( TS::LOG, "%s\n", msg );
}
else if( a.dims == 2 && (a.rows == 1 || a.cols == 1) )
else if( a.dims <= 2 && (a.rows == 1 || a.cols == 1) )
{
ts->printf( TS::LOG, "%s at element %d\n", msg, idx[0] + idx[1] );
}
@@ -2365,7 +2365,7 @@ void gemm( const Mat& _a, const Mat& _b, double alpha,
int b_step = (int)b.step1(), b_delta = cn;
int c_rows = 0, c_cols = 0, c_step = 0, c_delta = 0;
CV_Assert( a.type() == b.type() && a.dims == 2 && b.dims == 2 && cn <= 2 );
CV_Assert( a.type() == b.type() && a.dims <= 2 && b.dims <= 2 && cn <= 2 );
if( flags & cv::GEMM_1_T )
{
@@ -2392,7 +2392,7 @@ void gemm( const Mat& _a, const Mat& _b, double alpha,
std::swap( c_step, c_delta );
}
CV_Assert( c.dims == 2 && c.type() == a.type() && c_rows == a_rows && c_cols == b_cols );
CV_Assert( c.dims <= 2 && c.type() == a.type() && c_rows == a_rows && c_cols == b_cols );
}
d.create(a_rows, b_cols, a.type());