mirrors
/
mmdeploy
mirror of https://github.com/open-mmlab/mmdeploy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update to ppl.nn v0.9.1 and ppl.cv v0.7.1 (#1356)

pull/1530/head
GY 2022-12-13 14:21:24 +08:00 committed by GitHub
parent 7cb4b9b18a
commit 05ed8e16ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
csrc/mmdeploy/net/ppl/ppl_net.cpp
View File

@ -10,18 +10,15 @@
#if PPL_NN_HAS_X86 #if PPL_NN_HAS_X86
#include "ppl/nn/engines/x86/engine_factory.h" #include "ppl/nn/engines/x86/engine_factory.h"
#include "ppl/nn/engines/x86/engine_options.h" #include "ppl/nn/engines/x86/engine_options.h"
#include "ppl/nn/engines/x86/ops.h"
#endif #endif
#if PPL_NN_HAS_CUDA #if PPL_NN_HAS_CUDA
#include "ppl/nn/engines/cuda/engine_factory.h" #include "ppl/nn/engines/cuda/engine_factory.h"
#include "ppl/nn/engines/cuda/engine_options.h" #include "ppl/nn/engines/cuda/engine_options.h"
#include "ppl/nn/engines/cuda/ops.h"
#define PPL_CUDA_IMPORT_FROM_BUFFER 1 #define PPL_CUDA_IMPORT_FROM_BUFFER 1
#endif #endif
#if PPL_NN_HAS_RISCV #if PPL_NN_HAS_RISCV
#include "ppl/nn/engines/riscv/engine_factory.h" #include "ppl/nn/engines/riscv/engine_factory.h"
#include "ppl/nn/engines/riscv/engine_options.h" #include "ppl/nn/engines/riscv/engine_options.h"
#include "ppl/nn/engines/riscv/ops.h"
#endif #endif
namespace mmdeploy::framework { namespace mmdeploy::framework {
@ -64,7 +61,6 @@ Result<void> PPLNet::Init(const Value& args) {
#if PPL_NN_HAS_CUDA #if PPL_NN_HAS_CUDA
if (device_.is_device()) { if (device_.is_device()) {
ppl::nn::cuda::RegisterBuiltinOpImpls();
ppl::nn::cuda::EngineOptions options{}; ppl::nn::cuda::EngineOptions options{};
options.device_id = device_.device_id(); options.device_id = device_.device_id();
options.mm_policy = ppl::nn::cuda::MM_BEST_FIT; options.mm_policy = ppl::nn::cuda::MM_BEST_FIT;
@ -93,13 +89,11 @@ Result<void> PPLNet::Init(const Value& args) {
#endif #endif
#if PPL_NN_HAS_X86 #if PPL_NN_HAS_X86
if (device_.is_host()) { if (device_.is_host()) {
ppl::nn::x86::RegisterBuiltinOpImpls();
engines_.emplace_back(ppl::nn::x86::EngineFactory::Create({})); engines_.emplace_back(ppl::nn::x86::EngineFactory::Create({}));
} }
#endif #endif
#if PPL_NN_HAS_RISCV #if PPL_NN_HAS_RISCV
if (device_.is_host()) { if (device_.is_host()) {
ppl::nn::riscv::RegisterBuiltinOpImpls();
ppl::nn::riscv::EngineOptions options{}; ppl::nn::riscv::EngineOptions options{};
// TODO: // TODO:
// FP16 -> postprocess // FP16 -> postprocess

2
docs/en/05-supported-backends/pplnn.md
View File

@ -1,6 +1,6 @@
# PPLNN Support # PPLNN Support
MMDeploy supports ppl.nn v0.8.1 and later. This tutorial is based on Linux systems like Ubuntu-18.04. MMDeploy supports ppl.nn v0.9.1 and later. This tutorial is based on Linux systems like Ubuntu-18.04.
## Installation ## Installation

2
docs/zh_cn/05-supported-backends/pplnn.md
View File

@ -1,6 +1,6 @@
# PPLNN 支持情况 # PPLNN 支持情况
MMDeploy supports ppl.nn v0.8.1 and later. This tutorial is based on Linux systems like Ubuntu-18.04. MMDeploy supports ppl.nn v0.9.1 and later. This tutorial is based on Linux systems like Ubuntu-18.04.
## Installation ## Installation

4
tools/scripts/build_ubuntu_x64_pplnn.py
View File

@ -20,7 +20,7 @@ def install_pplcv(dep_dir, build_cuda):
# git clone # git clone
if not os.path.exists(pplcv_dir): if not os.path.exists(pplcv_dir):
os.system( os.system(
'git clone --depth 1 --branch v0.7.0 https://github.com/openppl-public/ppl.cv/' # noqa: E501 'git clone --depth 1 --branch v0.7.1 https://github.com/openppl-public/ppl.cv/' # noqa: E501
) )
# build # build
@ -50,7 +50,7 @@ def install_pplnn(dep_dir, build_cuda):
# git clone # git clone
if not os.path.exists(pplnn_dir): if not os.path.exists(pplnn_dir):
os.system( os.system(
'git clone --depth 1 --branch v0.8.2 https://github.com/openppl-public/ppl.nn/' # noqa: E501 'git clone --depth 1 --branch v0.9.1 https://github.com/openppl-public/ppl.nn/' # noqa: E501
) )
# build # build