From 6f51284ae7c852a7dc4c8fd478fa9733986d7ffa Mon Sep 17 00:00:00 2001 From: Alexander Davis Date: Sat, 4 May 2019 18:54:27 +0200 Subject: [PATCH 1/2] ensure that build is in /incubator-singa --- tool/docker/devel/ubuntu/cpu/Dockerfile | 50 ++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/tool/docker/devel/ubuntu/cpu/Dockerfile b/tool/docker/devel/ubuntu/cpu/Dockerfile index d8a6cc1dc8..394b00ae9a 100644 --- a/tool/docker/devel/ubuntu/cpu/Dockerfile +++ b/tool/docker/devel/ubuntu/cpu/Dockerfile @@ -20,32 +20,32 @@ FROM ubuntu:18.04 # install dependencies RUN apt-get update \ && apt-get install -y --no-install-recommends \ - git \ - build-essential \ - autoconf \ - libtool \ - libprotobuf-dev \ - libopenblas-dev \ - libpcre3-dev \ - protobuf-compiler \ - wget \ - swig \ - openssh-server \ - python3-dev \ - python3-pip \ - python3-setuptools \ - libgoogle-glog-dev \ - cmake \ + git \ + build-essential \ + autoconf \ + libtool \ + libprotobuf-dev \ + libopenblas-dev \ + libpcre3-dev \ + protobuf-compiler \ + wget \ + swig \ + openssh-server \ + python3-dev \ + python3-pip \ + python3-setuptools \ + libgoogle-glog-dev \ + cmake \ && apt-get clean \ && apt-get autoremove \ && apt-get autoclean \ && rm -rf /var/lib/apt/lists/* \ && pip3 install -U --no-cache \ - wheel \ - numpy \ - setuptools \ - protobuf \ - future + wheel \ + numpy \ + setuptools \ + protobuf \ + future # install mkldnn RUN wget https://github.com/intel/mkl-dnn/archive/v0.18.tar.gz -P /tmp/ \ @@ -62,13 +62,13 @@ RUN mkdir /var/run/sshd \ && mkdir /root/.ssh # build incubator singa -RUN git clone https://github.com/apache/incubator-singa.git $HOME/incubator-singa \ - && cd $HOME/incubator-singa \ +RUN git clone https://github.com/apache/incubator-singa.git /incubator-singa \ + && cd /incubator-singa \ && mkdir build && cd build \ && cmake -DENABLE_TEST=ON -DUSE_PYTHON3=ON -DUSE_MKLDNN=ON .. -RUN cd $HOME/incubator-singa/build && make && make install +RUN cd /incubator-singa/build && make && make install -WORKDIR $HOME/incubator-singa +WORKDIR /incubator-singa EXPOSE 22 CMD ["/usr/sbin/sshd", "-D"] From a6dff3003493018bd4ffc1077355c21bdad2d69a Mon Sep 17 00:00:00 2001 From: Alexander Davis Date: Sat, 4 May 2019 19:01:01 +0200 Subject: [PATCH 2/2] remove formatting --- tool/docker/devel/ubuntu/cpu/Dockerfile | 42 ++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tool/docker/devel/ubuntu/cpu/Dockerfile b/tool/docker/devel/ubuntu/cpu/Dockerfile index 394b00ae9a..344849e125 100644 --- a/tool/docker/devel/ubuntu/cpu/Dockerfile +++ b/tool/docker/devel/ubuntu/cpu/Dockerfile @@ -20,32 +20,32 @@ FROM ubuntu:18.04 # install dependencies RUN apt-get update \ && apt-get install -y --no-install-recommends \ - git \ - build-essential \ - autoconf \ - libtool \ - libprotobuf-dev \ - libopenblas-dev \ - libpcre3-dev \ - protobuf-compiler \ - wget \ - swig \ - openssh-server \ - python3-dev \ - python3-pip \ - python3-setuptools \ - libgoogle-glog-dev \ - cmake \ + git \ + build-essential \ + autoconf \ + libtool \ + libprotobuf-dev \ + libopenblas-dev \ + libpcre3-dev \ + protobuf-compiler \ + wget \ + swig \ + openssh-server \ + python3-dev \ + python3-pip \ + python3-setuptools \ + libgoogle-glog-dev \ + cmake \ && apt-get clean \ && apt-get autoremove \ && apt-get autoclean \ && rm -rf /var/lib/apt/lists/* \ && pip3 install -U --no-cache \ - wheel \ - numpy \ - setuptools \ - protobuf \ - future + wheel \ + numpy \ + setuptools \ + protobuf \ + future # install mkldnn RUN wget https://github.com/intel/mkl-dnn/archive/v0.18.tar.gz -P /tmp/ \