From 2431890f730f129990e64d631663d68208f14e8d Mon Sep 17 00:00:00 2001 From: CoolCola <49013063+CoolKbh@users.noreply.github.com> Date: Sun, 25 Dec 2022 16:30:03 +0800 Subject: [PATCH] [Model]Fit yolov7face file path (#961) fit yolov7face file path --- fastdeploy/vision.h | 2 +- .../{yolov7-face => contrib/yolov7face}/postprocessor.cc | 2 +- .../{yolov7-face => contrib/yolov7face}/postprocessor.h | 0 .../{yolov7-face => contrib/yolov7face}/preprocessor.cc | 2 +- .../{yolov7-face => contrib/yolov7face}/preprocessor.h | 0 .../facedet/{yolov7-face => contrib/yolov7face}/yolov7face.cc | 2 +- .../facedet/{yolov7-face => contrib/yolov7face}/yolov7face.h | 4 ++-- .../{yolov7-face => contrib/yolov7face}/yolov7face_pybind.cc | 0 8 files changed, 6 insertions(+), 6 deletions(-) rename fastdeploy/vision/facedet/{yolov7-face => contrib/yolov7face}/postprocessor.cc (98%) rename fastdeploy/vision/facedet/{yolov7-face => contrib/yolov7face}/postprocessor.h (100%) rename fastdeploy/vision/facedet/{yolov7-face => contrib/yolov7face}/preprocessor.cc (98%) rename fastdeploy/vision/facedet/{yolov7-face => contrib/yolov7face}/preprocessor.h (100%) rename fastdeploy/vision/facedet/{yolov7-face => contrib/yolov7face}/yolov7face.cc (97%) rename fastdeploy/vision/facedet/{yolov7-face => contrib/yolov7face}/yolov7face.h (95%) rename fastdeploy/vision/facedet/{yolov7-face => contrib/yolov7face}/yolov7face_pybind.cc (100%) diff --git a/fastdeploy/vision.h b/fastdeploy/vision.h index 732f9e7a5..9c22d45ad 100644 --- a/fastdeploy/vision.h +++ b/fastdeploy/vision.h @@ -37,7 +37,7 @@ #include "fastdeploy/vision/facedet/contrib/scrfd.h" #include "fastdeploy/vision/facedet/contrib/ultraface.h" #include "fastdeploy/vision/facedet/contrib/yolov5face.h" -#include "fastdeploy/vision/facedet/yolov7-face/yolov7face.h" +#include "fastdeploy/vision/facedet/contrib/yolov7face/yolov7face.h" #include "fastdeploy/vision/faceid/contrib/adaface.h" #include "fastdeploy/vision/faceid/contrib/arcface.h" #include "fastdeploy/vision/faceid/contrib/cosface.h" diff --git a/fastdeploy/vision/facedet/yolov7-face/postprocessor.cc b/fastdeploy/vision/facedet/contrib/yolov7face/postprocessor.cc similarity index 98% rename from fastdeploy/vision/facedet/yolov7-face/postprocessor.cc rename to fastdeploy/vision/facedet/contrib/yolov7face/postprocessor.cc index e2c92a6d1..30bb523cc 100644 --- a/fastdeploy/vision/facedet/yolov7-face/postprocessor.cc +++ b/fastdeploy/vision/facedet/contrib/yolov7face/postprocessor.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "fastdeploy/vision/facedet/yolov7-face/postprocessor.h" +#include "fastdeploy/vision/facedet/contrib/yolov7face/postprocessor.h" #include "fastdeploy/vision/utils/utils.h" namespace fastdeploy { diff --git a/fastdeploy/vision/facedet/yolov7-face/postprocessor.h b/fastdeploy/vision/facedet/contrib/yolov7face/postprocessor.h similarity index 100% rename from fastdeploy/vision/facedet/yolov7-face/postprocessor.h rename to fastdeploy/vision/facedet/contrib/yolov7face/postprocessor.h diff --git a/fastdeploy/vision/facedet/yolov7-face/preprocessor.cc b/fastdeploy/vision/facedet/contrib/yolov7face/preprocessor.cc similarity index 98% rename from fastdeploy/vision/facedet/yolov7-face/preprocessor.cc rename to fastdeploy/vision/facedet/contrib/yolov7face/preprocessor.cc index 83301d76d..ad5dd7e33 100644 --- a/fastdeploy/vision/facedet/yolov7-face/preprocessor.cc +++ b/fastdeploy/vision/facedet/contrib/yolov7face/preprocessor.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "fastdeploy/vision/facedet/yolov7-face/preprocessor.h" +#include "fastdeploy/vision/facedet/contrib/yolov7face/preprocessor.h" #include "fastdeploy/function/concat.h" #include "fastdeploy/vision/common/processors/mat.h" diff --git a/fastdeploy/vision/facedet/yolov7-face/preprocessor.h b/fastdeploy/vision/facedet/contrib/yolov7face/preprocessor.h similarity index 100% rename from fastdeploy/vision/facedet/yolov7-face/preprocessor.h rename to fastdeploy/vision/facedet/contrib/yolov7face/preprocessor.h diff --git a/fastdeploy/vision/facedet/yolov7-face/yolov7face.cc b/fastdeploy/vision/facedet/contrib/yolov7face/yolov7face.cc similarity index 97% rename from fastdeploy/vision/facedet/yolov7-face/yolov7face.cc rename to fastdeploy/vision/facedet/contrib/yolov7face/yolov7face.cc index 7c2906f39..5e7fae891 100644 --- a/fastdeploy/vision/facedet/yolov7-face/yolov7face.cc +++ b/fastdeploy/vision/facedet/contrib/yolov7face/yolov7face.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "fastdeploy/vision/facedet/yolov7-face/yolov7face.h" +#include "fastdeploy/vision/facedet/contrib/yolov7face/yolov7face.h" #include "fastdeploy/utils/perf.h" #include "fastdeploy/vision/utils/utils.h" diff --git a/fastdeploy/vision/facedet/yolov7-face/yolov7face.h b/fastdeploy/vision/facedet/contrib/yolov7face/yolov7face.h similarity index 95% rename from fastdeploy/vision/facedet/yolov7-face/yolov7face.h rename to fastdeploy/vision/facedet/contrib/yolov7face/yolov7face.h index 6410fe590..5e1016483 100644 --- a/fastdeploy/vision/facedet/yolov7-face/yolov7face.h +++ b/fastdeploy/vision/facedet/contrib/yolov7face/yolov7face.h @@ -16,8 +16,8 @@ #include "fastdeploy/fastdeploy_model.h" #include "fastdeploy/vision/common/processors/transform.h" #include "fastdeploy/vision/common/result.h" -#include "fastdeploy/vision/facedet/yolov7-face/preprocessor.h" -#include "fastdeploy/vision/facedet/yolov7-face/postprocessor.h" +#include "fastdeploy/vision/facedet/contrib/yolov7face/preprocessor.h" +#include "fastdeploy/vision/facedet/contrib/yolov7face/postprocessor.h" namespace fastdeploy { diff --git a/fastdeploy/vision/facedet/yolov7-face/yolov7face_pybind.cc b/fastdeploy/vision/facedet/contrib/yolov7face/yolov7face_pybind.cc similarity index 100% rename from fastdeploy/vision/facedet/yolov7-face/yolov7face_pybind.cc rename to fastdeploy/vision/facedet/contrib/yolov7face/yolov7face_pybind.cc