Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
GoAI
Paddle
提交
afcb58c4
P
Paddle
项目概览
GoAI
/
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
afcb58c4
编写于
5月 06, 2017
作者:
G
gangliao
提交者:
GitHub
5月 06, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2017 from emailweixu/add_python_test
run python tests in virtualenv
上级
ba3d9f02
5458be66
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
37 addition
and
142 deletion
+37
-142
cmake/external/python.cmake
cmake/external/python.cmake
+4
-4
cmake/util.cmake
cmake/util.cmake
+11
-0
paddle/api/test/CMakeLists.txt
paddle/api/test/CMakeLists.txt
+2
-2
paddle/scripts/run_python_tests.sh
paddle/scripts/run_python_tests.sh
+17
-7
python/paddle/v2/plot/tests/CMakeLists.txt
python/paddle/v2/plot/tests/CMakeLists.txt
+1
-3
python/paddle/v2/plot/tests/run_tests.sh
python/paddle/v2/plot/tests/run_tests.sh
+0
-36
python/paddle/v2/reader/tests/CMakeLists.txt
python/paddle/v2/reader/tests/CMakeLists.txt
+1
-3
python/paddle/v2/reader/tests/run_tests.sh
python/paddle/v2/reader/tests/run_tests.sh
+0
-35
python/paddle/v2/tests/CMakeLists.txt
python/paddle/v2/tests/CMakeLists.txt
+1
-16
python/paddle/v2/tests/run_tests.sh
python/paddle/v2/tests/run_tests.sh
+0
-36
未找到文件。
cmake/external/python.cmake
浏览文件 @
afcb58c4
# Copyright (c) 2016 PaddlePaddle Authors. 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.
...
...
@@ -19,7 +19,7 @@ FIND_PACKAGE(PythonInterp 2.7)
FIND_PACKAGE
(
PythonLibs 2.7
)
SET
(
py_env
""
)
SET
(
USE_VIRTUALENV_FOR_TEST 1
)
IF
(
PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND
)
find_python_module
(
pip REQUIRED
)
find_python_module
(
numpy REQUIRED
)
...
...
cmake/util.cmake
浏览文件 @
afcb58c4
...
...
@@ -144,3 +144,14 @@ function(create_resources res_file output_file)
COMMAND python ARGS
${
PROJ_ROOT
}
/cmake/make_resource.py
${
res_file
}
${
output_file
}
DEPENDS
${
res_file
}
${
PROJ_ROOT
}
/cmake/make_resource.py
)
endfunction
()
# Create a python unittest using run_python_tests.sh,
# which takes care of making correct running environment
function
(
add_python_test TEST_NAME
)
message
(
"PYTHON:
${
PYTHON_EXECUTABLE
}
"
)
add_test
(
NAME
${
TEST_NAME
}
COMMAND bash
${
PROJ_ROOT
}
/paddle/scripts/run_python_tests.sh
${
USE_VIRTUALENV_FOR_TEST
}
${
PYTHON_EXECUTABLE
}
${
ARGN
}
WORKING_DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
)
endfunction
()
paddle/api/test/CMakeLists.txt
浏览文件 @
afcb58c4
add_
test
(
NAME
test_swig_api
COMMAND bash
${
PROJ_ROOT
}
/paddle/api/test/run_tests.sh
${
PYTHON_EXECUTABLE
}
)
add_
python_test
(
test_swig_api
testArguments.py testGradientMachine.py testMatrix.py testVector.py testTrain.py testTrainer.py
)
paddle/
api/test/ru
n_tests.sh
→
paddle/
scripts/run_pytho
n_tests.sh
浏览文件 @
afcb58c4
...
...
@@ -18,19 +18,29 @@ pushd `dirname $0` > /dev/null
SCRIPTPATH
=
$PWD
popd
>
/dev/null
cd
$SCRIPTPATH
USE_VIRTUALENV_FOR_TEST
=
$1
;
shift
PYTHON
=
$1
;
shift
$1
-m
pip
install
../../dist/
*
.whl
if
[
$USE_VIRTUALENV_FOR_TEST
-ne
0
]
;
then
rm
-rf
.test_env
virtualenv .test_env
source
.test_env/bin/activate
PYTHON
=
python
fi
test_list
=
"testArguments.py testGradientMachine.py testMatrix.py testVector.py testTrain.py testTrainer.py"
export
PYTHONPATH
=
$SCRIPTPATH
/../../python/
$PYTHON
-m
pip
install
$SCRIPTPATH
/../dist/
*
.whl requests matplotlib
ipython
==
5.3
export
PYTHONPATH
=
$PWD
/../../../python/
for
fn
in
$test_list
for
fn
in
"
$@
"
do
echo
"test
$fn
"
$
1
$fn
$
PYTHON
$fn
if
[
$?
-ne
0
]
;
then
exit
1
fi
done
if
[
$USE_VIRTUALENV_FOR_TEST
-ne
0
]
;
then
deactivate
rm
-rf
.test_env
fi
python/paddle/v2/plot/tests/CMakeLists.txt
浏览文件 @
afcb58c4
add_test
(
NAME test_ploter
COMMAND bash
${
PROJ_ROOT
}
/python/paddle/v2/plot/tests/run_tests.sh
${
PYTHON_EXECUTABLE
}
)
add_python_test
(
test_ploter test_ploter.py
)
python/paddle/v2/plot/tests/run_tests.sh
已删除
100755 → 0
浏览文件 @
ba3d9f02
#!/bin/bash
# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
#
# 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.
pushd
`
dirname
$0
`
>
/dev/null
SCRIPTPATH
=
$PWD
popd
>
/dev/null
cd
$SCRIPTPATH
$1
-m
pip
install
../../../../../paddle/dist/
*
.whl
export
DISABLE_PLOT
=
"True"
test_list
=
"test_ploter.py"
export
PYTHONPATH
=
$PWD
/../../../../../python/
for
fn
in
$test_list
do
echo
"test
$fn
"
$1
$fn
if
[
$?
-ne
0
]
;
then
exit
1
fi
done
python/paddle/v2/reader/tests/CMakeLists.txt
浏览文件 @
afcb58c4
add_test
(
NAME reader_tests
COMMAND bash
${
PROJ_ROOT
}
/python/paddle/v2/reader/tests/run_tests.sh
${
PYTHON_EXECUTABLE
}
)
add_python_test
(
reader_tests creator_test.py decorator_test.py
)
python/paddle/v2/reader/tests/run_tests.sh
已删除
100755 → 0
浏览文件 @
ba3d9f02
#!/bin/bash
# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
#
# 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.
pushd
`
dirname
$0
`
>
/dev/null
SCRIPTPATH
=
$PWD
popd
>
/dev/null
cd
$SCRIPTPATH
$1
-m
pip
install
../../../../../paddle/dist/
*
.whl
test_list
=
"creator_test.py decorator_test.py"
export
PYTHONPATH
=
$PWD
/../../../../../python/
for
fn
in
$test_list
do
echo
"test
$fn
"
$1
$fn
if
[
$?
-ne
0
]
;
then
exit
1
fi
done
python/paddle/v2/tests/CMakeLists.txt
浏览文件 @
afcb58c4
add_test
(
NAME test_v2_api
COMMAND bash
${
PROJ_ROOT
}
/python/paddle/v2/tests/run_tests.sh
${
PYTHON_EXECUTABLE
}
)
add_test
(
NAME test_v2_layer
COMMAND
${
PROJ_ROOT
}
/paddle/.set_python_path.sh -d
${
PROJ_ROOT
}
/python/
${
PYTHON_EXECUTABLE
}
${
PROJ_ROOT
}
/python/paddle/v2/tests/test_layer.py
WORKING_DIRECTORY
${
PROJ_ROOT
}
/python/paddle
)
add_test
(
NAME test_v2_rnn_layer
COMMAND
${
PROJ_ROOT
}
/paddle/.set_python_path.sh -d
${
PROJ_ROOT
}
/python/
${
PYTHON_EXECUTABLE
}
${
PROJ_ROOT
}
/python/paddle/v2/tests/test_rnn_layer.py
)
add_test
(
NAME test_topology
COMMAND
${
PROJ_ROOT
}
/paddle/.set_python_path.sh -d
${
PROJ_ROOT
}
/python/
${
PYTHON_EXECUTABLE
}
${
PROJ_ROOT
}
/python/paddle/v2/tests/test_topology.py
WORKING_DIRECTORY
${
PROJ_ROOT
}
/python/paddle
)
add_python_test
(
test_v2_api test_data_feeder.py test_parameters.py test_layer.py test_rnn_layer.py test_topology.py
)
python/paddle/v2/tests/run_tests.sh
已删除
100755 → 0
浏览文件 @
ba3d9f02
#!/bin/bash
# Copyright (c) 2016 PaddlePaddle Authors. All Rights Reserved
#
# 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.
pushd
`
dirname
$0
`
>
/dev/null
SCRIPTPATH
=
$PWD
popd
>
/dev/null
cd
$SCRIPTPATH
$1
-m
pip
install
../../../../paddle/dist/
*
.whl
test_list
=
"test_data_feeder.py test_parameters.py"
export
PYTHONPATH
=
$PWD
/../../../../python/
for
fn
in
$test_list
do
echo
"test
$fn
"
$1
$fn
if
[
$?
-ne
0
]
;
then
exit
1
fi
done
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录