Merge pull request PaddlePaddle#1543 from Zheng-Bicheng/rknn_pybind

[Pybind] update rknpu2 pybind
Venonary · Mar 8, 2023 · 547910f · 547910f
2 parents c2d377a + 1e56d50
commit 547910f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 9 deletions.
diff --git a/fastdeploy/pybind/main.cc.in b/fastdeploy/pybind/main.cc.in
@@ -181,9 +181,6 @@ PYBIND11_MODULE(@PY_LIBRARY_NAME@, m) {
       m.def_submodule("text", "Text module of FastDeploy.");
   BindText(text_module);
 #endif
-  auto rknpu2_module =
-      m.def_submodule("rknpu2", "RKNPU2 config module of FastDeploy.");
-  BindRKNPU2Config(rknpu2_module);
 }
 
 }  // namespace fastdeploy
diff --git a/fastdeploy/pybind/rknpu2_config_pybind.cc → ...e/backends/rknpu2/rknpu2_config_pybind.cc b/fastdeploy/pybind/rknpu2_config_pybind.cc → ...e/backends/rknpu2/rknpu2_config_pybind.cc
@@ -14,7 +14,7 @@
 #include "fastdeploy/pybind/main.h"
 #include "fastdeploy/runtime/backends/rknpu2/option.h"
 namespace fastdeploy {
-void BindRKNPU2Config(pybind11::module& m) {
+void BindRKNPU2Option(pybind11::module& m) {
   pybind11::enum_<fastdeploy::rknpu2::CpuName>(
       m, "CpuName", pybind11::arithmetic(), "CpuName for inference.")
       .value("RK356X", fastdeploy::rknpu2::CpuName::RK356X)

diff --git a/fastdeploy/runtime/option_pybind.cc b/fastdeploy/runtime/option_pybind.cc
@@ -22,14 +22,15 @@ void BindOrtOption(pybind11::module& m);
 void BindTrtOption(pybind11::module& m);
 void BindPaddleOption(pybind11::module& m);
 void BindPorosOption(pybind11::module& m);
-
+void BindRKNPU2Option(pybind11::module& m);
 void BindOption(pybind11::module& m) {
   BindLiteOption(m);
   BindOpenVINOOption(m);
   BindOrtOption(m);
   BindTrtOption(m);
   BindPaddleOption(m);
   BindPorosOption(m);
+  BindRKNPU2Option(m);
 
   pybind11::class_<RuntimeOption>(m, "RuntimeOption")
       .def(pybind11::init())

diff --git a/python/fastdeploy/__init__.py b/python/fastdeploy/__init__.py
@@ -27,7 +27,6 @@
 from .c_lib_wrap import (
     ModelFormat,
     Backend,
-    rknpu2,
     FDDataType,
     TensorInfo,
     Device,

diff --git a/python/fastdeploy/runtime.py b/python/fastdeploy/runtime.py
@@ -16,7 +16,6 @@
 import numpy as np
 from . import ModelFormat
 from . import c_lib_wrap as C
-from . import rknpu2
 
 
 class Runtime:
@@ -253,8 +252,8 @@ def use_cpu(self):
         return self._option.use_cpu()
 
     def use_rknpu2(self,
-                   rknpu2_name=rknpu2.CpuName.RK3588,
-                   rknpu2_core=rknpu2.CoreMask.RKNN_NPU_CORE_0):
+                   rknpu2_name=C.CpuName.RK356X,
+                   rknpu2_core=C.CoreMask.RKNN_NPU_CORE_AUTO):
         return self._option.use_rknpu2(rknpu2_name, rknpu2_core)
 
     def use_sophgo(self):