Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle
提交
40141f74
P
Paddle
项目概览
PaddlePaddle
/
Paddle
1 年多 前同步成功
通知
2302
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看板
提交
40141f74
编写于
10月 24, 2018
作者:
M
minqiyang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Implement the unittest for hash op
test=develop
上级
accb7b5d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
29 addition
and
10 deletion
+29
-10
cmake/external/xxhash.cmake
cmake/external/xxhash.cmake
+1
-1
paddle/fluid/operators/hash_op.cc
paddle/fluid/operators/hash_op.cc
+1
-1
paddle/scripts/paddle_build.sh
paddle/scripts/paddle_build.sh
+6
-6
python/paddle/fluid/tests/unittests/test_hash_op.py
python/paddle/fluid/tests/unittests/test_hash_op.py
+21
-2
未找到文件。
cmake/external/xxhash.cmake
浏览文件 @
40141f74
...
@@ -16,7 +16,7 @@ ExternalProject_Add(
...
@@ -16,7 +16,7 @@ ExternalProject_Add(
CONFIGURE_COMMAND
""
CONFIGURE_COMMAND
""
BUILD_IN_SOURCE 1
BUILD_IN_SOURCE 1
PATCH_COMMAND
PATCH_COMMAND
BUILD_COMMAND make lib
BUILD_COMMAND
sed -i
"s/-Wstrict-prototypes -Wundef/-Wstrict-prototypes -Wundef -fPIC/g"
${
XXHASH_SOURCE_DIR
}
/src/extern_xxhash/Makefile &&
make lib
INSTALL_COMMAND export PREFIX=
${
XXHASH_INSTALL_DIR
}
/ && make install
INSTALL_COMMAND export PREFIX=
${
XXHASH_INSTALL_DIR
}
/ && make install
TEST_COMMAND
""
TEST_COMMAND
""
)
)
...
...
paddle/fluid/operators/hash_op.cc
浏览文件 @
40141f74
...
@@ -46,7 +46,7 @@ class HashOp : public framework::OperatorWithKernel {
...
@@ -46,7 +46,7 @@ class HashOp : public framework::OperatorWithKernel {
// keep the last dim to 1
// keep the last dim to 1
out_dims
.
emplace_back
(
1
);
out_dims
.
emplace_back
(
1
);
ctx
->
SetOutputDim
(
"Out"
,
dims
);
ctx
->
SetOutputDim
(
"Out"
,
framework
::
make_ddim
(
out_dims
)
);
ctx
->
ShareLoD
(
"X"
,
/*->*/
"Out"
);
ctx
->
ShareLoD
(
"X"
,
/*->*/
"Out"
);
}
}
};
};
...
...
paddle/scripts/paddle_build.sh
浏览文件 @
40141f74
...
@@ -95,9 +95,9 @@ function cmake_gen() {
...
@@ -95,9 +95,9 @@ function cmake_gen() {
exit
1
exit
1
fi
fi
fi
fi
else
else
if
[
"
$1
"
!=
""
]
;
then
if
[
"
$1
"
!=
""
]
;
then
echo
"using python abi:
$1
"
echo
"using python abi:
$1
"
if
[
"
$1
"
==
"cp27-cp27m"
]
;
then
if
[
"
$1
"
==
"cp27-cp27m"
]
;
then
export
LD_LIBRARY_PATH
=
/opt/_internal/cpython-2.7.11-ucs2/lib:
${
LD_LIBRARY_PATH
#/opt/_internal/cpython-2.7.11-ucs4/lib
:
}
export
LD_LIBRARY_PATH
=
/opt/_internal/cpython-2.7.11-ucs2/lib:
${
LD_LIBRARY_PATH
#/opt/_internal/cpython-2.7.11-ucs4/lib
:
}
export
PATH
=
/opt/python/cp27-cp27m/bin/:
${
PATH
}
export
PATH
=
/opt/python/cp27-cp27m/bin/:
${
PATH
}
...
@@ -119,7 +119,7 @@ function cmake_gen() {
...
@@ -119,7 +119,7 @@ function cmake_gen() {
fi
fi
fi
fi
fi
fi
if
[
"
$SYSTEM
"
==
"Darwin"
]
;
then
if
[
"
$SYSTEM
"
==
"Darwin"
]
;
then
WITH_DISTRIBUTE
=
${
WITH_DISTRIBUTE
:-
ON
}
WITH_DISTRIBUTE
=
${
WITH_DISTRIBUTE
:-
ON
}
WITH_AVX
=
${
WITH_AVX
:-
ON
}
WITH_AVX
=
${
WITH_AVX
:-
ON
}
...
@@ -127,7 +127,7 @@ function cmake_gen() {
...
@@ -127,7 +127,7 @@ function cmake_gen() {
else
else
INFERENCE_DEMO_INSTALL_DIR
=
${
INFERENCE_DEMO_INSTALL_DIR
:-
/root/.cache/inference_demo
}
INFERENCE_DEMO_INSTALL_DIR
=
${
INFERENCE_DEMO_INSTALL_DIR
:-
/root/.cache/inference_demo
}
fi
fi
cat
<<
EOF
cat
<<
EOF
========================================
========================================
Configuring cmake in /paddle/build ...
Configuring cmake in /paddle/build ...
...
@@ -394,8 +394,8 @@ EOF
...
@@ -394,8 +394,8 @@ EOF
export
http_proxy
=
export
http_proxy
=
export
https_proxy
=
export
https_proxy
=
# TODO: jiabin need to refine this part when these tests fixed on mac
# TODO: jiabin need to refine this part when these tests fixed on mac
ctest
--output-on-failure
-j
$1
ctest
--output-on-failure
-j
$1
# make install should also be test when unittest
# make install should also be test when unittest
make
install
-j
8
make
install
-j
8
pip
install
--user
${
INSTALL_PREFIX
:-
/paddle/build
}
/opt/paddle/share/wheels/
*
.whl
pip
install
--user
${
INSTALL_PREFIX
:-
/paddle/build
}
/opt/paddle/share/wheels/
*
.whl
if
[[
${
WITH_FLUID_ONLY
:-
OFF
}
==
"OFF"
]]
;
then
if
[[
${
WITH_FLUID_ONLY
:-
OFF
}
==
"OFF"
]]
;
then
...
...
python/paddle/fluid/tests/unittests/test_hash_op.py
浏览文件 @
40141f74
...
@@ -22,13 +22,32 @@ class TestScaleOp(OpTest):
...
@@ -22,13 +22,32 @@ class TestScaleOp(OpTest):
self
.
op_type
=
"hash"
self
.
op_type
=
"hash"
self
.
init_test_case
()
self
.
init_test_case
()
self
.
inputs
=
{
'X'
:
(
self
.
in_seq
,
self
.
lod
)}
self
.
inputs
=
{
'X'
:
(
self
.
in_seq
,
self
.
lod
)}
self
.
attrs
=
{
'num_hash'
:
8
,
'mod_by'
:
10000
}
self
.
attrs
=
{
'num_hash'
:
4
,
'mod_by'
:
10000
}
self
.
outputs
=
{
'Out'
:
(
self
.
out_seq
,
self
.
lod
)}
self
.
outputs
=
{
'Out'
:
(
self
.
out_seq
,
self
.
lod
)}
def
init_test_case
(
self
):
def
init_test_case
(
self
):
np
.
random
.
seed
=
1
self
.
in_seq
=
np
.
random
.
randint
(
0
,
10
,
(
30
,
1
)).
astype
(
"int32"
)
self
.
in_seq
=
np
.
random
.
randint
(
0
,
10
,
(
30
,
1
)).
astype
(
"int32"
)
self
.
lod
=
[[
9
,
4
,
11
,
6
]]
self
.
lod
=
[[
9
,
4
,
11
,
6
]]
self
.
out_seq
=
np
.
ones
([
30
,
8
],
dtype
=
np
.
int32
)
# self.out_seq = np.ones([30, 4, 1], dtype=np.int32)
self
.
out_seq
=
[
[[
9662
],
[
9217
],
[
1129
],
[
8487
]],
[[
9662
],
[
9217
],
[
1129
],
[
8487
]],
[[
8310
],
[
1327
],
[
1654
],
[
4567
]],
[[
6897
],
[
3218
],
[
2013
],
[
1241
]],
[[
9407
],
[
6715
],
[
6949
],
[
8094
]],
[[
8473
],
[
694
],
[
5142
],
[
2479
]],
[[
8310
],
[
1327
],
[
1654
],
[
4567
]],
[[
6897
],
[
3218
],
[
2013
],
[
1241
]],
[[
4372
],
[
9456
],
[
8204
],
[
6695
]],
[[
6897
],
[
3218
],
[
2013
],
[
1241
]],
[[
8473
],
[
694
],
[
5142
],
[
2479
]],
[[
4372
],
[
9456
],
[
8204
],
[
6695
]],
[[
4372
],
[
9456
],
[
8204
],
[
6695
]],
[[
8473
],
[
694
],
[
5142
],
[
2479
]],
[[
9407
],
[
6715
],
[
6949
],
[
8094
]],
[[
9369
],
[
4525
],
[
8935
],
[
9210
]],
[[
4372
],
[
9456
],
[
8204
],
[
6695
]],
[[
4372
],
[
9456
],
[
8204
],
[
6695
]],
[[
9369
],
[
4525
],
[
8935
],
[
9210
]],
[[
6897
],
[
3218
],
[
2013
],
[
1241
]],
[[
9038
],
[
7951
],
[
5953
],
[
8657
]],
[[
9407
],
[
6715
],
[
6949
],
[
8094
]],
[[
9662
],
[
9217
],
[
1129
],
[
8487
]],
[[
9369
],
[
4525
],
[
8935
],
[
9210
]],
[[
9038
],
[
7951
],
[
5953
],
[
8657
]],
[[
9662
],
[
9217
],
[
1129
],
[
8487
]],
[[
9369
],
[
4525
],
[
8935
],
[
9210
]],
[[
1719
],
[
5986
],
[
9919
],
[
3421
]],
[[
4372
],
[
9456
],
[
8204
],
[
6695
]],
[[
9038
],
[
7951
],
[
5953
],
[
8657
]]
]
self
.
out_seq
=
np
.
array
(
self
.
out_seq
)
def
test_check_output
(
self
):
def
test_check_output
(
self
):
self
.
check_output
()
self
.
check_output
()
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录