Merge branch 'PaddlePaddle:develop' into develop

PaddlePaddle · Apr 1, 2024 · 75b0d34 · 75b0d34
2 parents 0f4c697 + f367e17
commit 75b0d34
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/c_api/fastdeploy_capi/core/fd_type.cc b/c_api/fastdeploy_capi/core/fd_type.cc
@@ -38,6 +38,8 @@ DECLARE_AND_IMPLEMENT_FD_TYPE_ONEDIMARRAY(OneDimArrayFloat)
 DECLARE_AND_IMPLEMENT_FD_TYPE_ONEDIMARRAY(Cstr)
 // FD_C_OneDimArrayCstr
 DECLARE_AND_IMPLEMENT_FD_TYPE_TWODIMARRAY(OneDimArrayCstr, Cstr)
+// FD_C_TwoDimArrayCstr
+DECLARE_AND_IMPLEMENT_FD_TYPE_THREEDIMARRAY(TwoDimArrayCstr,OneDimArrayCstr)
 // FD_C_TwoDimArraySize
 DECLARE_AND_IMPLEMENT_FD_TYPE_TWODIMARRAY(TwoDimArraySize, OneDimArraySize)
 // FD_C_TwoDimArrayInt8

diff --git a/fastdeploy/function/gaussian_random.h b/fastdeploy/function/gaussian_random.h
@@ -28,7 +28,7 @@ namespace function {
     @param seed The seed of random generator.
     @param dtype The data type of the output Tensor.
 */
-void GaussianRandom(const std::vector<int64_t>& shape, FDTensor* out,
+FASTDEPLOY_DECL void GaussianRandom(const std::vector<int64_t>& shape, FDTensor* out,
                     FDDataType dtype = FDDataType::FP32, float mean = 0.0f,
                     float std = 1.0f, int seed = 0);
 

diff --git a/serving/README.md b/serving/README.md
@@ -56,4 +56,4 @@ Users can also compile the image by themselves according to their own needs, ref
 | NLP |	[PaddleNLP/ERNIE-3.0](../examples/text/ernie-3.0/serving/README.md)|
 | NLP |	[PaddleNLP/UIE](../examples/text/uie/serving/README.md)|
 | Speech |	[PaddleSpeech/PP-TTS](../examples/audio/pp-tts/serving/README.md)|
-| OCR |	[PaddleOCR/PP-OCRv3](../examples/vision/ocr/PP-OCRv3/serving/README.md)|
+| OCR |	[PaddleOCR/PP-OCRv3](../examples/vision/ocr/PP-OCR/serving/fastdeploy_serving/README.md)|
diff --git a/serving/README_CN.md b/serving/README_CN.md
@@ -40,12 +40,12 @@ docker pull registry.baidubce.com/paddlepaddle/fastdeploy:1.0.7-gpu-cuda11.4-trt
 
 ### 服务化部署示例
 
-| 任务场景 | 模型  |
-|---|---|
-| Classification | [PaddleClas](../examples/vision/classification/paddleclas/serving/README.md) |
+| 任务场景 | 模型                                                                                |
+|---|-----------------------------------------------------------------------------------|
+| Classification | [PaddleClas](../examples/vision/classification/paddleclas/serving/README.md)      |
 | Detection | [PaddleDetection](../examples/vision/detection/paddledetection/serving/README.md) |
-| Detection | [ultralytics/YOLOv5](../examples/vision/detection/yolov5/serving/README.md) |
-| NLP |	[PaddleNLP/ERNIE-3.0](../examples/text/ernie-3.0/serving/README.md)|
-| NLP |	[PaddleNLP/UIE](../examples/text/uie/serving/README.md)|
-| Speech |	[PaddleSpeech/PP-TTS](../examples/audio/pp-tts/serving/README.md)|
-| OCR |	[PaddleOCR/PP-OCRv3](../examples/vision/ocr/PP-OCRv3/serving/README.md)|
+| Detection | [ultralytics/YOLOv5](../examples/vision/detection/yolov5/serving/README.md)       |
+| NLP | 	[PaddleNLP/ERNIE-3.0](../examples/text/ernie-3.0/serving/README.md)              |
+| NLP | 	[PaddleNLP/UIE](../examples/text/uie/serving/README.md)                          |
+| Speech | 	[PaddleSpeech/PP-TTS](../examples/audio/pp-tts/serving/README.md)                |
+| OCR | 	[PaddleOCR/PP-OCRv3](../examples/vision/ocr/PP-OCR/serving/fastdeploy_serving/README.md)  |