Merge pull request #359 from Leoqh96/master

update facedetect readme & dependencies

Author: JingyuanZhang

packages/paddlejs-models/facedetect/README.md

@@ -16,10 +16,18 @@ await faceDetector.init();
 // Result is face area information. It includes left, top, width, height, confidence
 const res = await faceDetector.detect(
     imgEle,
-    { shrink: 0.4, threshold: 0.6}
+    { shrink: 0.4, threshold: 0.6 }
 );
 ```
 
+# Run Demo
+1. Execute in the current directory
+``` bash
+npm install
+npm run dev
+```
+2. Visit http://0.0.0.0:8867 
+
 # Performance
 + **multi small-sized face**  
 <img width="500"  src="https://mms-voice-fe.cdn.bcebos.com/pdmodel/face/detection/pic/small.png"/>
@@ -30,4 +38,7 @@ const res = await faceDetector.detect(
 # Postprocess
 This model has a better recognition effect for small-sized faces, and the image will be shrink before prediction, so it is necessary to transform the prediction output data.  
 <img width="500"  src="https://mms-voice-fe.cdn.bcebos.com/pdmodel/face/detection/pic/example.png"/>  
-The red line indicates the predicted output result, and the green line indicates the converted result. dx dy fw fh are known parameters.
+The red line indicates the predicted output result, and the green line indicates the converted result. dx dy fw fh are known parameters.
+
+# Reference
+[original model link](https://github.com/PaddlePaddle/PaddleHub/tree/release/v2.2/modules/image/face_detection/pyramidbox_lite_mobile)

packages/paddlejs-models/facedetect/README_cn.md

@@ -15,10 +15,18 @@ await faceDetector.init();
 // 结果为人脸区域信息，包括：左侧 left，上部 top，区域宽 width，区域高 height，置信度 confidence
 const res = await faceDetector.detect(
     imgEle,
-    { shrink: 0.4, threshold: 0.6}
+    { shrink: 0.4, threshold: 0.6 }
 );
 ```
 
+# 运行 Demo
+1. 在当前目录下执行
+``` bash
+npm install
+npm run dev
+```
+2. 浏览器访问 http://0.0.0.0:8867 
+
 # 效果
 + **多个小尺寸人脸**  
 <img width="500"  src="https://mms-voice-fe.cdn.bcebos.com/pdmodel/face/detection/pic/small.png"/>
@@ -29,4 +37,7 @@ const res = await faceDetector.detect(
 # 数据后处理
 此人脸检测模型对小尺寸人脸具有更好的识别效果，图像在预测前会进行缩小，因此需要对预测输出数据进行变换，及为**数据后处理过程**。示意如下：  
 <img width="500"  src="https://mms-voice-fe.cdn.bcebos.com/pdmodel/face/detection/pic/example.png"/>  
-红线标识的是预测输出结果，绿线标识的是经过转换后的结果，二者变换过程所涉及到的 dx dy fw fh均为已知量。
+红线标识的是预测输出结果，绿线标识的是经过转换后的结果，二者变换过程所涉及到的 dx dy fw fh均为已知量。
+
+# 参考
+[源模型链接](https://github.com/PaddlePaddle/PaddleHub/tree/release/v2.2/modules/image/face_detection/pyramidbox_lite_mobile)

packages/paddlejs-models/facedetect/package.json

@@ -10,8 +10,8 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "@paddlejs/paddlejs-backend-webgl": "^1.1.11",
-        "@paddlejs/paddlejs-core": "^2.1.11"
+        "@paddlejs/paddlejs-backend-webgl": "^1.1.15",
+        "@paddlejs/paddlejs-core": "^2.1.14"
     },
     "devDependencies": {
         "html-webpack-plugin": "^3.2.0",

packages/paddlejs-models/facedetect/src/index.ts

@@ -30,7 +30,7 @@ const defaultFeedShape: FeedShape = {
     fh: 1024
 };
 const defaultModelConfig: ModelConfig = {
-    modelPath: 'https://paddlejs.cdn.bcebos.com/models/face_detect',
+    modelPath: 'https://paddlejs.cdn.bcebos.com/models/fuse/facedetect',
     mean: [0.407843137, 0.458823529, 0.482352941],
     std: [0.5, 0.5, 0.5]
 };