Merge pull request #379 from PaddlePaddle/master

merge Master

Author: JingyuanZhang

e2e/jest-puppeteer.config.js

@@ -1,14 +1,14 @@
 // jest-puppeteer.config.js
 module.exports = {
     launch: {
-        headless: false
+        headless: false,
+        product: 'chrome'
     },
-    browser: 'chromium',
     browserContext: 'default',
     server: {
         command: './node_modules/ts-node/dist/bin.js e2e/server.ts',
         port: 9898,
-        launchTimeout: 10000,
+        launchTimeout: 50000,
         debug: true
     }
 };

packages/paddlejs-converter/setup.py

@@ -1,13 +1,13 @@
 import setuptools
 
-PY_MODILES = ["convertToPaddleJSModel", "convertModel", "optimizeModel", "pruningModel", "rnn"]
+PY_MODILES = ["convertToPaddleJSModel", "convertModel", "optimizeModel", "pruningModel", "rnn", "fuseOps"]
 
 with open("README.md", "r") as fh:
     long_description = fh.read()
 
 setuptools.setup(
     name="paddlejsconverter",
-    version="1.0.5",
+    version="1.0.6",
     author="paddlejs",
     author_email="382248373@qq.com",
     description="Paddlejs model converter",

packages/paddlejs-models/detect/README.md

@@ -6,6 +6,14 @@ detect model is used to detect the position of label frame in the image.
 
 <img src="https://img.shields.io/npm/v/@paddlejs-models/detect?color=success" alt="version"> <img src="https://img.shields.io/bundlephobia/min/@paddlejs-models/detect" alt="size"> <img src="https://img.shields.io/npm/dm/@paddlejs-models/detect?color=orange" alt="downloads"> <img src="https://img.shields.io/npm/dt/@paddlejs-models/detect" alt="downloads">
 
+# Run Demo
+1. Execute in the current directory
+``` bash
+npm install
+npm run dev
+```
+2. Visit http://0.0.0.0:8890
+
 
 # Usage
 

packages/paddlejs-models/detect/README_cn.md

@@ -6,6 +6,15 @@ detect模型用于检测图像中label框选位置。
 
 <img src="https://img.shields.io/npm/v/@paddlejs-models/detect?color=success" alt="version"> <img src="https://img.shields.io/bundlephobia/min/@paddlejs-models/detect" alt="size"> <img src="https://img.shields.io/npm/dm/@paddlejs-models/detect?color=orange" alt="downloads"> <img src="https://img.shields.io/npm/dt/@paddlejs-models/detect" alt="downloads">
 
+# 运行 Demo
+1. 在当前目录下执行
+``` bash
+npm install
+npm run dev
+```
+2. 访问 http://0.0.0.0:8890
+
+
 # 使用
 
 ```js

packages/paddlejs-models/gesture/README.md

@@ -6,6 +6,16 @@ gesture is a gesture recognition module, including two models: gesture_detect an
 
 <img src="https://img.shields.io/npm/v/@paddlejs-models/gesture?color=success" alt="version"> <img src="https://img.shields.io/bundlephobia/min/@paddlejs-models/gesture" alt="size"> <img src="https://img.shields.io/npm/dm/@paddlejs-models/gesture?color=orange" alt="downloads"> <img src="https://img.shields.io/npm/dt/@paddlejs-models/gesture" alt="downloads">
 
+
+# Run Demo
+1. Execute in the current directory
+``` bash
+npm install
+npm run dev
+```
+2. Visit http://0.0.0.0:8865
+
+
 # Usage
 
 ```js

packages/paddlejs-models/gesture/README_cn.md

@@ -6,6 +6,15 @@ gesture 为手势识别模块，包括两个模型：gesture_detect和gesture_re
 
 <img src="https://img.shields.io/npm/v/@paddlejs-models/gesture?color=success" alt="version"> <img src="https://img.shields.io/bundlephobia/min/@paddlejs-models/gesture" alt="size"> <img src="https://img.shields.io/npm/dm/@paddlejs-models/gesture?color=orange" alt="downloads"> <img src="https://img.shields.io/npm/dt/@paddlejs-models/gesture" alt="downloads">
 
+# 运行 Demo
+1. 在当前目录下执行
+``` bash
+npm install
+npm run dev
+```
+2. 访问 http://0.0.0.0:8865
+
+
 # 使用
 
 ```js

packages/paddlejs-models/gesture/webpack.dev.js

@@ -9,7 +9,7 @@ module.exports = {
     devtool: 'inline-source-map',
     devServer: {
         host: '0.0.0.0',
-        port: 8866
+        port: 8865
     },
     plugins: [
         new HtmlWebpackPlugin({

packages/paddlejs-models/humanseg/README.md

@@ -11,6 +11,16 @@ Api drawMask can draw the background without human.
 
 <img src="https://img.shields.io/npm/v/@paddlejs-models/humanseg?color=success" alt="version"> <img src="https://img.shields.io/bundlephobia/min/@paddlejs-models/humanseg" alt="size"> <img src="https://img.shields.io/npm/dm/@paddlejs-models/humanseg?color=orange" alt="downloads"> <img src="https://img.shields.io/npm/dt/@paddlejs-models/humanseg" alt="downloads">
 
+
+# Run Demo
+1. Execute in the current directory
+``` bash
+npm install
+npm run dev
+```
+2. Visit http://0.0.0.0:8866
+3. Visit gpu pipeline http://0.0.0.0:8866/gpu.html
+
 # Usage
 
 ```js

packages/paddlejs-models/humanseg/README_cn.md

@@ -7,6 +7,16 @@
 
 <img src="https://img.shields.io/npm/v/@paddlejs-models/humanseg?color=success" alt="version"> <img src="https://img.shields.io/bundlephobia/min/@paddlejs-models/humanseg" alt="size"> <img src="https://img.shields.io/npm/dm/@paddlejs-models/humanseg?color=orange" alt="downloads"> <img src="https://img.shields.io/npm/dt/@paddlejs-models/humanseg" alt="downloads">
 
+# 运行 Demo
+1. 在当前目录下执行
+``` bash
+npm install
+npm run dev
+```
+2. 访问 http://0.0.0.0:8866
+3. 访问 gpu 全流程处理效果 http://0.0.0.0:8866/gpu.html
+
+
 # 使用
 
 ```js

packages/paddlejs-models/mobilenet/README.md

@@ -6,6 +6,14 @@ mobilenet model can classify img. It provides simple interfaces to use. You can
 
 <img src="https://img.shields.io/npm/v/@paddlejs-models/mobilenet?color=success" alt="version"> <img src="https://img.shields.io/bundlephobia/min/@paddlejs-models/mobilenet" alt="size"> <img src="https://img.shields.io/npm/dm/@paddlejs-models/mobilenet?color=orange" alt="downloads"> <img src="https://img.shields.io/npm/dt/@paddlejs-models/mobilenet" alt="downloads">
 
+# Run Demo
+1. Execute in the current directory
+``` bash
+npm install
+npm run dev
+```
+2. Visit http://0.0.0.0:8867
+
 # Usage
 
 ```js