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

Merge pull request #3081 from akarsakov:small_fixes

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-08-13 10:50:33 +00:00
parent 28f3a44e33 713ddb89bd
commit 01bd4961e3
6 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/core/perf/opencl/perf_dxt.cpp
+1 -1
View File
@@ -75,7 +75,7 @@ OCL_PERF_TEST_P(DftFixture, Dft, ::testing::Combine(Values(C2C, R2R, C2R, R2C),
const Size srcSize = get<1>(params);
int flags = get<2>(params);
int in_cn, out_cn;
int in_cn = 0, out_cn = 0;
switch (dft_type)
{
case R2R: flags |= cv::DFT_REAL_OUTPUT; in_cn = 1; out_cn = 1; break;
modules/core/src/matmul.cpp
+3 -2
View File
@@ -781,8 +781,9 @@ void cv::gemm( InputArray matA, InputArray matB, double alpha,
InputArray matC, double beta, OutputArray _matD, int flags )
{
#ifdef HAVE_CLAMDBLAS
CV_OCL_RUN(ocl::haveAmdBlas() && matA.dims() <= 2 && matB.dims() <= 2 && matC.dims() <= 2 && _matD.isUMat(),
ocl_gemm(matA, matB, alpha, matC, beta, _matD, flags))
CV_OCL_RUN(ocl::haveAmdBlas() && matA.dims() <= 2 && matB.dims() <= 2 && matC.dims() <= 2 && _matD.isUMat() &&
matA.cols() > 20 && matA.rows() > 20 && matB.cols() > 20, // since it works incorrect for small sizes
ocl_gemm(matA, matB, alpha, matC, beta, _matD, flags))
#endif
const int block_lin_size = 128;
modules/core/test/ocl/test_gemm.cpp
+3 -2
View File
@@ -90,14 +90,15 @@ PARAM_TEST_CASE(Gemm,
void generateTestData()
{
Size ARoiSize = randomSize(1, MAX_VALUE);
// set minimum size to 20, since testing less sizes doesn't make sense
Size ARoiSize = randomSize(20, MAX_VALUE);
Border ABorder = randomBorder(0, use_roi ? MAX_VALUE : 0);
randomSubMat(A, A_roi, ARoiSize, ABorder, type, -11, 11);
if (atrans)
ARoiSize = Size(ARoiSize.height, ARoiSize.width);
Size BRoiSize = randomSize(1, MAX_VALUE);
Size BRoiSize = randomSize(20, MAX_VALUE);
if (btrans)
BRoiSize.width = ARoiSize.width;
else
modules/core/test/test_eigen.cpp
+1 -1
View File
@@ -164,7 +164,7 @@ void Core_EigenTest_32::run(int) { check_full(CV_32FC1); }
void Core_EigenTest_64::run(int) { check_full(CV_64FC1); }
Core_EigenTest::Core_EigenTest()
: eps_val_32(1e-3f), eps_vec_32(1e-2f),
: eps_val_32(1e-3f), eps_vec_32(12e-3f),
eps_val_64(1e-4f), eps_vec_64(1e-3f), ntests(100) {}
Core_EigenTest::~Core_EigenTest() {}