diff --git a/official/cv/east/infer/mxbase/src/PostProcess/EASTMindSporePost.cpp b/official/cv/east/infer/mxbase/src/PostProcess/EASTMindSporePost.cpp index a46360759f9e16dd00a8e513e9948295629762f7..ae31a7e765af19ceaa06ede1f4ea9702e014fb7c 100644 --- a/official/cv/east/infer/mxbase/src/PostProcess/EASTMindSporePost.cpp +++ b/official/cv/east/infer/mxbase/src/PostProcess/EASTMindSporePost.cpp @@ -43,7 +43,7 @@ namespace MxBase { configData_.GetFileValue<float>("NMS_THRESH", nmsThresh_); configData_.GetFileValue<float>("SCORE_THRESH", scoreThresh_); - configData_.GetFileValue<int>("OUT_SIZE", outSize_); + configData_.GetFileValue<uint32_t>("OUT_SIZE", outSize_); LogInfo << "End to Init EASTPostProcess."; return APP_ERR_OK; @@ -151,7 +151,7 @@ namespace MxBase { void EASTPostProcess::GetTextObjectInfo(const std::vector<std::vector<float>> &polys, const std::vector<MxBase::ResizedImageInfo> &resizedImageInfos, std::vector<TextObjectInfo> *textsInfos) { - auto boxes = lanms::merge_quadrangle_n9(polys, nmsThresh_); + auto boxes = lanms::MergeQuadrangleN9(polys, nmsThresh_); std::vector<std::vector<float>> ans; for (size_t i = 0; i < boxes.size(); i++) { auto &p = boxes[i]; diff --git a/official/cv/east/infer/sdk/mxpi/CMakeLists.txt b/official/cv/east/infer/sdk/mxpi/CMakeLists.txt deleted file mode 100644 index 0691e48bb0222bc30a653894df7235d52dddc366..0000000000000000000000000000000000000000 --- a/official/cv/east/infer/sdk/mxpi/CMakeLists.txt +++ /dev/null @@ -1,39 +0,0 @@ -cmake_minimum_required(VERSION 3.5.2) -project(eastpost) -add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) - -set(PLUGIN_NAME "eastpostprocessor") -set(TARGET_LIBRARY ${PLUGIN_NAME}) -set(ACL_LIB_PATH $ENV{ASCEND_HOME}/nnrt/latest/acllib) - -include_directories(${CMAKE_CURRENT_BINARY_DIR}) - -include_directories($ENV{MX_SDK_HOME}/include) -include_directories($ENV{MX_SDK_HOME}/opensource/include) -include_directories($ENV{MX_SDK_HOME}/opensource/include/opencv4) -include_directories($ENV{MX_SDK_HOME}/opensource/include/gstreamer-1.0) -include_directories($ENV{MX_SDK_HOME}/opensource/include/glib-2.0) -include_directories($ENV{MX_SDK_HOME}/opensource/lib/glib-2.0/include) - -link_directories($ENV{MX_SDK_HOME}/lib) -link_directories($ENV{MX_SDK_HOME}/opensource/lib/) - -add_compile_options(-std=c++11 -fPIC -fstack-protector-all -pie -Wno-deprecated-declarations) -add_compile_options("-DPLUGIN_NAME=${PLUGIN_NAME}") -add_compile_options("-Dgoogle=mindxsdk_private") - -add_definitions(-DENABLE_DVPP_INTERFACE) - -#message("ACL_LIB_PATH:${ACL_LIB_PATH}.") -#include_directories(${CMAKE_CURRENT_BINARY_DIR}) -include_directories(${ACL_LIB_PATH}/include) - -add_library(${TARGET_LIBRARY} SHARED ../../mxbase/src/PostProcess/clipper/clipper.cpp - ../../mxbase/src/PostProcess/lanmsUtils.h ../../mxbase/src/PostProcess/EASTMindSporePost.cpp -../../mxbase/src/PostProcess/EASTMindSporePost.h) - -target_link_libraries(${TARGET_LIBRARY} glib-2.0 gstreamer-1.0 gobject-2.0 gstbase-1.0 gmodule-2.0) -target_link_libraries(${TARGET_LIBRARY} plugintoolkit mxpidatatype mxbase) -target_link_libraries(${TARGET_LIBRARY} -Wl,-z,relro,-z,now,-z,noexecstack -s) - -install(TARGETS ${TARGET_LIBRARY}) \ No newline at end of file diff --git a/official/cv/east/infer/sdk/mxpi/build.sh b/official/cv/east/infer/sdk/mxpi/build.sh deleted file mode 100644 index 07728e78c907ed8c930f680f56dc5663c872f8bc..0000000000000000000000000000000000000000 --- a/official/cv/east/infer/sdk/mxpi/build.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/bash - -# Copyright 2021 Huawei Technologies Co., Ltd -# -# 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. -# ============================================================================ - - -# env - -mkdir -p build -cd build || exit - -function make_plugin() { - if ! cmake ..; - then - echo "cmake failed." - return 1 - fi - - if ! (make && make install); - then - echo "make failed." - return 1 - fi - return 0 -} - -if make_plugin; -then - echo "INFO: The plugin of post processor install successfully." -else - echo "ERROR: The plugin of post processor install failed." -fi - -cd - || exit \ No newline at end of file diff --git a/official/cv/east/infer/sdk/pipeline/east.pipeline b/official/cv/east/infer/sdk/pipeline/east.pipeline index cb8705bfd9939d4e80ef71a9efa9ab5a90e37b81..10cb53ed1ab80f7f87975ee947003613aa5ac08c 100644 --- a/official/cv/east/infer/sdk/pipeline/east.pipeline +++ b/official/cv/east/infer/sdk/pipeline/east.pipeline @@ -33,7 +33,7 @@ "funcLanguage":"c++", "dataSource": "mxpi_tensorinfer0", "postProcessConfigPath": "../data/models/east.cfg", - "postProcessLibPath": "./mxpi/build/libeastpostprocessor.so" + "postProcessLibPath": "../mxbase/build/libeastpostprocessor.so" }, "factory": "mxpi_textobjectpostprocessor", "next": "mxpi_dataserialize0"