From 05ed8e16ea57d24720097c950c2608059750976e Mon Sep 17 00:00:00 2001 From: GY <856454+ouonline@users.noreply.github.com> Date: Tue, 13 Dec 2022 14:21:24 +0800 Subject: [PATCH] update to ppl.nn v0.9.1 and ppl.cv v0.7.1 (#1356) --- csrc/mmdeploy/net/ppl/ppl_net.cpp | 6 ------ docs/en/05-supported-backends/pplnn.md | 2 +- docs/zh_cn/05-supported-backends/pplnn.md | 2 +- tools/scripts/build_ubuntu_x64_pplnn.py | 4 ++-- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/csrc/mmdeploy/net/ppl/ppl_net.cpp b/csrc/mmdeploy/net/ppl/ppl_net.cpp index 06f21bf57..449dc317b 100644 --- a/csrc/mmdeploy/net/ppl/ppl_net.cpp +++ b/csrc/mmdeploy/net/ppl/ppl_net.cpp @@ -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 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 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 diff --git a/docs/en/05-supported-backends/pplnn.md b/docs/en/05-supported-backends/pplnn.md index c0875ce9f..a43bd6819 100644 --- a/docs/en/05-supported-backends/pplnn.md +++ b/docs/en/05-supported-backends/pplnn.md @@ -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 diff --git a/docs/zh_cn/05-supported-backends/pplnn.md b/docs/zh_cn/05-supported-backends/pplnn.md index 2dcca8e05..bed333d4f 100644 --- a/docs/zh_cn/05-supported-backends/pplnn.md +++ b/docs/zh_cn/05-supported-backends/pplnn.md @@ -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 diff --git a/tools/scripts/build_ubuntu_x64_pplnn.py b/tools/scripts/build_ubuntu_x64_pplnn.py index 5c46c0965..8b382826f 100644 --- a/tools/scripts/build_ubuntu_x64_pplnn.py +++ b/tools/scripts/build_ubuntu_x64_pplnn.py @@ -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