Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Crayon鑫
Paddle
提交
4ab06076
P
Paddle
项目概览
Crayon鑫
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
4ab06076
编写于
3月 12, 2019
作者:
Z
Zhen Wang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix NaN bugs.
上级
08e75731
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
17 addition
and
11 deletion
+17
-11
python/paddle/fluid/compiler.py
python/paddle/fluid/compiler.py
+4
-6
python/paddle/fluid/contrib/slim/tests/test_quantization_pass.py
...paddle/fluid/contrib/slim/tests/test_quantization_pass.py
+10
-2
python/paddle/fluid/framework.py
python/paddle/fluid/framework.py
+3
-3
未找到文件。
python/paddle/fluid/compiler.py
浏览文件 @
4ab06076
...
@@ -224,12 +224,10 @@ class CompiledProgram(object):
...
@@ -224,12 +224,10 @@ class CompiledProgram(object):
self
.
_build_strategy
.
trainers_endpoints
=
tps
self
.
_build_strategy
.
trainers_endpoints
=
tps
self
.
_persistable_vars
=
[]
self
.
_persistable_vars
=
[]
for
block_id
in
range
(
self
.
_program_desc
.
num_blocks
()):
for
node
in
self
.
_graph
.
nodes
():
bdesc
=
self
.
_program_desc
.
block
(
block_id
)
if
node
.
is_var
()
and
node
.
var
()
is
not
None
and
node
.
var
().
persistable
()
and
\
self
.
_persistable_vars
.
extend
([
node
.
var
().
type
()
!=
core
.
VarDesc
.
VarType
.
RAW
:
cpt
.
to_text
(
v
.
name
())
for
v
in
bdesc
.
all_vars
()
self
.
_persistable_vars
.
append
(
cpt
.
to_text
(
node
.
name
()))
if
v
.
persistable
()
and
v
.
type
()
!=
core
.
VarDesc
.
VarType
.
RAW
])
places
=
list
(
map
(
_place_obj
,
self
.
_places
))
places
=
list
(
map
(
_place_obj
,
self
.
_places
))
...
...
python/paddle/fluid/contrib/slim/tests/test_quantization_pass.py
浏览文件 @
4ab06076
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
# see the license for the specific language governing permissions and
# see the license for the specific language governing permissions and
# limitations under the license.
# limitations under the license.
import
os
import
unittest
import
unittest
import
random
import
random
import
numpy
as
np
import
numpy
as
np
...
@@ -25,6 +26,9 @@ from paddle.fluid.contrib.slim.quantization import ConvertToInt8Pass
...
@@ -25,6 +26,9 @@ from paddle.fluid.contrib.slim.quantization import ConvertToInt8Pass
from
paddle.fluid.contrib.slim.quantization
import
TransformForMobilePass
from
paddle.fluid.contrib.slim.quantization
import
TransformForMobilePass
from
paddle.fluid
import
core
from
paddle.fluid
import
core
os
.
environ
[
"CUDA_VISIBLE_DEVICES"
]
=
"0"
os
.
environ
[
"CPU_NUM"
]
=
"1"
def
linear_fc
(
num
):
def
linear_fc
(
num
):
data
=
fluid
.
layers
.
data
(
name
=
'image'
,
shape
=
[
1
,
32
,
32
],
dtype
=
'float32'
)
data
=
fluid
.
layers
.
data
(
name
=
'image'
,
shape
=
[
1
,
32
,
32
],
dtype
=
'float32'
)
...
@@ -249,7 +253,11 @@ class TestQuantizationFreezePass(unittest.TestCase):
...
@@ -249,7 +253,11 @@ class TestQuantizationFreezePass(unittest.TestCase):
marked_nodes
.
add
(
op
)
marked_nodes
.
add
(
op
)
test_graph
.
draw
(
'.'
,
'test'
+
dev_name
+
quant_type
,
marked_nodes
)
test_graph
.
draw
(
'.'
,
'test'
+
dev_name
+
quant_type
,
marked_nodes
)
quantized_main_program
=
main_graph
.
to_program
()
build_strategy
=
fluid
.
BuildStrategy
()
build_strategy
.
memory_optimize
=
False
build_strategy
.
enable_inplace
=
False
binary
=
fluid
.
CompiledProgram
(
main_graph
.
graph
).
with_data_parallel
(
loss_name
=
loss
.
name
,
build_strategy
=
build_strategy
)
quantized_test_program
=
test_graph
.
to_program
()
quantized_test_program
=
test_graph
.
to_program
()
iters
=
5
iters
=
5
batch_size
=
8
batch_size
=
8
...
@@ -264,7 +272,7 @@ class TestQuantizationFreezePass(unittest.TestCase):
...
@@ -264,7 +272,7 @@ class TestQuantizationFreezePass(unittest.TestCase):
with
fluid
.
scope_guard
(
scope
):
with
fluid
.
scope_guard
(
scope
):
for
_
in
range
(
iters
):
for
_
in
range
(
iters
):
data
=
next
(
train_reader
())
data
=
next
(
train_reader
())
loss_v
=
exe
.
run
(
program
=
quantized_main_program
,
loss_v
=
exe
.
run
(
binary
,
feed
=
feeder
.
feed
(
data
),
feed
=
feeder
.
feed
(
data
),
fetch_list
=
[
loss
])
fetch_list
=
[
loss
])
if
not
for_ci
:
if
not
for_ci
:
...
...
python/paddle/fluid/framework.py
浏览文件 @
4ab06076
...
@@ -2232,10 +2232,10 @@ class IrGraph(object):
...
@@ -2232,10 +2232,10 @@ class IrGraph(object):
Notes: the `graph` cannot contain a circle.
Notes: the `graph` cannot contain a circle.
Returns:
Returns:
se
t(IrNode): nodes in topology order.
lis
t(IrNode): nodes in topology order.
"""
"""
ordered_nodes
=
core
.
topology_sort
(
self
.
graph
)
ordered_nodes
=
core
.
topology_sort
(
self
.
graph
)
return
{
IrNode
(
n
)
for
n
in
ordered_nodes
}
return
[
IrNode
(
n
)
for
n
in
ordered_nodes
]
def
build_adjacency_list
(
self
):
def
build_adjacency_list
(
self
):
"""
"""
...
@@ -2303,7 +2303,7 @@ class IrGraph(object):
...
@@ -2303,7 +2303,7 @@ class IrGraph(object):
"""
"""
Convert the graph into a Program.
Convert the graph into a Program.
Notes
: When the graph includes backward operator nodes, the
WARN
: When the graph includes backward operator nodes, the
conversion process may be failed. Usually, this function is
conversion process may be failed. Usually, this function is
only used to convert a test graph.
only used to convert a test graph.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录