Develop

.gitignore

@@ -9,4 +9,6 @@ build-debug.sh
 *dist
 fastdeploy.egg-info
 .setuptools-cmake-build
-fastdeploy/version.py
+fastdeploy/version.py
+fastdeploy/LICENSE*
+fastdeploy/ThirdPartyNotices*

CMakeLists.txt

@@ -38,6 +38,9 @@ option(ENABLE_VISION_VISUALIZE "if to enable visualize vision model result toolb
 option(ENABLE_OPENCV_CUDA "if to enable opencv with cuda, this will allow process image with GPU." OFF)
 option(ENABLE_DEBUG "if to enable print debug information, this may reduce performance." OFF)
 
+# Whether to build fastdeply with vision/text/... examples, only for testings.
+option(WITH_VISION_EXAMPLES "Whether to build fastdeply with vision examples" ON)
+
 if(ENABLE_DEBUG)
   add_definitions(-DFASTDEPLOY_DEBUG)
 endif()
@@ -50,6 +53,13 @@ option(BUILD_FASTDEPLOY_PYTHON "if build python lib for fastdeploy." OFF)
 include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
+if (WITH_VISION_EXAMPLES AND EXISTS ${PROJECT_SOURCE_DIR}/examples)
+  # ENABLE_VISION and ENABLE_VISION_VISUALIZE must be ON if enable vision examples.
+  message(STATUS "Found WTIH_VISION_EXAMPLES ON, so, force ENABLE_VISION and ENABLE_VISION_VISUALIZE ON")
+  set(ENABLE_VISION ON CACHE BOOL "force to enable vision models usage" FORCE)
+  set(ENABLE_VISION_VISUALIZE ON CACHE BOOL "force to enable visualize vision model result toolbox" FORCE)
+endif()
+
 add_definitions(-DFASTDEPLOY_LIB)
 file(GLOB_RECURSE ALL_DEPLOY_SRCS ${PROJECT_SOURCE_DIR}/fastdeploy/*.cc)
 file(GLOB_RECURSE DEPLOY_ORT_SRCS ${PROJECT_SOURCE_DIR}/fastdeploy/backends/ort/*.cc)
@@ -107,11 +117,11 @@ if(ENABLE_TRT_BACKEND)
   list(APPEND DEPEND_LIBS ${TRT_INFER_LIB} ${TRT_ONNX_LIB} ${TRT_CAFFE_LIB} ${TRT_PLUGIN_LIB})
 
   # copy tensorrt libraries to third lib
-  if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt")
-    file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib")
-  endif()
-  file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib")
-  file(COPY ${TRT_INFER_LIB} ${TRT_ONNX_LIB} ${TRT_CAFFE_LIB} ${TRT_PLUGIN_LIB} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib" FOLLOW_SYMLINK_CHAIN)
+#  if(EXISTS "${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt")
+#    file(REMOVE_RECURSE "${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib")
+#  endif()
+#  file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib")
+#  file(COPY ${TRT_INFER_LIB} ${TRT_ONNX_LIB} ${TRT_CAFFE_LIB} ${TRT_PLUGIN_LIB} DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/third_libs/install/tensorrt/lib" FOLLOW_SYMLINK_CHAIN)
 endif()
 
 if(ENABLE_VISION)
@@ -170,6 +180,13 @@ endif()
 set_target_properties(fastdeploy PROPERTIES VERSION ${FASTDEPLOY_VERSION})
 target_link_libraries(fastdeploy ${DEPEND_LIBS})
 
+# add examples after prepare include paths for third-parties
+if (WITH_VISION_EXAMPLES AND EXISTS ${PROJECT_SOURCE_DIR}/examples)
+  add_definitions(-DWITH_VISION_EXAMPLES)
+  set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/examples/bin)
+  add_subdirectory(examples)
+endif()
+
 include(external/summary.cmake)
 fastdeploy_summary()
 
@@ -261,4 +278,5 @@ if(BUILD_FASTDEPLOY_PYTHON)
                                    ${EXTRA_FLAGS})
     target_compile_options(fastdeploy_main PRIVATE $<$<NOT:$<CONFIG:Debug>>:/MT> $<$<CONFIG:Debug>:/MTd>)
   endif()
+
 endif(BUILD_FASTDEPLOY_PYTHON)

docs/api/runtime_option.md

@@ -77,9 +77,9 @@ option = fd.RuntimeOption()
 option.backend = fd.Backend.TRT
 # 当使用TRT后端，且为动态输入shape时
 # 需配置输入shape信息
-option.trt_min_shape = {"images": [1, 3, 224, 224]}
-option.trt_opt_shape = {"images": [4, 3, 224, 224]}
-option.trt_max_shape = {"images": [8, 3, 224, 224]}
+option.trt_min_shape = {"x": [1, 3, 224, 224]}
+option.trt_opt_shape = {"x": [4, 3, 224, 224]}
+option.trt_max_shape = {"x": [8, 3, 224, 224]}
 
 model = fd.vision.ppcls.Model("resnet50/inference.pdmodel",
                               "resnet50/inference.pdiparams",
@@ -117,9 +117,9 @@ model = fd.vision.ppcls.Model("resnet50/inference.pdmodel",
 
 int main() {
   auto option = fastdeploy::RuntimeOption();
-  option.trt_min_shape["images"] = {1, 3, 224, 224};
-  option.trt_opt_shape["images"] = {4, 3, 224, 224};
-  option.trt_max_shape["images"] = {8, 3, 224, 224};
+  option.trt_min_shape["x"] = {1, 3, 224, 224};
+  option.trt_opt_shape["x"] = {4, 3, 224, 224};
+  option.trt_max_shape["x"] = {8, 3, 224, 224};
 
   auto model = fastdeploy::vision::ppcls.Model(
                            "resnet50/inference.pdmodel",

examples/.gitignore

@@ -0,0 +1,8 @@
+*.jpg
+*.png
+*.jpeg
+*.onnx
+*.engine
+*.pd*
+*.nb
+bin

examples/CMakeLists.txt

@@ -0,0 +1,25 @@
+function(add_fastdeploy_executable field url model)
+  # temp target name/file var in function scope
+  set(TEMP_TARGET_FILE ${PROJECT_SOURCE_DIR}/examples/${field}/${url}_${model}.cc)
+  set(TEMP_TARGET_NAME ${field}_${url}_${model})
+  if (EXISTS ${TEMP_TARGET_FILE} AND TARGET fastdeploy)
+    add_executable(${TEMP_TARGET_NAME} ${TEMP_TARGET_FILE})
+    target_link_libraries(${TEMP_TARGET_NAME} PUBLIC fastdeploy)
+    message(STATUS "Found source file: [${field}/${url}_${model}.cc], ADD!!! fastdeploy executable: [${TEMP_TARGET_NAME}] !")
+  else ()
+    message(WARNING "Can not found source file: [${field}/${url}_${model}.cc], SKIP!!! fastdeploy executable: [${TEMP_TARGET_NAME}] !")
+  endif()
+  unset(TEMP_TARGET_FILE)
+  unset(TEMP_TARGET_NAME)
+endfunction()
+
+# vision examples
+if (WITH_VISION_EXAMPLES)
+  add_fastdeploy_executable(vision ultralytics yolov5)
+  add_fastdeploy_executable(vision ppdet ppyoloe)
+  add_fastdeploy_executable(vision meituan yolov6)
+  add_fastdeploy_executable(vision wongkinyiu yolov7)
+  add_fastdeploy_executable(vision megvii yolox)
+endif()
+
+# other examples ...

examples/resources/.gitignore

@@ -0,0 +1,11 @@
+images/*.jpg
+images/*.jpeg
+images/*.png
+models/*.onnx
+models/*.pd*
+models/*.engine
+models/*.trt
+models/*.nb
+outputs/*.jpg
+outputs/*.jpeg
+outputs/*.png

examples/resources/images/.gitignore

@@ -0,0 +1,3 @@
+*.jpg
+*.jpeg
+*.png

examples/resources/models/.gitignore

@@ -0,0 +1,5 @@
+*.onnx
+*.engine
+*.pd*
+*.nb
+*.trt

examples/resources/outputs/.gitignore

@@ -0,0 +1,3 @@
+*.jpg
+*.png
+*.jpeg

examples/vision/megvii_yolox.cc

@@ -0,0 +1,52 @@
+// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "fastdeploy/vision.h"
+
+int main() {
+  namespace vis = fastdeploy::vision;
+
+  std::string model_file = "../resources/models/yolox_s.onnx";
+  std::string img_path = "../resources/images/bus.jpg";
+  std::string vis_path  = "../resources/outputs/megvii_yolox_vis_result.jpg";
+
+  auto model = vis::megvii::YOLOX(model_file);
+  if (!model.Initialized()) {
+    std::cerr << "Init Failed! Model: " << model_file << std::endl;
+    return -1;
+  } else {
+    std::cout << "Init Done! Model:" << model_file << std::endl; 
+  }
+  model.EnableDebug();
+
+  cv::Mat im = cv::imread(img_path);
+  cv::Mat vis_im = im.clone();
+
+  vis::DetectionResult res;
+  if (!model.Predict(&im, &res)) {
+    std::cerr << "Prediction Failed." << std::endl;
+    return -1;
+  } else {
+    std::cout << "Prediction Done!" << std::endl; 
+  }
+
+  // 输出预测框结果
+  std::cout << res.Str() << std::endl;
+
+  // 可视化预测结果
+  vis::Visualize::VisDetection(&vis_im, res);
+  cv::imwrite(vis_path, vis_im);
+  std::cout << "Detect Done! Saved: " << vis_path << std::endl;
+  return 0;
+}

examples/vision/meituan_yolov6.cc

@@ -0,0 +1,52 @@
+// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "fastdeploy/vision.h"
+
+int main() {
+  namespace vis = fastdeploy::vision;
+
+  std::string model_file = "../resources/models/yolov6s.onnx";
+  std::string img_path = "../resources/images/bus.jpg";
+  std::string vis_path  = "../resources/outputs/meituan_yolov6_vis_result.jpg";
+
+  auto model = vis::meituan::YOLOv6(model_file);
+  if (!model.Initialized()) {
+    std::cerr << "Init Failed! Model: " << model_file << std::endl;
+    return -1;
+  } else {
+    std::cout << "Init Done! Model:" << model_file << std::endl; 
+  }
+  model.EnableDebug();
+
+  cv::Mat im = cv::imread(img_path);
+  cv::Mat vis_im = im.clone();
+
+  vis::DetectionResult res;
+  if (!model.Predict(&im, &res)) {
+    std::cerr << "Prediction Failed." << std::endl;
+    return -1;
+  } else {
+    std::cout << "Prediction Done!" << std::endl; 
+  }
+
+  // 输出预测框结果
+  std::cout << res.Str() << std::endl;
+
+  // 可视化预测结果
+  vis::Visualize::VisDetection(&vis_im, res);
+  cv::imwrite(vis_path, vis_im);
+  std::cout << "Detect Done! Saved: " << vis_path << std::endl;
+  return 0;
+}

examples/vision/ppdet_ppyoloe.cc

@@ -0,0 +1,51 @@
+// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "fastdeploy/vision.h"
+
+int main() {
+  namespace vis = fastdeploy::vision;
+
+  std::string model_file = "ppyoloe_crn_l_300e_coco/model.pdmodel";
+  std::string params_file = "ppyoloe_crn_l_300e_coco/model.pdiparams";
+  std::string config_file = "ppyoloe_crn_l_300e_coco/infer_cfg.yml";
+  std::string img_path = "test.jpeg";
+  std::string vis_path = "vis.jpeg";
+
+  auto model = vis::ppdet::PPYOLOE(model_file, params_file, config_file);
+  if (!model.Initialized()) {
+    std::cerr << "Init Failed." << std::endl;
+    return -1;
+  }
+
+  cv::Mat im = cv::imread(img_path);
+  cv::Mat vis_im = im.clone();
+
+  vis::DetectionResult res;
+  if (!model.Predict(&im, &res)) {
+    std::cerr << "Prediction Failed." << std::endl;
+    return -1;
+  } else {
+    std::cout << "Prediction Done!" << std::endl;
+  }
+
+  // 输出预测框结果
+  std::cout << res.Str() << std::endl;
+
+  // 可视化预测结果
+  vis::Visualize::VisDetection(&vis_im, res);
+  cv::imwrite(vis_path, vis_im);
+  std::cout << "Detect Done! Saved: " << vis_path << std::endl;
+  return 0;
+}

examples/vision/ultralytics_yolov5.cc

@@ -0,0 +1,52 @@
+// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "fastdeploy/vision.h"
+
+int main() {
+  namespace vis = fastdeploy::vision;
+
+  std::string model_file = "../resources/models/yolov5s.onnx";
+  std::string img_path = "../resources/images/bus.jpg";
+  std::string vis_path  = "../resources/outputs/ultralytics_yolov5_vis_result.jpg";
+
+  auto model = vis::ultralytics::YOLOv5(model_file);
+  if (!model.Initialized()) {
+    std::cerr << "Init Failed! Model: " << model_file << std::endl;
+    return -1;
+  } else {
+    std::cout << "Init Done! Model:" << model_file << std::endl; 
+  }
+  model.EnableDebug();
+
+  cv::Mat im = cv::imread(img_path);
+  cv::Mat vis_im = im.clone();
+
+  vis::DetectionResult res;
+  if (!model.Predict(&im, &res)) {
+    std::cerr << "Prediction Failed." << std::endl;
+    return -1;
+  } else {
+    std::cout << "Prediction Done!" << std::endl; 
+  }
+
+  // 输出预测框结果
+  std::cout << res.Str() << std::endl;
+
+  // 可视化预测结果
+  vis::Visualize::VisDetection(&vis_im, res);
+  cv::imwrite(vis_path, vis_im);
+  std::cout << "Detect Done! Saved: " << vis_path << std::endl;
+  return 0;
+}