Merge pull request #10331 from arrybn:python_dnn_net
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 20 Dec 2017 14:30:26 +0000 (14:30 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 20 Dec 2017 14:30:27 +0000 (14:30 +0000)
1  2 
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.