update to ppl.nn v0.9.1 and ppl.cv v0.7.1 (#1356)
parent
7cb4b9b18a
commit
05ed8e16ea
csrc/mmdeploy/net/ppl
tools/scripts
|
@ -10,18 +10,15 @@
|
|||
#if PPL_NN_HAS_X86
|
||||
#include "ppl/nn/engines/x86/engine_factory.h"
|
||||
#include "ppl/nn/engines/x86/engine_options.h"
|
||||
#include "ppl/nn/engines/x86/ops.h"
|
||||
#endif
|
||||
#if PPL_NN_HAS_CUDA
|
||||
#include "ppl/nn/engines/cuda/engine_factory.h"
|
||||
#include "ppl/nn/engines/cuda/engine_options.h"
|
||||
#include "ppl/nn/engines/cuda/ops.h"
|
||||
#define PPL_CUDA_IMPORT_FROM_BUFFER 1
|
||||
#endif
|
||||
#if PPL_NN_HAS_RISCV
|
||||
#include "ppl/nn/engines/riscv/engine_factory.h"
|
||||
#include "ppl/nn/engines/riscv/engine_options.h"
|
||||
#include "ppl/nn/engines/riscv/ops.h"
|
||||
#endif
|
||||
|
||||
namespace mmdeploy::framework {
|
||||
|
@ -64,7 +61,6 @@ Result<void> PPLNet::Init(const Value& args) {
|
|||
|
||||
#if PPL_NN_HAS_CUDA
|
||||
if (device_.is_device()) {
|
||||
ppl::nn::cuda::RegisterBuiltinOpImpls();
|
||||
ppl::nn::cuda::EngineOptions options{};
|
||||
options.device_id = device_.device_id();
|
||||
options.mm_policy = ppl::nn::cuda::MM_BEST_FIT;
|
||||
|
@ -93,13 +89,11 @@ Result<void> PPLNet::Init(const Value& args) {
|
|||
#endif
|
||||
#if PPL_NN_HAS_X86
|
||||
if (device_.is_host()) {
|
||||
ppl::nn::x86::RegisterBuiltinOpImpls();
|
||||
engines_.emplace_back(ppl::nn::x86::EngineFactory::Create({}));
|
||||
}
|
||||
#endif
|
||||
#if PPL_NN_HAS_RISCV
|
||||
if (device_.is_host()) {
|
||||
ppl::nn::riscv::RegisterBuiltinOpImpls();
|
||||
ppl::nn::riscv::EngineOptions options{};
|
||||
// TODO:
|
||||
// FP16 -> postprocess
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# 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
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# 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
|
||||
|
||||
|
|
|
@ -20,7 +20,7 @@ def install_pplcv(dep_dir, build_cuda):
|
|||
# git clone
|
||||
if not os.path.exists(pplcv_dir):
|
||||
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
|
||||
|
@ -50,7 +50,7 @@ def install_pplnn(dep_dir, build_cuda):
|
|||
# git clone
|
||||
if not os.path.exists(pplnn_dir):
|
||||
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
|
||||
|
|
Loading…
Reference in New Issue