mirrors/mmdeploy
1
0
Fork 0
mirror of https://github.com/open-mmlab/mmdeploy.git synced 2025-01-14 08:09:43 +08:00
Code Issues Projects Releases Wiki Activity

[Enhancement] Support ncnn vulkan (#318)

Browse Source 
* support ncnn_vulkan

* fix some comments

* avoid bc breaking

* add default value of config
This commit is contained in:
hanrui1sensetime 2022-04-14 22:12:17 +08:00 committed by GitHub
parent e96077feea
commit c54d574a10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mmdeploy/backend/ncnn/wrapper.py
View File

@ -38,12 +38,14 @@ class NCNNWrapper(BaseWrapper):
param_file: str, param_file: str,
bin_file: str, bin_file: str,
output_names: Optional[Sequence[str]] = None, output_names: Optional[Sequence[str]] = None,
use_vulkan: bool = False,
**kwargs): **kwargs):
net = ncnn.Net() net = ncnn.Net()
if importlib.util.find_spec('mmdeploy.backend.ncnn.ncnn_ext'): if importlib.util.find_spec('mmdeploy.backend.ncnn.ncnn_ext'):
from mmdeploy.backend.ncnn import ncnn_ext from mmdeploy.backend.ncnn import ncnn_ext
ncnn_ext.register_mmdeploy_custom_layers(net) ncnn_ext.register_mmdeploy_custom_layers(net)
net.opt.use_vulkan_compute = use_vulkan
net.load_param(param_file) net.load_param(param_file)
net.load_model(bin_file) net.load_model(bin_file)

7
mmdeploy/codebase/base/backend_model.py
View File

@ -5,7 +5,8 @@ from typing import Optional, Sequence, Union
import mmcv import mmcv
import torch import torch
from mmdeploy.utils import SDK_TASK_MAP, Backend, get_ir_config, get_task_type from mmdeploy.utils import (SDK_TASK_MAP, Backend, get_backend_config,
get_ir_config, get_task_type)
class BaseBackendModel(torch.nn.Module, metaclass=ABCMeta): class BaseBackendModel(torch.nn.Module, metaclass=ABCMeta):
@ -73,10 +74,12 @@ class BaseBackendModel(torch.nn.Module, metaclass=ABCMeta):
output_names=output_names) output_names=output_names)
elif backend == Backend.NCNN: elif backend == Backend.NCNN:
from mmdeploy.backend.ncnn import NCNNWrapper from mmdeploy.backend.ncnn import NCNNWrapper
use_vulkan = get_backend_config('use_vulkan', False)
return NCNNWrapper( return NCNNWrapper(
param_file=backend_files[0], param_file=backend_files[0],
bin_file=backend_files[1], bin_file=backend_files[1],
output_names=output_names) output_names=output_names,
use_vulkan=use_vulkan)
elif backend == Backend.OPENVINO: elif backend == Backend.OPENVINO:
from mmdeploy.backend.openvino import OpenVINOWrapper from mmdeploy.backend.openvino import OpenVINOWrapper
return OpenVINOWrapper( return OpenVINOWrapper(