Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
PaddleDetection
提交
d0a5ce29
P
PaddleDetection
项目概览
PaddlePaddle
/
PaddleDetection
12 个月 前同步成功
通知
692
Star
11112
Fork
2696
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
184
列表
看板
标记
里程碑
合并请求
40
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
PaddleDetection
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
184
Issue
184
列表
看板
标记
里程碑
合并请求
40
合并请求
40
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d0a5ce29
编写于
1月 05, 2017
作者:
L
liaogang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Clean travis ci
上级
19dc8df4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
32 deletion
+15
-32
.travis.yml
.travis.yml
+1
-1
cmake/external/python.cmake
cmake/external/python.cmake
+8
-27
paddle/scripts/travis/build_and_test.sh
paddle/scripts/travis/build_and_test.sh
+5
-3
python/CMakeLists.txt
python/CMakeLists.txt
+1
-1
未找到文件。
.travis.yml
浏览文件 @
d0a5ce29
...
@@ -47,7 +47,7 @@ before_install:
...
@@ -47,7 +47,7 @@ before_install:
fi
fi
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then paddle/scripts/travis/before_install.osx.sh; fi
-
if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then paddle/scripts/travis/before_install.osx.sh; fi
-
if [[ "$JOB" == "PRE_COMMIT" ]]; then sudo ln -s /usr/bin/clang-format-3.8 /usr/bin/clang-format; fi
-
if [[ "$JOB" == "PRE_COMMIT" ]]; then sudo ln -s /usr/bin/clang-format-3.8 /usr/bin/clang-format; fi
-
pip install --upgrade pip
-
pip install --upgrade pip
-
pip install wheel protobuf sphinx recommonmark sphinx_rtd_theme virtualenv pre-commit requests==2.9.2 LinkChecker
-
pip install wheel protobuf sphinx recommonmark sphinx_rtd_theme virtualenv pre-commit requests==2.9.2 LinkChecker
script
:
script
:
-
paddle/scripts/travis/main.sh
-
paddle/scripts/travis/main.sh
...
...
cmake/external/python.cmake
浏览文件 @
d0a5ce29
...
@@ -138,41 +138,22 @@ SET(NUMPY_SOURCES_DIR ${PYTHON_SOURCES_DIR}/numpy)
...
@@ -138,41 +138,22 @@ SET(NUMPY_SOURCES_DIR ${PYTHON_SOURCES_DIR}/numpy)
SET
(
NUMPY_TAG_VERSION
"v1.11.3"
)
SET
(
NUMPY_TAG_VERSION
"v1.11.3"
)
SET
(
NUMPY_VERSION
"1.11.3"
)
SET
(
NUMPY_VERSION
"1.11.3"
)
SET
(
EGG_NAME
""
)
SET
(
PYTHON_NUMPY_INCLUDE_DIR
""
)
IF
(
WIN32
)
IF
(
WIN32
)
SET
(
EGG_NAME
"numpy-
${
NUMPY_VERSION
}
-py2.7-
${
HOST_SYSTEM
}
.egg"
)
SET
(
EGG_NAME
"numpy-
${
NUMPY_VERSION
}
-py2.7-
${
HOST_SYSTEM
}
.egg"
)
ELSE
(
WIN32
)
ELSE
(
WIN32
)
IF
(
APPLE
)
IF
(
APPLE
)
SET
(
EGG_NAME
"numpy-
${
NUMPY_VERSION
}
-py2.7-
${
HOST_SYSTEM
}
-
${
MACOS_VERSION
}
-x86_64.egg
"
)
SET
(
EGG_NAME
"numpy-
${
NUMPY_VERSION
}
-py2.7-
${
HOST_SYSTEM
}
-
${
MACOS_VERSION
}
"
)
ELSE
(
APPLE
)
ELSE
(
APPLE
)
SET
(
EGG_NAME
"numpy-
${
NUMPY_VERSION
}
-py2.7-linux-x86_64.egg"
)
SET
(
EGG_NAME
"numpy-
${
NUMPY_VERSION
}
-py2.7-linux"
)
SET
(
EGG_NAME
"numpy-
${
NUMPY_VERSION
}
-py2.7-linux"
)
ENDIF
(
APPLE
)
ENDIF
(
APPLE
)
ENDIF
(
WIN32
)
SET
(
PYTHON_NUMPY_INCLUDE_DIR
"
${
PY_SITE_PACKAGES_PATH
}
/
${
EGG_NAME
}
/numpy/core/include"
)
FOREACH
(
suffix x86_64 intel fat64 fat32 universal
)
IF
(
${
PYTHON_FOUND
}
)
# local python
LIST
(
APPEND PYTHON_NUMPY_INCLUDE_DIR
${
PY_SITE_PACKAGES_PATH
}
/
${
EGG_NAME
}
-
${
suffix
}
.egg/numpy/core/include
)
SET
(
PYTHON_NUMPY_INCLUDE_DIR
"
${
PY_SITE_PACKAGES_PATH
}
/
${
EGG_NAME
}
/numpy/core/include"
)
ELSE
(
${
PYTHON_FOUND
}
)
# global python
SET
(
PYTHON_NUMPY_INCLUDE_DIR
""
)
SET
(
PY_SITE_PACKAGES_DIR
""
)
FILE
(
WRITE
${
PROJECT_BINARY_DIR
}
/FindNumpyPath.py
"try: import site; print(site.getsitepackages())
\n
except:pass
\n
"
)
EXEC_PROGRAM
(
"env
${
py_env
}
${
PYTHON_EXECUTABLE
}
"
${
PROJECT_BINARY_DIR
}
ARGS
"FindNumpyPath.py"
OUTPUT_VARIABLE NUMPY_PATH
)
STRING
(
REPLACE
"["
""
NUMPY_PATH
"
${
NUMPY_PATH
}
"
)
STRING
(
REPLACE
"]"
""
NUMPY_PATH
"
${
NUMPY_PATH
}
"
)
STRING
(
REPLACE
"'"
""
NUMPY_PATH
"
${
NUMPY_PATH
}
"
)
STRING
(
REPLACE
", "
";"
SITE_DIRS
"
${
NUMPY_PATH
}
"
)
FOREACH
(
SITE_DIR
${
SITE_DIRS
}
)
IF
(
EXISTS
${
SITE_DIR
}
)
LIST
(
APPEND PYTHON_NUMPY_INCLUDE_DIR
"
${
SITE_DIR
}
/
${
EGG_NAME
}
/numpy/core/include"
)
SET
(
PY_SITE_PACKAGES_DIR
"
${
SITE_DIR
}
"
)
ENDIF
()
ENDFOREACH
()
ENDFOREACH
()
ENDIF
(
${
PYTHON_FOUND
}
)
ENDIF
(
WIN32
)
INCLUDE_DIRECTORIES
(
${
PYTHON_NUMPY_INCLUDE_DIR
}
)
INCLUDE_DIRECTORIES
(
${
PYTHON_NUMPY_INCLUDE_DIR
}
)
...
...
paddle/scripts/travis/build_and_test.sh
浏览文件 @
d0a5ce29
#!/bin/bash
#!/bin/bash
source
./common.sh
source
./common.sh
python
-c
'import pip; print(pip.pep425tags.get_supported())'
if
[[
"
$TRAVIS_OS_NAME
"
==
"osx"
]]
;
then
if
[[
"
$TRAVIS_OS_NAME
"
==
"osx"
]]
;
then
CMAKE_EXTRA
=
"-DWITH_SWIG_PY=OFF"
CMAKE_EXTRA
=
"-DWITH_SWIG_PY=OFF"
else
else
...
@@ -14,11 +16,11 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
...
@@ -14,11 +16,11 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
NRPOC
=
`
nproc
`
NRPOC
=
`
nproc
`
make
-j
$NPROC
make
-j
$NPROC
make coveralls
make coveralls
sudo
make
install
elif
[[
"
$TRAVIS_OS_NAME
"
==
"osx"
]]
;
then
elif
[[
"
$TRAVIS_OS_NAME
"
==
"osx"
]]
;
then
NPROC
=
`
sysctl
-n
hw.ncpu
`
NPROC
=
`
sysctl
-n
hw.ncpu
`
make
-j
$NPROC
make
-j
$NPROC
env
CTEST_OUTPUT_ON_FAILURE
=
1 make
test
ARGS
=
"-j
$NPROC
"
env
CTEST_OUTPUT_ON_FAILURE
=
1 make
test
ARGS
=
"-j
$NPROC
"
sudo
make
install
sudo
paddle version
fi
fi
sudo
make
install
sudo
paddle version
python/CMakeLists.txt
浏览文件 @
d0a5ce29
...
@@ -16,7 +16,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in
...
@@ -16,7 +16,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in
add_custom_command
(
OUTPUT
${
OUTPUT_DIR
}
/.timestamp
add_custom_command
(
OUTPUT
${
OUTPUT_DIR
}
/.timestamp
COMMAND env
${
py_env
}
${
PYTHON_EXECUTABLE
}
setup.py bdist_wheel
COMMAND env
${
py_env
}
${
PYTHON_EXECUTABLE
}
setup.py bdist_wheel
COMMAND
${
CMAKE_COMMAND
}
-E touch
${
OUTPUT_DIR
}
/.timestamp
COMMAND
${
CMAKE_COMMAND
}
-E touch
${
OUTPUT_DIR
}
/.timestamp
DEPENDS gen_proto_py
${
PY_FILES
}
)
DEPENDS gen_proto_py
${
PY_FILES
}
${
external_project_dependencies
}
)
add_custom_target
(
paddle_python ALL DEPENDS
add_custom_target
(
paddle_python ALL DEPENDS
${
OUTPUT_DIR
}
/.timestamp
)
${
OUTPUT_DIR
}
/.timestamp
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录