Anatoly Baksheev
10 years ago
parent
42b36fb346
commit
10c3a1378a
4 changed files with 185 additions and 172 deletions
@ -0,0 +1,177 @@ |
||||
#ifndef __OPENCV_DNN_DNN_HPP__ |
||||
#define __OPENCV_DNN_DNN_HPP__ |
||||
|
||||
#include <opencv2/core.hpp> |
||||
#include <map> |
||||
#include <vector> |
||||
#include <opencv2/dnn/dict.hpp> |
||||
|
||||
namespace cv |
||||
{ |
||||
namespace dnn |
||||
{ |
||||
class Layer; |
||||
class NetConfiguration; |
||||
class Net; |
||||
class Blob; |
||||
class LayerParams; |
||||
|
||||
//wrapper over cv::Mat and cv::UMat
|
||||
class CV_EXPORTS Blob |
||||
{ |
||||
public: |
||||
Blob(); |
||||
Blob(InputArray in); |
||||
|
||||
void fill(InputArray in); |
||||
void fill(int ndims, const int *sizes, int type, void *data, bool deepCopy = true); |
||||
void create(int ndims, const int *sizes, int type = CV_32F); |
||||
|
||||
bool empty() const; |
||||
|
||||
Mat& getMatRef(); |
||||
const Mat& getMatRef() const; |
||||
Mat getMat(); |
||||
Mat getMat(int num, int channel); |
||||
|
||||
int cols() const; |
||||
int rows() const; |
||||
Size size() const; |
||||
|
||||
int channels() const; |
||||
int num() const; |
||||
|
||||
Vec4i shape() const; |
||||
|
||||
private: |
||||
Mat m; |
||||
}; |
||||
|
||||
class CV_EXPORTS LayerParams : public Dict |
||||
{ |
||||
public: |
||||
|
||||
std::vector<Blob> learnedBlobs; |
||||
}; |
||||
|
||||
class CV_EXPORTS LayerRegister |
||||
{ |
||||
public: |
||||
|
||||
typedef Layer* (*Constuctor)(); |
||||
|
||||
static void registerLayer(const String &type, Constuctor constructor); |
||||
|
||||
static void unregisterLayer(const String &type); |
||||
|
||||
static Ptr<Layer> createLayerInstance(const String &type); |
||||
|
||||
private: |
||||
LayerRegister(); |
||||
LayerRegister(const LayerRegister &lr); |
||||
|
||||
static std::map<String, Constuctor> registeredLayers; |
||||
}; |
||||
|
||||
//this class allows to build new Layers
|
||||
class CV_EXPORTS Layer |
||||
{ |
||||
public: |
||||
|
||||
//TODO: this field must be declared as public if we want support possibility to change these params in runtime
|
||||
std::vector<Blob> learnedParams; |
||||
|
||||
virtual ~Layer(); |
||||
|
||||
//type of Layer
|
||||
virtual String type() const; |
||||
|
||||
//setUp calls once (think that it's constructor)
|
||||
virtual void setUp(LayerParams ¶ms); |
||||
|
||||
//after setUp the following two function must be able to return values
|
||||
virtual int getNumInputs(); |
||||
virtual int getNumOutputs(); |
||||
|
||||
//maybe useless function
|
||||
//shape of output blobs must be adjusted with respect to shape of input blobs
|
||||
virtual void adjustShape(const std::vector<Blob> &inputs, std::vector<Blob> &outputs); |
||||
|
||||
virtual void forward(std::vector<Blob> &inputs, std::vector<Blob> &outputs); |
||||
}; |
||||
|
||||
//TODO: divide NetConfiguration interface and implementation, hide internal data
|
||||
//TODO: maybe eliminate all int ids and replace them by string names
|
||||
//Proxy class for different formats
|
||||
//Each format importer must populate it
|
||||
class CV_EXPORTS NetConfiguration |
||||
{ |
||||
public: |
||||
|
||||
static Ptr<NetConfiguration> create(); |
||||
|
||||
int addLayer(const String &name, const String &type); |
||||
|
||||
void deleteLayer(int layerId); |
||||
|
||||
void setLayerParams(int layerId, LayerParams ¶ms); |
||||
|
||||
//each output of each layer can be labeled by unique string label (as in Caffe)
|
||||
//if label not specified then %layer_name%:c_%N% will be used
|
||||
void setLayerOutputLabels(int layerId, const std::vector<String> &outputNames); |
||||
|
||||
//version #1
|
||||
void addConnection(int fromLayer, int fromLayerOutput, int toLayer, int toLayerInput); |
||||
|
||||
//or maybe version #2
|
||||
inline int getBlobId(int layerId, int inputOutputNumber) |
||||
{ |
||||
return (layerId << 16) + inputOutputNumber; |
||||
} |
||||
|
||||
void addConnection(int outputId, int inputId); |
||||
|
||||
void addConnections(const std::vector<int> &outputIds, const std::vector<int> &inputIds); |
||||
|
||||
private: |
||||
|
||||
int lastLayerId; |
||||
std::map< int, Ptr<Layer> > layers; |
||||
std::map< int, std::vector<String> > layerOutputLabels; |
||||
}; |
||||
|
||||
|
||||
class CV_EXPORTS Net |
||||
{ |
||||
public: |
||||
|
||||
static Ptr<Net> create(Ptr<NetConfiguration> config); |
||||
|
||||
virtual ~Net() = 0; |
||||
|
||||
virtual int getBlobId(int layerId, int outputId) = 0; |
||||
|
||||
virtual int getBlobId(const String &blobName) = 0; |
||||
|
||||
virtual void forward(std::vector< int, Ptr<Blob> > &inputBlobs, std::vector<int, Ptr<Blob> > &outputBlobs) = 0; |
||||
|
||||
virtual void forward(int layer, std::vector<Ptr<Blob> > &layerOutputs) = 0; |
||||
}; |
||||
|
||||
class CV_EXPORTS Importer |
||||
{ |
||||
public: |
||||
|
||||
virtual void populateNetConfiguration(Ptr<NetConfiguration> config) = 0; |
||||
|
||||
virtual ~Importer(); |
||||
}; |
||||
|
||||
CV_EXPORTS Ptr<Importer> createCaffeImporter(const String &prototxt, const String &caffeModel); |
||||
|
||||
} |
||||
} |
||||
|
||||
#include <opencv2/dnn/dnn.inl.hpp> |
||||
|
||||
#endif /* __OPENCV_DNN_DNN_HPP__ */ |
||||
@ -1,2 +1,2 @@ |
||||
#include <opencv2/core.hpp> |
||||
#include <opencv2/dnn.hpp> |
||||
#include <opencv2/dnn.hpp> |
||||
|
||||
Loading…
Reference in new issue