Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
84362dc0
P
Paddle-Lite
项目概览
PaddlePaddle
/
Paddle-Lite
通知
331
Star
4
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
271
列表
看板
标记
里程碑
合并请求
78
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle-Lite
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
271
Issue
271
列表
看板
标记
里程碑
合并请求
78
合并请求
78
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
84362dc0
编写于
3月 06, 2019
作者:
R
Ray Liu
提交者:
GitHub
3月 06, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1470 from codeWorm2015/develop
format files
上级
d05d3060
439db947
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
33 addition
and
8 deletion
+33
-8
metal/paddle-mobile-demo/paddle-mobile-demo.xcodeproj/project.pbxproj
...-mobile-demo/paddle-mobile-demo.xcodeproj/project.pbxproj
+4
-0
metal/paddle-mobile-demo/paddle-mobile-demo/Assets.xcassets/paddle-mobile.imageset/Contents.json
...demo/Assets.xcassets/paddle-mobile.imageset/Contents.json
+21
-0
metal/paddle-mobile-demo/paddle-mobile-demo/Assets.xcassets/paddle-mobile.imageset/paddle-mobile.png
.../Assets.xcassets/paddle-mobile.imageset/paddle-mobile.png
+0
-0
metal/paddle-mobile-demo/paddle-mobile-demo/Base.lproj/Main.storyboard
...mobile-demo/paddle-mobile-demo/Base.lproj/Main.storyboard
+2
-2
metal/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift
...addle-mobile-demo/paddle-mobile-demo/ViewController.swift
+4
-2
metal/paddle-mobile/paddle-mobile.xcodeproj/project.pbxproj
metal/paddle-mobile/paddle-mobile.xcodeproj/project.pbxproj
+2
-2
metal/paddle-mobile/paddle-mobile/Src/Framework/Executor.swift
.../paddle-mobile/paddle-mobile/Src/Framework/Executor.swift
+0
-2
未找到文件。
metal/paddle-mobile-demo/paddle-mobile-demo.xcodeproj/project.pbxproj
浏览文件 @
84362dc0
...
@@ -50,6 +50,7 @@
...
@@ -50,6 +50,7 @@
FCEBEC2C20E1391F00C0B14D
/* paddle_mobile.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FCEBEC2B20E1391F00C0B14D
/* paddle_mobile.framework */
;
};
FCEBEC2C20E1391F00C0B14D
/* paddle_mobile.framework in Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FCEBEC2B20E1391F00C0B14D
/* paddle_mobile.framework */
;
};
FCEBEC2D20E1391F00C0B14D
/* paddle_mobile.framework in Embed Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FCEBEC2B20E1391F00C0B14D
/* paddle_mobile.framework */
;
settings
=
{
ATTRIBUTES
=
(
CodeSignOnCopy
,
RemoveHeadersOnCopy
,
);
};
};
FCEBEC2D20E1391F00C0B14D
/* paddle_mobile.framework in Embed Frameworks */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FCEBEC2B20E1391F00C0B14D
/* paddle_mobile.framework */
;
settings
=
{
ATTRIBUTES
=
(
CodeSignOnCopy
,
RemoveHeadersOnCopy
,
);
};
};
FCF437E8214B6DDB00943429
/* MultiPredictViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FCF437E7214B6DDB00943429
/* MultiPredictViewController.swift */
;
};
FCF437E8214B6DDB00943429
/* MultiPredictViewController.swift in Sources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FCF437E7214B6DDB00943429
/* MultiPredictViewController.swift */
;
};
FCFADE34222F63CC0037DCE8
/* test_big.JPG in Resources */
=
{
isa
=
PBXBuildFile
;
fileRef
=
FCFADE33222F63CB0037DCE8
/* test_big.JPG */
;
};
/* End PBXBuildFile section */
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
/* Begin PBXCopyFilesBuildPhase section */
...
@@ -118,6 +119,7 @@
...
@@ -118,6 +119,7 @@
FCCED60421D7646E00BE8D5F
/* test_image_super */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file
;
path
=
test_image_super
;
sourceTree
=
"<group>"
;
};
FCCED60421D7646E00BE8D5F
/* test_image_super */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
file
;
path
=
test_image_super
;
sourceTree
=
"<group>"
;
};
FCEBEC2B20E1391F00C0B14D
/* paddle_mobile.framework */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
wrapper.framework
;
path
=
paddle_mobile.framework
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
FCEBEC2B20E1391F00C0B14D
/* paddle_mobile.framework */
=
{
isa
=
PBXFileReference
;
explicitFileType
=
wrapper.framework
;
path
=
paddle_mobile.framework
;
sourceTree
=
BUILT_PRODUCTS_DIR
;
};
FCF437E7214B6DDB00943429
/* MultiPredictViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
MultiPredictViewController.swift
;
sourceTree
=
"<group>"
;
};
FCF437E7214B6DDB00943429
/* MultiPredictViewController.swift */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
sourcecode.swift
;
path
=
MultiPredictViewController.swift
;
sourceTree
=
"<group>"
;
};
FCFADE33222F63CB0037DCE8
/* test_big.JPG */
=
{
isa
=
PBXFileReference
;
lastKnownFileType
=
image.jpeg
;
path
=
test_big.JPG
;
sourceTree
=
"<group>"
;
};
/* End PBXFileReference section */
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
/* Begin PBXFrameworksBuildPhase section */
...
@@ -196,6 +198,7 @@
...
@@ -196,6 +198,7 @@
FC203FA821CBFDBA00B37166
/* images */
=
{
FC203FA821CBFDBA00B37166
/* images */
=
{
isa
=
PBXGroup
;
isa
=
PBXGroup
;
children
=
(
children
=
(
FCFADE33222F63CB0037DCE8
/* test_big.JPG */
,
FC2BFCBF21DF279900C262B2
/* classify-img-output.png */
,
FC2BFCBF21DF279900C262B2
/* classify-img-output.png */
,
FC2BFCBD21DF15D900C262B2
/* 123.jpg */
,
FC2BFCBD21DF15D900C262B2
/* 123.jpg */
,
FC2BFCBB21DF0A8600C262B2
/* 00001.jpg */
,
FC2BFCBB21DF0A8600C262B2
/* 00001.jpg */
,
...
@@ -389,6 +392,7 @@
...
@@ -389,6 +392,7 @@
FC2BFCBE21DF15D900C262B2
/* 123.jpg in Resources */
,
FC2BFCBE21DF15D900C262B2
/* 123.jpg in Resources */
,
FC039B8920E11C560081E9F8
/* Assets.xcassets in Resources */
,
FC039B8920E11C560081E9F8
/* Assets.xcassets in Resources */
,
FC9797C721D609FB00F2FD90
/* synset.txt in Resources */
,
FC9797C721D609FB00F2FD90
/* synset.txt in Resources */
,
FCFADE34222F63CC0037DCE8
/* test_big.JPG in Resources */
,
FC5E03B221DCE8D90016C137
/* mingren_input_data in Resources */
,
FC5E03B221DCE8D90016C137
/* mingren_input_data in Resources */
,
FC704C1A21D2375300F98BAB
/* super_model in Resources */
,
FC704C1A21D2375300F98BAB
/* super_model in Resources */
,
FC039B8720E11C550081E9F8
/* Main.storyboard in Resources */
,
FC039B8720E11C550081E9F8
/* Main.storyboard in Resources */
,
...
...
metal/paddle-mobile-demo/paddle-mobile-demo/Assets.xcassets/paddle-mobile.imageset/Contents.json
0 → 100644
浏览文件 @
84362dc0
{
"images"
:
[
{
"idiom"
:
"universal"
,
"filename"
:
"paddle-mobile.png"
,
"scale"
:
"1x"
},
{
"idiom"
:
"universal"
,
"scale"
:
"2x"
},
{
"idiom"
:
"universal"
,
"scale"
:
"3x"
}
],
"info"
:
{
"version"
:
1
,
"author"
:
"xcode"
}
}
\ No newline at end of file
metal/paddle-mobile-demo/paddle-mobile-demo/Assets.xcassets/paddle-mobile.imageset/paddle-mobile.png
0 → 100644
浏览文件 @
84362dc0
5.2 KB
metal/paddle-mobile-demo/paddle-mobile-demo/Base.lproj/Main.storyboard
浏览文件 @
84362dc0
...
@@ -155,7 +155,7 @@
...
@@ -155,7 +155,7 @@
<nil
key=
"textColor"
/>
<nil
key=
"textColor"
/>
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
</label>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"paddle-mobile
.png
"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"4ey-Xr-U4e"
>
<imageView
userInteractionEnabled=
"NO"
contentMode=
"scaleToFill"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
image=
"paddle-mobile"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"4ey-Xr-U4e"
>
<rect
key=
"frame"
x=
"90"
y=
"637"
width=
"195"
height=
"30"
/>
<rect
key=
"frame"
x=
"90"
y=
"637"
width=
"195"
height=
"30"
/>
<constraints>
<constraints>
<constraint
firstAttribute=
"width"
secondItem=
"4ey-Xr-U4e"
secondAttribute=
"height"
multiplier=
"6.5:1"
id=
"8c5-FF-lB9"
/>
<constraint
firstAttribute=
"width"
secondItem=
"4ey-Xr-U4e"
secondAttribute=
"height"
multiplier=
"6.5:1"
id=
"8c5-FF-lB9"
/>
...
@@ -320,6 +320,6 @@
...
@@ -320,6 +320,6 @@
</scene>
</scene>
</scenes>
</scenes>
<resources>
<resources>
<image
name=
"paddle-mobile
.png
"
width=
"402"
height=
"62"
/>
<image
name=
"paddle-mobile"
width=
"402"
height=
"62"
/>
</resources>
</resources>
</document>
</document>
metal/paddle-mobile-demo/paddle-mobile-demo/ViewController.swift
浏览文件 @
84362dc0
...
@@ -105,7 +105,10 @@ class ViewController: UIViewController {
...
@@ -105,7 +105,10 @@ class ViewController: UIViewController {
// self?.toPredictTexture = texture
// self?.toPredictTexture = texture
// }
// }
let
beforeDate
=
Date
.
init
()
runner
.
getTexture
(
image
:
selectImage
!.
cgImage
!
)
{
[
weak
self
]
(
texture
)
in
runner
.
getTexture
(
image
:
selectImage
!.
cgImage
!
)
{
[
weak
self
]
(
texture
)
in
let
timeUse
=
Date
.
init
()
.
timeIntervalSince
(
beforeDate
)
print
(
"get texture time use:
\(
timeUse
)
"
)
self
?
.
toPredictTexture
=
texture
self
?
.
toPredictTexture
=
texture
}
}
}
}
...
@@ -178,7 +181,7 @@ class ViewController: UIViewController {
...
@@ -178,7 +181,7 @@ class ViewController: UIViewController {
modelPickerView
.
dataSource
=
self
modelPickerView
.
dataSource
=
self
threadPickerView
.
delegate
=
self
threadPickerView
.
delegate
=
self
threadPickerView
.
dataSource
=
self
threadPickerView
.
dataSource
=
self
if
let
image
=
UIImage
.
init
(
named
:
"
00001
.jpg"
)
{
if
let
image
=
UIImage
.
init
(
named
:
"
test
.jpg"
)
{
selectImage
=
image
selectImage
=
image
selectImageView
.
image
=
image
selectImageView
.
image
=
image
}
else
{
}
else
{
...
@@ -249,7 +252,6 @@ extension ViewController: VideoCaptureDelegate{
...
@@ -249,7 +252,6 @@ extension ViewController: VideoCaptureDelegate{
func
predictTexture
(
texture
:
MTLTexture
){
func
predictTexture
(
texture
:
MTLTexture
){
runner
.
scaleTexture
(
input
:
texture
)
{
(
scaledTexture
)
in
runner
.
scaleTexture
(
input
:
texture
)
{
(
scaledTexture
)
in
self
.
runner
.
predict
(
texture
:
scaledTexture
,
completion
:
{
(
success
,
resultHolder
)
in
self
.
runner
.
predict
(
texture
:
scaledTexture
,
completion
:
{
(
success
,
resultHolder
)
in
// print(resultHolder!.result![0])
resultHolder
?
.
first
?
.
releasePointer
()
resultHolder
?
.
first
?
.
releasePointer
()
})
})
}
}
...
...
metal/paddle-mobile/paddle-mobile.xcodeproj/project.pbxproj
浏览文件 @
84362dc0
...
@@ -758,7 +758,7 @@
...
@@ -758,7 +758,7 @@
"$(inherited)"
,
"$(inherited)"
,
"$(PROJECT_DIR)/paddle-mobile/CPU"
,
"$(PROJECT_DIR)/paddle-mobile/CPU"
,
);
);
MACH_O_TYPE
=
mh_dy
lib
;
MACH_O_TYPE
=
static
lib
;
MTL_LANGUAGE_REVISION
=
UseDeploymentTarget
;
MTL_LANGUAGE_REVISION
=
UseDeploymentTarget
;
PRODUCT_BUNDLE_IDENTIFIER
=
"orange.paddle-mobile"
;
PRODUCT_BUNDLE_IDENTIFIER
=
"orange.paddle-mobile"
;
PRODUCT_NAME
=
"$(TARGET_NAME:c99extidentifier)"
;
PRODUCT_NAME
=
"$(TARGET_NAME:c99extidentifier)"
;
...
@@ -795,7 +795,7 @@
...
@@ -795,7 +795,7 @@
"$(inherited)"
,
"$(inherited)"
,
"$(PROJECT_DIR)/paddle-mobile/CPU"
,
"$(PROJECT_DIR)/paddle-mobile/CPU"
,
);
);
MACH_O_TYPE
=
mh_dy
lib
;
MACH_O_TYPE
=
static
lib
;
MTL_LANGUAGE_REVISION
=
UseDeploymentTarget
;
MTL_LANGUAGE_REVISION
=
UseDeploymentTarget
;
PRODUCT_BUNDLE_IDENTIFIER
=
"orange.paddle-mobile"
;
PRODUCT_BUNDLE_IDENTIFIER
=
"orange.paddle-mobile"
;
PRODUCT_NAME
=
"$(TARGET_NAME:c99extidentifier)"
;
PRODUCT_NAME
=
"$(TARGET_NAME:c99extidentifier)"
;
...
...
metal/paddle-mobile/paddle-mobile/Src/Framework/Executor.swift
浏览文件 @
84362dc0
...
@@ -120,8 +120,6 @@ public class Executor<P: PrecisionType> {
...
@@ -120,8 +120,6 @@ public class Executor<P: PrecisionType> {
return
return
*/
*/
//输出 op 计算结果
//输出 op 计算结果
if
GlobalConfig
.
shared
.
debug
{
if
GlobalConfig
.
shared
.
debug
{
for
i
in
0
..<
SSelf
.
ops
.
count
{
for
i
in
0
..<
SSelf
.
ops
.
count
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录