Requested change

Author: Deepdive543443

src/net.cpp

@@ -2206,12 +2206,20 @@ int Extractor::input(int blob_index, const Mat& in)
     if (blob_index < 0 || blob_index >= (int)d->blob_mats.size())
         return -1;
 
-    Mat shape = d->net->blobs()[blob_index].shape;
-    if (shape.total() && (shape.w != in.w) && (shape.h != in.h) && (shape.d != in.d) && (shape.c != in.c))
-        return -1;
+    const Mat& shape = d->net->blobs()[blob_index].shape;
+    if (shape.total())
+    {
+        if ((in.dims == 3 || in.dims == 4) && (shape.w != in.w || shape.h != in.h || shape.d != in.d || shape.c != in.c * in.elempack))
+            return -1;
 
-    d->blob_mats[blob_index] = in;
+        if (in.dims == 2 && (shape.w != in.w || shape.h != in.h * in.elempack))
+            return -1;
+
+        if (in.dims == 1 && (shape.w != in.w * in.elempack))
+            return -1;        
+    }
 
+    d->blob_mats[blob_index] = in;
     return 0;
 }