diff --git a/Android/README.md b/Android/README.md index 9c0895a..30cdb63 100644 --- a/Android/README.md +++ b/Android/README.md @@ -25,13 +25,13 @@ The ```build.gradle``` in Main Module add,select which function you need.But the dependencies { ... // Must have and must be the newest!!!! - implementation 'com.tengine.tenginekit:core:0.0.2' + implementation 'com.tengine.tenginekit:core:0.0.3' // Function on Face - implementation 'com.tengine.tenginekit:face:0.0.2' + implementation 'com.tengine.tenginekit:face:0.0.3' // Function on Hand - implementation 'com.tengine.tenginekit:hand:0.0.1' + implementation 'com.tengine.tenginekit:hand:0.0.2' // Function on Body - implementation 'com.tengine.tenginekit:body:0.0.1' + implementation 'com.tengine.tenginekit:body:0.0.2' ... } ``` diff --git a/Android/sample/FaceDemo/app/build.gradle b/Android/sample/FaceDemo/app/build.gradle index 3f9812e..d96cf1c 100644 --- a/Android/sample/FaceDemo/app/build.gradle +++ b/Android/sample/FaceDemo/app/build.gradle @@ -50,8 +50,8 @@ dependencies { implementation 'com.makeramen:roundedimageview:2.3.0' implementation 'com.google.android.material:material:1.0.0' - implementation 'com.tengine.tenginekit:core:0.0.2' - implementation 'com.tengine.tenginekit:face:0.0.2' + implementation 'com.tengine.tenginekit:core:0.0.3' + implementation 'com.tengine.tenginekit:face:0.0.3' implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support:recyclerview-v7:28.0.0' diff --git a/Android/sample/GoogleBodyDemo/app/build.gradle b/Android/sample/GoogleBodyDemo/app/build.gradle index 1e45ae1..d557ada 100644 --- a/Android/sample/GoogleBodyDemo/app/build.gradle +++ b/Android/sample/GoogleBodyDemo/app/build.gradle @@ -50,8 +50,9 @@ dependencies { implementation 'com.makeramen:roundedimageview:2.3.0' implementation 'com.google.android.material:material:1.0.0' - implementation 'com.tengine.tenginekit:core:0.0.1' - implementation 'com.tengine.tenginekit:body:0.0.1' + implementation 'com.tengine.tenginekit:core:0.0.3' + implementation 'com.tengine.tenginekit:body:0.0.2' + implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support:recyclerview-v7:28.0.0' implementation 'com.android.support:design:28.0.0' diff --git a/Android/sample/GoogleFaceDemo/app/build.gradle b/Android/sample/GoogleFaceDemo/app/build.gradle index a7ba901..d96cf1c 100644 --- a/Android/sample/GoogleFaceDemo/app/build.gradle +++ b/Android/sample/GoogleFaceDemo/app/build.gradle @@ -50,8 +50,8 @@ dependencies { implementation 'com.makeramen:roundedimageview:2.3.0' implementation 'com.google.android.material:material:1.0.0' - implementation 'com.tengine.tenginekit:core:0.0.1' - implementation 'com.tengine.tenginekit:face:0.0.1' + implementation 'com.tengine.tenginekit:core:0.0.3' + implementation 'com.tengine.tenginekit:face:0.0.3' implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support:recyclerview-v7:28.0.0' diff --git a/Android/sample/GoogleHandDemo/app/build.gradle b/Android/sample/GoogleHandDemo/app/build.gradle index 5a1204b..c59244b 100644 --- a/Android/sample/GoogleHandDemo/app/build.gradle +++ b/Android/sample/GoogleHandDemo/app/build.gradle @@ -50,8 +50,8 @@ dependencies { implementation 'com.makeramen:roundedimageview:2.3.0' implementation 'com.google.android.material:material:1.0.0' - implementation 'com.tengine.tenginekit:core:0.0.1' - implementation 'com.tengine.tenginekit:hand:0.0.1' + implementation 'com.tengine.tenginekit:core:0.0.3' + implementation 'com.tengine.tenginekit:hand:0.0.2' implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support:recyclerview-v7:28.0.0' diff --git a/Android/sample/ImageDemo/app/build.gradle b/Android/sample/ImageDemo/app/build.gradle index dcea8a7..d357bc9 100644 --- a/Android/sample/ImageDemo/app/build.gradle +++ b/Android/sample/ImageDemo/app/build.gradle @@ -50,8 +50,8 @@ dependencies { implementation 'com.makeramen:roundedimageview:2.3.0' implementation 'com.google.android.material:material:1.0.0' - implementation 'com.tengine.tenginekit:core:0.0.1' - implementation 'com.tengine.tenginekit:face:0.0.1' + implementation 'com.tengine.tenginekit:core:0.0.3' + implementation 'com.tengine.tenginekit:face:0.0.3' implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support:recyclerview-v7:28.0.0' diff --git a/Docs/README_CN.md b/Docs/README_CN.md index 07381ee..4e048b9 100644 --- a/Docs/README_CN.md +++ b/Docs/README_CN.md @@ -45,7 +45,7 @@ TengineKit是一个易于集成的AI算法SDK。目前,它可以在各种手 - 身体检测(尚未手机实时) - 身体关键点(尚未手机实时) -# 性能指标(Face Detect & Face Landmark)(缩短了时间) +# 性能指标(Face Detect & Face Landmark) | CPU | 耗时 | 帧率 | | :---: | :---: | :---: | diff --git a/Linux/README.md b/Linux/README.md index 668d8a9..66b1617 100644 --- a/Linux/README.md +++ b/Linux/README.md @@ -1,14 +1,19 @@ -[中文版本](docs/Linux_README_CN.md) +[中文版本](docs/Linux_README_CN.md) | English Version -# Files -- libTengineKitSDK.so -- tenginekit_api.h -- tenginekit_struct.h -- [models](docs/Model_des.md) +# Qucik Start +## Sources +- Library File : ```libTengineKitSDK.so``` +- Header Files : ```tenginekit_api.h``` && ```tenginekit_struct.h``` +- Model Files : [Models Path](docs/Model_des.md) -# System -Linux +## System - Ubuntu 18 -# Usage +## Function - [API](docs/Linux_api.md) : When using sdk, you can refer to API to complete the functions you need. + +## Sample Usage +```bash +./make.sh +./bin/demo resources/image/4.jpg +``` \ No newline at end of file diff --git a/Linux/docs/Linux_README_CN.md b/Linux/docs/Linux_README_CN.md index edd291e..e27731a 100644 --- a/Linux/docs/Linux_README_CN.md +++ b/Linux/docs/Linux_README_CN.md @@ -1,12 +1,19 @@ -# 文件 -- libTengineKitSDK.so -- tenginekit_api.h -- tenginekit_struct.h -- [models](Model_des.md) - -# 系统 -Linux +中文版本 | [English Version](../README.md) + +# 快速开始 +# 资源 +- 库文件 : ```libTengineKitSDK.so``` +- 头文件 : ```tenginekit_api.h``` && ```tenginekit_struct.h``` +- 模型文件 : [在这里](docs/Model_des.md) + +## 系统 - Ubuntu 18 -# 使用 -- [API](Linux_api_CN.md) : 在使用sdk时,您可以参考API来完成你需要的功能。 \ No newline at end of file +## 功能 +- [API](Linux_api_CN.md) : 在使用sdk时,您可以参考API来完成你需要的功能。 + +## 示例使用 +```bash +./make.sh +./bin/demo resources/image/4.jpg +``` \ No newline at end of file diff --git a/Linux/docs/Model_des.md b/Linux/docs/Model_des.md index 4523218..31844f0 100644 --- a/Linux/docs/Model_des.md +++ b/Linux/docs/Model_des.md @@ -2,13 +2,13 @@ | Model Name | Function | | :---: | :---: | -| detect.bin | Face Detect | -| detect_go.bin | Google`s Face Detect | +| face_detect.bin | Face Detect | +| face_detect_go.bin | Google`s Face Detect | | face_landmark2d.bin | Face 2d Landmark | | face_landmark3d.bin | Face 3d Landmark | -| attribution.bin | Face Attribution | +| face_attr.bin | Face Attribution | | iris_landmark_go.bin | Iris Landmark | | hand_detect_go.bin | Hand Detect | | hand_landmark_go.bin | Hand Landmark | | body_detect_go.bin | Body Detect | -| body_landmark2d_go.bin | Body Landmark | \ No newline at end of file +| body_landmark_go.bin | Body Landmark | \ No newline at end of file diff --git a/Linux/libs/libTengineKitSDK.so b/Linux/libs/libTengineKitSDK.so index ab5f346..9e8cbc4 100644 Binary files a/Linux/libs/libTengineKitSDK.so and b/Linux/libs/libTengineKitSDK.so differ diff --git a/Linux/models/body_detect_go.bin b/Linux/models/body_detect_go.bin index e3c10cd..e7ed5e8 100644 Binary files a/Linux/models/body_detect_go.bin and b/Linux/models/body_detect_go.bin differ diff --git a/Linux/models/body_landmark2d_go.bin b/Linux/models/body_landmark_go.bin similarity index 99% rename from Linux/models/body_landmark2d_go.bin rename to Linux/models/body_landmark_go.bin index 5705496..54d557d 100644 Binary files a/Linux/models/body_landmark2d_go.bin and b/Linux/models/body_landmark_go.bin differ diff --git a/Linux/models/attribution.bin b/Linux/models/face_attr.bin similarity index 99% rename from Linux/models/attribution.bin rename to Linux/models/face_attr.bin index cc61840..33a7629 100644 Binary files a/Linux/models/attribution.bin and b/Linux/models/face_attr.bin differ diff --git a/Linux/models/detect.bin b/Linux/models/face_detect.bin similarity index 98% rename from Linux/models/detect.bin rename to Linux/models/face_detect.bin index 9807a9a..a8644d8 100644 Binary files a/Linux/models/detect.bin and b/Linux/models/face_detect.bin differ diff --git a/Linux/models/detect_go.bin b/Linux/models/face_detect_go.bin similarity index 93% rename from Linux/models/detect_go.bin rename to Linux/models/face_detect_go.bin index f10e8ef..d2f78ca 100644 Binary files a/Linux/models/detect_go.bin and b/Linux/models/face_detect_go.bin differ diff --git a/Linux/models/face_landmark2d.bin b/Linux/models/face_landmark2d.bin index 533e285..c99c35c 100644 Binary files a/Linux/models/face_landmark2d.bin and b/Linux/models/face_landmark2d.bin differ diff --git a/Linux/models/face_landmark3d.bin b/Linux/models/face_landmark3d.bin index 4958d41..04a611a 100644 Binary files a/Linux/models/face_landmark3d.bin and b/Linux/models/face_landmark3d.bin differ diff --git a/Linux/models/hand_detect_go.bin b/Linux/models/hand_detect_go.bin index f9f3ea9..de36112 100644 Binary files a/Linux/models/hand_detect_go.bin and b/Linux/models/hand_detect_go.bin differ diff --git a/Linux/models/hand_landmark_go.bin b/Linux/models/hand_landmark_go.bin index b9b24fe..92620f5 100644 Binary files a/Linux/models/hand_landmark_go.bin and b/Linux/models/hand_landmark_go.bin differ diff --git a/Linux/models/iris_landmark_go.bin b/Linux/models/iris_landmark_go.bin index 249f1dd..74b697c 100644 Binary files a/Linux/models/iris_landmark_go.bin and b/Linux/models/iris_landmark_go.bin differ diff --git a/README.md b/README.md index 582d118..10649f6 100644 --- a/README.md +++ b/README.md @@ -49,14 +49,16 @@ or - body detect(Real-time, not yet on Mobile) - body landamrks(Real-time, not yet on Mobile) -# Update (2021/01/08) -- Khadas NPU application -- Improved the speed of face detection and face landmarks -- Update folders -- Update Linux Models -- Update Core v0.0.2 & Face v0.0.2 - -# Performance(Face Detect & Face Landmark)(Reduced time) +# Update (2021/02/24) +- Update Core v0.0.3 +- Update Face v0.0.3 +- Update Hand v0.0.2 +- Update Body v0.0.2 +- Fixed some Bugs +- Rename models +- Linux libTengineKitSDK.so + +# Performance(Face Detect & Face Landmark) | CPU | Time consuming | Frame rate | | :---: | :---: | :---: |