From: Vadim Pisarevsky <vadim.pisarevsky@gmail.com>
Date: Wed, 20 Dec 2017 14:30:26 +0000 (+0000)
Subject: Merge pull request #10331 from arrybn:python_dnn_net
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~263
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eecb64a97313bcc0221db20c9cd0636f1c27a6d8;p=platform%2Fupstream%2Fopencv.git

Merge pull request #10331 from arrybn:python_dnn_net
---

eecb64a97313bcc0221db20c9cd0636f1c27a6d8
diff --cc modules/dnn/include/opencv2/dnn/dnn.hpp
index 3ded147,a0eca0a..7488351
--- a/modules/dnn/include/opencv2/dnn/dnn.hpp
+++ b/modules/dnn/include/opencv2/dnn/dnn.hpp
@@@ -423,9 -423,18 +423,9 @@@ CV__DNN_EXPERIMENTAL_NS_BEGI
           *  @param outputBlobs contains all output blobs for each layer specified in @p outBlobNames.
           *  @param outBlobNames names for layers which outputs are needed to get
           */
-         void forward(std::vector<std::vector<Mat> >& outputBlobs,
-                      const std::vector<String>& outBlobNames);
+         CV_WRAP_AS(forwardAndRetrieve) void forward(CV_OUT std::vector<std::vector<Mat> >& outputBlobs,
+                                                     const std::vector<String>& outBlobNames);
  
 -        //TODO:
 -        /** @brief Optimized forward.
 -         *  @warning Not implemented yet.
 -         *  @details Makes forward only those layers which weren't changed after previous forward().
 -         */
 -        void forwardOpt(LayerId toLayer);
 -        /** @overload */
 -        void forwardOpt(const std::vector<LayerId> &toLayers);
 -
          /**
           * @brief Compile Halide layers.
           * @param[in] scheduler Path to YAML file with scheduling directives.