third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #19497 from OrestChura:oc/kmeans_ptest

Browse Source 
[G-API]: Performance tests for kmeans

* - Perf.Tests for kmeans(2D, 3D (Point2f/3f), ND (Mat))
 - New file for common parts of acc. and perf. tests for core kernels added
 - Some typos corrections

* Applying comments
This commit is contained in:
Orest Chura
2021-02-26 00:58:52 +03:00
committed by GitHub
parent 0553543e6e
commit 21b2e33ebb
9 changed files with 374 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/perf/common/gapi_core_perf_tests.hpp
+7 -1
View File
@@ -2,7 +2,7 @@
// It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html.
//
// Copyright (C) 2018-2020 Intel Corporation
// Copyright (C) 2018-2021 Intel Corporation
#ifndef OPENCV_GAPI_CORE_PERF_TESTS_HPP
@@ -73,6 +73,12 @@ namespace opencv_test
class ConcatVertVecPerfTest : public TestPerfParams<tuple<cv::Size, MatType, cv::GCompileArgs>> {};
class LUTPerfTest : public TestPerfParams<tuple<MatType, MatType, cv::Size, cv::GCompileArgs>> {};
class ConvertToPerfTest : public TestPerfParams<tuple<compare_f, MatType, int, cv::Size, double, double, cv::GCompileArgs>> {};
class KMeansNDPerfTest : public TestPerfParams<tuple<cv::Size, CompareMats, int,
cv::KmeansFlags, cv::GCompileArgs>> {};
class KMeans2DPerfTest : public TestPerfParams<tuple<int, int, cv::KmeansFlags,
cv::GCompileArgs>> {};
class KMeans3DPerfTest : public TestPerfParams<tuple<int, int, cv::KmeansFlags,
cv::GCompileArgs>> {};
class ResizePerfTest : public TestPerfParams<tuple<compare_f, MatType, int, cv::Size, cv::Size, cv::GCompileArgs>> {};
class ResizeFxFyPerfTest : public TestPerfParams<tuple<compare_f, MatType, int, cv::Size, double, double, cv::GCompileArgs>> {};
class ParseSSDBLPerfTest : public TestPerfParams<tuple<cv::Size, float, int, cv::GCompileArgs>>, public ParserSSDTest {};
modules/gapi/perf/common/gapi_core_perf_tests_inl.hpp
+132 -1
View File
@@ -2,7 +2,7 @@
// It is subject to the license terms in the LICENSE file found in the top-level directory
// of this distribution and at http://opencv.org/license.html.
//
// Copyright (C) 2018-2020 Intel Corporation
// Copyright (C) 2018-2021 Intel Corporation
#ifndef OPENCV_GAPI_CORE_PERF_TESTS_INL_HPP
@@ -12,6 +12,8 @@
#include "gapi_core_perf_tests.hpp"
#include "../../test/common/gapi_core_tests_common.hpp"
namespace opencv_test
{
using namespace perf;
@@ -1905,6 +1907,135 @@ PERF_TEST_P_(ConvertToPerfTest, TestPerformance)
//------------------------------------------------------------------------------
PERF_TEST_P_(KMeansNDPerfTest, TestPerformance)
{
cv::Size sz;
CompareMats cmpF;
int K = -1;
cv::KmeansFlags flags = cv::KMEANS_RANDOM_CENTERS;
cv::GCompileArgs compile_args;
std::tie(sz, cmpF, K, flags, compile_args) = GetParam();
MatType2 type = CV_32FC1;
initMatrixRandU(type, sz, -1, false);
double compact_gapi = -1.;
cv::Mat labels_gapi, centers_gapi;
if (flags & cv::KMEANS_USE_INITIAL_LABELS)
{
const int amount = sz.height;
cv::Mat bestLabels(cv::Size{1, amount}, CV_32SC1);
cv::randu(bestLabels, 0, K);
cv::GComputation c(kmeansTestGAPI(in_mat1, bestLabels, K, flags, std::move(compile_args),
compact_gapi, labels_gapi, centers_gapi));
TEST_CYCLE()
{
c.apply(cv::gin(in_mat1, bestLabels),
cv::gout(compact_gapi, labels_gapi, centers_gapi));
}
kmeansTestOpenCVCompare(in_mat1, bestLabels, K, flags, compact_gapi, labels_gapi,
centers_gapi, cmpF);
}
else
{
cv::GComputation c(kmeansTestGAPI(in_mat1, K, flags, std::move(compile_args), compact_gapi,
labels_gapi, centers_gapi));
TEST_CYCLE()
{
c.apply(cv::gin(in_mat1), cv::gout(compact_gapi, labels_gapi, centers_gapi));
}
kmeansTestValidate(sz, type, K, compact_gapi, labels_gapi, centers_gapi);
}
SANITY_CHECK_NOTHING();
}
PERF_TEST_P_(KMeans2DPerfTest, TestPerformance)
{
int amount = -1;
int K = -1;
cv::KmeansFlags flags = cv::KMEANS_RANDOM_CENTERS;
cv::GCompileArgs compile_args;
std::tie(amount, K, flags, compile_args) = GetParam();
std::vector<cv::Point2f> in_vector{};
initPointsVectorRandU(amount, in_vector);
double compact_gapi = -1.;
std::vector<int> labels_gapi{};
std::vector<cv::Point2f> centers_gapi{};
if (flags & cv::KMEANS_USE_INITIAL_LABELS)
{
std::vector<int> bestLabels(amount);
cv::randu(bestLabels, 0, K);
cv::GComputation c(kmeansTestGAPI(in_vector, bestLabels, K, flags, std::move(compile_args),
compact_gapi, labels_gapi, centers_gapi));
TEST_CYCLE()
{
c.apply(cv::gin(in_vector, bestLabels),
cv::gout(compact_gapi, labels_gapi, centers_gapi));
}
kmeansTestOpenCVCompare(in_vector, bestLabels, K, flags, compact_gapi, labels_gapi,
centers_gapi);
}
else
{
cv::GComputation c(kmeansTestGAPI(in_vector, K, flags, std::move(compile_args),
compact_gapi, labels_gapi, centers_gapi));
TEST_CYCLE()
{
c.apply(cv::gin(in_vector), cv::gout(compact_gapi, labels_gapi, centers_gapi));
}
kmeansTestValidate({-1, amount}, -1, K, compact_gapi, labels_gapi, centers_gapi);
}
SANITY_CHECK_NOTHING();
}
PERF_TEST_P_(KMeans3DPerfTest, TestPerformance)
{
int amount = -1;
int K = -1;
cv::KmeansFlags flags = cv::KMEANS_RANDOM_CENTERS;
cv::GCompileArgs compile_args;
std::tie(amount, K, flags, compile_args) = GetParam();
std::vector<cv::Point3f> in_vector{};
initPointsVectorRandU(amount, in_vector);
double compact_gapi = -1.;
std::vector<int> labels_gapi;
std::vector<cv::Point3f> centers_gapi;
if (flags & cv::KMEANS_USE_INITIAL_LABELS)
{
std::vector<int> bestLabels(amount);
cv::randu(bestLabels, 0, K);
cv::GComputation c(kmeansTestGAPI(in_vector, bestLabels, K, flags, std::move(compile_args),
compact_gapi, labels_gapi, centers_gapi));
TEST_CYCLE()
{
c.apply(cv::gin(in_vector, bestLabels),
cv::gout(compact_gapi, labels_gapi, centers_gapi));
}
kmeansTestOpenCVCompare(in_vector, bestLabels, K, flags, compact_gapi, labels_gapi,
centers_gapi);
}
else
{
cv::GComputation c(kmeansTestGAPI(in_vector, K, flags, std::move(compile_args),
compact_gapi, labels_gapi, centers_gapi));
TEST_CYCLE()
{
c.apply(cv::gin(in_vector), cv::gout(compact_gapi, labels_gapi, centers_gapi));
}
kmeansTestValidate({-1, amount}, -1, K, compact_gapi, labels_gapi, centers_gapi);
}
SANITY_CHECK_NOTHING();
}
//------------------------------------------------------------------------------
PERF_TEST_P_(ResizePerfTest, TestPerformance)
{
compare_f cmpF = get<0>(GetParam());