Merge branch 'develop' into develop

core/general-server/op/general_dist_kv_infer_op.cpp

@@ -181,7 +181,7 @@ int GeneralDistKVInferOp::inference() {
          continue;
       }
       VLOG(2) << "(logid=" << log_id << ") key: " << keys[cube_val_idx]  << " , cube value len:" << cur_val->buff.size();
-      memcpy(data_ptr, cur_val->buff.data(), cur_val->buff.size());
+      memcpy(data_ptr, cur_val->buff.data() + 10, sizeof(float) * EMBEDDING_SIZE);
       //VLOG(3) <<  keys[cube_val_idx] << ":" << data_ptr[0] << ", " << data_ptr[1] << ", " <<data_ptr[2] << ", " <<data_ptr[3] << ", " <<data_ptr[4] << ", " <<data_ptr[5] << ", " <<data_ptr[6] << ", " <<data_ptr[7] << ", " <<data_ptr[8];
       ++cube_key_found;
       ++cube_val_idx;

tools/scripts/ipipe_py3.sh

@@ -909,7 +909,7 @@ function ocr_c++_service() {
     cp -r ocr_det_client/ ./ocr_det_client_cp
     rm -rf ocr_det_client
     mv ocr_det_client_cp ocr_det_client
-    sed -i "s/feed_type: 1/feed_type: 3/g" ocr_det_client/serving_client_conf.prototxt
+    sed -i "s/feed_type: 1/feed_type: 20/g" ocr_det_client/serving_client_conf.prototxt
     sed -i "s/shape: 3/shape: 1/g" ocr_det_client/serving_client_conf.prototxt
     sed -i '7,8d' ocr_det_client/serving_client_conf.prototxt
     echo -e "${GREEN_COLOR}OCR_C++_Service_GPU_RPC server started${RES}"