From a6dc35f637a6b37e668fca71c8773ff1a999655c Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Mon, 11 Mar 2019 19:21:04 +0100
Subject: [PATCH] Update to MXNet 1.4.0
---
ubuntu18.04/cuda-devel/Dockerfile | 10 +++++-----
ubuntu18.04/devel/Dockerfile | 10 +++++-----
ubuntu18.04/mxnet_profile.sh | 2 +-
windows/base/Dockerfile | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ubuntu18.04/cuda-devel/Dockerfile b/ubuntu18.04/cuda-devel/Dockerfile
index 77b0ea7..b8290e9 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.3.1/apache-mxnet-src-1.3.1.rc0-incubating.tar.gz && \
- tar -xf apache-mxnet-src-1.3.1.rc0-incubating.tar.gz --owner root --group root --no-same-owner && \
- rm -f apache-mxnet-src-1.3.1.rc0-incubating.tar.gz && \
- mv apache-mxnet-src-1.3.1.rc0-incubating mxnet-1.3.1 && \
- cd mxnet-1.3.1 && \
+ curl -sSLO https://github.com/apache/incubator-mxnet/releases/download/1.4.0/apache-mxnet-src-1.4.0-incubating.tar.gz && \
+ tar -xf apache-mxnet-src-1.4.0-incubating.tar.gz --owner root --group root --no-same-owner && \
+ rm -f apache-mxnet-src-1.4.0-incubating.tar.gz && \
+ mv apache-mxnet-src-1.4.0-incubating mxnet-1.4.0 && \
+ cd mxnet-1.4.0 && \
cmake -Bbuild -H. \
-DCMAKE_CXX_STANDARD=14 -DUSE_CXX14_IF_AVAILABLE=ON \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
diff --git a/ubuntu18.04/devel/Dockerfile b/ubuntu18.04/devel/Dockerfile
index f88ee3a..4d04994 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.3.1/apache-mxnet-src-1.3.1.rc0-incubating.tar.gz && \
- tar -xf apache-mxnet-src-1.3.1.rc0-incubating.tar.gz --owner root --group root --no-same-owner && \
- rm -f apache-mxnet-src-1.3.1.rc0-incubating.tar.gz && \
- mv apache-mxnet-src-1.3.1.rc0-incubating mxnet-1.3.1 && \
- cd mxnet-1.3.1 && \
+ curl -sSLO https://github.com/apache/incubator-mxnet/releases/download/1.4.0/apache-mxnet-src-1.4.0-incubating.tar.gz && \
+ tar -xf apache-mxnet-src-1.4.0-incubating.tar.gz --owner root --group root --no-same-owner && \
+ rm -f apache-mxnet-src-1.4.0-incubating.tar.gz && \
+ mv apache-mxnet-src-1.4.0-incubating mxnet-1.4.0 && \
+ cd mxnet-1.4.0 && \
cmake -Bbuild -H. \
-DCMAKE_CXX_STANDARD=14 -DUSE_CXX14_IF_AVAILABLE=ON \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
diff --git a/ubuntu18.04/mxnet_profile.sh b/ubuntu18.04/mxnet_profile.sh
index 62c1308..229eb8d 100755
--- a/ubuntu18.04/mxnet_profile.sh
+++ b/ubuntu18.04/mxnet_profile.sh
@@ -1,2 +1,2 @@
#! /bin/sh
-export MXNet_DIR=/opt/mxnet-1.3.1
\ No newline at end of file
+export MXNet_DIR=/opt/mxnet-1.4.0
\ No newline at end of file
diff --git a/windows/base/Dockerfile b/windows/base/Dockerfile
index 5585230..ed1690e 100644
--- a/windows/base/Dockerfile
+++ b/windows/base/Dockerfile
@@ -40,6 +40,6 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
RUN $vcpkg_dir = 'C:/vcpkg'; \
git clone --depth=1 https://git.imp.fu-berlin.de/bioroboticslab/robofish/vcpkg.git $vcpkg_dir; \
cd $vcpkg_dir; \
- git checkout 2afab7acd3f8d7c7cf7046c032174af9cdbdbe2f; \
+ git checkout cd7b1c0e2901b607af3271fb3c753f851336e0c5; \
./scripts/bootstrap.ps1; \
[Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine);
--
GitLab