Skip to content

Commit

Permalink
Merge pull request joyycom#12 from PYNing/master
Browse files Browse the repository at this point in the history
Pack MacOS libs as zip file, Update MacOS Integration Document
  • Loading branch information
Liusunming authored Dec 20, 2021
2 parents d906618 + 3813317 commit b133c74
Show file tree
Hide file tree
Showing 91 changed files with 14 additions and 2,927 deletions.
25 changes: 14 additions & 11 deletions demos/MacOS/readme.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
- [1. MacOS Demo安装包](#1-macos-demo安装包)
- [2. 运行MacOS Deom工程](#2-运行macos-deom工程)
- [1. 拷贝头文件与库文件](#1-拷贝头文件与库文件)
- [2. 拷贝模型文件](#2-拷贝模型文件)
- [3. 检查集成情况](#3-检查集成情况)
- [4. 运行](#4-运行)
- [2. 运行MacOS Demo工程](#2-运行macos-demo工程)
- [1. 解压Framework](#1-解压framework)
- [2. 拷贝头文件与库文件](#2-拷贝头文件与库文件)
- [3. 拷贝模型文件](#3-拷贝模型文件)
- [4. 检查集成情况](#4-检查集成情况)
- [5. 运行](#5-运行)
- [3. VNN SDK集成参考](#3-vnn-sdk集成参考)
- [1. 添加系统库依赖](#1-添加系统库依赖)
- [2. 添加VNN库](#2-添加vnn库)
Expand All @@ -14,14 +15,16 @@
# 1. MacOS Demo安装包
因Apple签名机制的限制,暂不能提供dmg安装包体验,需要通过Demo工程生成安装包

# 2. 运行MacOS Deom工程
# 2. 运行MacOS Demo工程
MacOS Demo工程已提前预设Framework路径、头文件搜索路径等,按如下操作即可运行
需要准备XCode(指引使用版本为版本为13.1),运行MacOS(版本10.10及以上)的计算机(Intel x64 CPU 和 Apple arm64 CPU均可)
## 1. 拷贝头文件与库文件
## 1. 解压Framework
进入```libs/macOS```目录,就地解压```x86_64_arm64.zip```文件
## 2. 拷贝头文件与库文件
拷贝根目录下的 ```libs``` 文件夹,放入 ```vnn_macos_demos``` 文件夹中
## 2. 拷贝模型文件
## 3. 拷贝模型文件
拷贝根目录下的 ```models``` 文件夹中的内容放入 ```vnn_mac_demos/files``` 文件夹中
## 3. 检查集成情况
## 4. 检查集成情况
用 XCode 打开 vnn_macos_demos 目录下的 ```vnndemo.xcodeproj```文件,如上述步骤正确,XCode将显示 ```Framework``` 集成情况如下

![MacOS_Guide_1_0](../../doc/resource/MacOS_Guide_1_0.png)
Expand All @@ -30,7 +33,7 @@ MacOS Demo工程已提前预设Framework路径、头文件搜索路径等,按

![iOS_Guide_1_1](../../doc/resource/iOS_Guide_1_1.png)

## 4. 运行
## 5. 运行
VNN MacOS 提供摄像头和相册两种演示模式,以下分别为手势识别SDK的摄像头Demo、人脸关键点检测SDK的相册Demo
![MacOS_Guide_1_1](../../doc/resource/MacOS_Guide_1_1.png)

Expand Down Expand Up @@ -66,4 +69,4 @@ VNN Demo 依赖9个系统库,按如下图添加这些依赖库
![MacOS_Guide_1_5](../../doc/resource/MacOS_Guide_1_5.png)

## 5. 放置模型文件、运行等
参考上文 ```运行MacOS Deom工程```
参考上文 ```运行MacOS Demo工程```
Binary file added libs/macOS/x86_64_arm64.zip
Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion libs/macOS/x86_64_arm64/vnn_core_osx.framework/Headers

This file was deleted.

1 change: 0 additions & 1 deletion libs/macOS/x86_64_arm64/vnn_core_osx.framework/Resources

This file was deleted.

This file was deleted.

Loading

0 comments on commit b133c74

Please sign in to comment.