Remove code that import fastdeploy directly

This commit is contained in:
jiangjiajun
2022-07-06 08:48:40 +00:00
parent b69f13b268
commit 9016ccc861
5 changed files with 12 additions and 13 deletions

View File

@@ -4,4 +4,4 @@ from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
version = '0.3.0'
git_version = '9d87046d78bcfc10c07b1e7a2bccda3914452201'
git_version = 'b69f13b26846f2e13f6ad3c81f1d4ad3ad81fdbb'

View File

@@ -14,20 +14,20 @@
from __future__ import absolute_import
import logging
import fastdeploy as fd
from fastdeploy import C
from ... import FastDeployModel, Frontend
from ... import fastdeploy_main as C
class Model(fd.FastDeployModel):
class Model(FastDeployModel):
def __init__(self,
model_file,
params_file,
config_file,
backend_option=None,
model_format=fd.Frontend.PADDLE):
model_format=Frontend.PADDLE):
super(Model, self).__init__(backend_option)
assert model_format == fd.Frontend.PADDLE, "PaddleClas only support model format of Frontend.Paddle now."
assert model_format == Frontend.PADDLE, "PaddleClas only support model format of Frontend.Paddle now."
self._model = C.vision.ppcls.Model(model_file, params_file,
config_file, self._runtime_option,
model_format)

View File

@@ -14,16 +14,16 @@
from __future__ import absolute_import
import logging
import fastdeploy as fd
from fastdeploy import C
from ... import FastDeployModel, Frontend
from ... import fastdeploy_main as C
class YOLOv5(fd.FastDeployModel):
class YOLOv5(FastDeployModel):
def __init__(self,
model_file,
params_file=None,
params_file="",
runtime_option=None,
model_format=fd.Frontend.ONNX):
model_format=Frontend.ONNX):
# 调用基函数进行backend_option的初始化
# 初始化后的option保存在self._runtime_option
super(YOLOv5, self).__init__(runtime_option)

View File

@@ -14,8 +14,7 @@
from __future__ import absolute_import
import logging
import fastdeploy as fd
from fastdeploy import C
from ... import fastdeploy_main as C
def vis_detection(im_data, det_result, line_size=1, font_size=0.5):