diff --git a/machine-learning/app/sessions/rknn.py b/machine-learning/app/sessions/rknn.py index 0ad3b7d52b..9607a65c41 100644 --- a/machine-learning/app/sessions/rknn.py +++ b/machine-learning/app/sessions/rknn.py @@ -13,7 +13,7 @@ from rknn.rknnpool import RknnPoolExecutor, soc_name from ..config import log, settings -def runInfrence(rknn_lite: Any, input: list[NDArray[np.float32]]) -> list[NDArray[np.float32]]: +def runInference(rknn_lite: Any, input: list[NDArray[np.float32]]) -> list[NDArray[np.float32]]: outputs: list[NDArray[np.float32]] = rknn_lite.inference(inputs=input, data_format="nchw") return outputs @@ -27,7 +27,7 @@ class RknnSession: self.tpe = settings.rknn_threads log.info(f"Loading RKNN model from {self.model_path} with {self.tpe} threads.") - self.rknnpool = RknnPoolExecutor(rknnModel=self.model_path.as_posix(), tpes=self.tpe, func=runInfrence) + self.rknnpool = RknnPoolExecutor(rknnModel=self.model_path.as_posix(), tpes=self.tpe, func=runInference) log.info(f"Loaded RKNN model from {self.model_path} with {self.tpe} threads.") def __del__(self) -> None: diff --git a/machine-learning/rknn/rknnpool.py b/machine-learning/rknn/rknnpool.py index 73b40093d7..192c050bea 100644 --- a/machine-learning/rknn/rknnpool.py +++ b/machine-learning/rknn/rknnpool.py @@ -31,7 +31,7 @@ except (FileNotFoundError, ImportError): soc_name = None -def initRKNN(rknnModel="./rknnModel/yolov5s.rknn", id=0): +def initRKNN(rknnModel, id) -> RKNNLite: if not is_available: raise RuntimeError("rknn is not available!") rknn_lite = RKNNLite() @@ -59,7 +59,7 @@ def initRKNN(rknnModel="./rknnModel/yolov5s.rknn", id=0): return rknn_lite -def initRKNNs(rknnModel="./rknnModel/yolov5s.rknn", tpes=1): +def initRKNNs(rknnModel, tpes) -> list[RKNNLite]: rknn_list = [] for i in range(tpes): rknn_list.append(initRKNN(rknnModel, i % 3)) @@ -75,8 +75,8 @@ class RknnPoolExecutor: self.func = func self.num = 0 - def put(self, frame) -> None: - self.queue.put(self.pool.submit(self.func, self.rknn_pool[self.num % self.tpes], frame)) + def put(self, inputs) -> None: + self.queue.put(self.pool.submit(self.func, self.rknn_pool[self.num % self.tpes], inputs)) self.num += 1 def get(self) -> list[list[NDArray[np.float32]], bool]: