From ff60abb575b0ae6e863347bc31e155d45ed7459b Mon Sep 17 00:00:00 2001 From: Paul Jurczak Date: Wed, 2 Jun 2021 13:15:52 -0600 Subject: [PATCH] Merge pull request #20080 from pauljurczak:patch-3 * Update dnn.hpp getPerfProfile is not supported by the CUDA backend, see https://github.com/opencv/opencv/issues/20077 * dnn.hpp: fix doxygen formatting --- modules/dnn/include/opencv2/dnn/dnn.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/dnn/include/opencv2/dnn/dnn.hpp b/modules/dnn/include/opencv2/dnn/dnn.hpp index f4efe57fac..e31e89bde5 100644 --- a/modules/dnn/include/opencv2/dnn/dnn.hpp +++ b/modules/dnn/include/opencv2/dnn/dnn.hpp @@ -712,9 +712,11 @@ CV__DNN_EXPERIMENTAL_NS_BEGIN CV_WRAP void enableFusion(bool fusion); /** @brief Returns overall time for inference and timings (in ticks) for layers. + * * Indexes in returned vector correspond to layers ids. Some layers can be fused with others, - * in this case zero ticks count will be return for that skipped layers. - * @param timings vector for tick timings for all layers. + * in this case zero ticks count will be return for that skipped layers. Supported by DNN_BACKEND_OPENCV on DNN_TARGET_CPU only. + * + * @param[out] timings vector for tick timings for all layers. * @return overall ticks for model inference. */ CV_WRAP int64 getPerfProfile(CV_OUT std::vector& timings);