fix reshape2&transpose2 gpu infershape (#1778)

src/framework/cl/cl_image.cpp

@@ -122,6 +122,8 @@ Print &operator<<(Print &printer, const CLImage &cl_image) {
 
   CL_CHECK_ERRORS(err);
 
+  PADDLE_MOBILE_ENFORCE(cl_image.numel() != 0,
+                        "cl_image numel should not be 0 ");
   float *tensor_data = new float[cl_image.numel()];
   auto converter = cl_image.Converter();
   converter->ImageToNCHW(image_data, tensor_data, cl_image.ImageDims(),

src/framework/cl/cl_image_converter.cpp

@@ -391,6 +391,8 @@ void CLImageConverterDWBlock::ImageToNCHW(half_t *image, float *tensor,
 
 const DDim &CLImageConverterNormal::InitImageDimInfoWith(
     const DDim &tensor_dim) {
+  PADDLE_MOBILE_ENFORCE(tensor_dim.size() <= 4 && tensor_dim.size() > 0,
+                        "tensor dim is not support ");
   size_t new_dims[] = {1, 1, 1, 1};
   for (int j = 0; j < tensor_dim.size(); ++j) {
     new_dims[4 - tensor_dim.size() + j] = tensor_dim[j];

src/framework/executor.cpp

@@ -1027,7 +1027,7 @@ void Executor<GPU_CL, float>::InitCombineMemory() {
         bool shouldResize = true;
         if (ddim.size() > 4) {
           for (int i = 0; i < ddim.size() - 4; ++i) {
-            if (ddim[i] != 0) {
+            if (ddim[i] != 0 && ddim[i] != 1) {
               shouldResize = false;
               break;
             }

src/operators/reshape2_op.cpp

@@ -75,6 +75,9 @@ void Reshape2Op<Dtype, T>::InferShape() const {
     xshape_dims[i + 1] = input_x_dims[i];
   }
   this->param_.OutputXShape()->Resize(framework::make_ddim(xshape_dims));
+#ifdef PADDLE_MOBILE_CL
+  this->param_.OutputXShape()->Resize(input_x_dims);
+#endif
 }
 
 }  // namespace operators

src/operators/transpose2_op.cpp

@@ -100,6 +100,9 @@ void Transpose2Op<Dtype, T>::InferShape() const {
     xshape_dims[i + 1] = input_x_dims[i];
   }
   this->param_.OutputXShape()->Resize(framework::make_ddim(xshape_dims));
+#ifdef PADDLE_MOBILE_CL
+  this->param_.OutputXShape()->Resize(input_x_dims);
+#endif
 }
 
 }  // namespace operators

tools/python/fluidtools/run.py

@@ -155,7 +155,7 @@ def load_feed_kv():
         expected_len = 1
         for dim in feed_shape:
             expected_len *= dim
-        if len(data) != expected_len:
+        if len(np.atleast_1d(data)) != expected_len:
             return None
         data = data.reshape(feed_shape).astype("float32")