Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
urhero
Paddle
提交
9e524fce
P
Paddle
项目概览
urhero
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9e524fce
编写于
9月 13, 2017
作者:
L
Liu Yiqun
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove the generation of executable, such as paddle_trainer, when setting WITH_C_API.
上级
b4d710ce
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
44 addition
and
31 deletion
+44
-31
.travis.yml
.travis.yml
+2
-2
cmake/cross_compiling/ios.cmake
cmake/cross_compiling/ios.cmake
+3
-0
paddle/function/neon/NeonDepthwiseConv.cpp
paddle/function/neon/NeonDepthwiseConv.cpp
+1
-1
paddle/function/neon/NeonDepthwiseConv.h
paddle/function/neon/NeonDepthwiseConv.h
+1
-1
paddle/gserver/layers/SequenceSliceLayer.cpp
paddle/gserver/layers/SequenceSliceLayer.cpp
+5
-4
paddle/pserver/CMakeLists.txt
paddle/pserver/CMakeLists.txt
+12
-8
paddle/scripts/travis/build_ios.sh
paddle/scripts/travis/build_ios.sh
+4
-1
paddle/trainer/CMakeLists.txt
paddle/trainer/CMakeLists.txt
+16
-14
未找到文件。
.travis.yml
浏览文件 @
9e524fce
...
...
@@ -41,8 +41,8 @@ before_install:
-
if [[ "$JOB" == "check_style" ]]; 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
# protobuf version.
-
pip install -r $TRAVIS_BUILD_DIR/python/requirements.txt
-
pip install wheel sphinx==1.5.6 recommonmark sphinx-rtd-theme==0.1.9 virtualenv pre-commit LinkChecker
-
sudo
pip install -r $TRAVIS_BUILD_DIR/python/requirements.txt
-
sudo
pip install wheel sphinx==1.5.6 recommonmark sphinx-rtd-theme==0.1.9 virtualenv pre-commit LinkChecker
-
|
function timeout() { perl -e 'alarm shift; exec @ARGV' "$@"; }
script
:
...
...
cmake/cross_compiling/ios.cmake
浏览文件 @
9e524fce
...
...
@@ -252,6 +252,9 @@ set(CMAKE_PLATFORM_HAS_INSTALLNAME 1)
if
(
NOT IOS_ENABLE_BITCODE
)
set
(
CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS
"-dynamiclib -headerpad_max_install_names"
)
set
(
CMAKE_SHARED_MODULE_CREATE_C_FLAGS
"-bundle -headerpad_max_install_names"
)
else
()
set
(
CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS
"-dynamiclib"
)
set
(
CMAKE_SHARED_MODULE_CREATE_C_FLAGS
"-bundle"
)
endif
()
set
(
CMAKE_SHARED_MODULE_LOADER_C_FLAG
"-Wl,-bundle_loader,"
)
set
(
CMAKE_SHARED_MODULE_LOADER_CXX_FLAG
"-Wl,-bundle_loader,"
)
...
...
paddle/function/neon/NeonDepthwiseConv.cpp
浏览文件 @
9e524fce
...
...
@@ -52,7 +52,7 @@ public:
int
outputHeight
=
output
[
2
];
int
outputWidth
=
output
[
3
];
int
filterMultiplier
=
outputChannels
/
groups_
;
CHECK_EQ
(
inputChannels
,
groups_
);
CHECK_EQ
(
static_cast
<
size_t
>
(
inputChannels
)
,
groups_
);
// only support strideH() == strideW() and filterHeight == filterWidth.
CHECK_EQ
(
strideH
(),
strideW
());
...
...
paddle/function/neon/NeonDepthwiseConv.h
浏览文件 @
9e524fce
...
...
@@ -594,7 +594,7 @@ struct StridePadding {
float32x4_t
s1
=
vdupq_n_f32
(
0.
f
);
for
(
int
s
=
0
;
s
<
step
;
s
++
)
{
float32x4_t
s0
=
vld1q_f32
(
input
);
float32x4x2_t
v
=
{
s0
,
s1
};
float32x4x2_t
v
=
{
{
s0
,
s1
}
};
vst2q_f32
(
inputPadding
,
v
);
input
+=
4
;
inputPadding
+=
8
;
...
...
paddle/gserver/layers/SequenceSliceLayer.cpp
浏览文件 @
9e524fce
...
...
@@ -73,9 +73,10 @@ void SequenceSliceLayer::checkInputs() {
CHECK
(
inputSeq
.
hasSeq
())
<<
"The first input of sequence slice layer "
<<
"must be a sequence."
;
const
MatrixPtr
indices1
=
getInputValue
(
1
);
CHECK_EQ
(
static_cast
<
size_t
>
(
indices1
->
getHeight
()),
inputSeq
.
hasSubseq
()
?
inputSeq
.
getNumSubSequences
()
:
inputSeq
.
getNumSequences
())
CHECK_EQ
(
indices1
->
getHeight
(),
static_cast
<
size_t
>
(
inputSeq
.
hasSubseq
()
?
inputSeq
.
getNumSubSequences
()
:
inputSeq
.
getNumSequences
()))
<<
"Height of the second input should be equal to number of sequence "
<<
"in the first input."
;
if
(
inputLayers_
.
size
()
==
3
)
{
...
...
@@ -151,7 +152,7 @@ void SequenceSliceLayer::calSelectedRows(const MatrixPtr starts,
if
(
ends
)
endPos
=
inputSeqInfoVec_
[
i
][
j
]
+
ends
->
getElement
(
rowIdx
,
k
);
int
seqLen
=
endPos
-
begPos
+
1
;
CHECK_GT
(
seqLen
,
0
U
);
CHECK_GT
(
seqLen
,
0
);
for
(
int
m
=
begPos
;
m
<=
endPos
;
++
m
)
selectedRows_
.
push_back
(
m
);
hasSubseq
?
outSubSeqStartPos_
.
push_back
(
outSubSeqStartPos_
.
back
()
+
seqLen
)
...
...
paddle/pserver/CMakeLists.txt
浏览文件 @
9e524fce
...
...
@@ -45,14 +45,18 @@ add_dependencies(paddle_pserver paddle_proto ${external_project_dependencies})
set
(
PSERVER_MAIN_SOURCES
ParameterServer2Main.cpp
)
add_executable
(
paddle_pserver_main
${
PSERVER_MAIN_SOURCES
}
)
link_paddle_exe
(
paddle_pserver_main
)
if
(
WITH_TESTING
)
add_subdirectory
(
test
)
endif
()
install
(
TARGETS paddle_pserver_main
RUNTIME DESTINATION opt/paddle/bin
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
)
set_target_properties
(
paddle_pserver_main PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE
)
if
(
NOT WITH_C_API
)
add_executable
(
paddle_pserver_main
${
PSERVER_MAIN_SOURCES
}
)
link_paddle_exe
(
paddle_pserver_main
)
install
(
TARGETS paddle_pserver_main
RUNTIME DESTINATION opt/paddle/bin
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
)
set_target_properties
(
paddle_pserver_main PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE
)
endif
()
paddle/scripts/travis/build_ios.sh
浏览文件 @
9e524fce
...
...
@@ -8,10 +8,13 @@ cd $TRAVIS_BUILD_DIR/build_ios
# Compile paddle binaries
cmake
-DCMAKE_SYSTEM_NAME
=
iOS
\
-DIOS_PLATFORM
=
OS
\
-DCMAKE_OSX_ARCHITECTURES
=
"arm64"
\
-DWITH_C_API
=
ON
\
-DUSE_EIGEN_FOR_BLAS
=
ON
\
-DWITH_TESTING
=
OFF
\
-DWITH_SWIG_PY
=
OFF
\
-DWITH_STYLE_CHECK
=
OFF
\
-DCMAKE_BUILD_TYPE
=
Release
\
..
make
-j
`
nproc
`
make
paddle/trainer/CMakeLists.txt
浏览文件 @
9e524fce
...
...
@@ -50,22 +50,22 @@ macro(add_paddle_exe TARGET_NAME)
link_paddle_exe
(
${
TARGET_NAME
}
)
endmacro
()
add_paddle_exe
(
paddle_trainer
TrainerMain.cpp
)
add_paddle_exe
(
paddle_merge_model
MergeModel.cpp
)
if
(
WITH_TESTING
)
add_subdirectory
(
tests
)
add_subdirectory
(
tests
)
endif
()
install
(
TARGETS paddle_trainer paddle_merge_model
RUNTIME DESTINATION opt/paddle/bin
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
)
set_target_properties
(
paddle_trainer PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE
)
set_target_properties
(
paddle_merge_model PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE
)
if
(
NOT WITH_C_API
)
add_paddle_exe
(
paddle_trainer TrainerMain.cpp
)
add_paddle_exe
(
paddle_merge_model MergeModel.cpp
)
install
(
TARGETS paddle_trainer paddle_merge_model
RUNTIME DESTINATION opt/paddle/bin
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ
)
set_target_properties
(
paddle_trainer PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE
)
set_target_properties
(
paddle_merge_model PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE
)
endif
()
if
(
APPLE
)
set
(
CMAKE_EXE_LINKER_FLAGS
"-framework CoreFoundation -framework Security"
)
...
...
@@ -73,6 +73,8 @@ endif()
if
(
WITH_GOLANG
)
add_dependencies
(
paddle_trainer_lib paddle_pserver_cclient
)
target_link_libraries
(
paddle_trainer paddle_pserver_cclient
)
target_link_libraries
(
paddle_trainer_lib paddle_pserver_cclient
)
if
(
NOT WITH_C_API
)
target_link_libraries
(
paddle_trainer paddle_pserver_cclient
)
endif
()
endif
(
WITH_GOLANG
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录