apps/FastDeploy
1
0
Fork 0
mirror of https://github.com/PaddlePaddle/FastDeploy.git synced 2025-11-01 04:12:58 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

[Other] Remove useless macros (#1095)

Browse Source 
* Remove useless macros

* triger ci

* fix check error

* rename INTEGRATE_PADDLE2ONNX to ENABLE_PADDLE2ONNX
This commit is contained in:
Jason
2023-01-09 21:35:23 +08:00
committed by GitHub
parent 48bc7241cb
commit df20b2a02b
35 changed files with 510 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fastdeploy/runtime/backends/openvino/ov_backend.cc
View File

@@ -13,7 +13,7 @@
// limitations under the License.
#include "fastdeploy/runtime/backends/openvino/ov_backend.h"
#ifdef ENABLE_PADDLE_FRONTEND
#ifdef ENABLE_PADDLE2ONNX
#include "paddle2onnx/converter.h"
#endif

4
fastdeploy/runtime/backends/ort/ort_backend.cc
View File

@@ -21,7 +21,7 @@
#include "fastdeploy/runtime/backends/ort/ops/multiclass_nms.h"
#include "fastdeploy/runtime/backends/ort/utils.h"
#include "fastdeploy/utils/utils.h"
#ifdef ENABLE_PADDLE_FRONTEND
#ifdef ENABLE_PADDLE2ONNX
#include "paddle2onnx/converter.h"
#endif
@@ -84,7 +84,7 @@ bool OrtBackend::InitFromPaddle(const std::string& model_file,
char* model_content_ptr;
int model_content_size = 0;
bool save_external = false;
#ifdef ENABLE_PADDLE_FRONTEND
#ifdef ENABLE_PADDLE2ONNX
std::vector<paddle2onnx::CustomOp> ops;
ops.resize(2);
strcpy(ops[0].op_name, "multiclass_nms3");

2
fastdeploy/runtime/backends/paddle/paddle_backend.h
View File

@@ -21,7 +21,7 @@
#include "fastdeploy/runtime/backends/backend.h"
#include "fastdeploy/runtime/backends/paddle/option.h"
#ifdef ENABLE_PADDLE_FRONTEND
#ifdef ENABLE_PADDLE2ONNX
#include "paddle2onnx/converter.h"
#endif
#include "fastdeploy/utils/unique_ptr.h"

4
fastdeploy/runtime/backends/tensorrt/trt_backend.cc
View File

@@ -20,7 +20,7 @@
#include "NvInferRuntime.h"
#include "fastdeploy/function/cuda_cast.h"
#include "fastdeploy/utils/utils.h"
#ifdef ENABLE_PADDLE_FRONTEND
#ifdef ENABLE_PADDLE2ONNX
#include "paddle2onnx/converter.h"
#endif
@@ -123,7 +123,7 @@ bool TrtBackend::InitFromPaddle(const std::string& model_file,
}
option_ = option;
#ifdef ENABLE_PADDLE_FRONTEND
#ifdef ENABLE_PADDLE2ONNX
std::vector<paddle2onnx::CustomOp> ops;
ops.resize(1);
strcpy(ops[0].op_name, "pool2d");