From 0effa594407aa02726dd187795dadbf4a6deede1 Mon Sep 17 00:00:00 2001 From: Mengyang Liu <49838178+liu-mengyang@users.noreply.github.com> Date: Tue, 27 Sep 2022 13:40:04 +0800 Subject: [PATCH] Split demos of C and C++ SDK into two subdirectories (#1099) * Split demos of C and C++ SDK into two subdirectories * Split demos of C and C++ SDK into two subdirectories * Split demos of C and C++ SDK into two subdirectories * Split demos of C and C++ SDK into two subdirectories * Combine add_example --- demo/csrc/CMakeLists.txt | 34 +++++++++---------- demo/csrc/{ => c}/async_ocr.cpp | 0 demo/csrc/{ => c}/async_ocr_v2.cpp | 0 demo/csrc/{ => c}/image_classification.cpp | 0 demo/csrc/{ => c}/image_restorer.cpp | 0 demo/csrc/{ => c}/image_segmentation.cpp | 0 demo/csrc/{ => c}/object_detection.cpp | 0 demo/csrc/{ => c}/ocr.cpp | 0 demo/csrc/{ => c}/pose_detection.cpp | 0 .../csrc/{ => c}/rotated_object_detection.cpp | 0 demo/csrc/{ => cpp}/classifier.cxx | 0 demo/csrc/{ => cpp}/detector.cxx | 0 demo/csrc/{ => cpp}/pose_detector.cxx | 0 demo/csrc/{ => cpp}/restorer.cxx | 0 demo/csrc/{ => cpp}/rotated_detector.cxx | 0 demo/csrc/{ => cpp}/segmentor.cxx | 0 demo/csrc/{ => cpp}/text_ocr.cxx | 0 docs/en/get_started.md | 4 +-- docs/zh_cn/get_started.md | 4 +-- 19 files changed, 21 insertions(+), 21 deletions(-) rename demo/csrc/{ => c}/async_ocr.cpp (100%) rename demo/csrc/{ => c}/async_ocr_v2.cpp (100%) rename demo/csrc/{ => c}/image_classification.cpp (100%) rename demo/csrc/{ => c}/image_restorer.cpp (100%) rename demo/csrc/{ => c}/image_segmentation.cpp (100%) rename demo/csrc/{ => c}/object_detection.cpp (100%) rename demo/csrc/{ => c}/ocr.cpp (100%) rename demo/csrc/{ => c}/pose_detection.cpp (100%) rename demo/csrc/{ => c}/rotated_object_detection.cpp (100%) rename demo/csrc/{ => cpp}/classifier.cxx (100%) rename demo/csrc/{ => cpp}/detector.cxx (100%) rename demo/csrc/{ => cpp}/pose_detector.cxx (100%) rename demo/csrc/{ => cpp}/restorer.cxx (100%) rename demo/csrc/{ => cpp}/rotated_detector.cxx (100%) rename demo/csrc/{ => cpp}/segmentor.cxx (100%) rename demo/csrc/{ => cpp}/text_ocr.cxx (100%) diff --git a/demo/csrc/CMakeLists.txt b/demo/csrc/CMakeLists.txt index ad62a0dec..917bea720 100644 --- a/demo/csrc/CMakeLists.txt +++ b/demo/csrc/CMakeLists.txt @@ -6,10 +6,11 @@ if (NOT (${CMAKE_PROJECT_NAME} STREQUAL "MMDeploy")) find_package(MMDeploy REQUIRED) endif () -function(add_example dep name) + +function(add_example dep folder name) if (NOT dep OR TARGET mmdeploy_${dep}) # Search for c/cpp sources - file(GLOB _SRCS ${name}.c*) + file(GLOB _SRCS ${folder}/${name}.c*) add_executable(${name} ${_SRCS}) if (NOT (MSVC OR APPLE)) # Disable new dtags so that executables can run even without LD_LIBRARY_PATH set @@ -28,13 +29,13 @@ function(add_example dep name) endif () endfunction() -add_example(classifier image_classification) -add_example(detector object_detection) -add_example(segmentor image_segmentation) -add_example(restorer image_restorer) -add_example(text_detector ocr) -add_example(pose_detector pose_detection) -add_example(rotated_detector rotated_object_detection) +add_example(classifier c image_classification) +add_example(detector c object_detection) +add_example(segmentor c image_segmentation) +add_example(restorer c image_restorer) +add_example(text_detector c ocr) +add_example(pose_detector c pose_detection) +add_example(rotated_detector c rotated_object_detection) #add_example("" async_ocr) #add_example("" async_ocr_v2) @@ -42,12 +43,11 @@ add_example(rotated_detector rotated_object_detection) #add_example("" det_pose) if (MMDEPLOY_BUILD_SDK_CXX_API) - add_example(classifier classifier) - add_example(detector detector) - add_example(segmentor segmentor) - add_example(restorer restorer) - add_example(text_detector text_ocr) - add_example(text_detector text_det_recog) - add_example(pose_detector pose_detector) - add_example(rotated_detector rotated_detector) + add_example(classifier cpp classifier) + add_example(detector cpp detector) + add_example(segmentor cpp segmentor) + add_example(restorer cpp restorer) + add_example(text_detector cpp text_ocr) + add_example(pose_detector cpp pose_detector) + add_example(rotated_detector cpp rotated_detector) endif () diff --git a/demo/csrc/async_ocr.cpp b/demo/csrc/c/async_ocr.cpp similarity index 100% rename from demo/csrc/async_ocr.cpp rename to demo/csrc/c/async_ocr.cpp diff --git a/demo/csrc/async_ocr_v2.cpp b/demo/csrc/c/async_ocr_v2.cpp similarity index 100% rename from demo/csrc/async_ocr_v2.cpp rename to demo/csrc/c/async_ocr_v2.cpp diff --git a/demo/csrc/image_classification.cpp b/demo/csrc/c/image_classification.cpp similarity index 100% rename from demo/csrc/image_classification.cpp rename to demo/csrc/c/image_classification.cpp diff --git a/demo/csrc/image_restorer.cpp b/demo/csrc/c/image_restorer.cpp similarity index 100% rename from demo/csrc/image_restorer.cpp rename to demo/csrc/c/image_restorer.cpp diff --git a/demo/csrc/image_segmentation.cpp b/demo/csrc/c/image_segmentation.cpp similarity index 100% rename from demo/csrc/image_segmentation.cpp rename to demo/csrc/c/image_segmentation.cpp diff --git a/demo/csrc/object_detection.cpp b/demo/csrc/c/object_detection.cpp similarity index 100% rename from demo/csrc/object_detection.cpp rename to demo/csrc/c/object_detection.cpp diff --git a/demo/csrc/ocr.cpp b/demo/csrc/c/ocr.cpp similarity index 100% rename from demo/csrc/ocr.cpp rename to demo/csrc/c/ocr.cpp diff --git a/demo/csrc/pose_detection.cpp b/demo/csrc/c/pose_detection.cpp similarity index 100% rename from demo/csrc/pose_detection.cpp rename to demo/csrc/c/pose_detection.cpp diff --git a/demo/csrc/rotated_object_detection.cpp b/demo/csrc/c/rotated_object_detection.cpp similarity index 100% rename from demo/csrc/rotated_object_detection.cpp rename to demo/csrc/c/rotated_object_detection.cpp diff --git a/demo/csrc/classifier.cxx b/demo/csrc/cpp/classifier.cxx similarity index 100% rename from demo/csrc/classifier.cxx rename to demo/csrc/cpp/classifier.cxx diff --git a/demo/csrc/detector.cxx b/demo/csrc/cpp/detector.cxx similarity index 100% rename from demo/csrc/detector.cxx rename to demo/csrc/cpp/detector.cxx diff --git a/demo/csrc/pose_detector.cxx b/demo/csrc/cpp/pose_detector.cxx similarity index 100% rename from demo/csrc/pose_detector.cxx rename to demo/csrc/cpp/pose_detector.cxx diff --git a/demo/csrc/restorer.cxx b/demo/csrc/cpp/restorer.cxx similarity index 100% rename from demo/csrc/restorer.cxx rename to demo/csrc/cpp/restorer.cxx diff --git a/demo/csrc/rotated_detector.cxx b/demo/csrc/cpp/rotated_detector.cxx similarity index 100% rename from demo/csrc/rotated_detector.cxx rename to demo/csrc/cpp/rotated_detector.cxx diff --git a/demo/csrc/segmentor.cxx b/demo/csrc/cpp/segmentor.cxx similarity index 100% rename from demo/csrc/segmentor.cxx rename to demo/csrc/cpp/segmentor.cxx diff --git a/demo/csrc/text_ocr.cxx b/demo/csrc/cpp/text_ocr.cxx similarity index 100% rename from demo/csrc/text_ocr.cxx rename to demo/csrc/cpp/text_ocr.cxx diff --git a/docs/en/get_started.md b/docs/en/get_started.md index 923e66f56..b46420b86 100644 --- a/docs/en/get_started.md +++ b/docs/en/get_started.md @@ -321,9 +321,9 @@ find_package(MMDeploy REQUIRED) target_link_libraries(${name} PRIVATE mmdeploy ${OpenCV_LIBS}) ``` -For more SDK C++ API usages, please read these [samples](https://github.com/open-mmlab/mmdeploy/tree/master/demo/csrc). +For more SDK C++ API usages, please read these [samples](https://github.com/open-mmlab/mmdeploy/tree/master/demo/csrc/cpp). -For the rest C, C# and Java API usages, please read [C demos](https://github.com/open-mmlab/mmdeploy/tree/master/demo/csrc), [C# demos](https://github.com/open-mmlab/mmdeploy/tree/master/demo/csharp) and [Java demos](https://github.com/open-mmlab/mmdeploy/tree/master/demo/java) respectively. +For the rest C, C# and Java API usages, please read [C demos](https://github.com/open-mmlab/mmdeploy/tree/master/demo/csrc/c), [C# demos](https://github.com/open-mmlab/mmdeploy/tree/master/demo/csharp) and [Java demos](https://github.com/open-mmlab/mmdeploy/tree/master/demo/java) respectively. We'll talk about them more in our next release. #### Accelerate preprocessing（Experimental） diff --git a/docs/zh_cn/get_started.md b/docs/zh_cn/get_started.md index ec9c2fb5f..96332a085 100644 --- a/docs/zh_cn/get_started.md +++ b/docs/zh_cn/get_started.md @@ -322,9 +322,9 @@ target_link_libraries(${name} PRIVATE mmdeploy ${OpenCV_LIBS}) ``` 编译时，使用 -DMMDeploy_DIR，传入MMDeloyConfig.cmake所在的路径。它在预编译包中的sdk/lib/cmake/MMDeloy下。 -更多示例，请查阅[此处](https://github.com/open-mmlab/mmdeploy/tree/master/demo/csrc)。 +更多示例，请查阅[此处](https://github.com/open-mmlab/mmdeploy/tree/master/demo/csrc/cpp)。 -对于 C API、C# API、Java API 的使用方法，请分别阅读代码[C demos](https://github.com/open-mmlab/mmdeploy/tree/master/demo/csrc)， [C# demos](https://github.com/open-mmlab/mmdeploy/tree/master/demo/csharp) 和 [Java demos](https://github.com/open-mmlab/mmdeploy/tree/master/demo/java)。 +对于 C API、C# API、Java API 的使用方法，请分别阅读代码[C demos](https://github.com/open-mmlab/mmdeploy/tree/master/demo/csrc/c)， [C# demos](https://github.com/open-mmlab/mmdeploy/tree/master/demo/csharp) 和 [Java demos](https://github.com/open-mmlab/mmdeploy/tree/master/demo/java)。 我们将在后续版本中详细讲述它们的用法。 #### 加速预处理（实验性功能）