Extended and generalized CropLayer implementation

Also, small fix inside inside Python types conversion was added

modules/dnn/include/opencv2/dnn/all_layers.hpp

@@ -370,6 +370,9 @@ namespace dnn
     class CV_EXPORTS_W CropLayer : public Layer
     {
     public:
+        CV_PROP int startAxis;
+        CV_PROP std::vector<int> offset;
+
         static Ptr<CropLayer> create(int start_axis, const std::vector<int> &offset);
     };
 

modules/dnn/misc/python/pyopencv_dnn.hpp

@@ -70,7 +70,7 @@ bool pyopencv_to(PyObject *o, dnn::DictValue &dv, const char *name)
         return true; //Current state will be used
     else if (PyLong_Check(o))
     {
-        dv = dnn::DictValue(PyLong_AsLong(o));
+        dv = dnn::DictValue((int64)PyLong_AsLongLong(o));
         return true;
     }
     else if (PyFloat_Check(o))

modules/dnn/samples/googlenet_python.py

@@ -26,7 +26,7 @@ cv2.ocl.setUseOpenCL(True)  #Disable OCL if you want
 net = dnn.readNetFromCaffe('bvlc_googlenet.prototxt', 'bvlc_googlenet.caffemodel')
 net.setBlob(".data", blob)
 net.forward()
-timeit_forward(net)        #Uncomment to check performance
+#timeit_forward(net)        #Uncomment to check performance
 
 prob = net.getBlob("prob")
 print("Output:", prob.shape, prob.dtype)

modules/dnn/src/caffe/layer_loaders.cpp

@@ -232,30 +232,16 @@ Ptr<Layer> createLayerFromCaffe<PowerLayer>(LayerParams& params)
 template<> //CropLayer specialization
 Ptr<Layer> createLayerFromCaffe<CropLayer>(LayerParams& params)
 {
-    int start_axis = params.get<int>("axis");
-    if (4 <= start_axis)
-        CV_Error(Error::StsBadArg, "crop axis bigger than input dim");
+    int start_axis = params.get<int>("axis", 2);
+    DictValue *paramOffset = params.ptr("offset");
 
-    DictValue paramOffset = params.get("offset");
-
-    std::vector<int> offset(4, 0);
-    if (1 < paramOffset.size())
-    {
-        if (4 - start_axis != paramOffset.size())
-            CV_Error(Error::StsBadArg, "number of offset values specified must be equal to the number of dimensions following axis.");
-        for (size_t i = start_axis; i < offset.size(); i++)
+    std::vector<int> offset;
+    if (paramOffset)
     {
-            offset[i] = paramOffset.get<int>(i);
-        }
-    }
-    else
-    {
-        const int offset_val = paramOffset.get<int>(0);
-        for (size_t i = start_axis; i < offset.size(); i++)
-        {
-            offset[i] = offset_val;
-        }
+        for (int i = 0; i < paramOffset->size(); i++)
+            offset.push_back(paramOffset->get<int>(i));
     }
+
     return Ptr<Layer>(CropLayer::create(start_axis, offset));
 }
 

modules/dnn/src/layers/crop_layer.cpp

