diff --git a/ubuntu18.04/cuda-devel/Dockerfile b/ubuntu18.04/cuda-devel/Dockerfile index 77b0ea7af7f1a8351aee7eadebf1272e1a2e8675..b8290e986c65ae0a65da41feb86033110db0bfd0 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 f88ee3ae302e8bf6f26d591f670d99335947c2ba..4d049943df1280501023eed6fb77f99fab1563f2 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 62c13083c47f43d79110812433cfc8c6267686d8..229eb8d1f6aa56c1ec42159a1a4b88d70786f551 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 558523096a4eee4e1f54aa9c11364c672611000d..ed1690e6245526d6082daa0351972d1d6d3a0ae4 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);