Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
Paddle
提交
d3ef2543
P
Paddle
项目概览
BaiXuePrincess
/
Paddle
与 Fork 源项目一致
Fork自
PaddlePaddle / Paddle
通知
1
Star
1
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看板
未验证
提交
d3ef2543
编写于
11月 15, 2017
作者:
Y
Yiqun Liu
提交者:
GitHub
11月 15, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix compiling error for Android, and installing error for cmake of low version. (#5660)
上级
313f8454
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
15 addition
and
10 deletion
+15
-10
cmake/external/openblas.cmake
cmake/external/openblas.cmake
+1
-1
paddle/gserver/layers/ROIPoolLayer.cpp
paddle/gserver/layers/ROIPoolLayer.cpp
+11
-6
paddle/scripts/docker/build_android.sh
paddle/scripts/docker/build_android.sh
+3
-3
未找到文件。
cmake/external/openblas.cmake
浏览文件 @
d3ef2543
...
...
@@ -98,7 +98,7 @@ IF(NOT ${CBLAS_FOUND})
ENDIF
()
INSTALL
(
CODE
"execute_process(
COMMAND
${
CMAKE_COMMAND
}
-E copy_directory
${
CBLAS_INSTALL_DIR
}
/lib
destination
${
CMAKE_INSTALL_PREFIX
}
/
${
TMP_INSTALL_DIR
}
${
CMAKE_INSTALL_PREFIX
}
/
${
TMP_INSTALL_DIR
}
)"
)
INSTALL
(
CODE
"MESSAGE(STATUS
\"
Installing:
\"
...
...
paddle/gserver/layers/ROIPoolLayer.cpp
浏览文件 @
d3ef2543
...
...
@@ -100,8 +100,9 @@ void ROIPoolLayer::forward(PassType passType) {
size_t
roiEndH
=
round
(
bottomROIs
[
4
]
*
spatialScale_
);
CHECK_GE
(
roiBatchIdx
,
0UL
);
CHECK_LT
(
roiBatchIdx
,
batchSize
);
size_t
roiHeight
=
std
::
max
(
roiEndH
-
roiStartH
+
1
,
1UL
);
size_t
roiWidth
=
std
::
max
(
roiEndW
-
roiStartW
+
1
,
1UL
);
size_t
roiHeight
=
std
::
max
(
roiEndH
-
roiStartH
+
1
,
static_cast
<
size_t
>
(
1
));
size_t
roiWidth
=
std
::
max
(
roiEndW
-
roiStartW
+
1
,
static_cast
<
size_t
>
(
1
));
real
binSizeH
=
static_cast
<
real
>
(
roiHeight
)
/
static_cast
<
real
>
(
pooledHeight_
);
real
binSizeW
=
...
...
@@ -114,10 +115,14 @@ void ROIPoolLayer::forward(PassType passType) {
size_t
wstart
=
static_cast
<
size_t
>
(
std
::
floor
(
pw
*
binSizeW
));
size_t
hend
=
static_cast
<
size_t
>
(
std
::
ceil
((
ph
+
1
)
*
binSizeH
));
size_t
wend
=
static_cast
<
size_t
>
(
std
::
ceil
((
pw
+
1
)
*
binSizeW
));
hstart
=
std
::
min
(
std
::
max
(
hstart
+
roiStartH
,
0UL
),
height_
);
wstart
=
std
::
min
(
std
::
max
(
wstart
+
roiStartW
,
0UL
),
width_
);
hend
=
std
::
min
(
std
::
max
(
hend
+
roiStartH
,
0UL
),
height_
);
wend
=
std
::
min
(
std
::
max
(
wend
+
roiStartW
,
0UL
),
width_
);
hstart
=
std
::
min
(
std
::
max
(
hstart
+
roiStartH
,
static_cast
<
size_t
>
(
0
)),
height_
);
wstart
=
std
::
min
(
std
::
max
(
wstart
+
roiStartW
,
static_cast
<
size_t
>
(
0
)),
width_
);
hend
=
std
::
min
(
std
::
max
(
hend
+
roiStartH
,
static_cast
<
size_t
>
(
0
)),
height_
);
wend
=
std
::
min
(
std
::
max
(
wend
+
roiStartW
,
static_cast
<
size_t
>
(
0
)),
width_
);
bool
isEmpty
=
(
hend
<=
hstart
)
||
(
wend
<=
wstart
);
size_t
poolIndex
=
ph
*
pooledWidth_
+
pw
;
...
...
paddle/scripts/docker/build_android.sh
浏览文件 @
d3ef2543
...
...
@@ -44,7 +44,7 @@ if [ $ANDROID_ABI == "armeabi-v7a" ]; then
-DHOST_C_COMPILER
=
/usr/bin/gcc
\
-DHOST_CXX_COMPILER
=
/usr/bin/g++
\
-DCMAKE_INSTALL_PREFIX
=
$DEST_ROOT
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DCMAKE_BUILD_TYPE
=
MinSizeRel
\
-DUSE_EIGEN_FOR_BLAS
=
ON
\
-DWITH_C_API
=
ON
\
-DWITH_SWIG_PY
=
OFF
\
...
...
@@ -58,7 +58,7 @@ elif [ $ANDROID_ABI == "arm64-v8a" ]; then
-DHOST_C_COMPILER
=
/usr/bin/gcc
\
-DHOST_CXX_COMPILER
=
/usr/bin/g++
\
-DCMAKE_INSTALL_PREFIX
=
$DEST_ROOT
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DCMAKE_BUILD_TYPE
=
MinSizeRel
\
-DUSE_EIGEN_FOR_BLAS
=
OFF
\
-DWITH_C_API
=
ON
\
-DWITH_SWIG_PY
=
OFF
\
...
...
@@ -72,7 +72,7 @@ elif [ $ANDROID_ABI == "armeabi" ]; then
-DHOST_C_COMPILER
=
/usr/bin/gcc
\
-DHOST_CXX_COMPILER
=
/usr/bin/g++
\
-DCMAKE_INSTALL_PREFIX
=
$DEST_ROOT
\
-DCMAKE_BUILD_TYPE
=
Release
\
-DCMAKE_BUILD_TYPE
=
MinSizeRel
\
-DWITH_C_API
=
ON
\
-DWITH_SWIG_PY
=
OFF
\
-DWITH_STYLE_CHECK
=
OFF
\
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录