Thanks to visit codestin.com
Credit goes to github.com

Skip to content

add REDUCE_SUM2 #13879

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

Merged
merged 18 commits into from
Apr 28, 2023
Merged

add REDUCE_SUM2 #13879

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
6b46a12
add REDUCE_SUM2
chacha21 Feb 20, 2019
4fac0d5
Update matrix_operations.cpp
chacha21 Feb 20, 2019
b8cca87
added tests
chacha21 Feb 20, 2019
1ed46da
Update test_mat.cpp
chacha21 Feb 21, 2019
fc2e03e
change implementation of SUM_REDUCE2 with init functor
chacha21 Feb 21, 2019
1eb203c
Merge remote-tracking branch 'upstream/master' into REDUCE_SUM2
chacha21 Feb 28, 2019
a9134d0
Parallelize reduceR and reduceC
chacha21 Mar 2, 2019
06f1c71
Merge remote-tracking branch 'upstream/master' into REDUCE_SUM2
chacha21 Mar 2, 2019
b63757e
Merge remote-tracking branch 'upstream/master' into REDUCE_SUM2
chacha21 Mar 13, 2019
a8d3bbe
Merge remote-tracking branch 'upstream/master' into REDUCE_SUM2
chacha21 Mar 13, 2019
3407b84
Merge remote-tracking branch 'upstream/master' into REDUCE_SUM2
chacha21 Apr 3, 2019
614c492
Merge remote-tracking branch 'upstream/master' into REDUCE_SUM2
chacha21 Apr 12, 2019
7dbd344
Merge remote-tracking branch 'upstream/master' into REDUCE_SUM2
chacha21 Dec 18, 2019
a31e488
Update perf_reduce.cpp
chacha21 Dec 18, 2019
8928c36
Merge remote-tracking branch 'upstream/4.x' into pr13879
mshabunin Apr 18, 2023
3f65606
fixup! Update perf_reduce.cpp
mshabunin Apr 18, 2023
251f136
fixup! Update perf_reduce.cpp
mshabunin Apr 18, 2023
b3d34c8
fixup! Update perf_reduce.cpp
mshabunin Apr 18, 2023
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
5 changes: 3 additions & 2 deletions modules/core/include/opencv2/core.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,8 @@ enum KmeansFlags {
enum ReduceTypes { REDUCE_SUM = 0, //!< the output is the sum of all rows/columns of the matrix.
REDUCE_AVG = 1, //!< the output is the mean vector of all rows/columns of the matrix.
REDUCE_MAX = 2, //!< the output is the maximum (column/row-wise) of all rows/columns of the matrix.
REDUCE_MIN = 3 //!< the output is the minimum (column/row-wise) of all rows/columns of the matrix.
REDUCE_MIN = 3, //!< the output is the minimum (column/row-wise) of all rows/columns of the matrix.
REDUCE_SUM2 = 4 //!< the output is the sum of all squared rows/columns of the matrix.
};

//! @} core_array
Expand Down Expand Up @@ -903,7 +904,7 @@ The function #reduce reduces the matrix to a vector by treating the matrix rows/
1D vectors and performing the specified operation on the vectors until a single row/column is
obtained. For example, the function can be used to compute horizontal and vertical projections of a
raster image. In case of #REDUCE_MAX and #REDUCE_MIN , the output image should have the same type as the source one.
In case of #REDUCE_SUM and #REDUCE_AVG , the output may have a larger element bit-depth to preserve accuracy.
In case of #REDUCE_SUM, #REDUCE_SUM2 and #REDUCE_AVG , the output may have a larger element bit-depth to preserve accuracy.
And multi-channel arrays are also supported in these two reduction modes.

The following code demonstrates its usage for a single channel matrix.
Expand Down
5 changes: 2 additions & 3 deletions modules/core/perf/opencl/perf_arithm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1150,7 +1150,7 @@ OCL_PERF_TEST_P(ReduceMinMaxFixture, Reduce,
SANITY_CHECK(dst, eps);
}

CV_ENUM(ReduceAccOp, CV_REDUCE_SUM, CV_REDUCE_AVG)
CV_ENUM(ReduceAccOp, REDUCE_SUM, REDUCE_AVG, REDUCE_SUM2)

typedef tuple<Size, std::pair<MatType, MatType>, int, ReduceAccOp> ReduceAccParams;
typedef TestBaseWithParam<ReduceAccParams> ReduceAccFixture;
Expand All @@ -1168,7 +1168,6 @@ OCL_PERF_TEST_P(ReduceAccFixture, Reduce,
dim = get<2>(params), op = get<3>(params);
const Size srcSize = get<0>(params),
dstSize(dim == 0 ? srcSize.width : 1, dim == 0 ? 1 : srcSize.height);
const double eps = CV_MAT_DEPTH(dtype) <= CV_32S ? 1 : 3e-4;

checkDeviceMaxMemoryAllocSize(srcSize, stype);
checkDeviceMaxMemoryAllocSize(srcSize, dtype);
Expand All @@ -1178,7 +1177,7 @@ OCL_PERF_TEST_P(ReduceAccFixture, Reduce,

OCL_TEST_CYCLE() cv::reduce(src, dst, dim, op, dtype);

SANITY_CHECK(dst, eps);
SANITY_CHECK_NOTHING();
}

} } // namespace opencv_test::ocl
Expand Down
10 changes: 5 additions & 5 deletions modules/core/perf/perf_reduce.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace opencv_test
{
using namespace perf;

CV_ENUM(ROp, CV_REDUCE_SUM, CV_REDUCE_AVG, CV_REDUCE_MAX, CV_REDUCE_MIN)
CV_ENUM(ROp, REDUCE_SUM, REDUCE_AVG, REDUCE_MAX, REDUCE_MIN, REDUCE_SUM2)
typedef tuple<Size, MatType, ROp> Size_MatType_ROp_t;
typedef perf::TestBaseWithParam<Size_MatType_ROp_t> Size_MatType_ROp;

Expand All @@ -23,7 +23,7 @@ PERF_TEST_P(Size_MatType_ROp, reduceR,
int reduceOp = get<2>(GetParam());

int ddepth = -1;
if( CV_MAT_DEPTH(matType) < CV_32S && (reduceOp == REDUCE_SUM || reduceOp == REDUCE_AVG) )
if( CV_MAT_DEPTH(matType) < CV_32S && (reduceOp == REDUCE_SUM || reduceOp == REDUCE_AVG || reduceOp == REDUCE_SUM2) )
ddepth = CV_32S;

Mat src(sz, matType);
Expand All @@ -35,7 +35,7 @@ PERF_TEST_P(Size_MatType_ROp, reduceR,
int runs = 15;
TEST_CYCLE_MULTIRUN(runs) reduce(src, vec, 0, reduceOp, ddepth);

SANITY_CHECK(vec, 1);
SANITY_CHECK_NOTHING();
}

PERF_TEST_P(Size_MatType_ROp, reduceC,
Expand All @@ -51,7 +51,7 @@ PERF_TEST_P(Size_MatType_ROp, reduceC,
int reduceOp = get<2>(GetParam());

int ddepth = -1;
if( CV_MAT_DEPTH(matType)< CV_32S && (reduceOp == REDUCE_SUM || reduceOp == REDUCE_AVG) )
if( CV_MAT_DEPTH(matType)< CV_32S && (reduceOp == REDUCE_SUM || reduceOp == REDUCE_AVG || reduceOp == REDUCE_SUM2) )
ddepth = CV_32S;

Mat src(sz, matType);
Expand All @@ -62,7 +62,7 @@ PERF_TEST_P(Size_MatType_ROp, reduceC,

TEST_CYCLE() reduce(src, vec, 1, reduceOp, ddepth);

SANITY_CHECK(vec, 1);
SANITY_CHECK_NOTHING();
}

typedef tuple<Size, MatType, int> Size_MatType_RMode_t;
Expand Down
Loading