From 12ea873ee0a779940bf5e756ec74c947485da85f Mon Sep 17 00:00:00 2001
From: yeyunpeng2020 <yeyunpeng1@huawei.com>
Date: Thu, 25 Mar 2021 20:21:17 +0800
Subject: [PATCH] fix gpu shape bug

---
 .../lite/src/runtime/kernel/opencl/kernel/fill.cc     | 11 +++++------
 mindspore/lite/test/models_gpu_fp32.cfg               |  2 ++
 mindspore/lite/tools/cropper/build_cropper_config.sh  |  1 +
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.cc b/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.cc
index ae79a65bc8..0533ceb326 100644
--- a/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.cc
+++ b/mindspore/lite/src/runtime/kernel/opencl/kernel/fill.cc
@@ -55,13 +55,12 @@ int FillOpenCLKernel::RunShape() {
   auto tensor_shape = in_tensors_[0]->shape();
   void *tensor_shape_data = tensor_shape.data();
   for (int i = 0; i < tensor_shape.size(); ++i) {
-    fill_value.s[0] = reinterpret_cast<float *>(tensor_shape_data)[i];
-    size_t index = static_cast<size_t>(i);
-    auto src_origin = cl::array<cl::size_type, 3U>{0, index, 0};
-    auto region = cl::array<cl::size_type, 3U>{1, 1, 1};
-    cl::Image2D *out_image = reinterpret_cast<cl::Image2D *>(allocator_->GetImage(src_data));
-    ocl_runtime_->GetDefaultCommandQueue()->enqueueFillImage(*out_image, fill_value, src_origin, region);
+    fill_value.s[i] = reinterpret_cast<float *>(tensor_shape_data)[i];
   }
+  auto src_origin = cl::array<cl::size_type, 3U>{0, 0, 0};
+  auto region = cl::array<cl::size_type, 3U>{1, 1, 1};
+  cl::Image2D *out_image = reinterpret_cast<cl::Image2D *>(allocator_->GetImage(src_data));
+  ocl_runtime_->GetDefaultCommandQueue()->enqueueFillImage(*out_image, fill_value, src_origin, region);
   return RET_OK;
 }
 
diff --git a/mindspore/lite/test/models_gpu_fp32.cfg b/mindspore/lite/test/models_gpu_fp32.cfg
index 545506c7d3..588e8e154e 100644
--- a/mindspore/lite/test/models_gpu_fp32.cfg
+++ b/mindspore/lite/test/models_gpu_fp32.cfg
@@ -23,3 +23,5 @@ landmark
 PoseNet_dla_17_x512
 age_new
 plat_isface
+Q_hand_0812.pb
+Q_dila-small-mix-full-fineturn-390000-nopixel-nosigmoid.pb
\ No newline at end of file
diff --git a/mindspore/lite/tools/cropper/build_cropper_config.sh b/mindspore/lite/tools/cropper/build_cropper_config.sh
index fcd419389e..1a5561a140 100644
--- a/mindspore/lite/tools/cropper/build_cropper_config.sh
+++ b/mindspore/lite/tools/cropper/build_cropper_config.sh
@@ -190,6 +190,7 @@ generateOpsList
 getCommonFile
 # get src/ops
 getOpsFile "Registry\(schema::PrimitiveType_" "${MINDSPORE_HOME}/mindspore/lite/src/ops" "prototype" &
+getOpsFile "REG_POPULATE\(PrimitiveType_" "${MINDSPORE_HOME}/mindspore/lite/src/ops" "prototype" &
 getOpsFile "REG_INFER\(.*?, PrimType_" "${MINDSPORE_HOME}/mindspore/lite/nnacl/infer" "prototype" &
 getOpsFile "REG_KERNEL\(.*?, kNumberTypeFloat32, PrimitiveType_" "${MINDSPORE_HOME}/mindspore/lite/src/runtime/kernel/arm" "kNumberTypeFloat32" &
 getOpsFile "REG_KERNEL\(.*?, kNumberTypeFloat16, PrimitiveType_" "${MINDSPORE_HOME}/mindspore/lite/src/runtime/kernel/arm" "kNumberTypeFloat16" &