Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
af86c3c4
P
Paddle
项目概览
PaddlePaddle
/
Paddle
大约 1 年 前同步成功
通知
2298
Star
20931
Fork
5422
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1423
列表
看板
标记
里程碑
合并请求
543
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1,423
Issue
1,423
列表
看板
标记
里程碑
合并请求
543
合并请求
543
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
af86c3c4
编写于
11月 30, 2016
作者:
Q
qingqing01
提交者:
GitHub
11月 30, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #657 from reyoung/feature/protobuf_equal
Using ApproximatelyEquals for trainer config unittest.
上级
767c4e84
1eb9c36f
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
121 addition
and
31 deletion
+121
-31
CMakeLists.txt
CMakeLists.txt
+11
-0
proto/CMakeLists.txt
proto/CMakeLists.txt
+0
-9
python/paddle/trainer_config_helpers/tests/CMakeLists.txt
python/paddle/trainer_config_helpers/tests/CMakeLists.txt
+14
-4
python/paddle/trainer_config_helpers/tests/ProtobufEqualMain.cpp
...paddle/trainer_config_helpers/tests/ProtobufEqualMain.cpp
+59
-0
python/paddle/trainer_config_helpers/tests/configs/.gitignore
...on/paddle/trainer_config_helpers/tests/configs/.gitignore
+1
-1
python/paddle/trainer_config_helpers/tests/configs/file_list.sh
.../paddle/trainer_config_helpers/tests/configs/file_list.sh
+9
-0
python/paddle/trainer_config_helpers/tests/configs/generate_protostr.sh
...trainer_config_helpers/tests/configs/generate_protostr.sh
+3
-11
python/paddle/trainer_config_helpers/tests/configs/run_tests.sh
.../paddle/trainer_config_helpers/tests/configs/run_tests.sh
+24
-6
未找到文件。
CMakeLists.txt
浏览文件 @
af86c3c4
...
...
@@ -12,6 +12,17 @@ include(package)
find_package
(
SWIG 2.0
)
find_package
(
CUDA QUIET
)
find_package
(
Protobuf REQUIRED
)
# Check protobuf library version.
execute_process
(
COMMAND
${
PROTOBUF_PROTOC_EXECUTABLE
}
--version
OUTPUT_VARIABLE PROTOBUF_VERSION
)
string
(
REPLACE
"libprotoc "
""
PROTOBUF_VERSION
${
PROTOBUF_VERSION
}
)
set
(
PROTOBUF_3 OFF
)
if
(
${
PROTOBUF_VERSION
}
VERSION_GREATER
"3.0.0"
OR
${
PROTOBUF_VERSION
}
VERSION_EQUAL
"3.0.0"
)
set
(
PROTOBUF_3 ON
)
endif
()
find_package
(
PythonLibs 2.7 REQUIRED
)
find_package
(
PythonInterp 2.7 REQUIRED
)
find_package
(
ZLIB REQUIRED
)
...
...
proto/CMakeLists.txt
浏览文件 @
af86c3c4
execute_process
(
COMMAND
${
PROTOBUF_PROTOC_EXECUTABLE
}
--version
OUTPUT_VARIABLE PROTOBUF_VERSION
)
string
(
REPLACE
"libprotoc "
""
PROTOBUF_VERSION
${
PROTOBUF_VERSION
}
)
set
(
PROTOBUF_3 OFF
)
if
(
${
PROTOBUF_VERSION
}
VERSION_GREATER
"3.0.0"
OR
${
PROTOBUF_VERSION
}
VERSION_EQUAL
"3.0.0"
)
set
(
PROTOBUF_3 ON
)
endif
()
set
(
proto_filenames
DataConfig.proto
DataFormat.proto
...
...
python/paddle/trainer_config_helpers/tests/CMakeLists.txt
浏览文件 @
af86c3c4
...
...
@@ -4,7 +4,17 @@ add_test(NAME layers_test
python
${
PROJ_ROOT
}
/python/paddle/trainer_config_helpers/tests/layers_test.py
WORKING_DIRECTORY
${
PROJ_ROOT
}
/python/paddle
)
add_test
(
NAME test_layerHelpers
COMMAND
${
PROJ_ROOT
}
/python/paddle/trainer_config_helpers/tests/configs/run_tests.sh
)
if
(
PROTOBUF_3
)
add_paddle_exe
(
protobuf_equal
ProtobufEqualMain.cpp
)
add_test
(
NAME test_layerHelpers
COMMAND
${
PROJ_ROOT
}
/python/paddle/trainer_config_helpers/tests/configs/run_tests.sh
${
CMAKE_CURRENT_BINARY_DIR
}
/protobuf_equal
)
else
()
add_test
(
NAME test_layerHelpers
COMMAND
${
PROJ_ROOT
}
/python/paddle/trainer_config_helpers/tests/configs/run_tests.sh
)
endif
()
python/paddle/trainer_config_helpers/tests/ProtobufEqualMain.cpp
0 → 100644
浏览文件 @
af86c3c4
/* Copyright (c) 2016 Baidu, Inc. All Rights Reserve.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */
#include <google/protobuf/text_format.h>
#include <google/protobuf/util/message_differencer.h>
#include <fstream>
#include <iostream>
#include "TrainerConfig.pb.h"
bool
loadPb
(
google
::
protobuf
::
Message
*
conf
,
const
std
::
string
&
filename
)
{
std
::
ifstream
fin
;
fin
.
open
(
filename
.
c_str
());
if
(
fin
.
is_open
())
{
std
::
string
str
((
std
::
istreambuf_iterator
<
char
>
(
fin
)),
std
::
istreambuf_iterator
<
char
>
());
bool
ok
=
google
::
protobuf
::
TextFormat
::
ParseFromString
(
str
,
conf
);
fin
.
close
();
return
ok
;
}
else
{
return
false
;
}
}
int
main
(
int
argc
,
char
**
argv
)
{
std
::
unique_ptr
<
google
::
protobuf
::
Message
>
config1
;
std
::
unique_ptr
<
google
::
protobuf
::
Message
>
config2
;
if
(
argc
==
3
)
{
config1
.
reset
(
new
paddle
::
ModelConfig
());
config2
.
reset
(
new
paddle
::
ModelConfig
());
}
else
if
(
argc
==
4
)
{
config1
.
reset
(
new
paddle
::
TrainerConfig
());
config2
.
reset
(
new
paddle
::
TrainerConfig
());
}
if
(
!
config1
||
!
config2
)
{
return
1
;
}
else
if
(
!
loadPb
(
config1
.
get
(),
argv
[
1
]))
{
return
2
;
}
else
if
(
!
loadPb
(
config2
.
get
(),
argv
[
2
]))
{
return
3
;
}
else
{
if
(
google
::
protobuf
::
util
::
MessageDifferencer
::
ApproximatelyEquals
(
*
config1
,
*
config2
))
{
return
0
;
}
else
{
return
4
;
}
}
}
python/paddle/trainer_config_helpers/tests/configs/.gitignore
浏览文件 @
af86c3c4
protostr/*.unitest
protostr/*.unit
t
est
python/paddle/trainer_config_helpers/tests/configs/file_list.sh
0 → 100755
浏览文件 @
af86c3c4
#!/bin/bash
export
configs
=(
test_fc layer_activations projections test_print_layer
test_sequence_pooling test_lstmemory_layer test_grumemory_layer
last_first_seq test_expand_layer test_ntm_layers test_hsigmoid
img_layers img_trans_layers util_layers simple_rnn_layers unused_layers test_cost_layers
test_rnn_group shared_fc shared_lstm test_cost_layers_with_weight
test_spp_layer test_bilinear_interp test_maxout test_bi_grumemory math_ops
)
export
whole_configs
=(
test_split_datasource
)
python/paddle/trainer_config_helpers/tests/configs/generate_protostr.sh
浏览文件 @
af86c3c4
...
...
@@ -5,24 +5,16 @@ cd `dirname $0`
export
PYTHONPATH
=
$PWD
/../../../../
protostr
=
$PWD
/protostr
configs
=(
test_fc layer_activations projections test_print_layer
test_sequence_pooling test_lstmemory_layer test_grumemory_layer
last_first_seq test_expand_layer test_ntm_layers test_hsigmoid
img_layers img_trans_layers util_layers simple_rnn_layers unused_layers test_cost_layers
test_rnn_group shared_fc shared_lstm test_cost_layers_with_weight
test_spp_layer test_bilinear_interp test_maxout test_bi_grumemory math_ops
)
whole_configs
=(
test_split_datasource
)
.
file_list.sh
for
conf
in
${
configs
[*]
}
do
echo
"Generating "
$conf
python
-m
paddle.utils.dump_config
$conf
.py
>
$protostr
/
$conf
.protostr.unitest
python
-m
paddle.utils.dump_config
$conf
.py
>
$protostr
/
$conf
.protostr.unit
t
est
done
for
conf
in
${
whole_configs
[*]
}
do
echo
"Generating "
$conf
python
-m
paddle.utils.dump_config
$conf
.py
""
--whole
>
$protostr
/
$conf
.protostr.unitest
python
-m
paddle.utils.dump_config
$conf
.py
""
--whole
>
$protostr
/
$conf
.protostr.unit
t
est
done
python/paddle/trainer_config_helpers/tests/configs/run_tests.sh
浏览文件 @
af86c3c4
...
...
@@ -9,9 +9,27 @@ files=`ls $protostr | grep -v "unitest"`
./generate_protostr.sh
for
file
in
$files
do
base_protostr
=
$protostr
/
$file
new_protostr
=
$protostr
/
$file
.unitest
diff
$base_protostr
$new_protostr
-u
done
.
./file_list.sh
if
[
-z
$1
]
;
then
for
file
in
$files
do
base_protostr
=
$protostr
/
$file
new_protostr
=
$protostr
/
$file
.unittest
diff
$base_protostr
$new_protostr
-u
done
else
for
file
in
${
configs
[*]
}
do
if
!
$1
$protostr
/
$file
.protostr
$protostr
/
$file
.protostr.unittest
;
then
diff
$protostr
/
$file
.protostr
$protostr
/
$file
.protostr.unittest
-u
fi
done
for
file
in
${
whole_configs
[*]
}
do
if
!
$1
$protostr
/
$file
.protostr
$protostr
/
$file
.protostr.unittest
--whole
;
then
diff
$protostr
/
$file
.protostr
$protostr
/
$file
.protostr.unittest
-u
fi
done
fi
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录