mirror of
https://github.com/koush/scrypted.git
synced 2026-03-16 07:02:07 +00:00
ncnn: fix face recognition model name
This commit is contained in:
4
plugins/ncnn/package-lock.json
generated
4
plugins/ncnn/package-lock.json
generated
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "@scrypted/ncnn",
|
||||
"version": "0.1.89",
|
||||
"version": "0.1.91",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "@scrypted/ncnn",
|
||||
"version": "0.1.89",
|
||||
"version": "0.1.91",
|
||||
"devDependencies": {
|
||||
"@scrypted/sdk": "file:../../sdk"
|
||||
}
|
||||
|
||||
@@ -50,5 +50,5 @@
|
||||
"devDependencies": {
|
||||
"@scrypted/sdk": "file:../../sdk"
|
||||
},
|
||||
"version": "0.1.89"
|
||||
"version": "0.1.91"
|
||||
}
|
||||
|
||||
@@ -23,7 +23,7 @@ class NCNNFaceRecognition(FaceRecognizeDetection):
|
||||
|
||||
def downloadModel(self, model: str):
|
||||
scrypted_yolov9 = "scrypted_yolov9" in model
|
||||
ncnnmodel = "best_converted" if scrypted_yolov9 else "best"
|
||||
ncnnmodel = "best_converted" if scrypted_yolov9 else model
|
||||
model_path = self.downloadHuggingFaceModelLocalFallback(model)
|
||||
binFile = os.path.join(model_path, f"{ncnnmodel}.ncnn.bin")
|
||||
paramFile = os.path.join(model_path, f"{ncnnmodel}.ncnn.param")
|
||||
|
||||
@@ -35,8 +35,12 @@ class FaceRecognizeDetection(PredictPlugin):
|
||||
self.loop = asyncio.get_event_loop()
|
||||
self.minThreshold = 0.5
|
||||
|
||||
self.detectModel = self.downloadModel("scrypted_yolov9t_relu_face")
|
||||
self.faceModel = self.downloadModel("inception_resnet_v1")
|
||||
try:
|
||||
self.detectModel = self.downloadModel("scrypted_yolov9t_relu_face")
|
||||
self.faceModel = self.downloadModel("inception_resnet_v1")
|
||||
except Exception:
|
||||
traceback.print_exc()
|
||||
raise
|
||||
|
||||
def downloadModel(self, model: str):
|
||||
pass
|
||||
|
||||
Reference in New Issue
Block a user