Skip to content

O
opencv
Commit f07250ac authored by Vladislav Vinogradov's avatar Vladislav Vinogradov
Browse files
Options

updated gpu performance tests

parent 5cc4d23d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 586 additions and 565 deletions
modules/gpu/perf/perf_calib3d.cpp
View file @ f07250ac
This diff is collapsed.
modules/gpu/perf/perf_features2d.cpp
View file @ f07250ac
...@@ -3,185 +3,207 @@ ...@@ -3,185 +3,207 @@
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// BruteForceMatcher_match // SURF
GPU_PERF_TEST(BruteForceMatcher_match, cv::gpu::DeviceInfo, int) GPU_PERF_TEST_1(SURF, cv::gpu::DeviceInfo)
{ {
cv::gpu::DeviceInfo devInfo = GET_PARAM(0); cv::gpu::DeviceInfo devInfo = GetParam();
int desc_size = GET_PARAM(1);
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat query_host(3000, desc_size, CV_32FC1); cv::Mat img_host = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE);
cv::Mat train_host(3000, desc_size, CV_32FC1); ASSERT_FALSE(img_host.empty());
declare.in(query_host, train_host, WARMUP_RNG); cv::gpu::SURF_GPU surf;
cv::gpu::GpuMat query(query_host); cv::gpu::GpuMat img(img_host);
cv::gpu::GpuMat train(train_host); cv::gpu::GpuMat keypoints, descriptors;
cv::gpu::GpuMat trainIdx, distance;
cv::gpu::BFMatcher_GPU matcher(cv::NORM_L2); surf(img, cv::gpu::GpuMat(), keypoints, descriptors);
declare.time(3.0); declare.time(2.0);
TEST_CYCLE() TEST_CYCLE()
{ {
matcher.matchSingle(query, train, trainIdx, distance); surf(img, cv::gpu::GpuMat(), keypoints, descriptors);
} }
} }
INSTANTIATE_TEST_CASE_P(Features2D, BruteForceMatcher_match, testing::Combine( INSTANTIATE_TEST_CASE_P(Features2D, SURF, ALL_DEVICES);
ALL_DEVICES,
testing::Values(64, 128, 256)));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// BruteForceMatcher_knnMatch // FAST
GPU_PERF_TEST(BruteForceMatcher_knnMatch, cv::gpu::DeviceInfo, int, int) GPU_PERF_TEST_1(FAST, cv::gpu::DeviceInfo)
{ {
cv::gpu::DeviceInfo devInfo = GET_PARAM(0); cv::gpu::DeviceInfo devInfo = GetParam();
int desc_size = GET_PARAM(1);
int k = GET_PARAM(2);
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat query_host(3000, desc_size, CV_32FC1); cv::Mat img_host = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE);
cv::Mat train_host(3000, desc_size, CV_32FC1); ASSERT_FALSE(img_host.empty());
declare.in(query_host, train_host, WARMUP_RNG); cv::gpu::FAST_GPU fast(20);
cv::gpu::GpuMat query(query_host); cv::gpu::GpuMat img(img_host);
cv::gpu::GpuMat train(train_host); cv::gpu::GpuMat keypoints;
cv::gpu::GpuMat trainIdx, distance, allDist;
cv::gpu::BFMatcher_GPU matcher(cv::NORM_L2);
declare.time(3.0); fast(img, cv::gpu::GpuMat(), keypoints);
TEST_CYCLE() TEST_CYCLE()
{ {
matcher.knnMatchSingle(query, train, trainIdx, distance, allDist, k); fast(img, cv::gpu::GpuMat(), keypoints);
} }
} }
INSTANTIATE_TEST_CASE_P(Features2D, BruteForceMatcher_knnMatch, testing::Combine( INSTANTIATE_TEST_CASE_P(Features2D, FAST, ALL_DEVICES);
ALL_DEVICES,
testing::Values(64, 128, 256),
testing::Values(2, 3)));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// BruteForceMatcher_radiusMatch // ORB
GPU_PERF_TEST(BruteForceMatcher_radiusMatch, cv::gpu::DeviceInfo, int) GPU_PERF_TEST_1(ORB, cv::gpu::DeviceInfo)
{ {
cv::gpu::DeviceInfo devInfo = GET_PARAM(0); cv::gpu::DeviceInfo devInfo = GetParam();
int desc_size = GET_PARAM(1);
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat query_host(3000, desc_size, CV_32FC1); cv::Mat img_host = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE);
cv::Mat train_host(3000, desc_size, CV_32FC1); ASSERT_FALSE(img_host.empty());
fill(query_host, 0, 1);
fill(train_host, 0, 1);
cv::gpu::GpuMat query(query_host);
cv::gpu::GpuMat train(train_host);
cv::gpu::GpuMat trainIdx, nMatches, distance;
cv::gpu::BFMatcher_GPU matcher(cv::NORM_L2); cv::gpu::ORB_GPU orb(4000);
declare.time(3.0); cv::gpu::GpuMat img(img_host);
cv::gpu::GpuMat keypoints, descriptors;
TEST_CYCLE() TEST_CYCLE()
{ {
matcher.radiusMatchSingle(query, train, trainIdx, distance, nMatches, 2.0); orb(img, cv::gpu::GpuMat(), keypoints, descriptors);
} }
} }
INSTANTIATE_TEST_CASE_P(Features2D, BruteForceMatcher_radiusMatch, testing::Combine( INSTANTIATE_TEST_CASE_P(Features2D, ORB, ALL_DEVICES);
ALL_DEVICES,
testing::Values(64, 128, 256)));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// SURF // BruteForceMatcher_match
GPU_PERF_TEST_1(SURF, cv::gpu::DeviceInfo) IMPLEMENT_PARAM_CLASS(DescriptorSize, int)
{
cv::gpu::DeviceInfo devInfo = GetParam();
GPU_PERF_TEST(BruteForceMatcher_match, cv::gpu::DeviceInfo, DescriptorSize, NormType)
{
cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat img_host = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE); int desc_size = GET_PARAM(1);
int normType = GET_PARAM(2);
ASSERT_FALSE(img_host.empty()); int type = normType == cv::NORM_HAMMING ? CV_8U : CV_32F;
cv::gpu::GpuMat img(img_host); cv::Mat query_host(3000, desc_size, type);
cv::gpu::GpuMat keypoints, descriptors; fill(query_host, 0.0, 10.0);
cv::gpu::SURF_GPU surf; cv::Mat train_host(3000, desc_size, type);
fill(train_host, 0.0, 10.0);
declare.time(2.0); cv::gpu::BFMatcher_GPU matcher(normType);
cv::gpu::GpuMat query(query_host);
cv::gpu::GpuMat train(train_host);
cv::gpu::GpuMat trainIdx, distance;
matcher.matchSingle(query, train, trainIdx, distance);
declare.time(3.0);
TEST_CYCLE() TEST_CYCLE()
{ {
surf(img, cv::gpu::GpuMat(), keypoints, descriptors); matcher.matchSingle(query, train, trainIdx, distance);
} }
} }
INSTANTIATE_TEST_CASE_P(Features2D, SURF, DEVICES(cv::gpu::GLOBAL_ATOMICS)); INSTANTIATE_TEST_CASE_P(Features2D, BruteForceMatcher_match, testing::Combine(
ALL_DEVICES,
testing::Values(DescriptorSize(64), DescriptorSize(128), DescriptorSize(256)),
testing::Values(NormType(cv::NORM_L1), NormType(cv::NORM_L2), NormType(cv::NORM_HAMMING))));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// FAST // BruteForceMatcher_knnMatch
GPU_PERF_TEST_1(FAST, cv::gpu::DeviceInfo) IMPLEMENT_PARAM_CLASS(K, int)
{
cv::gpu::DeviceInfo devInfo = GetParam();
GPU_PERF_TEST(BruteForceMatcher_knnMatch, cv::gpu::DeviceInfo, DescriptorSize, K, NormType)
{
cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat img_host = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE); int desc_size = GET_PARAM(1);
int k = GET_PARAM(2);
int normType = GET_PARAM(3);
ASSERT_FALSE(img_host.empty()); int type = normType == cv::NORM_HAMMING ? CV_8U : CV_32F;
cv::gpu::GpuMat img(img_host); cv::Mat query_host(3000, desc_size, type);
cv::gpu::GpuMat keypoints, descriptors; fill(query_host, 0.0, 10.0);
cv::gpu::FAST_GPU fastGPU(20); cv::Mat train_host(3000, desc_size, type);
fill(train_host, 0.0, 10.0);
cv::gpu::BFMatcher_GPU matcher(normType);
cv::gpu::GpuMat query(query_host);
cv::gpu::GpuMat train(train_host);
cv::gpu::GpuMat trainIdx, distance, allDist;
matcher.knnMatchSingle(query, train, trainIdx, distance, allDist, k);
declare.time(3.0);
TEST_CYCLE() TEST_CYCLE()
{ {
fastGPU(img, cv::gpu::GpuMat(), keypoints); matcher.knnMatchSingle(query, train, trainIdx, distance, allDist, k);
} }
} }
INSTANTIATE_TEST_CASE_P(Features2D, FAST, DEVICES(cv::gpu::GLOBAL_ATOMICS)); INSTANTIATE_TEST_CASE_P(Features2D, BruteForceMatcher_knnMatch, testing::Combine(
ALL_DEVICES,
testing::Values(DescriptorSize(64), DescriptorSize(128), DescriptorSize(256)),
testing::Values(K(2), K(3)),
testing::Values(NormType(cv::NORM_L1), NormType(cv::NORM_L2), NormType(cv::NORM_HAMMING))));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// ORB // BruteForceMatcher_radiusMatch
GPU_PERF_TEST_1(ORB, cv::gpu::DeviceInfo) GPU_PERF_TEST(BruteForceMatcher_radiusMatch, cv::gpu::DeviceInfo, DescriptorSize, NormType)
{ {
cv::gpu::DeviceInfo devInfo = GetParam(); cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat img_host = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE); int desc_size = GET_PARAM(1);
int normType = GET_PARAM(2);
ASSERT_FALSE(img_host.empty()); int type = normType == cv::NORM_HAMMING ? CV_8U : CV_32F;
cv::gpu::GpuMat img(img_host); cv::Mat query_host(3000, desc_size, type);
cv::gpu::GpuMat keypoints, descriptors; fill(query_host, 0.0, 1.0);
cv::Mat train_host(3000, desc_size, type);
fill(train_host, 0.0, 1.0);
cv::gpu::ORB_GPU orbGPU(4000); cv::gpu::BFMatcher_GPU matcher(normType);
cv::gpu::GpuMat query(query_host);
cv::gpu::GpuMat train(train_host);
cv::gpu::GpuMat trainIdx, nMatches, distance;
matcher.radiusMatchSingle(query, train, trainIdx, distance, nMatches, 2.0);
declare.time(3.0);
TEST_CYCLE() TEST_CYCLE()
{ {
orbGPU(img, cv::gpu::GpuMat(), keypoints, descriptors); matcher.radiusMatchSingle(query, train, trainIdx, distance, nMatches, 2.0);
} }
} }
INSTANTIATE_TEST_CASE_P(Features2D, ORB, DEVICES(cv::gpu::GLOBAL_ATOMICS)); INSTANTIATE_TEST_CASE_P(Features2D, BruteForceMatcher_radiusMatch, testing::Combine(
ALL_DEVICES,
testing::Values(DescriptorSize(64), DescriptorSize(128), DescriptorSize(256)),
testing::Values(NormType(cv::NORM_L1), NormType(cv::NORM_L2), NormType(cv::NORM_HAMMING))));
#endif #endif
modules/gpu/perf/perf_filters.cpp
View file @ f07250ac
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
IMPLEMENT_PARAM_CLASS(KernelSize, int)
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Blur // Blur
IMPLEMENT_PARAM_CLASS(KernelSize, int)
GPU_PERF_TEST(Blur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) GPU_PERF_TEST(Blur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
{ {
cv::gpu::DeviceInfo devInfo = GET_PARAM(0); cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
...@@ -17,19 +17,20 @@ GPU_PERF_TEST(Blur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -17,19 +17,20 @@ GPU_PERF_TEST(Blur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
int ksize = GET_PARAM(3); int ksize = GET_PARAM(3);
cv::Mat src_host(size, type); cv::Mat src_host(size, type);
fill(src_host, 0.0, 255.0);
declare.in(src_host, WARMUP_RNG);
cv::gpu::GpuMat src(src_host); cv::gpu::GpuMat src(src_host);
cv::gpu::GpuMat dst; cv::gpu::GpuMat dst;
cv::gpu::blur(src, dst, cv::Size(ksize, ksize));
TEST_CYCLE() TEST_CYCLE()
{ {
cv::gpu::blur(src, dst, cv::Size(ksize, ksize)); cv::gpu::blur(src, dst, cv::Size(ksize, ksize));
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Blur, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Blur, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4)), testing::Values(MatType(CV_8UC1), MatType(CV_8UC4)),
...@@ -48,20 +49,21 @@ GPU_PERF_TEST(Sobel, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -48,20 +49,21 @@ GPU_PERF_TEST(Sobel, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
int ksize = GET_PARAM(3); int ksize = GET_PARAM(3);
cv::Mat src_host(size, type); cv::Mat src_host(size, type);
fill(src_host, 0.0, 255.0);
declare.in(src_host, WARMUP_RNG);
cv::gpu::GpuMat src(src_host); cv::gpu::GpuMat src(src_host);
cv::gpu::GpuMat dst; cv::gpu::GpuMat dst;
cv::gpu::GpuMat buf; cv::gpu::GpuMat buf;
cv::gpu::Sobel(src, dst, -1, 1, 1, buf, ksize);
TEST_CYCLE() TEST_CYCLE()
{ {
cv::gpu::Sobel(src, dst, -1, 1, 1, buf, ksize); cv::gpu::Sobel(src, dst, -1, 1, 1, buf, ksize);
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Sobel, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Sobel, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1)), testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1)),
...@@ -79,20 +81,21 @@ GPU_PERF_TEST(Scharr, cv::gpu::DeviceInfo, cv::Size, MatType) ...@@ -79,20 +81,21 @@ GPU_PERF_TEST(Scharr, cv::gpu::DeviceInfo, cv::Size, MatType)
int type = GET_PARAM(2); int type = GET_PARAM(2);
cv::Mat src_host(size, type); cv::Mat src_host(size, type);
fill(src_host, 0.0, 255.0);
declare.in(src_host, WARMUP_RNG);
cv::gpu::GpuMat src(src_host); cv::gpu::GpuMat src(src_host);
cv::gpu::GpuMat dst; cv::gpu::GpuMat dst;
cv::gpu::GpuMat buf; cv::gpu::GpuMat buf;
cv::gpu::Scharr(src, dst, -1, 1, 0, buf);
TEST_CYCLE() TEST_CYCLE()
{ {
cv::gpu::Scharr(src, dst, -1, 1, 0, buf); cv::gpu::Scharr(src, dst, -1, 1, 0, buf);
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Scharr, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Scharr, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1)))); testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1))));
...@@ -110,20 +113,21 @@ GPU_PERF_TEST(GaussianBlur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -110,20 +113,21 @@ GPU_PERF_TEST(GaussianBlur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
int ksize = GET_PARAM(3); int ksize = GET_PARAM(3);
cv::Mat src_host(size, type); cv::Mat src_host(size, type);
fill(src_host, 0.0, 255.0);
declare.in(src_host, WARMUP_RNG);
cv::gpu::GpuMat src(src_host); cv::gpu::GpuMat src(src_host);
cv::gpu::GpuMat dst; cv::gpu::GpuMat dst;
cv::gpu::GpuMat buf; cv::gpu::GpuMat buf;
cv::gpu::GaussianBlur(src, dst, cv::Size(ksize, ksize), buf, 0.5);
TEST_CYCLE() TEST_CYCLE()
{ {
cv::gpu::GaussianBlur(src, dst, cv::Size(ksize, ksize), buf, 0.5); cv::gpu::GaussianBlur(src, dst, cv::Size(ksize, ksize), buf, 0.5);
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, GaussianBlur, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, GaussianBlur, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1)), testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1)),
...@@ -142,19 +146,20 @@ GPU_PERF_TEST(Laplacian, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -142,19 +146,20 @@ GPU_PERF_TEST(Laplacian, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
int ksize = GET_PARAM(3); int ksize = GET_PARAM(3);
cv::Mat src_host(size, type); cv::Mat src_host(size, type);
fill(src_host, 0.0, 255.0);
declare.in(src_host, WARMUP_RNG);
cv::gpu::GpuMat src(src_host); cv::gpu::GpuMat src(src_host);
cv::gpu::GpuMat dst; cv::gpu::GpuMat dst;
cv::gpu::Laplacian(src, dst, -1, ksize);
TEST_CYCLE() TEST_CYCLE()
{ {
cv::gpu::Laplacian(src, dst, -1, ksize); cv::gpu::Laplacian(src, dst, -1, ksize);
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Laplacian, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Laplacian, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1), MatType(CV_32FC4)), testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1), MatType(CV_32FC4)),
...@@ -172,8 +177,7 @@ GPU_PERF_TEST(Erode, cv::gpu::DeviceInfo, cv::Size, MatType) ...@@ -172,8 +177,7 @@ GPU_PERF_TEST(Erode, cv::gpu::DeviceInfo, cv::Size, MatType)
int type = GET_PARAM(2); int type = GET_PARAM(2);
cv::Mat src_host(size, type); cv::Mat src_host(size, type);
fill(src_host, 0.0, 255.0);
declare.in(src_host, WARMUP_RNG);
cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3)); cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3));
...@@ -181,13 +185,15 @@ GPU_PERF_TEST(Erode, cv::gpu::DeviceInfo, cv::Size, MatType) ...@@ -181,13 +185,15 @@ GPU_PERF_TEST(Erode, cv::gpu::DeviceInfo, cv::Size, MatType)
cv::gpu::GpuMat dst; cv::gpu::GpuMat dst;
cv::gpu::GpuMat buf; cv::gpu::GpuMat buf;
cv::gpu::erode(src, dst, ker, buf);
TEST_CYCLE() TEST_CYCLE()
{ {
cv::gpu::erode(src, dst, ker, buf); cv::gpu::erode(src, dst, ker, buf);
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Erode, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Erode, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4)))); testing::Values(MatType(CV_8UC1), MatType(CV_8UC4))));
...@@ -204,8 +210,7 @@ GPU_PERF_TEST(Dilate, cv::gpu::DeviceInfo, cv::Size, MatType) ...@@ -204,8 +210,7 @@ GPU_PERF_TEST(Dilate, cv::gpu::DeviceInfo, cv::Size, MatType)
int type = GET_PARAM(2); int type = GET_PARAM(2);
cv::Mat src_host(size, type); cv::Mat src_host(size, type);
fill(src_host, 0.0, 255.0);
declare.in(src_host, WARMUP_RNG);
cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3)); cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3));
...@@ -213,13 +218,15 @@ GPU_PERF_TEST(Dilate, cv::gpu::DeviceInfo, cv::Size, MatType) ...@@ -213,13 +218,15 @@ GPU_PERF_TEST(Dilate, cv::gpu::DeviceInfo, cv::Size, MatType)
cv::gpu::GpuMat dst; cv::gpu::GpuMat dst;
cv::gpu::GpuMat buf; cv::gpu::GpuMat buf;
cv::gpu::dilate(src, dst, ker, buf);
TEST_CYCLE() TEST_CYCLE()
{ {
cv::gpu::dilate(src, dst, ker, buf); cv::gpu::dilate(src, dst, ker, buf);
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Dilate, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Dilate, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4)))); testing::Values(MatType(CV_8UC1), MatType(CV_8UC4))));
...@@ -240,8 +247,7 @@ GPU_PERF_TEST(MorphologyEx, cv::gpu::DeviceInfo, cv::Size, MatType, MorphOp) ...@@ -240,8 +247,7 @@ GPU_PERF_TEST(MorphologyEx, cv::gpu::DeviceInfo, cv::Size, MatType, MorphOp)
int morphOp = GET_PARAM(3); int morphOp = GET_PARAM(3);
cv::Mat src_host(size, type); cv::Mat src_host(size, type);
fill(src_host, 0.0, 255.0);
declare.in(src_host, WARMUP_RNG);
cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3)); cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3));
...@@ -250,13 +256,15 @@ GPU_PERF_TEST(MorphologyEx, cv::gpu::DeviceInfo, cv::Size, MatType, MorphOp) ...@@ -250,13 +256,15 @@ GPU_PERF_TEST(MorphologyEx, cv::gpu::DeviceInfo, cv::Size, MatType, MorphOp)
cv::gpu::GpuMat buf1; cv::gpu::GpuMat buf1;
cv::gpu::GpuMat buf2; cv::gpu::GpuMat buf2;
cv::gpu::morphologyEx(src, dst, morphOp, ker, buf1, buf2);
TEST_CYCLE() TEST_CYCLE()
{ {
cv::gpu::morphologyEx(src, dst, morphOp, ker, buf1, buf2); cv::gpu::morphologyEx(src, dst, morphOp, ker, buf1, buf2);
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, MorphologyEx, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, MorphologyEx, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4)), testing::Values(MatType(CV_8UC1), MatType(CV_8UC4)),
...@@ -275,20 +283,23 @@ GPU_PERF_TEST(Filter2D, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -275,20 +283,23 @@ GPU_PERF_TEST(Filter2D, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
int ksize = GET_PARAM(3); int ksize = GET_PARAM(3);
cv::Mat src_host(size, type); cv::Mat src_host(size, type);
cv::Mat kernel(ksize, ksize, CV_32FC1); fill(src_host, 0.0, 255.0);
declare.in(src_host, kernel, WARMUP_RNG); cv::Mat kernel(ksize, ksize, CV_32FC1);
fill(kernel, 0.0, 1.0);
cv::gpu::GpuMat src(src_host); cv::gpu::GpuMat src(src_host);
cv::gpu::GpuMat dst; cv::gpu::GpuMat dst;
cv::gpu::filter2D(src, dst, -1, kernel);
TEST_CYCLE() TEST_CYCLE()
{ {
cv::gpu::filter2D(src, dst, -1, kernel); cv::gpu::filter2D(src, dst, -1, kernel);
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Filter2D, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Filter2D, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1), MatType(CV_32FC4)), testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1), MatType(CV_32FC4)),
......
modules/gpu/perf/perf_imgproc.cpp
View file @ f07250ac
This diff is collapsed.
modules/gpu/perf/perf_matop.cpp
View file @ f07250ac
...@@ -3,79 +3,21 @@ ...@@ -3,79 +3,21 @@
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Merge // SetTo
GPU_PERF_TEST(Merge, cv::gpu::DeviceInfo, cv::Size, perf::MatType) GPU_PERF_TEST(SetTo, cv::gpu::DeviceInfo, cv::Size, MatType)
{ {
cv::gpu::DeviceInfo devInfo = GET_PARAM(0); cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
cv::Size size = GET_PARAM(1);
int type = GET_PARAM(2);
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
const int num_channels = 4;
std::vector<cv::gpu::GpuMat> src(num_channels);
for (int i = 0; i < num_channels; ++i)
src[i] = cv::gpu::GpuMat(size, type, cv::Scalar::all(i));
cv::gpu::GpuMat dst;
TEST_CYCLE()
{
cv::gpu::merge(src, dst);
}
}
INSTANTIATE_TEST_CASE_P(MatOp, Merge, testing::Combine(
ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES,
testing::Values(CV_8UC1, CV_16UC1, CV_32FC1)));
//////////////////////////////////////////////////////////////////////
// Split
GPU_PERF_TEST(Split, cv::gpu::DeviceInfo, cv::Size, perf::MatType)
{
cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
cv::Size size = GET_PARAM(1); cv::Size size = GET_PARAM(1);
int type = GET_PARAM(2); int type = GET_PARAM(2);
cv::gpu::setDevice(devInfo.deviceID());
const int num_channels = 4;
cv::gpu::GpuMat src(size, CV_MAKETYPE(type, num_channels), cv::Scalar(1, 2, 3, 4));
std::vector<cv::gpu::GpuMat> dst(num_channels);
for (int i = 0; i < num_channels; ++i)
dst[i] = cv::gpu::GpuMat(size, type);
TEST_CYCLE()
{
cv::gpu::split(src, dst);
}
}
INSTANTIATE_TEST_CASE_P(MatOp, Split, testing::Combine(
ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES,
testing::Values(CV_8UC1, CV_16UC1, CV_32FC1)));
//////////////////////////////////////////////////////////////////////
// SetTo
GPU_PERF_TEST(SetTo, cv::gpu::DeviceInfo, cv::Size, perf::MatType)
{
cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
cv::Size size = GET_PARAM(1);
int type = GET_PARAM(2);
cv::gpu::setDevice(devInfo.deviceID());
cv::gpu::GpuMat src(size, type); cv::gpu::GpuMat src(size, type);
cv::Scalar val(1, 2, 3, 4); cv::Scalar val(1, 2, 3, 4);
src.setTo(val);
TEST_CYCLE() TEST_CYCLE()
{ {
src.setTo(val); src.setTo(val);
...@@ -83,31 +25,36 @@ GPU_PERF_TEST(SetTo, cv::gpu::DeviceInfo, cv::Size, perf::MatType) ...@@ -83,31 +25,36 @@ GPU_PERF_TEST(SetTo, cv::gpu::DeviceInfo, cv::Size, perf::MatType)
} }
INSTANTIATE_TEST_CASE_P(MatOp, SetTo, testing::Combine( INSTANTIATE_TEST_CASE_P(MatOp, SetTo, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_16UC1, CV_16UC3, CV_16UC4, CV_32FC1, CV_32FC3, CV_32FC4))); testing::Values(MatType(CV_8UC1), MatType(CV_8UC3), MatType(CV_8UC4),
MatType(CV_16UC1), MatType(CV_16UC3), MatType(CV_16UC4),
MatType(CV_32FC1), MatType(CV_32FC3), MatType(CV_32FC4),
MatType(CV_64FC1), MatType(CV_64FC3), MatType(CV_64FC4))));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// SetToMasked // SetToMasked
GPU_PERF_TEST(SetToMasked, cv::gpu::DeviceInfo, cv::Size, perf::MatType) GPU_PERF_TEST(SetToMasked, cv::gpu::DeviceInfo, cv::Size, MatType)
{ {
cv::gpu::DeviceInfo devInfo = GET_PARAM(0); cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
cv::gpu::setDevice(devInfo.deviceID());
cv::Size size = GET_PARAM(1); cv::Size size = GET_PARAM(1);
int type = GET_PARAM(2); int type = GET_PARAM(2);
cv::gpu::setDevice(devInfo.deviceID());
cv::Mat src_host(size, type); cv::Mat src_host(size, type);
cv::Mat mask_host(size, CV_8UC1); fill(src_host, 0, 255);
declare.in(src_host, WARMUP_RNG); cv::Mat mask_host(size, CV_8UC1);
fill(mask_host, 0, 2); fill(mask_host, 0, 2);
cv::gpu::GpuMat src(src_host); cv::gpu::GpuMat src(src_host);
cv::Scalar val(1, 2, 3, 4); cv::Scalar val(1, 2, 3, 4);
cv::gpu::GpuMat mask(mask_host); cv::gpu::GpuMat mask(mask_host);
src.setTo(val, mask);
TEST_CYCLE() TEST_CYCLE()
{ {
src.setTo(val, mask); src.setTo(val, mask);
...@@ -115,31 +62,36 @@ GPU_PERF_TEST(SetToMasked, cv::gpu::DeviceInfo, cv::Size, perf::MatType) ...@@ -115,31 +62,36 @@ GPU_PERF_TEST(SetToMasked, cv::gpu::DeviceInfo, cv::Size, perf::MatType)
} }
INSTANTIATE_TEST_CASE_P(MatOp, SetToMasked, testing::Combine( INSTANTIATE_TEST_CASE_P(MatOp, SetToMasked, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_16UC1, CV_16UC3, CV_16UC4, CV_32FC1, CV_32FC3, CV_32FC4))); testing::Values(MatType(CV_8UC1), MatType(CV_8UC3), MatType(CV_8UC4),
MatType(CV_16UC1), MatType(CV_16UC3), MatType(CV_16UC4),
MatType(CV_32FC1), MatType(CV_32FC3), MatType(CV_32FC4),
MatType(CV_64FC1), MatType(CV_64FC3), MatType(CV_64FC4))));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// CopyToMasked // CopyToMasked
GPU_PERF_TEST(CopyToMasked, cv::gpu::DeviceInfo, cv::Size, perf::MatType) GPU_PERF_TEST(CopyToMasked, cv::gpu::DeviceInfo, cv::Size, MatType)
{ {
cv::gpu::DeviceInfo devInfo = GET_PARAM(0); cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
cv::gpu::setDevice(devInfo.deviceID());
cv::Size size = GET_PARAM(1); cv::Size size = GET_PARAM(1);
int type = GET_PARAM(2); int type = GET_PARAM(2);
cv::gpu::setDevice(devInfo.deviceID());
cv::Mat src_host(size, type); cv::Mat src_host(size, type);
cv::Mat mask_host(size, CV_8UC1); fill(src_host, 0, 255);
declare.in(src_host, WARMUP_RNG); cv::Mat mask_host(size, CV_8UC1);
fill(mask_host, 0, 2); fill(mask_host, 0, 2);
cv::gpu::GpuMat src(src_host); cv::gpu::GpuMat src(src_host);
cv::gpu::GpuMat mask(mask_host); cv::gpu::GpuMat mask(mask_host);
cv::gpu::GpuMat dst; cv::gpu::GpuMat dst;
src.copyTo(dst, mask);
TEST_CYCLE() TEST_CYCLE()
{ {
src.copyTo(dst, mask); src.copyTo(dst, mask);
...@@ -147,39 +99,43 @@ GPU_PERF_TEST(CopyToMasked, cv::gpu::DeviceInfo, cv::Size, perf::MatType) ...@@ -147,39 +99,43 @@ GPU_PERF_TEST(CopyToMasked, cv::gpu::DeviceInfo, cv::Size, perf::MatType)
} }
INSTANTIATE_TEST_CASE_P(MatOp, CopyToMasked, testing::Combine( INSTANTIATE_TEST_CASE_P(MatOp, CopyToMasked, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_16UC1, CV_16UC3, CV_16UC4, CV_32FC1, CV_32FC3, CV_32FC4))); testing::Values(MatType(CV_8UC1), MatType(CV_8UC3), MatType(CV_8UC4),
MatType(CV_16UC1), MatType(CV_16UC3), MatType(CV_16UC4),
MatType(CV_32FC1), MatType(CV_32FC3), MatType(CV_32FC4),
MatType(CV_64FC1), MatType(CV_64FC3), MatType(CV_64FC4))));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// ConvertTo // ConvertTo
GPU_PERF_TEST(ConvertTo, cv::gpu::DeviceInfo, cv::Size, perf::MatType, perf::MatType) GPU_PERF_TEST(ConvertTo, cv::gpu::DeviceInfo, cv::Size, MatDepth, MatDepth)
{ {
cv::gpu::DeviceInfo devInfo = GET_PARAM(0); cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
cv::Size size = GET_PARAM(1);
int type1 = GET_PARAM(2);
int type2 = GET_PARAM(3);
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat src_host(size, type1); cv::Size size = GET_PARAM(1);
int depth1 = GET_PARAM(2);
int depth2 = GET_PARAM(3);
declare.in(src_host, WARMUP_RNG); cv::Mat src_host(size, depth1);
fill(src_host, 0, 255);
cv::gpu::GpuMat src(src_host); cv::gpu::GpuMat src(src_host);
cv::gpu::GpuMat dst; cv::gpu::GpuMat dst;
src.convertTo(dst, depth2, 0.5, 1.0);
TEST_CYCLE() TEST_CYCLE()
{ {
src.convertTo(dst, type2, 0.5, 1.0); src.convertTo(dst, depth2, 0.5, 1.0);
} }
} }
INSTANTIATE_TEST_CASE_P(MatOp, ConvertTo, testing::Combine( INSTANTIATE_TEST_CASE_P(MatOp, ConvertTo, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(CV_8UC1, CV_16UC1, CV_32FC1), testing::Values(MatDepth(CV_8U), MatDepth(CV_16U), MatDepth(CV_32F), MatDepth(CV_64F)),
testing::Values(CV_8UC1, CV_16UC1, CV_32FC1))); testing::Values(MatDepth(CV_8U), MatDepth(CV_16U), MatDepth(CV_32F), MatDepth(CV_64F))));
#endif #endif
modules/gpu/perf/perf_objdetect.cpp
View file @ f07250ac
...@@ -2,13 +2,16 @@ ...@@ -2,13 +2,16 @@
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
///////////////////////////////////////////////////////////////
// HOG
GPU_PERF_TEST_1(HOG, cv::gpu::DeviceInfo) GPU_PERF_TEST_1(HOG, cv::gpu::DeviceInfo)
{ {
cv::gpu::DeviceInfo devInfo = GetParam(); cv::gpu::DeviceInfo devInfo = GetParam();
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat img_host = readImage("gpu/hog/road.png", cv::IMREAD_GRAYSCALE); cv::Mat img_host = readImage("gpu/hog/road.png", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(img_host.empty());
cv::gpu::GpuMat img(img_host); cv::gpu::GpuMat img(img_host);
std::vector<cv::Rect> found_locations; std::vector<cv::Rect> found_locations;
...@@ -16,6 +19,8 @@ GPU_PERF_TEST_1(HOG, cv::gpu::DeviceInfo) ...@@ -16,6 +19,8 @@ GPU_PERF_TEST_1(HOG, cv::gpu::DeviceInfo)
cv::gpu::HOGDescriptor hog; cv::gpu::HOGDescriptor hog;
hog.setSVMDetector(cv::gpu::HOGDescriptor::getDefaultPeopleDetector()); hog.setSVMDetector(cv::gpu::HOGDescriptor::getDefaultPeopleDetector());
hog.detectMultiScale(img, found_locations);
TEST_CYCLE() TEST_CYCLE()
{ {
hog.detectMultiScale(img, found_locations); hog.detectMultiScale(img, found_locations);
...@@ -24,6 +29,8 @@ GPU_PERF_TEST_1(HOG, cv::gpu::DeviceInfo) ...@@ -24,6 +29,8 @@ GPU_PERF_TEST_1(HOG, cv::gpu::DeviceInfo)
INSTANTIATE_TEST_CASE_P(ObjDetect, HOG, ALL_DEVICES); INSTANTIATE_TEST_CASE_P(ObjDetect, HOG, ALL_DEVICES);
///////////////////////////////////////////////////////////////
// HaarClassifier
GPU_PERF_TEST_1(HaarClassifier, cv::gpu::DeviceInfo) GPU_PERF_TEST_1(HaarClassifier, cv::gpu::DeviceInfo)
{ {
...@@ -31,14 +38,16 @@ GPU_PERF_TEST_1(HaarClassifier, cv::gpu::DeviceInfo) ...@@ -31,14 +38,16 @@ GPU_PERF_TEST_1(HaarClassifier, cv::gpu::DeviceInfo)
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat img_host = readImage("gpu/haarcascade/group_1_640x480_VGA.pgm", cv::IMREAD_GRAYSCALE); cv::Mat img_host = readImage("gpu/haarcascade/group_1_640x480_VGA.pgm", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(img_host.empty());
cv::gpu::CascadeClassifier_GPU cascade; cv::gpu::CascadeClassifier_GPU cascade;
if (!cascade.load("haarcascade_frontalface_alt.xml")) ASSERT_TRUE(cascade.load(perf::TestBase::getDataPath("gpu/perf/haarcascade_frontalface_alt.xml")));
CV_Error(0, "Can't load cascade");
cv::gpu::GpuMat img(img_host); cv::gpu::GpuMat img(img_host);
cv::gpu::GpuMat objects_buffer(1, 100, cv::DataType<cv::Rect>::type); cv::gpu::GpuMat objects_buffer;
cascade.detectMultiScale(img, objects_buffer);
TEST_CYCLE() TEST_CYCLE()
{ {
...@@ -48,7 +57,4 @@ GPU_PERF_TEST_1(HaarClassifier, cv::gpu::DeviceInfo) ...@@ -48,7 +57,4 @@ GPU_PERF_TEST_1(HaarClassifier, cv::gpu::DeviceInfo)
INSTANTIATE_TEST_CASE_P(ObjDetect, HaarClassifier, ALL_DEVICES); INSTANTIATE_TEST_CASE_P(ObjDetect, HaarClassifier, ALL_DEVICES);
#endif #endif
modules/gpu/perf/perf_precomp.hpp
View file @ f07250ac
...@@ -3,12 +3,17 @@ ...@@ -3,12 +3,17 @@
#include <cstdio> #include <cstdio>
#include <iostream> #include <iostream>
#include "cvconfig.h" #include "cvconfig.h"
#include "opencv2/ts/ts.hpp" #include "opencv2/ts/ts.hpp"
#include "opencv2/ts/ts_perf.hpp" #include "opencv2/ts/ts_perf.hpp"
#include "opencv2/core/core.hpp" #include "opencv2/core/core.hpp"
#include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui.hpp"
#include "opencv2/gpu/gpu.hpp" #include "opencv2/gpu/gpu.hpp"
#include "opencv2/calib3d/calib3d.hpp"
#include "perf_utility.hpp" #include "perf_utility.hpp"
#if GTEST_CREATE_SHARED_LIBRARY #if GTEST_CREATE_SHARED_LIBRARY
......
modules/gpu/perf/perf_utility.cpp
View file @ f07250ac
...@@ -7,12 +7,12 @@ using namespace cv::gpu; ...@@ -7,12 +7,12 @@ using namespace cv::gpu;
void fill(Mat& m, double a, double b) void fill(Mat& m, double a, double b)
{ {
RNG rng(123456789); RNG rng(123456789);
rng.fill(m, RNG::UNIFORM, a, b); rng.fill(m, RNG::UNIFORM, Scalar::all(a), Scalar::all(b));
} }
void PrintTo(const CvtColorInfo& info, ostream* os) void PrintTo(const CvtColorInfo& info, ostream* os)
{ {
static const char* str[] = static const char* str[] =
{ {
"BGR2BGRA", "BGR2BGRA",
"BGRA2BGR", "BGRA2BGR",
...@@ -89,7 +89,7 @@ void PrintTo(const CvtColorInfo& info, ostream* os) ...@@ -89,7 +89,7 @@ void PrintTo(const CvtColorInfo& info, ostream* os)
0, 0,
0, 0,
0, 0,
"HLS2BGR", "HLS2BGR",
"HLS2RGB", "HLS2RGB",
...@@ -131,7 +131,7 @@ void PrintTo(const CvtColorInfo& info, ostream* os) ...@@ -131,7 +131,7 @@ void PrintTo(const CvtColorInfo& info, ostream* os)
0, 0,
0, 0,
0, 0,
0 0
}; };
*os << str[info.code]; *os << str[info.code];
...@@ -147,11 +147,6 @@ Mat readImage(const string& fileName, int flags) ...@@ -147,11 +147,6 @@ Mat readImage(const string& fileName, int flags)
return imread(perf::TestBase::getDataPath(fileName), flags); return imread(perf::TestBase::getDataPath(fileName), flags);
} }
bool supportFeature(const DeviceInfo& info, FeatureSet feature)
{
return TargetArchs::builtWith(feature) && info.supports(feature);
}
const vector<DeviceInfo>& devices() const vector<DeviceInfo>& devices()
{ {
static vector<DeviceInfo> devs; static vector<DeviceInfo> devs;
...@@ -175,27 +170,3 @@ const vector<DeviceInfo>& devices() ...@@ -175,27 +170,3 @@ const vector<DeviceInfo>& devices()
return devs; return devs;
} }
vector<DeviceInfo> devices(FeatureSet feature)
{
const vector<DeviceInfo>& d = devices();
vector<DeviceInfo> devs_filtered;
if (TargetArchs::builtWith(feature))
{
devs_filtered.reserve(d.size());
for (size_t i = 0, size = d.size(); i < size; ++i)
{
const DeviceInfo& info = d[i];
if (info.supports(feature))
devs_filtered.push_back(info);
}
}
return devs_filtered;
}
modules/gpu/perf/perf_utility.hpp
View file @ f07250ac
...@@ -3,17 +3,23 @@ ...@@ -3,17 +3,23 @@
void fill(cv::Mat& m, double a, double b); void fill(cv::Mat& m, double a, double b);
enum {HORIZONTAL_AXIS = 0, VERTICAL_AXIS = 1, BOTH_AXIS = -1};
using perf::MatType; using perf::MatType;
using perf::MatDepth; using perf::MatDepth;
CV_ENUM(BorderMode, cv::BORDER_REFLECT101, cv::BORDER_REPLICATE, cv::BORDER_CONSTANT, cv::BORDER_REFLECT, cv::BORDER_WRAP) CV_ENUM(BorderMode, cv::BORDER_REFLECT101, cv::BORDER_REPLICATE, cv::BORDER_CONSTANT, cv::BORDER_REFLECT, cv::BORDER_WRAP)
CV_ENUM(FlipCode, HORIZONTAL_AXIS, VERTICAL_AXIS, BOTH_AXIS)
CV_ENUM(Interpolation, cv::INTER_NEAREST, cv::INTER_LINEAR, cv::INTER_CUBIC) CV_ENUM(Interpolation, cv::INTER_NEAREST, cv::INTER_LINEAR, cv::INTER_CUBIC)
CV_ENUM(MatchMethod, cv::TM_SQDIFF, cv::TM_SQDIFF_NORMED, cv::TM_CCORR, cv::TM_CCORR_NORMED, cv::TM_CCOEFF, cv::TM_CCOEFF_NORMED) CV_ENUM(NormType, cv::NORM_INF, cv::NORM_L1, cv::NORM_L2, cv::NORM_HAMMING)
CV_ENUM(NormType, cv::NORM_INF, cv::NORM_L1, cv::NORM_L2)
CV_ENUM(AlphaOp, cv::gpu::ALPHA_OVER, cv::gpu::ALPHA_IN, cv::gpu::ALPHA_OUT, cv::gpu::ALPHA_ATOP, cv::gpu::ALPHA_XOR, cv::gpu::ALPHA_PLUS, cv::gpu::ALPHA_OVER_PREMUL, cv::gpu::ALPHA_IN_PREMUL, cv::gpu::ALPHA_OUT_PREMUL, cv::gpu::ALPHA_ATOP_PREMUL, cv::gpu::ALPHA_XOR_PREMUL, cv::gpu::ALPHA_PLUS_PREMUL, cv::gpu::ALPHA_PREMUL) struct CvtColorInfo
{
int scn;
int dcn;
int code;
explicit CvtColorInfo(int scn_=0, int dcn_=0, int code_=0) : scn(scn_), dcn(dcn_), code(code_) {}
};
void PrintTo(const CvtColorInfo& info, std::ostream* os);
#define IMPLEMENT_PARAM_CLASS(name, type) \ #define IMPLEMENT_PARAM_CLASS(name, type) \
class name \ class name \
...@@ -26,19 +32,10 @@ CV_ENUM(AlphaOp, cv::gpu::ALPHA_OVER, cv::gpu::ALPHA_IN, cv::gpu::ALPHA_OUT, cv: ...@@ -26,19 +32,10 @@ CV_ENUM(AlphaOp, cv::gpu::ALPHA_OVER, cv::gpu::ALPHA_IN, cv::gpu::ALPHA_OUT, cv:
}; \ }; \
inline void PrintTo( name param, std::ostream* os) \ inline void PrintTo( name param, std::ostream* os) \
{ \ { \
*os << #name << "(" << testing::PrintToString(static_cast< type >(param)) << ")"; \ *os << #name << " = " << testing::PrintToString(static_cast< type >(param)); \
} }
struct CvtColorInfo IMPLEMENT_PARAM_CLASS(Channels, int)
{
int scn;
int dcn;
int code;
explicit CvtColorInfo(int scn_=0, int dcn_=0, int code_=0) : scn(scn_), dcn(dcn_), code(code_) {}
};
void PrintTo(const CvtColorInfo& info, std::ostream* os);
namespace cv { namespace gpu namespace cv { namespace gpu
{ {
...@@ -71,14 +68,9 @@ namespace cv { namespace gpu ...@@ -71,14 +68,9 @@ namespace cv { namespace gpu
cv::Mat readImage(const std::string& fileName, int flags = cv::IMREAD_COLOR); cv::Mat readImage(const std::string& fileName, int flags = cv::IMREAD_COLOR);
bool supportFeature(const cv::gpu::DeviceInfo& info, cv::gpu::FeatureSet feature);
const std::vector<cv::gpu::DeviceInfo>& devices(); const std::vector<cv::gpu::DeviceInfo>& devices();
std::vector<cv::gpu::DeviceInfo> devices(cv::gpu::FeatureSet feature);
#define ALL_DEVICES testing::ValuesIn(devices()) #define ALL_DEVICES testing::ValuesIn(devices())
#define DEVICES(feature) testing::ValuesIn(devices(feature))
#define GET_PARAM(k) std::tr1::get< k >(GetParam()) #define GET_PARAM(k) std::tr1::get< k >(GetParam())
......
modules/gpu/perf/perf_video.cpp
View file @ f07250ac
...@@ -8,13 +8,12 @@ ...@@ -8,13 +8,12 @@
GPU_PERF_TEST_1(BroxOpticalFlow, cv::gpu::DeviceInfo) GPU_PERF_TEST_1(BroxOpticalFlow, cv::gpu::DeviceInfo)
{ {
cv::gpu::DeviceInfo devInfo = GetParam(); cv::gpu::DeviceInfo devInfo = GetParam();
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat frame0_host = readImage("gpu/opticalflow/frame0.png", cv::IMREAD_GRAYSCALE); cv::Mat frame0_host = readImage("gpu/opticalflow/frame0.png", cv::IMREAD_GRAYSCALE);
cv::Mat frame1_host = readImage("gpu/opticalflow/frame1.png", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(frame0_host.empty()); ASSERT_FALSE(frame0_host.empty());
cv::Mat frame1_host = readImage("gpu/opticalflow/frame1.png", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(frame1_host.empty()); ASSERT_FALSE(frame1_host.empty());
frame0_host.convertTo(frame0_host, CV_32FC1, 1.0 / 255.0); frame0_host.convertTo(frame0_host, CV_32FC1, 1.0 / 255.0);
...@@ -22,12 +21,14 @@ GPU_PERF_TEST_1(BroxOpticalFlow, cv::gpu::DeviceInfo) ...@@ -22,12 +21,14 @@ GPU_PERF_TEST_1(BroxOpticalFlow, cv::gpu::DeviceInfo)
cv::gpu::GpuMat frame0(frame0_host); cv::gpu::GpuMat frame0(frame0_host);
cv::gpu::GpuMat frame1(frame1_host); cv::gpu::GpuMat frame1(frame1_host);
cv::gpu::GpuMat u; cv::gpu::GpuMat u;
cv::gpu::GpuMat v; cv::gpu::GpuMat v;
cv::gpu::BroxOpticalFlow d_flow(0.197f /*alpha*/, 50.0f /*gamma*/, 0.8f /*scale_factor*/, cv::gpu::BroxOpticalFlow d_flow(0.197f /*alpha*/, 50.0f /*gamma*/, 0.8f /*scale_factor*/,
10 /*inner_iterations*/, 77 /*outer_iterations*/, 10 /*solver_iterations*/); 10 /*inner_iterations*/, 77 /*outer_iterations*/, 10 /*solver_iterations*/);
d_flow(frame0, frame1, u, v);
declare.time(10); declare.time(10);
TEST_CYCLE() TEST_CYCLE()
...@@ -44,13 +45,12 @@ INSTANTIATE_TEST_CASE_P(Video, BroxOpticalFlow, ALL_DEVICES); ...@@ -44,13 +45,12 @@ INSTANTIATE_TEST_CASE_P(Video, BroxOpticalFlow, ALL_DEVICES);
GPU_PERF_TEST_1(InterpolateFrames, cv::gpu::DeviceInfo) GPU_PERF_TEST_1(InterpolateFrames, cv::gpu::DeviceInfo)
{ {
cv::gpu::DeviceInfo devInfo = GetParam(); cv::gpu::DeviceInfo devInfo = GetParam();
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat frame0_host = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE); cv::Mat frame0_host = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE);
cv::Mat frame1_host = readImage("gpu/perf/aloeR.jpg", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(frame0_host.empty()); ASSERT_FALSE(frame0_host.empty());
cv::Mat frame1_host = readImage("gpu/perf/aloeR.jpg", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(frame1_host.empty()); ASSERT_FALSE(frame1_host.empty());
frame0_host.convertTo(frame0_host, CV_32FC1, 1.0 / 255.0); frame0_host.convertTo(frame0_host, CV_32FC1, 1.0 / 255.0);
...@@ -58,18 +58,20 @@ GPU_PERF_TEST_1(InterpolateFrames, cv::gpu::DeviceInfo) ...@@ -58,18 +58,20 @@ GPU_PERF_TEST_1(InterpolateFrames, cv::gpu::DeviceInfo)
cv::gpu::GpuMat frame0(frame0_host); cv::gpu::GpuMat frame0(frame0_host);
cv::gpu::GpuMat frame1(frame1_host); cv::gpu::GpuMat frame1(frame1_host);
cv::gpu::GpuMat fu, fv; cv::gpu::GpuMat fu, fv;
cv::gpu::GpuMat bu, bv; cv::gpu::GpuMat bu, bv;
cv::gpu::BroxOpticalFlow d_flow(0.197f /*alpha*/, 50.0f /*gamma*/, 0.8f /*scale_factor*/, cv::gpu::BroxOpticalFlow d_flow(0.197f /*alpha*/, 50.0f /*gamma*/, 0.8f /*scale_factor*/,
10 /*inner_iterations*/, 77 /*outer_iterations*/, 10 /*solver_iterations*/); 10 /*inner_iterations*/, 77 /*outer_iterations*/, 10 /*solver_iterations*/);
d_flow(frame0, frame1, fu, fv); d_flow(frame0, frame1, fu, fv);
d_flow(frame1, frame0, bu, bv); d_flow(frame1, frame0, bu, bv);
cv::gpu::GpuMat newFrame; cv::gpu::GpuMat newFrame;
cv::gpu::GpuMat buf; cv::gpu::GpuMat buf;
cv::gpu::interpolateFrames(frame0, frame1, fu, fv, bu, bv, 0.5f, newFrame, buf);
TEST_CYCLE() TEST_CYCLE()
{ {
cv::gpu::interpolateFrames(frame0, frame1, fu, fv, bu, bv, 0.5f, newFrame, buf); cv::gpu::interpolateFrames(frame0, frame1, fu, fv, bu, bv, 0.5f, newFrame, buf);
...@@ -84,13 +86,12 @@ INSTANTIATE_TEST_CASE_P(Video, InterpolateFrames, ALL_DEVICES); ...@@ -84,13 +86,12 @@ INSTANTIATE_TEST_CASE_P(Video, InterpolateFrames, ALL_DEVICES);
GPU_PERF_TEST_1(CreateOpticalFlowNeedleMap, cv::gpu::DeviceInfo) GPU_PERF_TEST_1(CreateOpticalFlowNeedleMap, cv::gpu::DeviceInfo)
{ {
cv::gpu::DeviceInfo devInfo = GetParam(); cv::gpu::DeviceInfo devInfo = GetParam();
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat frame0_host = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE); cv::Mat frame0_host = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE);
cv::Mat frame1_host = readImage("gpu/perf/aloeR.jpg", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(frame0_host.empty()); ASSERT_FALSE(frame0_host.empty());
cv::Mat frame1_host = readImage("gpu/perf/aloeR.jpg", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(frame1_host.empty()); ASSERT_FALSE(frame1_host.empty());
frame0_host.convertTo(frame0_host, CV_32FC1, 1.0 / 255.0); frame0_host.convertTo(frame0_host, CV_32FC1, 1.0 / 255.0);
...@@ -100,13 +101,15 @@ GPU_PERF_TEST_1(CreateOpticalFlowNeedleMap, cv::gpu::DeviceInfo) ...@@ -100,13 +101,15 @@ GPU_PERF_TEST_1(CreateOpticalFlowNeedleMap, cv::gpu::DeviceInfo)
cv::gpu::GpuMat frame1(frame1_host); cv::gpu::GpuMat frame1(frame1_host);
cv::gpu::GpuMat u, v; cv::gpu::GpuMat u, v;
cv::gpu::BroxOpticalFlow d_flow(0.197f /*alpha*/, 50.0f /*gamma*/, 0.8f /*scale_factor*/, cv::gpu::BroxOpticalFlow d_flow(0.197f /*alpha*/, 50.0f /*gamma*/, 0.8f /*scale_factor*/,
10 /*inner_iterations*/, 77 /*outer_iterations*/, 10 /*solver_iterations*/); 10 /*inner_iterations*/, 77 /*outer_iterations*/, 10 /*solver_iterations*/);
d_flow(frame0, frame1, u, v); d_flow(frame0, frame1, u, v);
cv::gpu::GpuMat vertex, colors; cv::gpu::GpuMat vertex, colors;
cv::gpu::createOpticalFlowNeedleMap(u, v, vertex, colors);
TEST_CYCLE() TEST_CYCLE()
{ {
cv::gpu::createOpticalFlowNeedleMap(u, v, vertex, colors); cv::gpu::createOpticalFlowNeedleMap(u, v, vertex, colors);
...@@ -118,15 +121,16 @@ INSTANTIATE_TEST_CASE_P(Video, CreateOpticalFlowNeedleMap, ALL_DEVICES); ...@@ -118,15 +121,16 @@ INSTANTIATE_TEST_CASE_P(Video, CreateOpticalFlowNeedleMap, ALL_DEVICES);
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
// GoodFeaturesToTrack // GoodFeaturesToTrack
GPU_PERF_TEST(GoodFeaturesToTrack, cv::gpu::DeviceInfo, double) IMPLEMENT_PARAM_CLASS(MinDistance, double)
GPU_PERF_TEST(GoodFeaturesToTrack, cv::gpu::DeviceInfo, MinDistance)
{ {
cv::gpu::DeviceInfo devInfo = GET_PARAM(0); cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
cv::gpu::setDevice(devInfo.deviceID());
double minDistance = GET_PARAM(1); double minDistance = GET_PARAM(1);
cv::gpu::setDevice(devInfo.deviceID());
cv::Mat image_host = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE); cv::Mat image_host = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(image_host.empty()); ASSERT_FALSE(image_host.empty());
cv::gpu::GoodFeaturesToTrackDetector_GPU detector(8000, 0.01, minDistance); cv::gpu::GoodFeaturesToTrackDetector_GPU detector(8000, 0.01, minDistance);
...@@ -134,30 +138,38 @@ GPU_PERF_TEST(GoodFeaturesToTrack, cv::gpu::DeviceInfo, double) ...@@ -134,30 +138,38 @@ GPU_PERF_TEST(GoodFeaturesToTrack, cv::gpu::DeviceInfo, double)
cv::gpu::GpuMat image(image_host); cv::gpu::GpuMat image(image_host);
cv::gpu::GpuMat pts; cv::gpu::GpuMat pts;
detector(image, pts);
TEST_CYCLE() TEST_CYCLE()
{ {
detector(image, pts); detector(image, pts);
} }
} }
INSTANTIATE_TEST_CASE_P(Video, GoodFeaturesToTrack, testing::Combine(ALL_DEVICES, testing::Values(0.0, 3.0))); INSTANTIATE_TEST_CASE_P(Video, GoodFeaturesToTrack, testing::Combine(
ALL_DEVICES,
testing::Values(MinDistance(0.0), MinDistance(3.0))));
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
// PyrLKOpticalFlowSparse // PyrLKOpticalFlowSparse
GPU_PERF_TEST(PyrLKOpticalFlowSparse, cv::gpu::DeviceInfo, bool, int, int) IMPLEMENT_PARAM_CLASS(GraySource, bool)
IMPLEMENT_PARAM_CLASS(Points, int)
IMPLEMENT_PARAM_CLASS(WinSize, int)
GPU_PERF_TEST(PyrLKOpticalFlowSparse, cv::gpu::DeviceInfo, GraySource, Points, WinSize)
{ {
cv::gpu::DeviceInfo devInfo = GET_PARAM(0); cv::gpu::DeviceInfo devInfo = GET_PARAM(0);
cv::gpu::setDevice(devInfo.deviceID());
bool useGray = GET_PARAM(1); bool useGray = GET_PARAM(1);
int points = GET_PARAM(2); int points = GET_PARAM(2);
int win_size = GET_PARAM(3); int win_size = GET_PARAM(3);
cv::gpu::setDevice(devInfo.deviceID());
cv::Mat frame0_host = readImage("gpu/opticalflow/frame0.png", useGray ? cv::IMREAD_GRAYSCALE : cv::IMREAD_COLOR); cv::Mat frame0_host = readImage("gpu/opticalflow/frame0.png", useGray ? cv::IMREAD_GRAYSCALE : cv::IMREAD_COLOR);
cv::Mat frame1_host = readImage("gpu/opticalflow/frame1.png", useGray ? cv::IMREAD_GRAYSCALE : cv::IMREAD_COLOR);
ASSERT_FALSE(frame0_host.empty()); ASSERT_FALSE(frame0_host.empty());
cv::Mat frame1_host = readImage("gpu/opticalflow/frame1.png", useGray ? cv::IMREAD_GRAYSCALE : cv::IMREAD_COLOR);
ASSERT_FALSE(frame1_host.empty()); ASSERT_FALSE(frame1_host.empty());
cv::Mat gray_frame; cv::Mat gray_frame;
...@@ -179,19 +191,19 @@ GPU_PERF_TEST(PyrLKOpticalFlowSparse, cv::gpu::DeviceInfo, bool, int, int) ...@@ -179,19 +191,19 @@ GPU_PERF_TEST(PyrLKOpticalFlowSparse, cv::gpu::DeviceInfo, bool, int, int)
cv::gpu::GpuMat nextPts; cv::gpu::GpuMat nextPts;
cv::gpu::GpuMat status; cv::gpu::GpuMat status;
pyrLK.sparse(frame0, frame1, pts, nextPts, status);
TEST_CYCLE() TEST_CYCLE()
{ {
pyrLK.sparse(frame0, frame1, pts, nextPts, status); pyrLK.sparse(frame0, frame1, pts, nextPts, status);
} }
} }
INSTANTIATE_TEST_CASE_P(Video, PyrLKOpticalFlowSparse, testing::Combine INSTANTIATE_TEST_CASE_P(Video, PyrLKOpticalFlowSparse, testing::Combine(
( ALL_DEVICES,
ALL_DEVICES, testing::Values(GraySource(true), GraySource(false)),
testing::Bool(), testing::Values(Points(1000), Points(2000), Points(4000), Points(8000)),
testing::Values(1000, 2000, 4000, 8000), testing::Values(WinSize(17), WinSize(21))));
testing::Values(17, 21)
));
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
// PyrLKOpticalFlowDense // PyrLKOpticalFlowDense
...@@ -199,22 +211,23 @@ INSTANTIATE_TEST_CASE_P(Video, PyrLKOpticalFlowSparse, testing::Combine ...@@ -199,22 +211,23 @@ INSTANTIATE_TEST_CASE_P(Video, PyrLKOpticalFlowSparse, testing::Combine
GPU_PERF_TEST_1(PyrLKOpticalFlowDense, cv::gpu::DeviceInfo) GPU_PERF_TEST_1(PyrLKOpticalFlowDense, cv::gpu::DeviceInfo)
{ {
cv::gpu::DeviceInfo devInfo = GetParam(); cv::gpu::DeviceInfo devInfo = GetParam();
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat frame0_host = readImage("gpu/opticalflow/frame0.png", cv::IMREAD_GRAYSCALE); cv::Mat frame0_host = readImage("gpu/opticalflow/frame0.png", cv::IMREAD_GRAYSCALE);
cv::Mat frame1_host = readImage("gpu/opticalflow/frame1.png", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(frame0_host.empty()); ASSERT_FALSE(frame0_host.empty());
cv::Mat frame1_host = readImage("gpu/opticalflow/frame1.png", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(frame1_host.empty()); ASSERT_FALSE(frame1_host.empty());
cv::gpu::GpuMat frame0(frame0_host); cv::gpu::GpuMat frame0(frame0_host);
cv::gpu::GpuMat frame1(frame1_host); cv::gpu::GpuMat frame1(frame1_host);
cv::gpu::GpuMat u; cv::gpu::GpuMat u;
cv::gpu::GpuMat v; cv::gpu::GpuMat v;
cv::gpu::PyrLKOpticalFlow pyrLK; cv::gpu::PyrLKOpticalFlow pyrLK;
pyrLK.dense(frame0, frame1, u, v);
declare.time(10); declare.time(10);
TEST_CYCLE() TEST_CYCLE()
...@@ -225,20 +238,18 @@ GPU_PERF_TEST_1(PyrLKOpticalFlowDense, cv::gpu::DeviceInfo) ...@@ -225,20 +238,18 @@ GPU_PERF_TEST_1(PyrLKOpticalFlowDense, cv::gpu::DeviceInfo)
INSTANTIATE_TEST_CASE_P(Video, PyrLKOpticalFlowDense, ALL_DEVICES); INSTANTIATE_TEST_CASE_P(Video, PyrLKOpticalFlowDense, ALL_DEVICES);
////////////////////////////////////////////////////// //////////////////////////////////////////////////////
// FarnebackOpticalFlowTest // FarnebackOpticalFlowTest
GPU_PERF_TEST_1(FarnebackOpticalFlowTest, cv::gpu::DeviceInfo) GPU_PERF_TEST_1(FarnebackOpticalFlowTest, cv::gpu::DeviceInfo)
{ {
cv::gpu::DeviceInfo devInfo = GetParam(); cv::gpu::DeviceInfo devInfo = GetParam();
cv::gpu::setDevice(devInfo.deviceID()); cv::gpu::setDevice(devInfo.deviceID());
cv::Mat frame0_host = readImage("gpu/opticalflow/frame0.png", cv::IMREAD_GRAYSCALE); cv::Mat frame0_host = readImage("gpu/opticalflow/frame0.png", cv::IMREAD_GRAYSCALE);
cv::Mat frame1_host = readImage("gpu/opticalflow/frame1.png", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(frame0_host.empty()); ASSERT_FALSE(frame0_host.empty());
cv::Mat frame1_host = readImage("gpu/opticalflow/frame1.png", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(frame1_host.empty()); ASSERT_FALSE(frame1_host.empty());
cv::gpu::GpuMat frame0(frame0_host); cv::gpu::GpuMat frame0(frame0_host);
...@@ -246,13 +257,15 @@ GPU_PERF_TEST_1(FarnebackOpticalFlowTest, cv::gpu::DeviceInfo) ...@@ -246,13 +257,15 @@ GPU_PERF_TEST_1(FarnebackOpticalFlowTest, cv::gpu::DeviceInfo)
cv::gpu::GpuMat u; cv::gpu::GpuMat u;
cv::gpu::GpuMat v; cv::gpu::GpuMat v;
cv::gpu::FarnebackOpticalFlow calc; cv::gpu::FarnebackOpticalFlow farneback;
farneback(frame0, frame1, u, v);
declare.time(10); declare.time(10);
TEST_CYCLE() TEST_CYCLE()
{ {
calc(frame0, frame1, u, v); farneback(frame0, frame1, u, v);
} }
} }
......
modules/gpu/perf_cpu/perf_arithm.cpp deleted 100644 → 0
View file @ 5cc4d23d
This diff is collapsed.
modules/gpu/perf_cpu/perf_calib3d.cpp
View file @ f07250ac
...@@ -2,71 +2,135 @@ ...@@ -2,71 +2,135 @@
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
//////////////////////////////////////////////////////////////////////
// StereoBM
GPU_PERF_TEST_1(StereoBM, cv::gpu::DeviceInfo)
{
cv::Mat img_l = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(img_l.empty());
cv::Mat img_r = readImage("gpu/perf/aloeR.jpg", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(img_r.empty());
cv::StereoBM bm(0, 256);
cv::Mat dst;
bm(img_l, img_r, dst);
declare.time(5.0);
TEST_CYCLE()
{
bm(img_l, img_r, dst);
}
}
INSTANTIATE_TEST_CASE_P(Calib3D, StereoBM, ALL_DEVICES);
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// ProjectPoints // ProjectPoints
GPU_PERF_TEST_1(ProjectPoints, cv::gpu::DeviceInfo) IMPLEMENT_PARAM_CLASS(Count, int)
GPU_PERF_TEST(ProjectPoints, cv::gpu::DeviceInfo, Count)
{ {
cv::Mat src(1, 10000, CV_32FC3); int count = GET_PARAM(1);
declare.in(src, WARMUP_RNG); cv::Mat src(1, count, CV_32FC3);
fill(src, -100, 100);
cv::Mat rvec = cv::Mat::ones(1, 3, CV_32FC1);
cv::Mat tvec = cv::Mat::ones(1, 3, CV_32FC1);
cv::Mat camera_mat = cv::Mat::ones(3, 3, CV_32FC1);
cv::Mat dst; cv::Mat dst;
cv::projectPoints(src, rvec, tvec, camera_mat, cv::noArray(), dst);
TEST_CYCLE() TEST_CYCLE()
{ {
cv::projectPoints(src, cv::Mat::ones(1, 3, CV_32FC1), cv::Mat::ones(1, 3, CV_32FC1), cv::Mat::ones(3, 3, CV_32FC1), cv::Mat(), dst); cv::projectPoints(src, rvec, tvec, camera_mat, cv::noArray(), dst);
} }
} }
INSTANTIATE_TEST_CASE_P(Calib3D, ProjectPoints, ALL_DEVICES); INSTANTIATE_TEST_CASE_P(Calib3D, ProjectPoints, testing::Combine(
ALL_DEVICES,
testing::Values<Count>(5000, 10000, 20000)));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// SolvePnPRansac // SolvePnPRansac
GPU_PERF_TEST_1(SolvePnPRansac, cv::gpu::DeviceInfo) GPU_PERF_TEST(SolvePnPRansac, cv::gpu::DeviceInfo, Count)
{ {
cv::Mat object(1, 10000, CV_32FC3); int count = GET_PARAM(1);
cv::Mat image(1, 10000, CV_32FC2);
cv::Mat object(1, count, CV_32FC3);
fill(object, -100, 100);
declare.in(object, image, WARMUP_RNG); cv::Mat camera_mat(3, 3, CV_32FC1);
fill(camera_mat, 0.5, 1);
camera_mat.at<float>(0, 1) = 0.f;
camera_mat.at<float>(1, 0) = 0.f;
camera_mat.at<float>(2, 0) = 0.f;
camera_mat.at<float>(2, 1) = 0.f;
cv::Mat rvec, tvec; cv::Mat dist_coef(1, 8, CV_32F, cv::Scalar::all(0));
declare.time(3.0); std::vector<cv::Point2f> image_vec;
cv::Mat rvec_gold(1, 3, CV_32FC1);
fill(rvec_gold, 0, 1);
cv::Mat tvec_gold(1, 3, CV_32FC1);
fill(tvec_gold, 0, 1);
cv::projectPoints(object, rvec_gold, tvec_gold, camera_mat, dist_coef, image_vec);
cv::Mat image(1, count, CV_32FC2, &image_vec[0]);
cv::Mat rvec;
cv::Mat tvec;
cv::solvePnPRansac(object, image, camera_mat, dist_coef, rvec, tvec);
declare.time(10.0);
TEST_CYCLE() TEST_CYCLE()
{ {
cv::solvePnPRansac(object, image, cv::Mat::ones(3, 3, CV_32FC1), cv::Mat(1, 8, CV_32F, cv::Scalar::all(0)), rvec, tvec); cv::solvePnPRansac(object, image, camera_mat, dist_coef, rvec, tvec);
} }
} }
INSTANTIATE_TEST_CASE_P(Calib3D, SolvePnPRansac, ALL_DEVICES); INSTANTIATE_TEST_CASE_P(Calib3D, SolvePnPRansac, testing::Combine(
ALL_DEVICES,
testing::Values<Count>(5000, 10000, 20000)));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// StereoBM // ReprojectImageTo3D
GPU_PERF_TEST_1(StereoBM, cv::gpu::DeviceInfo) GPU_PERF_TEST(ReprojectImageTo3D, cv::gpu::DeviceInfo, cv::Size, MatDepth)
{ {
cv::Mat img_l = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE); cv::Size size = GET_PARAM(1);
cv::Mat img_r = readImage("gpu/perf/aloeR.jpg", cv::IMREAD_GRAYSCALE); int depth = GET_PARAM(2);
ASSERT_FALSE(img_l.empty()); cv::Mat src(size, depth);
ASSERT_FALSE(img_r.empty()); fill(src, 5.0, 30.0);
cv::Mat dst; cv::Mat Q(4, 4, CV_32FC1);
fill(Q, 0.1, 1.0);
cv::StereoBM bm(0, 256); cv::Mat dst;
declare.time(5.0); cv::reprojectImageTo3D(src, dst, Q);
TEST_CYCLE() TEST_CYCLE()
{ {
bm(img_l, img_r, dst); cv::reprojectImageTo3D(src, dst, Q);
} }
} }
INSTANTIATE_TEST_CASE_P(Calib3D, StereoBM, ALL_DEVICES); INSTANTIATE_TEST_CASE_P(Calib3D, ReprojectImageTo3D, testing::Combine(
ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES,
testing::Values<MatDepth>(CV_8U, CV_16S)));
#endif #endif
modules/gpu/perf_cpu/perf_core.cpp 0 → 100644
View file @ f07250ac
This diff is collapsed.
modules/gpu/perf_cpu/perf_features2d.cpp
View file @ f07250ac
...@@ -3,152 +3,182 @@ ...@@ -3,152 +3,182 @@
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// BruteForceMatcher_match // SURF
GPU_PERF_TEST(BruteForceMatcher_match, cv::gpu::DeviceInfo, int) GPU_PERF_TEST_1(SURF, cv::gpu::DeviceInfo)
{ {
int desc_size = GET_PARAM(1); cv::Mat img = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(img.empty());
cv::Mat query(3000, desc_size, CV_32FC1); cv::SURF surf;
cv::Mat train(3000, desc_size, CV_32FC1);
declare.in(query, train, WARMUP_RNG); std::vector<cv::KeyPoint> keypoints;
cv::Mat descriptors;
cv::BFMatcher matcher(cv::NORM_L2); surf(img, cv::noArray(), keypoints, descriptors);
std::vector<cv::DMatch> matches;
declare.time(10.0); declare.time(50.0);
TEST_CYCLE() TEST_CYCLE()
{ {
matcher.match(query, train, matches); surf(img, cv::noArray(), keypoints, descriptors);
} }
} }
INSTANTIATE_TEST_CASE_P(Features2D, BruteForceMatcher_match, testing::Combine( INSTANTIATE_TEST_CASE_P(Features2D, SURF, ALL_DEVICES);
ALL_DEVICES,
testing::Values(64, 128, 256)));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// BruteForceMatcher_knnMatch // FAST
GPU_PERF_TEST(BruteForceMatcher_knnMatch, cv::gpu::DeviceInfo, int, int) GPU_PERF_TEST_1(FAST, cv::gpu::DeviceInfo)
{ {
int desc_size = GET_PARAM(1); cv::Mat img = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE);
int k = GET_PARAM(2); ASSERT_FALSE(img.empty());
cv::Mat query(3000, desc_size, CV_32FC1);
cv::Mat train(3000, desc_size, CV_32FC1);
declare.in(query, train, WARMUP_RNG);
cv::BFMatcher matcher(cv::NORM_L2); std::vector<cv::KeyPoint> keypoints;
std::vector< std::vector<cv::DMatch> > matches;
declare.time(10.0); cv::FAST(img, keypoints, 20);
TEST_CYCLE() TEST_CYCLE()
{ {
matcher.knnMatch(query, train, matches, k); cv::FAST(img, keypoints, 20);
} }
} }
INSTANTIATE_TEST_CASE_P(Features2D, BruteForceMatcher_knnMatch, testing::Combine( INSTANTIATE_TEST_CASE_P(Features2D, FAST, ALL_DEVICES);
ALL_DEVICES,
testing::Values(64, 128, 256),
testing::Values(2, 3)));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// BruteForceMatcher_radiusMatch // ORB
GPU_PERF_TEST(BruteForceMatcher_radiusMatch, cv::gpu::DeviceInfo, int) GPU_PERF_TEST_1(ORB, cv::gpu::DeviceInfo)
{ {
int desc_size = GET_PARAM(1); cv::Mat img = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(img.empty());
cv::Mat query(3000, desc_size, CV_32FC1);
cv::Mat train(3000, desc_size, CV_32FC1);
fill(query, 0, 1); cv::ORB orb(4000);
fill(train, 0, 1);
cv::BFMatcher matcher(cv::NORM_L2); std::vector<cv::KeyPoint> keypoints;
std::vector< std::vector<cv::DMatch> > matches; cv::Mat descriptors;
declare.time(10.0); orb(img, cv::noArray(), keypoints, descriptors);
TEST_CYCLE() TEST_CYCLE()
{ {
matcher.radiusMatch(query, train, matches, 2.0); orb(img, cv::noArray(), keypoints, descriptors);
} }
} }
INSTANTIATE_TEST_CASE_P(Features2D, BruteForceMatcher_radiusMatch, testing::Combine( INSTANTIATE_TEST_CASE_P(Features2D, ORB, ALL_DEVICES);
ALL_DEVICES,
testing::Values(64, 128, 256)));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// SURF // BruteForceMatcher_match
GPU_PERF_TEST_1(SURF, cv::gpu::DeviceInfo) IMPLEMENT_PARAM_CLASS(DescriptorSize, int)
GPU_PERF_TEST(BruteForceMatcher_match, cv::gpu::DeviceInfo, DescriptorSize, NormType)
{ {
cv::Mat img = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE); int desc_size = GET_PARAM(1);
int normType = GET_PARAM(2);
ASSERT_FALSE(img.empty()); int type = normType == cv::NORM_HAMMING ? CV_8U : CV_32F;
std::vector<cv::KeyPoint> keypoints; cv::Mat query(3000, desc_size, type);
cv::Mat descriptors; fill(query, 0.0, 10.0);
cv::SURF surf; cv::Mat train(3000, desc_size, type);
fill(train, 0.0, 10.0);
declare.time(30.0); cv::BFMatcher matcher(normType);
std::vector<cv::DMatch> matches;
matcher.match(query, train, matches);
declare.time(20.0);
TEST_CYCLE() TEST_CYCLE()
{ {
surf(img, cv::noArray(), keypoints, descriptors); matcher.match(query, train, matches);
} }
} }
INSTANTIATE_TEST_CASE_P(Features2D, SURF, DEVICES(cv::gpu::GLOBAL_ATOMICS)); INSTANTIATE_TEST_CASE_P(Features2D, BruteForceMatcher_match, testing::Combine(
ALL_DEVICES,
testing::Values(DescriptorSize(64), DescriptorSize(128), DescriptorSize(256)),
testing::Values(NormType(cv::NORM_L1), NormType(cv::NORM_L2), NormType(cv::NORM_HAMMING))));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// FAST // BruteForceMatcher_knnMatch
GPU_PERF_TEST_1(FAST, cv::gpu::DeviceInfo) IMPLEMENT_PARAM_CLASS(K, int)
GPU_PERF_TEST(BruteForceMatcher_knnMatch, cv::gpu::DeviceInfo, DescriptorSize, K, NormType)
{ {
cv::Mat img = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE); int desc_size = GET_PARAM(1);
int k = GET_PARAM(2);
int normType = GET_PARAM(3);
ASSERT_FALSE(img.empty()); int type = normType == cv::NORM_HAMMING ? CV_8U : CV_32F;
std::vector<cv::KeyPoint> keypoints; cv::Mat query(3000, desc_size, type);
fill(query, 0.0, 10.0);
cv::Mat train(3000, desc_size, type);
fill(train, 0.0, 10.0);
cv::BFMatcher matcher(normType);
std::vector< std::vector<cv::DMatch> > matches;
matcher.knnMatch(query, train, matches, k);
declare.time(30.0);
TEST_CYCLE() TEST_CYCLE()
{ {
cv::FAST(img, keypoints, 20); matcher.knnMatch(query, train, matches, k);
} }
} }
INSTANTIATE_TEST_CASE_P(Features2D, FAST, DEVICES(cv::gpu::GLOBAL_ATOMICS)); INSTANTIATE_TEST_CASE_P(Features2D, BruteForceMatcher_knnMatch, testing::Combine(
ALL_DEVICES,
testing::Values(DescriptorSize(64), DescriptorSize(128), DescriptorSize(256)),
testing::Values(K(2), K(3)),
testing::Values(NormType(cv::NORM_L1), NormType(cv::NORM_L2), NormType(cv::NORM_HAMMING))));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// ORB // BruteForceMatcher_radiusMatch
GPU_PERF_TEST_1(ORB, cv::gpu::DeviceInfo) GPU_PERF_TEST(BruteForceMatcher_radiusMatch, cv::gpu::DeviceInfo, DescriptorSize, NormType)
{ {
cv::Mat img = readImage("gpu/perf/aloe.jpg", cv::IMREAD_GRAYSCALE); int desc_size = GET_PARAM(1);
int normType = GET_PARAM(2);
ASSERT_FALSE(img.empty()); int type = normType == cv::NORM_HAMMING ? CV_8U : CV_32F;
std::vector<cv::KeyPoint> keypoints; cv::Mat query(3000, desc_size, type);
cv::Mat descriptors; fill(query, 0.0, 1.0);
cv::ORB orb(4000); cv::Mat train(3000, desc_size, type);
fill(train, 0.0, 1.0);
cv::BFMatcher matcher(normType);
std::vector< std::vector<cv::DMatch> > matches;
matcher.radiusMatch(query, train, matches, 2.0);
declare.time(30.0);
TEST_CYCLE() TEST_CYCLE()
{ {
orb(img, cv::noArray(), keypoints, descriptors); matcher.radiusMatch(query, train, matches, 2.0);
} }
} }
INSTANTIATE_TEST_CASE_P(Features2D, ORB, DEVICES(cv::gpu::GLOBAL_ATOMICS)); INSTANTIATE_TEST_CASE_P(Features2D, BruteForceMatcher_radiusMatch, testing::Combine(
ALL_DEVICES,
testing::Values(DescriptorSize(64), DescriptorSize(128), DescriptorSize(256)),
testing::Values(NormType(cv::NORM_L1), NormType(cv::NORM_L2), NormType(cv::NORM_HAMMING))));
#endif #endif
modules/gpu/perf_cpu/perf_filters.cpp
View file @ f07250ac
...@@ -14,11 +14,12 @@ GPU_PERF_TEST(Blur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -14,11 +14,12 @@ GPU_PERF_TEST(Blur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
int ksize = GET_PARAM(3); int ksize = GET_PARAM(3);
cv::Mat src(size, type); cv::Mat src(size, type);
fill(src, 0.0, 255.0);
declare.in(src, WARMUP_RNG);
cv::Mat dst; cv::Mat dst;
cv::blur(src, dst, cv::Size(ksize, ksize));
declare.time(20.0); declare.time(20.0);
TEST_CYCLE() TEST_CYCLE()
...@@ -27,7 +28,7 @@ GPU_PERF_TEST(Blur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -27,7 +28,7 @@ GPU_PERF_TEST(Blur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Blur, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Blur, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4)), testing::Values(MatType(CV_8UC1), MatType(CV_8UC4)),
...@@ -43,11 +44,12 @@ GPU_PERF_TEST(Sobel, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -43,11 +44,12 @@ GPU_PERF_TEST(Sobel, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
int ksize = GET_PARAM(3); int ksize = GET_PARAM(3);
cv::Mat src(size, type); cv::Mat src(size, type);
fill(src, 0.0, 255.0);
declare.in(src, WARMUP_RNG);
cv::Mat dst; cv::Mat dst;
cv::Sobel(src, dst, -1, 1, 1, ksize);
declare.time(20.0); declare.time(20.0);
TEST_CYCLE() TEST_CYCLE()
...@@ -56,7 +58,7 @@ GPU_PERF_TEST(Sobel, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -56,7 +58,7 @@ GPU_PERF_TEST(Sobel, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Sobel, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Sobel, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1)), testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1)),
...@@ -71,11 +73,12 @@ GPU_PERF_TEST(Scharr, cv::gpu::DeviceInfo, cv::Size, MatType) ...@@ -71,11 +73,12 @@ GPU_PERF_TEST(Scharr, cv::gpu::DeviceInfo, cv::Size, MatType)
int type = GET_PARAM(2); int type = GET_PARAM(2);
cv::Mat src(size, type); cv::Mat src(size, type);
fill(src, 0.0, 255.0);
declare.in(src, WARMUP_RNG);
cv::Mat dst; cv::Mat dst;
cv::Scharr(src, dst, -1, 1, 0);
declare.time(20.0); declare.time(20.0);
TEST_CYCLE() TEST_CYCLE()
...@@ -84,7 +87,7 @@ GPU_PERF_TEST(Scharr, cv::gpu::DeviceInfo, cv::Size, MatType) ...@@ -84,7 +87,7 @@ GPU_PERF_TEST(Scharr, cv::gpu::DeviceInfo, cv::Size, MatType)
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Scharr, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Scharr, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1)))); testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1))));
...@@ -99,11 +102,12 @@ GPU_PERF_TEST(GaussianBlur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -99,11 +102,12 @@ GPU_PERF_TEST(GaussianBlur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
int ksize = GET_PARAM(3); int ksize = GET_PARAM(3);
cv::Mat src(size, type); cv::Mat src(size, type);
fill(src, 0.0, 255.0);
declare.in(src, WARMUP_RNG);
cv::Mat dst; cv::Mat dst;
cv::GaussianBlur(src, dst, cv::Size(ksize, ksize), 0.5);
declare.time(20.0); declare.time(20.0);
TEST_CYCLE() TEST_CYCLE()
...@@ -112,7 +116,7 @@ GPU_PERF_TEST(GaussianBlur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -112,7 +116,7 @@ GPU_PERF_TEST(GaussianBlur, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, GaussianBlur, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, GaussianBlur, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1)), testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1)),
...@@ -128,11 +132,12 @@ GPU_PERF_TEST(Laplacian, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -128,11 +132,12 @@ GPU_PERF_TEST(Laplacian, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
int ksize = GET_PARAM(3); int ksize = GET_PARAM(3);
cv::Mat src(size, type); cv::Mat src(size, type);
fill(src, 0.0, 255.0);
declare.in(src, WARMUP_RNG);
cv::Mat dst; cv::Mat dst;
cv::Laplacian(src, dst, -1, ksize);
declare.time(20.0); declare.time(20.0);
TEST_CYCLE() TEST_CYCLE()
...@@ -141,7 +146,7 @@ GPU_PERF_TEST(Laplacian, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -141,7 +146,7 @@ GPU_PERF_TEST(Laplacian, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Laplacian, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Laplacian, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1), MatType(CV_32FC4)), testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1), MatType(CV_32FC4)),
...@@ -156,13 +161,14 @@ GPU_PERF_TEST(Erode, cv::gpu::DeviceInfo, cv::Size, MatType) ...@@ -156,13 +161,14 @@ GPU_PERF_TEST(Erode, cv::gpu::DeviceInfo, cv::Size, MatType)
int type = GET_PARAM(2); int type = GET_PARAM(2);
cv::Mat src(size, type); cv::Mat src(size, type);
fill(src, 0.0, 255.0);
declare.in(src, WARMUP_RNG);
cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3)); cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3));
cv::Mat dst; cv::Mat dst;
cv::erode(src, dst, ker);
declare.time(20.0); declare.time(20.0);
TEST_CYCLE() TEST_CYCLE()
...@@ -171,7 +177,7 @@ GPU_PERF_TEST(Erode, cv::gpu::DeviceInfo, cv::Size, MatType) ...@@ -171,7 +177,7 @@ GPU_PERF_TEST(Erode, cv::gpu::DeviceInfo, cv::Size, MatType)
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Erode, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Erode, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4)))); testing::Values(MatType(CV_8UC1), MatType(CV_8UC4))));
...@@ -185,13 +191,14 @@ GPU_PERF_TEST(Dilate, cv::gpu::DeviceInfo, cv::Size, MatType) ...@@ -185,13 +191,14 @@ GPU_PERF_TEST(Dilate, cv::gpu::DeviceInfo, cv::Size, MatType)
int type = GET_PARAM(2); int type = GET_PARAM(2);
cv::Mat src(size, type); cv::Mat src(size, type);
fill(src, 0.0, 255.0);
declare.in(src, WARMUP_RNG);
cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3)); cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3));
cv::Mat dst; cv::Mat dst;
cv::dilate(src, dst, ker);
declare.time(20.0); declare.time(20.0);
TEST_CYCLE() TEST_CYCLE()
...@@ -200,7 +207,7 @@ GPU_PERF_TEST(Dilate, cv::gpu::DeviceInfo, cv::Size, MatType) ...@@ -200,7 +207,7 @@ GPU_PERF_TEST(Dilate, cv::gpu::DeviceInfo, cv::Size, MatType)
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Dilate, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Dilate, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4)))); testing::Values(MatType(CV_8UC1), MatType(CV_8UC4))));
...@@ -218,13 +225,14 @@ GPU_PERF_TEST(MorphologyEx, cv::gpu::DeviceInfo, cv::Size, MatType, MorphOp) ...@@ -218,13 +225,14 @@ GPU_PERF_TEST(MorphologyEx, cv::gpu::DeviceInfo, cv::Size, MatType, MorphOp)
int morphOp = GET_PARAM(3); int morphOp = GET_PARAM(3);
cv::Mat src(size, type); cv::Mat src(size, type);
fill(src, 0.0, 255.0);
declare.in(src, WARMUP_RNG);
cv::Mat dst; cv::Mat dst;
cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3)); cv::Mat ker = cv::getStructuringElement(cv::MORPH_RECT, cv::Size(3, 3));
cv::morphologyEx(src, dst, morphOp, ker);
declare.time(20.0); declare.time(20.0);
TEST_CYCLE() TEST_CYCLE()
...@@ -233,7 +241,7 @@ GPU_PERF_TEST(MorphologyEx, cv::gpu::DeviceInfo, cv::Size, MatType, MorphOp) ...@@ -233,7 +241,7 @@ GPU_PERF_TEST(MorphologyEx, cv::gpu::DeviceInfo, cv::Size, MatType, MorphOp)
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, MorphologyEx, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, MorphologyEx, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4)), testing::Values(MatType(CV_8UC1), MatType(CV_8UC4)),
...@@ -249,12 +257,15 @@ GPU_PERF_TEST(Filter2D, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -249,12 +257,15 @@ GPU_PERF_TEST(Filter2D, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
int ksize = GET_PARAM(3); int ksize = GET_PARAM(3);
cv::Mat src(size, type); cv::Mat src(size, type);
cv::Mat kernel(ksize, ksize, CV_32FC1); fill(src, 0.0, 255.0);
declare.in(src, kernel, WARMUP_RNG); cv::Mat kernel(ksize, ksize, CV_32FC1);
fill(kernel, 0.0, 1.0);
cv::Mat dst; cv::Mat dst;
cv::filter2D(src, dst, -1, kernel);
declare.time(20.0); declare.time(20.0);
TEST_CYCLE() TEST_CYCLE()
...@@ -263,7 +274,7 @@ GPU_PERF_TEST(Filter2D, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize) ...@@ -263,7 +274,7 @@ GPU_PERF_TEST(Filter2D, cv::gpu::DeviceInfo, cv::Size, MatType, KernelSize)
} }
} }
INSTANTIATE_TEST_CASE_P(Filter, Filter2D, testing::Combine( INSTANTIATE_TEST_CASE_P(Filters, Filter2D, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1), MatType(CV_32FC4)), testing::Values(MatType(CV_8UC1), MatType(CV_8UC4), MatType(CV_32FC1), MatType(CV_32FC4)),
......
modules/gpu/perf_cpu/perf_imgproc.cpp
View file @ f07250ac
This diff is collapsed.
modules/gpu/perf_cpu/perf_matop.cpp
View file @ f07250ac
...@@ -2,64 +2,10 @@ ...@@ -2,64 +2,10 @@
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
//////////////////////////////////////////////////////////////////////
// Merge
GPU_PERF_TEST(Merge, cv::gpu::DeviceInfo, cv::Size, perf::MatType)
{
cv::Size size = GET_PARAM(1);
int type = GET_PARAM(2);
const int num_channels = 4;
std::vector<cv::Mat> src(num_channels);
for (int i = 0; i < num_channels; ++i)
src[i] = cv::Mat(size, type, cv::Scalar::all(i));
cv::Mat dst;
TEST_CYCLE()
{
cv::merge(src, dst);
}
}
INSTANTIATE_TEST_CASE_P(MatOp, Merge, testing::Combine(
ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES,
testing::Values(CV_8UC1, CV_16UC1, CV_32FC1)));
//////////////////////////////////////////////////////////////////////
// Split
GPU_PERF_TEST(Split, cv::gpu::DeviceInfo, cv::Size, perf::MatType)
{
cv::Size size = GET_PARAM(1);
int type = GET_PARAM(2);
const int num_channels = 4;
cv::Mat src(size, CV_MAKETYPE(type, num_channels), cv::Scalar(1, 2, 3, 4));
std::vector<cv::Mat> dst(num_channels);
for (int i = 0; i < num_channels; ++i)
dst[i] = cv::Mat(size, type);
TEST_CYCLE()
{
cv::split(src, dst);
}
}
INSTANTIATE_TEST_CASE_P(MatOp, Split, testing::Combine(
ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES,
testing::Values(CV_8UC1, CV_16UC1, CV_32FC1)));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// SetTo // SetTo
GPU_PERF_TEST(SetTo, cv::gpu::DeviceInfo, cv::Size, perf::MatType) GPU_PERF_TEST(SetTo, cv::gpu::DeviceInfo, cv::Size, MatType)
{ {
cv::Size size = GET_PARAM(1); cv::Size size = GET_PARAM(1);
int type = GET_PARAM(2); int type = GET_PARAM(2);
...@@ -67,6 +13,8 @@ GPU_PERF_TEST(SetTo, cv::gpu::DeviceInfo, cv::Size, perf::MatType) ...@@ -67,6 +13,8 @@ GPU_PERF_TEST(SetTo, cv::gpu::DeviceInfo, cv::Size, perf::MatType)
cv::Mat src(size, type); cv::Mat src(size, type);
cv::Scalar val(1, 2, 3, 4); cv::Scalar val(1, 2, 3, 4);
src.setTo(val);
TEST_CYCLE() TEST_CYCLE()
{ {
src.setTo(val); src.setTo(val);
...@@ -74,26 +22,31 @@ GPU_PERF_TEST(SetTo, cv::gpu::DeviceInfo, cv::Size, perf::MatType) ...@@ -74,26 +22,31 @@ GPU_PERF_TEST(SetTo, cv::gpu::DeviceInfo, cv::Size, perf::MatType)
} }
INSTANTIATE_TEST_CASE_P(MatOp, SetTo, testing::Combine( INSTANTIATE_TEST_CASE_P(MatOp, SetTo, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_16UC1, CV_16UC3, CV_16UC4, CV_32FC1, CV_32FC3, CV_32FC4))); testing::Values(MatType(CV_8UC1), MatType(CV_8UC3), MatType(CV_8UC4),
MatType(CV_16UC1), MatType(CV_16UC3), MatType(CV_16UC4),
MatType(CV_32FC1), MatType(CV_32FC3), MatType(CV_32FC4),
MatType(CV_64FC1), MatType(CV_64FC3), MatType(CV_64FC4))));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// SetToMasked // SetToMasked
GPU_PERF_TEST(SetToMasked, cv::gpu::DeviceInfo, cv::Size, perf::MatType) GPU_PERF_TEST(SetToMasked, cv::gpu::DeviceInfo, cv::Size, MatType)
{ {
cv::Size size = GET_PARAM(1); cv::Size size = GET_PARAM(1);
int type = GET_PARAM(2); int type = GET_PARAM(2);
cv::Mat src(size, type); cv::Mat src(size, type);
cv::Mat mask(size, CV_8UC1); fill(src, 0, 255);
declare.in(src, WARMUP_RNG); cv::Mat mask(size, CV_8UC1);
fill(mask, 0, 2); fill(mask, 0, 2);
cv::Scalar val(1, 2, 3, 4); cv::Scalar val(1, 2, 3, 4);
src.setTo(val, mask);
TEST_CYCLE() TEST_CYCLE()
{ {
src.setTo(val, mask); src.setTo(val, mask);
...@@ -101,26 +54,31 @@ GPU_PERF_TEST(SetToMasked, cv::gpu::DeviceInfo, cv::Size, perf::MatType) ...@@ -101,26 +54,31 @@ GPU_PERF_TEST(SetToMasked, cv::gpu::DeviceInfo, cv::Size, perf::MatType)
} }
INSTANTIATE_TEST_CASE_P(MatOp, SetToMasked, testing::Combine( INSTANTIATE_TEST_CASE_P(MatOp, SetToMasked, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_16UC1, CV_16UC3, CV_16UC4, CV_32FC1, CV_32FC3, CV_32FC4))); testing::Values(MatType(CV_8UC1), MatType(CV_8UC3), MatType(CV_8UC4),
MatType(CV_16UC1), MatType(CV_16UC3), MatType(CV_16UC4),
MatType(CV_32FC1), MatType(CV_32FC3), MatType(CV_32FC4),
MatType(CV_64FC1), MatType(CV_64FC3), MatType(CV_64FC4))));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// CopyToMasked // CopyToMasked
GPU_PERF_TEST(CopyToMasked, cv::gpu::DeviceInfo, cv::Size, perf::MatType) GPU_PERF_TEST(CopyToMasked, cv::gpu::DeviceInfo, cv::Size, MatType)
{ {
cv::Size size = GET_PARAM(1); cv::Size size = GET_PARAM(1);
int type = GET_PARAM(2); int type = GET_PARAM(2);
cv::Mat src(size, type); cv::Mat src(size, type);
cv::Mat mask(size, CV_8UC1); fill(src, 0, 255);
declare.in(src, WARMUP_RNG); cv::Mat mask(size, CV_8UC1);
fill(mask, 0, 2); fill(mask, 0, 2);
cv::Mat dst; cv::Mat dst;
src.copyTo(dst, mask);
TEST_CYCLE() TEST_CYCLE()
{ {
src.copyTo(dst, mask); src.copyTo(dst, mask);
...@@ -128,35 +86,39 @@ GPU_PERF_TEST(CopyToMasked, cv::gpu::DeviceInfo, cv::Size, perf::MatType) ...@@ -128,35 +86,39 @@ GPU_PERF_TEST(CopyToMasked, cv::gpu::DeviceInfo, cv::Size, perf::MatType)
} }
INSTANTIATE_TEST_CASE_P(MatOp, CopyToMasked, testing::Combine( INSTANTIATE_TEST_CASE_P(MatOp, CopyToMasked, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(CV_8UC1, CV_8UC3, CV_8UC4, CV_16UC1, CV_16UC3, CV_16UC4, CV_32FC1, CV_32FC3, CV_32FC4))); testing::Values(MatType(CV_8UC1), MatType(CV_8UC3), MatType(CV_8UC4),
MatType(CV_16UC1), MatType(CV_16UC3), MatType(CV_16UC4),
MatType(CV_32FC1), MatType(CV_32FC3), MatType(CV_32FC4),
MatType(CV_64FC1), MatType(CV_64FC3), MatType(CV_64FC4))));
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// ConvertTo // ConvertTo
GPU_PERF_TEST(ConvertTo, cv::gpu::DeviceInfo, cv::Size, perf::MatType, perf::MatType) GPU_PERF_TEST(ConvertTo, cv::gpu::DeviceInfo, cv::Size, MatDepth, MatDepth)
{ {
cv::Size size = GET_PARAM(1); cv::Size size = GET_PARAM(1);
int type1 = GET_PARAM(2); int depth1 = GET_PARAM(2);
int type2 = GET_PARAM(3); int depth2 = GET_PARAM(3);
cv::Mat src(size, type1); cv::Mat src(size, depth1);
fill(src, 0, 255);
declare.in(src, WARMUP_RNG);
cv::Mat dst; cv::Mat dst;
src.convertTo(dst, depth2, 0.5, 1.0);
TEST_CYCLE() TEST_CYCLE()
{ {
src.convertTo(dst, type2, 0.5, 1.0); src.convertTo(dst, depth2, 0.5, 1.0);
} }
} }
INSTANTIATE_TEST_CASE_P(MatOp, ConvertTo, testing::Combine( INSTANTIATE_TEST_CASE_P(MatOp, ConvertTo, testing::Combine(
ALL_DEVICES, ALL_DEVICES,
GPU_TYPICAL_MAT_SIZES, GPU_TYPICAL_MAT_SIZES,
testing::Values(CV_8UC1, CV_16UC1, CV_32FC1), testing::Values(MatDepth(CV_8U), MatDepth(CV_16U), MatDepth(CV_32F), MatDepth(CV_64F)),
testing::Values(CV_8UC1, CV_16UC1, CV_32FC1))); testing::Values(MatDepth(CV_8U), MatDepth(CV_16U), MatDepth(CV_32F), MatDepth(CV_64F))));
#endif #endif
modules/gpu/perf_cpu/perf_objdetect.cpp
View file @ f07250ac
...@@ -2,15 +2,21 @@ ...@@ -2,15 +2,21 @@
#ifdef HAVE_CUDA #ifdef HAVE_CUDA
///////////////////////////////////////////////////////////////
// HOG
GPU_PERF_TEST_1(HOG, cv::gpu::DeviceInfo) GPU_PERF_TEST_1(HOG, cv::gpu::DeviceInfo)
{ {
cv::Mat img = readImage("gpu/hog/road.png", cv::IMREAD_GRAYSCALE); cv::Mat img = readImage("gpu/hog/road.png", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(img.empty());
std::vector<cv::Rect> found_locations; std::vector<cv::Rect> found_locations;
cv::HOGDescriptor hog; cv::HOGDescriptor hog;
hog.setSVMDetector(cv::gpu::HOGDescriptor::getDefaultPeopleDetector()); hog.setSVMDetector(cv::gpu::HOGDescriptor::getDefaultPeopleDetector());
hog.detectMultiScale(img, found_locations);
TEST_CYCLE() TEST_CYCLE()
{ {
hog.detectMultiScale(img, found_locations); hog.detectMultiScale(img, found_locations);
...@@ -19,27 +25,28 @@ GPU_PERF_TEST_1(HOG, cv::gpu::DeviceInfo) ...@@ -19,27 +25,28 @@ GPU_PERF_TEST_1(HOG, cv::gpu::DeviceInfo)
INSTANTIATE_TEST_CASE_P(ObjDetect, HOG, ALL_DEVICES); INSTANTIATE_TEST_CASE_P(ObjDetect, HOG, ALL_DEVICES);
///////////////////////////////////////////////////////////////
// HaarClassifier
GPU_PERF_TEST_1(HaarClassifier, cv::gpu::DeviceInfo) GPU_PERF_TEST_1(HaarClassifier, cv::gpu::DeviceInfo)
{ {
cv::Mat img = readImage("gpu/haarcascade/group_1_640x480_VGA.pgm", cv::IMREAD_GRAYSCALE); cv::Mat img = readImage("gpu/haarcascade/group_1_640x480_VGA.pgm", cv::IMREAD_GRAYSCALE);
ASSERT_FALSE(img.empty());
cv::CascadeClassifier cascade; cv::CascadeClassifier cascade;
if (!cascade.load("haarcascade_frontalface_alt.xml")) ASSERT_TRUE(cascade.load(perf::TestBase::getDataPath("gpu/perf/haarcascade_frontalface_alt.xml")));
CV_Error(0, "Can't load cascade");
std::vector<cv::Rect> rects; std::vector<cv::Rect> rects;
rects.reserve(1000);
cascade.detectMultiScale(img, rects);
TEST_CYCLE() TEST_CYCLE()
{ {
cascade.detectMultiScale(img, rects); cascade.detectMultiScale(img, rects);
} }
} }
INSTANTIATE_TEST_CASE_P(ObjDetect, HaarClassifier, ALL_DEVICES); INSTANTIATE_TEST_CASE_P(ObjDetect, HaarClassifier, ALL_DEVICES);
#endif #endif
modules/gpu/perf_cpu/perf_utility.cpp
View file @ f07250ac
...@@ -147,11 +147,6 @@ Mat readImage(const string& fileName, int flags) ...@@ -147,11 +147,6 @@ Mat readImage(const string& fileName, int flags)
return imread(perf::TestBase::getDataPath(fileName), flags); return imread(perf::TestBase::getDataPath(fileName), flags);
} }
bool supportFeature(const DeviceInfo& info, FeatureSet feature)
{
return TargetArchs::builtWith(feature) && info.supports(feature);
}
const vector<DeviceInfo>& devices() const vector<DeviceInfo>& devices()
{ {
static vector<DeviceInfo> devs; static vector<DeviceInfo> devs;
...@@ -175,27 +170,3 @@ const vector<DeviceInfo>& devices() ...@@ -175,27 +170,3 @@ const vector<DeviceInfo>& devices()
return devs; return devs;
} }
vector<DeviceInfo> devices(FeatureSet feature)
{
const vector<DeviceInfo>& d = devices();
vector<DeviceInfo> devs_filtered;
if (TargetArchs::builtWith(feature))
{
devs_filtered.reserve(d.size());
for (size_t i = 0, size = d.size(); i < size; ++i)
{
const DeviceInfo& info = d[i];
if (info.supports(feature))
devs_filtered.push_back(info);
}
}
return devs_filtered;
}
modules/gpu/perf_cpu/perf_utility.hpp
View file @ f07250ac
This diff is collapsed.
modules/gpu/perf_cpu/perf_video.cpp
View file @ f07250ac
This diff is collapsed.
modules/gpu/test/test_core.cpp
View file @ f07250ac
...@@ -1916,10 +1916,10 @@ TEST_P(LShift, Accuracy) ...@@ -1916,10 +1916,10 @@ TEST_P(LShift, Accuracy)
cv::Scalar_<int> val = randomScalar(0.0, 8.0); cv::Scalar_<int> val = randomScalar(0.0, 8.0);
cv::gpu::GpuMat dst = createMat(size, type, useRoi); cv::gpu::GpuMat dst = createMat(size, type, useRoi);
cv::gpu::rshift(loadMat(src, useRoi), val, dst); cv::gpu::lshift(loadMat(src, useRoi), val, dst);
cv::Mat dst_gold; cv::Mat dst_gold;
rhiftGold(src, val, dst_gold); lhiftGold(src, val, dst_gold);
EXPECT_MAT_NEAR(dst_gold, dst, 0.0); EXPECT_MAT_NEAR(dst_gold, dst, 0.0);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment