diff --git a/plugins/coreml/package-lock.json b/plugins/coreml/package-lock.json index 354f269ce..711fed707 100644 --- a/plugins/coreml/package-lock.json +++ b/plugins/coreml/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/coreml", - "version": "0.1.92", + "version": "0.1.97", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/coreml", - "version": "0.1.92", + "version": "0.1.97", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/coreml/package.json b/plugins/coreml/package.json index bfd712217..799062a5d 100644 --- a/plugins/coreml/package.json +++ b/plugins/coreml/package.json @@ -50,5 +50,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.92" + "version": "0.1.97" } diff --git a/plugins/ncnn/package-lock.json b/plugins/ncnn/package-lock.json index 311ed9bf9..058da39da 100644 --- a/plugins/ncnn/package-lock.json +++ b/plugins/ncnn/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/ncnn", - "version": "0.1.91", + "version": "0.1.92", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/ncnn", - "version": "0.1.91", + "version": "0.1.92", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/ncnn/package.json b/plugins/ncnn/package.json index 6fccc61a8..5dee3c7a8 100644 --- a/plugins/ncnn/package.json +++ b/plugins/ncnn/package.json @@ -40,15 +40,10 @@ "ClusterForkInterface", "ObjectDetection", "ObjectDetectionPreview" - ], - "labels": { - "require": [ - "@scrypted/ncnn" - ] - } + ] }, "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.91" + "version": "0.1.92" } diff --git a/plugins/ncnn/src/nc/segment.py b/plugins/ncnn/src/nc/segment.py index ef77cc944..7aec48695 100644 --- a/plugins/ncnn/src/nc/segment.py +++ b/plugins/ncnn/src/nc/segment.py @@ -20,8 +20,9 @@ class NCNNSegmentation(Segmentation): def loadModel(self, name): model_path = self.downloadHuggingFaceModelLocalFallback(name) - binFile = os.path.join(model_path, f"{name}.ncnn.bin") - paramFile = os.path.join(model_path, f"{name}.ncnn.param") + model_name = 'best_converted' + binFile = os.path.join(model_path, f"{model_name}.ncnn.bin") + paramFile = os.path.join(model_path, f"{model_name}.ncnn.param") net = ncnn.Net() net.opt.use_vulkan_compute = True @@ -53,8 +54,9 @@ class NCNNSegmentation(Segmentation): ex.extract("out0", out0) ex.extract("out1", out1) - pred = np.array(out0) - proto = np.array(out1) + # ncnn does not have batch dimension, so unsqueeze + pred = np.array([out0]) + proto = np.array([out1]) pred = yolov9_seg.non_max_suppression(pred, nm=32) return self.process_segmentation_output(pred, proto) diff --git a/plugins/onnx/package-lock.json b/plugins/onnx/package-lock.json index 507df537c..cc6aed7c6 100644 --- a/plugins/onnx/package-lock.json +++ b/plugins/onnx/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/onnx", - "version": "0.1.133", + "version": "0.1.134", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/onnx", - "version": "0.1.133", + "version": "0.1.134", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/onnx/package.json b/plugins/onnx/package.json index 3b7c62fba..d7cd0e151 100644 --- a/plugins/onnx/package.json +++ b/plugins/onnx/package.json @@ -50,5 +50,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.133" + "version": "0.1.134" } diff --git a/plugins/openvino/package-lock.json b/plugins/openvino/package-lock.json index 0f55a82d4..c4302e64a 100644 --- a/plugins/openvino/package-lock.json +++ b/plugins/openvino/package-lock.json @@ -1,12 +1,12 @@ { "name": "@scrypted/openvino", - "version": "0.1.197", + "version": "0.1.198", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@scrypted/openvino", - "version": "0.1.197", + "version": "0.1.198", "devDependencies": { "@scrypted/sdk": "file:../../sdk" } diff --git a/plugins/openvino/package.json b/plugins/openvino/package.json index 7480d6c76..6e195ab20 100644 --- a/plugins/openvino/package.json +++ b/plugins/openvino/package.json @@ -50,5 +50,5 @@ "devDependencies": { "@scrypted/sdk": "file:../../sdk" }, - "version": "0.1.197" + "version": "0.1.198" }