From 40cd4632651239c90212d18b05f26abce4e90188 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Fri, 27 Sep 2019 01:16:05 +0200
Subject: [PATCH] ubuntu18.04: Update to MXNet 1.5.1
---
ubuntu18.04/cuda-devel/Dockerfile | 13 ++++++-------
ubuntu18.04/devel/Dockerfile | 13 ++++++-------
2 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/ubuntu18.04/cuda-devel/Dockerfile b/ubuntu18.04/cuda-devel/Dockerfile
index 0913bc4..9d69c5b 100644
--- a/ubuntu18.04/cuda-devel/Dockerfile
+++ b/ubuntu18.04/cuda-devel/Dockerfile
@@ -4,11 +4,11 @@ FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-ubuntu18.04
RUN apt-get update && \
apt-get install -y libopencv-dev && \
cd /opt && \
- curl -sSLO https://github.com/apache/incubator-mxnet/releases/download/1.4.1/apache-mxnet-src-1.4.1-incubating.tar.gz && \
- tar -xf apache-mxnet-src-1.4.1-incubating.tar.gz --owner root --group root --no-same-owner && \
- rm -f apache-mxnet-src-1.4.1-incubating.tar.gz && \
- mv apache-mxnet-src-1.4.1-incubating mxnet-1.4.1 && \
- cd mxnet-1.4.1 && \
+ curl -sSLO https://github.com/apache/incubator-mxnet/releases/download/1.5.1.rc0/apache-mxnet-src-1.5.1.rc0-incubating.tar.gz && \
+ tar -xf apache-mxnet-src-1.5.1.rc0-incubating.tar.gz --owner root --group root --no-same-owner && \
+ rm -f apache-mxnet-src-1.5.1.rc0-incubating.tar.gz && \
+ mv apache-mxnet-src-1.5.1.rc0-incubating mxnet-1.5.1 && \
+ cd mxnet-1.5.1 && \
cmake -Bbuild -H. \
-DCMAKE_CXX_STANDARD=14 -DUSE_CXX14_IF_AVAILABLE=ON \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -20,7 +20,6 @@ RUN apt-get update && \
-DUSE_SIGNAL_HANDLER=ON \
-DENABLE_CUDA_RTC=ON \
-DBUILD_CPP_EXAMPLES=OFF \
- -DDO_NOT_BUILD_EXAMPLES=ON \
-DUSE_GPERFTOOLS=OFF \
-DUSE_JEMALLOC=OFF \
-G Ninja && \
@@ -28,4 +27,4 @@ RUN apt-get update && \
cd python && \
python3.7 setup.py install && \
apt-get clean
-ENV MXNet_DIR /opt/mxnet-1.4.1
+ENV MXNet_DIR /opt/mxnet-1.5.1
diff --git a/ubuntu18.04/devel/Dockerfile b/ubuntu18.04/devel/Dockerfile
index c93b4ef..de0547f 100644
--- a/ubuntu18.04/devel/Dockerfile
+++ b/ubuntu18.04/devel/Dockerfile
@@ -3,11 +3,11 @@ FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-ubuntu18.04
RUN apt-get update && \
apt-get install -y libopencv-dev && \
cd /opt && \
- curl -sSLO https://github.com/apache/incubator-mxnet/releases/download/1.4.1/apache-mxnet-src-1.4.1-incubating.tar.gz && \
- tar -xf apache-mxnet-src-1.4.1-incubating.tar.gz --owner root --group root --no-same-owner && \
- rm -f apache-mxnet-src-1.4.1-incubating.tar.gz && \
- mv apache-mxnet-src-1.4.1-incubating mxnet-1.4.1 && \
- cd mxnet-1.4.1 && \
+ curl -sSLO https://github.com/apache/incubator-mxnet/releases/download/1.5.1.rc0/apache-mxnet-src-1.5.1.rc0-incubating.tar.gz && \
+ tar -xf apache-mxnet-src-1.5.1.rc0-incubating.tar.gz --owner root --group root --no-same-owner && \
+ rm -f apache-mxnet-src-1.5.1.rc0-incubating.tar.gz && \
+ mv apache-mxnet-src-1.5.1.rc0-incubating mxnet-1.5.1 && \
+ cd mxnet-1.5.1 && \
cmake -Bbuild -H. \
-DCMAKE_CXX_STANDARD=14 -DUSE_CXX14_IF_AVAILABLE=ON \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
@@ -19,7 +19,6 @@ RUN apt-get update && \
-DUSE_SIGNAL_HANDLER=ON \
-DENABLE_CUDA_RTC=OFF \
-DBUILD_CPP_EXAMPLES=OFF \
- -DDO_NOT_BUILD_EXAMPLES=ON \
-DUSE_GPERFTOOLS=OFF \
-DUSE_JEMALLOC=OFF \
-G Ninja && \
@@ -27,4 +26,4 @@ RUN apt-get update && \
cd python && \
python3.7 setup.py install && \
apt-get clean
-ENV MXNet_DIR /opt/mxnet-1.4.1
+ENV MXNet_DIR /opt/mxnet-1.5.1
--
GitLab