Polish cmake files and runtime apis #36
Merged
+446
−193
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Collaborator
Author
|
jiangjiajun
commented
Jul 24, 2022
| assert index < self.num_inputs(), "The input parameter index:{} should less than number of inputs:{}.".format(index, self.num_inputs) | ||
| assert isinstance( | ||
| index, int), "The input parameter index should be type of int." | ||
| assert index < self.num_inputs( |
Collaborator
Author
There was a problem hiding this comment.
代码命名直接由fastdeploy_runtime.py 改为runtime.py
| .def("num_outputs", &Runtime::NumOutputs) | ||
| .def("get_input_info", &Runtime::GetInputInfo) | ||
| .def("get_output_info", &Runtime::GetOutputInfo) | ||
| .def_readonly("option", &Runtime::option); |
fastdeploy/utils/utils.cc
Outdated
|
|
||
| bool DISABLE_WARNING = false; | ||
| bool DISABLE_INFO = false; | ||
|
|
Collaborator
Author
There was a problem hiding this comment.
这两行代码还没用到，需要删除
fastdeploy/utils/utils.h
Outdated
| namespace fastdeploy { | ||
|
|
||
| extern bool DISABLE_WARNING; | ||
| extern bool DISABLE_INFO; |
| CMAKE_MINIMUM_REQUIRED (VERSION 3.16) | ||
|
|
||
| # 在低版本ABI环境中，通过如下代码进行兼容性编译 | ||
| # add_definitions(-D_GLIBCXX_USE_CXX11_ABI=0) |
Collaborator
Author
There was a problem hiding this comment.
ABI的注释需移除，改为提示用户编译器版本信息
| auto option = fastdeploy::RuntimeOption(); | ||
| option.device = fastdeploy::Device::CPU; | ||
| option.backend = fastdeploy::Backend::PDINFER; | ||
| option.backend = fastdeploy::Backend::TRT; |
| option.UseTrtBackend(); | ||
| option.SetTrtInputShape("images", {1, 3, 320, 320}, {1, 3, 640, 640}, | ||
| {1, 3, 1280, 1280}); | ||
| auto model = vis::ultralytics::YOLOv5("yolov5s.onnx", "", option); |
| option.backend = fastdeploy::Backend::TRT; | ||
| option.trt_fixed_shape["images"] = {1, 3, 640, 640}; | ||
| auto model = vis::megvii::YOLOX("yolox_s.onnx", "", option); | ||
| if (!model.Initialized()) { |
model_zoo/vision/yolox/yolox.py
Outdated
| model = fd.vision.megvii.YOLOX("yolox_s.onnx") | ||
| option = fd.RuntimeOption() | ||
| option.use_trt_backend() | ||
| model = fd.vision.megvii.YOLOX("yolox_s.onnx", runtime_option=option) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.