From 22cb23a075060c68f41f30a190165465c9ecfe2c Mon Sep 17 00:00:00 2001 From: Brett Jia Date: Tue, 6 Aug 2024 17:13:08 -0400 Subject: [PATCH] rknn: show model name + clean up detection classes (#1545) --- plugins/rknn/package-lock.json | 68 ++++++++++++------------- plugins/rknn/package.json | 2 +- plugins/rknn/src/rknn/optimized/yolo.py | 1 + plugins/rknn/src/rknn/plugin.py | 4 +- 4 files changed, 37 insertions(+), 38 deletions(-) diff --git a/plugins/rknn/package-lock.json b/plugins/rknn/package-lock.json index 84ece6ea0e..72c029cb65 100644 --- a/plugins/rknn/package-lock.json +++ b/plugins/rknn/package-lock.json @@ -1,36 +1,35 @@ { "name": "@scrypted/rknn", - "version": "0.1.2", + "version": "0.1.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/rknn", - "version": "0.1.2", + "version": "0.1.3", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } }, "../../sdk": { "name": "@scrypted/sdk", - "version": "0.3.31", + "version": "0.3.50", "dev": true, "license": "ISC", "dependencies": { - "@babel/preset-typescript": "^7.18.6", - "adm-zip": "^0.4.13", - "axios": "^1.6.5", - "babel-loader": "^9.1.0", - "babel-plugin-const-enum": "^1.1.0", - "esbuild": "^0.15.9", + "@babel/preset-typescript": "^7.24.7", + "adm-zip": "^0.5.14", + "axios": "^1.7.3", + "babel-loader": "^9.1.3", + "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", "raw-loader": "^4.0.2", - "rimraf": "^3.0.2", - "tmp": "^0.2.1", - "ts-loader": "^9.4.2", - "typescript": "^4.9.4", - "webpack": "^5.75.0", - "webpack-bundle-analyzer": "^4.5.0" + "rimraf": "^6.0.1", + "tmp": "^0.2.3", + "ts-loader": "^9.5.1", + "typescript": "^5.5.4", + "webpack": "^5.93.0", + "webpack-bundle-analyzer": "^4.10.2" }, "bin": { "scrypted-changelog": "bin/scrypted-changelog.js", @@ -42,11 +41,11 @@ "scrypted-webpack": "bin/scrypted-webpack.js" }, "devDependencies": { - "@types/node": "^18.11.18", - "@types/stringify-object": "^4.0.0", + "@types/node": "^22.1.0", + "@types/stringify-object": "^4.0.5", "stringify-object": "^3.3.0", - "ts-node": "^10.4.0", - "typedoc": "^0.23.21" + "ts-node": "^10.9.2", + "typedoc": "^0.26.5" } }, "../sdk": { @@ -61,25 +60,24 @@ "@scrypted/sdk": { "version": "file:../../sdk", "requires": { - "@babel/preset-typescript": "^7.18.6", - "@types/node": "^18.11.18", - "@types/stringify-object": "^4.0.0", - "adm-zip": "^0.4.13", - "axios": "^1.6.5", - "babel-loader": "^9.1.0", - "babel-plugin-const-enum": "^1.1.0", - "esbuild": "^0.15.9", + "@babel/preset-typescript": "^7.24.7", + "@types/node": "^22.1.0", + "@types/stringify-object": "^4.0.5", + "adm-zip": "^0.5.14", + "axios": "^1.7.3", + "babel-loader": "^9.1.3", + "babel-plugin-const-enum": "^1.2.0", "ncp": "^2.0.0", "raw-loader": "^4.0.2", - "rimraf": "^3.0.2", + "rimraf": "^6.0.1", "stringify-object": "^3.3.0", - "tmp": "^0.2.1", - "ts-loader": "^9.4.2", - "ts-node": "^10.4.0", - "typedoc": "^0.23.21", - "typescript": "^4.9.4", - "webpack": "^5.75.0", - "webpack-bundle-analyzer": "^4.5.0" + "tmp": "^0.2.3", + "ts-loader": "^9.5.1", + "ts-node": "^10.9.2", + "typedoc": "^0.26.5", + "typescript": "^5.5.4", + "webpack": "^5.93.0", + "webpack-bundle-analyzer": "^4.10.2" } } } diff --git a/plugins/rknn/package.json b/plugins/rknn/package.json index d5e8f69d27..9def3bc499 100644 --- a/plugins/rknn/package.json +++ b/plugins/rknn/package.json @@ -46,5 +46,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.2" + "version": "0.1.3" } diff --git a/plugins/rknn/src/rknn/optimized/yolo.py b/plugins/rknn/src/rknn/optimized/yolo.py index 4daee8af30..0bd4f91d7b 100644 --- a/plugins/rknn/src/rknn/optimized/yolo.py +++ b/plugins/rknn/src/rknn/optimized/yolo.py @@ -17,6 +17,7 @@ "spoon","bowl","banana","apple","sandwich","orange","broccoli","carrot","hot dog","pizza ","donut","cake","chair","sofa", "pottedplant","bed","diningtable","toilet ","tvmonitor","laptop ","mouse ","remote ","keyboard ","cell phone","microwave ", "oven ","toaster","sink","refrigerator ","book","clock","vase","scissors ","teddy bear ","hair drier", "toothbrush ") +CLASSES = [c.strip() for c in CLASSES] coco_id_list = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 27, 28, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, diff --git a/plugins/rknn/src/rknn/plugin.py b/plugins/rknn/src/rknn/plugin.py index 05b2e5a10b..1831ecd3c3 100644 --- a/plugins/rknn/src/rknn/plugin.py +++ b/plugins/rknn/src/rknn/plugin.py @@ -68,7 +68,7 @@ class RKNNPlugin(PredictPlugin, DeviceProvider): def __init__(self, nativeId=None): super().__init__(nativeId) self.cpu = ensure_compatibility_and_get_cpu() - model = 'yolov6n' + self.modelName = 'yolov6n' self.rknn_runtimes = {} @@ -80,7 +80,7 @@ def __init__(self, nativeId=None): else: raise RuntimeError('librknnrt.so not found. Please download it from {} and place it at {}'.format(lib_download, lib_path)) - model_download = model_download_tmpl.format(model, self.cpu) + model_download = model_download_tmpl.format(self.modelName, self.cpu) model_file = os.path.basename(model_download) model_path = self.downloadFile(model_download, model_file) print('Using model {}'.format(model_path))