Skip to content
Snippets Groups Projects
Commit a6dc35f6 authored by calrama's avatar calrama
Browse files

Update to MXNet 1.4.0

parent 5414eadd
Branches master
No related tags found
No related merge requests found
...@@ -4,11 +4,11 @@ FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-ubuntu18.04 ...@@ -4,11 +4,11 @@ FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-ubuntu18.04
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y libopencv-dev && \ apt-get install -y libopencv-dev && \
cd /opt && \ 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 && \ 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.3.1.rc0-incubating.tar.gz --owner root --group root --no-same-owner && \ tar -xf apache-mxnet-src-1.4.0-incubating.tar.gz --owner root --group root --no-same-owner && \
rm -f apache-mxnet-src-1.3.1.rc0-incubating.tar.gz && \ rm -f apache-mxnet-src-1.4.0-incubating.tar.gz && \
mv apache-mxnet-src-1.3.1.rc0-incubating mxnet-1.3.1 && \ mv apache-mxnet-src-1.4.0-incubating mxnet-1.4.0 && \
cd mxnet-1.3.1 && \ cd mxnet-1.4.0 && \
cmake -Bbuild -H. \ cmake -Bbuild -H. \
-DCMAKE_CXX_STANDARD=14 -DUSE_CXX14_IF_AVAILABLE=ON \ -DCMAKE_CXX_STANDARD=14 -DUSE_CXX14_IF_AVAILABLE=ON \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
......
...@@ -3,11 +3,11 @@ FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-ubuntu18.04 ...@@ -3,11 +3,11 @@ FROM git.imp.fu-berlin.de:5000/bioroboticslab/robofish/docker:base-ubuntu18.04
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y libopencv-dev && \ apt-get install -y libopencv-dev && \
cd /opt && \ 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 && \ 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.3.1.rc0-incubating.tar.gz --owner root --group root --no-same-owner && \ tar -xf apache-mxnet-src-1.4.0-incubating.tar.gz --owner root --group root --no-same-owner && \
rm -f apache-mxnet-src-1.3.1.rc0-incubating.tar.gz && \ rm -f apache-mxnet-src-1.4.0-incubating.tar.gz && \
mv apache-mxnet-src-1.3.1.rc0-incubating mxnet-1.3.1 && \ mv apache-mxnet-src-1.4.0-incubating mxnet-1.4.0 && \
cd mxnet-1.3.1 && \ cd mxnet-1.4.0 && \
cmake -Bbuild -H. \ cmake -Bbuild -H. \
-DCMAKE_CXX_STANDARD=14 -DUSE_CXX14_IF_AVAILABLE=ON \ -DCMAKE_CXX_STANDARD=14 -DUSE_CXX14_IF_AVAILABLE=ON \
-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \
......
#! /bin/sh #! /bin/sh
export MXNet_DIR=/opt/mxnet-1.3.1 export MXNet_DIR=/opt/mxnet-1.4.0
\ No newline at end of file \ No newline at end of file
...@@ -40,6 +40,6 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl ...@@ -40,6 +40,6 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl
RUN $vcpkg_dir = 'C:/vcpkg'; \ RUN $vcpkg_dir = 'C:/vcpkg'; \
git clone --depth=1 https://git.imp.fu-berlin.de/bioroboticslab/robofish/vcpkg.git $vcpkg_dir; \ git clone --depth=1 https://git.imp.fu-berlin.de/bioroboticslab/robofish/vcpkg.git $vcpkg_dir; \
cd $vcpkg_dir; \ cd $vcpkg_dir; \
git checkout 2afab7acd3f8d7c7cf7046c032174af9cdbdbe2f; \ git checkout cd7b1c0e2901b607af3271fb3c753f851336e0c5; \
./scripts/bootstrap.ps1; \ ./scripts/bootstrap.ps1; \
[Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine); [Environment]::SetEnvironmentVariable('VCPKG_DIR', "\"$vcpkg_dir\"", [EnvironmentVariableTarget]::Machine);
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment