Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
csdn_franckjun
Paddle
提交
8bbf3539
P
Paddle
项目概览
csdn_franckjun
/
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,发现更多精彩内容 >>
提交
8bbf3539
编写于
3月 02, 2017
作者:
W
wangkuiyi
提交者:
GitHub
3月 02, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #1533 from helinwang/no_mac
remove osx build from CI
上级
44e7de9c
f9ea339d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
28 deletion
+8
-28
.travis.yml
.travis.yml
+0
-9
paddle/scripts/travis/before_install.osx.sh
paddle/scripts/travis/before_install.osx.sh
+0
-4
paddle/scripts/travis/build_and_test.sh
paddle/scripts/travis/build_and_test.sh
+8
-15
未找到文件。
.travis.yml
浏览文件 @
8bbf3539
...
@@ -4,22 +4,14 @@ cache:
...
@@ -4,22 +4,14 @@ cache:
-
$HOME/third_party
-
$HOME/third_party
-
$HOME/.ccache
-
$HOME/.ccache
-
$HOME/.cache/pip
-
$HOME/.cache/pip
-
$HOME/Library/Caches/Homebrew
sudo
:
required
sudo
:
required
dist
:
trusty
dist
:
trusty
os
:
os
:
-
linux
-
linux
-
osx
env
:
env
:
-
JOB=DOCS
-
JOB=DOCS
-
JOB=BUILD_AND_TEST
-
JOB=BUILD_AND_TEST
-
JOB=PRE_COMMIT
-
JOB=PRE_COMMIT
matrix
:
exclude
:
-
os
:
osx
env
:
JOB=DOCS
# Only generate documentation in linux.
-
os
:
osx
env
:
JOB=PRE_COMMIT
# Only check pre-commit hook in linux
addons
:
addons
:
apt
:
apt
:
...
@@ -53,7 +45,6 @@ before_install:
...
@@ -53,7 +45,6 @@ before_install:
fi
fi
fi
fi
fi
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
# Paddle is using protobuf 3.1 currently. Protobuf 3.2 breaks the compatibility. So we specify the python
# Paddle is using protobuf 3.1 currently. Protobuf 3.2 breaks the compatibility. So we specify the python
# protobuf version.
# protobuf version.
...
...
paddle/scripts/travis/before_install.osx.sh
已删除
100755 → 0
浏览文件 @
44e7de9c
#!/bin/bash
brew update
brew tap homebrew/science
brew
install
openblas swig md5sha1sum
paddle/scripts/travis/build_and_test.sh
浏览文件 @
8bbf3539
...
@@ -2,18 +2,11 @@
...
@@ -2,18 +2,11 @@
source
./common.sh
source
./common.sh
NPROC
=
1
NPROC
=
1
if
[[
"
$TRAVIS_OS_NAME
"
==
"linux"
]]
;
then
export
PYTHONPATH
=
/opt/python/2.7.12/lib/python2.7/site-packages
export
PYTHONPATH
=
/opt/python/2.7.12/lib/python2.7/site-packages
export
PYTHONHOME
=
/opt/python/2.7.12
export
PYTHONHOME
=
/opt/python/2.7.12
export
PATH
=
/opt/python/2.7.12/bin:
${
PATH
}
export
PATH
=
/opt/python/2.7.12/bin:
${
PATH
}
cmake ..
-DCMAKE_Fortran_COMPILER
=
/usr/bin/gfortran-4.8
-DON_TRAVIS
=
ON
-DON_COVERALLS
=
ON
-DCOVERALLS_UPLOAD
=
ON
${
EXTRA_CMAKE_OPTS
}
cmake ..
-DCMAKE_Fortran_COMPILER
=
/usr/bin/gfortran-4.8
-DON_TRAVIS
=
ON
-DON_COVERALLS
=
ON
-DCOVERALLS_UPLOAD
=
ON
${
EXTRA_CMAKE_OPTS
}
NRPOC
=
`
nproc
`
NRPOC
=
`
nproc
`
make
-j
$NPROC
make
-j
$NPROC
make coveralls
make coveralls
sudo
make
install
sudo
make
install
elif
[[
"
$TRAVIS_OS_NAME
"
==
"osx"
]]
;
then
export
PYTHONPATH
=
/usr/local/lib/python2.7/site-packages
cmake ..
-DON_TRAVIS
=
ON
-DON_COVERALLS
=
ON
-DCOVERALLS_UPLOAD
=
ON
${
EXTRA_CMAKE_OPTS
}
NPROC
=
`
sysctl
-n
hw.ncpu
`
make
-j
$NPROC
fi
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录