mirror of
https://github.com/koush/scrypted.git
synced 2026-03-16 15:12:06 +00:00
detect: publish fixed ncnn segmentation and cluster fork
This commit is contained in:
4
plugins/coreml/package-lock.json
generated
4
plugins/coreml/package-lock.json
generated
@@ -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"
|
||||
}
|
||||
|
||||
@@ -50,5 +50,5 @@
|
||||
"devDependencies": {
|
||||
"@scrypted/sdk": "file:../../sdk"
|
||||
},
|
||||
"version": "0.1.92"
|
||||
"version": "0.1.97"
|
||||
}
|
||||
|
||||
4
plugins/ncnn/package-lock.json
generated
4
plugins/ncnn/package-lock.json
generated
@@ -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"
|
||||
}
|
||||
|
||||
@@ -40,15 +40,10 @@
|
||||
"ClusterForkInterface",
|
||||
"ObjectDetection",
|
||||
"ObjectDetectionPreview"
|
||||
],
|
||||
"labels": {
|
||||
"require": [
|
||||
"@scrypted/ncnn"
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
"devDependencies": {
|
||||
"@scrypted/sdk": "file:../../sdk"
|
||||
},
|
||||
"version": "0.1.91"
|
||||
"version": "0.1.92"
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
4
plugins/onnx/package-lock.json
generated
4
plugins/onnx/package-lock.json
generated
@@ -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"
|
||||
}
|
||||
|
||||
@@ -50,5 +50,5 @@
|
||||
"devDependencies": {
|
||||
"@scrypted/sdk": "file:../../sdk"
|
||||
},
|
||||
"version": "0.1.133"
|
||||
"version": "0.1.134"
|
||||
}
|
||||
|
||||
4
plugins/openvino/package-lock.json
generated
4
plugins/openvino/package-lock.json
generated
@@ -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"
|
||||
}
|
||||
|
||||
@@ -50,5 +50,5 @@
|
||||
"devDependencies": {
|
||||
"@scrypted/sdk": "file:../../sdk"
|
||||
},
|
||||
"version": "0.1.197"
|
||||
"version": "0.1.198"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user