@@ -47,57 +47,82 @@ namespace cv
 {
 namespace dnn
 {
-    CropLayerImpl::CropLayerImpl(int start_axis_, const std::vector<int> &offset_)
-    {
-        start_axis = start_axis_;
+
+CropLayerImpl::CropLayerImpl(int start_axis_, const std::vector<int> &offset_)
+{
+    startAxis = start_axis_;
     offset = offset_;
-    }
+}
 
-    void CropLayerImpl::allocate(const std::vector<Blob *> &inputs, std::vector<Blob> &outputs)
-    {
+void CropLayerImpl::allocate(const std::vector<Blob *> &inputs, std::vector<Blob> &outputs)
+{
     CV_Assert(2 == inputs.size());
 
     const Blob &inpBlob = *inputs[0];
-        CV_Assert(inpBlob.dims() == 4 && inpBlob.type() == CV_32F);
-
     const Blob &inpSzBlob = *inputs[1];
 
-        outSizes.resize(4, 0);
-        for (int i = 0; i < 4; i++)
+    int start_axis = inpBlob.canonicalAxis(startAxis);
+    int dims = inpBlob.dims();
+
+    std::vector<int> offset_final(dims, 0);
+    if (offset.size() == 1)
     {
-            if (i < start_axis)
-                outSizes[i] = inpBlob.size(i);
-            else
-                outSizes[i] = inpSzBlob.size(i);
-            if (offset[i] + outSizes[i] > inpBlob.size(i))
-                CV_Error(Error::StsBadArg, "invalid crop parameters");
+        for (int i = start_axis; i < dims; i++)
+            offset_final[i] = offset[0];
     }
+    else if (offset.size() > 1)
+    {
+        if ((int)offset.size() != dims - start_axis)
+            CV_Error(Error::StsBadArg, "number of offset values specified must be equal to the number of dimensions following axis.");
 
-        outputs.resize(1);
-        outputs[0].create(BlobShape(outSizes));
+        for (int i = start_axis; i < dims; i++)
+            offset_final[i] = offset[i - start_axis];
     }
 
-    void CropLayerImpl::forward(std::vector<Blob *> &inputs, std::vector<Blob> &outputs)
+    BlobShape dstShape = inpBlob.shape();
+    crop_ranges.resize(dims, Range::all());
+    for (int i = start_axis; i < dims; i++)
     {
-        Blob input = *inputs[0];
-        Blob output = outputs[0];
-        for (int num = 0; num < outSizes[0]; ++num)
-        {
-            for (int ch = 0; ch < outSizes[1]; ++ch)
-            {
-                for (int row = 0; row < outSizes[2]; ++row)
+        dstShape[i] = inpSzBlob.size(i);
+
+        if (!offset.empty()) //normal case
         {
-                    float *srcData = input.ptrf(num + offset[0], ch + offset[1], row + offset[2]);
-                    float *dstData = output.ptrf(num, ch, row);
-                    memcpy(dstData, srcData + offset[3], sizeof(float) * outSizes[3]);
-                }
+            if (offset_final[i] < 0 || offset_final[i] + inpSzBlob.size(i) > inpBlob.size(i))
+                CV_Error(Error::StsBadArg, "invalid crop parameters");
+
+            crop_ranges[i] = Range(offset_final[i], offset_final[i] + inpSzBlob.size(i));
         }
+        else //detect offset automatically so that cropped image is center of original one
+        {
+            if (inpSzBlob.size(i) > inpBlob.size(i))
+                CV_Error(Error::StsBadArg, "invalid output blob size");
+
+            int cur_crop = (inpBlob.size(i) - inpSzBlob.size(i)) / 2;
+            crop_ranges[i] = Range(cur_crop, cur_crop + inpSzBlob.size(i));
         }
     }
 
-    Ptr<CropLayer> CropLayer::create(int start_axis, const std::vector<int> &offset)
-    {
+    outputs.resize(1);
+    outputs[0].create(dstShape);
+}
+
+void CropLayerImpl::forward(std::vector<Blob *> &inputs, std::vector<Blob> &outputs)
+{
+    Blob &input = *inputs[0];
+    Blob &output = outputs[0];
+
+    #ifdef HAVE_OPENCL
+    if (input.getState() == Blob::HEAD_AT_UMAT)
+        input.umatRefConst()(&crop_ranges[0]).copyTo(output.umatRef());
+    else
+    #endif
+        input.matRefConst()(&crop_ranges[0]).copyTo(output.matRef());
+}
+
+Ptr<CropLayer> CropLayer::create(int start_axis, const std::vector<int> &offset)
+{
     return Ptr<CropLayer>(new CropLayerImpl(start_axis, offset));
-    }
+}
+
 }
 }

modules/dnn/src/layers/crop_layer.hpp

@@ -50,9 +50,7 @@ namespace dnn
 {
     class CropLayerImpl : public CropLayer
     {
-        int start_axis;
-        std::vector<int> offset;
-        std::vector<int> outSizes;
+        std::vector<Range> crop_ranges;
 
     public:
         CropLayerImpl(int start_axis, const std::vector<int> &offset);