Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
09b38c70
A
apollo
项目概览
Pinoxchio
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
09b38c70
编写于
7月 24, 2017
作者:
Z
zhujun08
提交者:
Jiangtao Hu
7月 24, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update docker file and image with Caffe support
上级
db47654f
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
65 addition
and
4 deletion
+65
-4
docker/dev.x86_64.dockerfile
docker/dev.x86_64.dockerfile
+50
-1
docker/scripts/dev_start.sh
docker/scripts/dev_start.sh
+1
-1
modules/perception/obstacle/lidar/interface/base_segmentation.h
...s/perception/obstacle/lidar/interface/base_segmentation.h
+2
-2
modules/perception/obstacle/lidar/segmentation/cnnseg/cnn_segmentation.cpp
...n/obstacle/lidar/segmentation/cnnseg/cnn_segmentation.cpp
+4
-0
modules/perception/obstacle/lidar/segmentation/cnnseg/cnn_segmentation.h
...ion/obstacle/lidar/segmentation/cnnseg/cnn_segmentation.h
+8
-0
未找到文件。
docker/dev.x86_64.dockerfile
浏览文件 @
09b38c70
...
...
@@ -25,7 +25,8 @@ RUN apt-get update && apt-get install -y \
software-properties-common
\
unzip
\
wget
\
zip
zip
\
cmake
RUN
add-apt-repository ppa:webupd8team/java
RUN
echo
"deb [arch=amd64] http://storage.googleapis.com/bazel-apt stable jdk1.8"
|
sudo tee
/etc/apt/sources.list.d/bazel.list
...
...
@@ -102,3 +103,51 @@ RUN ln -s -f /bin/true /usr/bin/chfn
RUN
apt-get
install
-y
\
libpcl-1.7-all
\
libopencv-dev
# install boost 1.56 (required for Caffe)
RUN
apt-get
install
-y
\
mpi-default-dev
\
libicu-dev
WORKDIR
/tmp
RUN
wget https://sourceforge.net/projects/boost/files/boost/1.56.0/boost_1_56_0.tar.gz
RUN
tar
xzf boost_1_56_0.tar.gz
WORKDIR
/tmp/boost_1_56_0
RUN
bash bootstrap.sh
--with-toolset
=
gcc
--with-libraries
=
filesystem,system,thread
RUN
./b2
install
# install Caffe (CPU_ONLY mode)
RUN
apt-get
install
-y
\
libleveldb-dev
\
libsnappy-dev
\
libhdf5-serial-dev
\
libatlas-base-dev
\
liblmdb-dev
WORKDIR
/tmp
RUN
wget https://github.com/google/glog/archive/v0.3.5.tar.gz
RUN
tar
xzf v0.3.5.tar.gz
WORKDIR
/tmp/glog-0.3.5
RUN
./configure
&&
make
&&
make
install
WORKDIR
/tmp
RUN
wget https://github.com/gflags/gflags/archive/v2.2.0.tar.gz
RUN
tar
xzf v2.2.0.tar.gz
WORKDIR
/tmp/gflags-2.2.0
RUN
mkdir
build
WORKDIR
/tmp/gflags-2.2.0/build
RUN
CXXFLAGS
=
"-fPIC"
cmake ..
&&
make
&&
make
install
RUN
mkdir
/third_party
WORKDIR
/third_party
# FIXME: use ARG instead of ENV once DockerHub supports this
# (https://github.com/docker/hub-feedback/issues/460)
ENV
CLONE_TAG=1.0
RUN
git clone
-b
${
CLONE_TAG
}
--depth
1 https://github.com/BVLC/caffe.git
&&
\
cd
caffe
&&
mkdir
build
&&
cd
build
&&
\
cmake
-DCPU_ONLY
=
ON
-DBUILD_python
=
OFF ..
&&
\
make
-j
"
$(
nproc
)
"
ENV
CAFFE_ROOT=/third_party/caffe
ENV
PATH $CAFFE_ROOT/build/tools:$PATH
RUN
echo
"
$CAFFE_ROOT
/build/lib"
>>
/etc/ld.so.conf.d/caffe.conf
&&
ldconfig
\ No newline at end of file
docker/scripts/dev_start.sh
浏览文件 @
09b38c70
...
...
@@ -18,7 +18,7 @@
VERSION
=
""
ARCH
=
$(
uname
-m
)
VERSION_X86_64
=
"dev-x86_64-201707
19_1528
"
VERSION_X86_64
=
"dev-x86_64-201707
24_1900
"
VERSION_AARCH64
=
"dev-aarch64-20170712_1533"
if
[[
$#
==
1
]]
;
then
VERSION
=
$1
...
...
modules/perception/obstacle/lidar/interface/base_segmentation.h
浏览文件 @
09b38c70
...
...
@@ -45,12 +45,12 @@
// };
//
// // Register plugin.
// REGISTER_SEGMENTATION(
NCut
Segmentation);
// REGISTER_SEGMENTATION(
CNN
Segmentation);
////////////////////////////////////////////////////////
// USING CODE:
//
// BaseSegmentation* segmentation =
// BaseSegmentationRegisterer::get_instance_by_name("
NCut
Segmentation");
// BaseSegmentationRegisterer::get_instance_by_name("
CNN
Segmentation");
// using segmentation to do somethings.
// ////////////////////////////////////////////////////
...
...
modules/perception/obstacle/lidar/segmentation/cnnseg/cnn_segmentation.cpp
0 → 100644
浏览文件 @
09b38c70
//
// Created by zhujun08 on 7/23/17.
//
modules/perception/obstacle/lidar/segmentation/cnnseg/cnn_segmentation.h
0 → 100644
浏览文件 @
09b38c70
//
// Created by zhujun08 on 7/23/17.
//
#ifndef APOLLO_CNN_SEGMENTATION_H
#define APOLLO_CNN_SEGMENTATION_H
#endif //APOLLO_CNN_SEGMENTATION_H
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录