You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by ma...@apache.org on 2019/02/14 12:41:45 UTC
[incubator-mxnet] branch v1.3.x updated: Updated dockerfiles to get
the dockcross images from mxnetcipinned (#13562)
This is an automated email from the ASF dual-hosted git repository.
marcoabreu pushed a commit to branch v1.3.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.3.x by this push:
new 3623af4 Updated dockerfiles to get the dockcross images from mxnetcipinned (#13562)
3623af4 is described below
commit 3623af4d39be2cba73f702c258a2c2256b87cb67
Author: Jose Luis Contreras <jo...@gmail.com>
AuthorDate: Thu Feb 14 13:41:16 2019 +0100
Updated dockerfiles to get the dockcross images from mxnetcipinned (#13562)
* Updated dockerfiles to get the dockcross images from mxnetcipinned
* Updated jetson dockerfile
* Fixed error in armv7, checked out armv8 and jetson from master branch
* Added fix for Jetson, removed CUDA update
* Fixed Jetson build
* Minor fix to test_operator.test_stn
---
ci/docker/Dockerfile.build.android_armv7 | 2 +-
ci/docker/Dockerfile.build.android_armv8 | 2 +-
ci/docker/Dockerfile.build.armv6 | 2 +-
ci/docker/Dockerfile.build.armv7 | 2 +-
ci/docker/Dockerfile.build.armv8 | 6 +++---
ci/docker/Dockerfile.build.jetson | 7 ++++---
make/crosscompile.jetson.mk | 4 ++--
tests/python/unittest/test_operator.py | 2 +-
8 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/ci/docker/Dockerfile.build.android_armv7 b/ci/docker/Dockerfile.build.android_armv7
old mode 100755
new mode 100644
index 799e29c..c601fc5
--- a/ci/docker/Dockerfile.build.android_armv7
+++ b/ci/docker/Dockerfile.build.android_armv7
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for Android ARMv7
-FROM mxnetci/dockcross-linux-base:08212018
+FROM mxnetcipinned/dockcross-base:11262018
MAINTAINER Pedro Larroy "pllarroy@amazon.com"
# The cross-compiling emulator
diff --git a/ci/docker/Dockerfile.build.android_armv8 b/ci/docker/Dockerfile.build.android_armv8
old mode 100755
new mode 100644
index 2c2c71c..60376b8
--- a/ci/docker/Dockerfile.build.android_armv8
+++ b/ci/docker/Dockerfile.build.android_armv8
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for Android ARM64/ARMv8
-FROM mxnetci/dockcross-linux-base:08212018
+FROM mxnetcipinned/dockcross-base:11262018
MAINTAINER Pedro Larroy "pllarroy@amazon.com"
RUN apt-get update && apt-get install -y \
diff --git a/ci/docker/Dockerfile.build.armv6 b/ci/docker/Dockerfile.build.armv6
old mode 100755
new mode 100644
index 78071fa..6f16d8c
--- a/ci/docker/Dockerfile.build.armv6
+++ b/ci/docker/Dockerfile.build.armv6
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for ARMv6
-FROM mxnetci/dockcross-linux-armv6:08212018
+FROM mxnetcipinned/dockcross-linux-armv6:11262018
ENV ARCH armv6l
ENV HOSTCC gcc
diff --git a/ci/docker/Dockerfile.build.armv7 b/ci/docker/Dockerfile.build.armv7
old mode 100755
new mode 100644
index 9a23a5d..5f02234
--- a/ci/docker/Dockerfile.build.armv7
+++ b/ci/docker/Dockerfile.build.armv7
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for Android ARMv7
-FROM mxnetci/dockcross-linux-armv7:09182018
+FROM mxnetcipinned/dockcross-linux-armv7:11262018
ENV ARCH armv7l
ENV HOSTCC gcc
diff --git a/ci/docker/Dockerfile.build.armv8 b/ci/docker/Dockerfile.build.armv8
old mode 100755
new mode 100644
index 46cc229..40f0efe
--- a/ci/docker/Dockerfile.build.armv8
+++ b/ci/docker/Dockerfile.build.armv8
@@ -18,7 +18,7 @@
#
# Dockerfile to build MXNet for ARM64/ARMv8
-FROM mxnetci/dockcross-linux-arm64:08212018
+FROM mxnetcipinned/dockcross-linux-arm64:11262018
ENV ARCH aarch64
ENV HOSTCC gcc
@@ -27,8 +27,8 @@ ENV TARGET ARMV8
WORKDIR /work/deps
# gh issue #11567 https://github.com/apache/incubator-mxnet/issues/11567
-RUN sed -i '\#deb http://cdn-fastly.deb.debian.org/debian-security jessie/updates main#d' /etc/apt/sources.list
-RUN sed -i 's/cdn-fastly.//' /etc/apt/sources.list
+# RUN sed -i '\#deb http://cdn-fastly.deb.debian.org/debian-security jessie/updates main#d' /etc/apt/sources.list
+# RUN sed -i 's/cdn-fastly.//' /etc/apt/sources.list
COPY install/ubuntu_arm.sh /work/
RUN /work/ubuntu_arm.sh
diff --git a/ci/docker/Dockerfile.build.jetson b/ci/docker/Dockerfile.build.jetson
index 4be011a..7957f59 100755
--- a/ci/docker/Dockerfile.build.jetson
+++ b/ci/docker/Dockerfile.build.jetson
@@ -22,15 +22,15 @@
FROM nvidia/cuda:9.0-cudnn7-devel as cudabuilder
-FROM mxnetci/dockcross-linux-arm64:05082018
+FROM mxnetcipinned/dockcross-linux-arm64:11262018
ENV ARCH aarch64
ENV HOSTCC gcc
ENV TARGET ARMV8
# gh issue #11567 https://github.com/apache/incubator-mxnet/issues/11567
-RUN sed -i '\#deb http://cdn-fastly.deb.debian.org/debian-security jessie/updates main#d' /etc/apt/sources.list
-RUN sed -i 's/cdn-fastly.//' /etc/apt/sources.list
+# RUN sed -i '\#deb http://cdn-fastly.deb.debian.org/debian-security jessie/updates main#d' /etc/apt/sources.list
+# RUN sed -i 's/cdn-fastly.//' /etc/apt/sources.list
WORKDIR /work/deps
@@ -66,6 +66,7 @@ RUN JETPACK_DOWNLOAD_PREFIX=https://developer.download.nvidia.com/devzone/devcen
dpkg -i --force-architecture $ARM_CUDNN_INSTALLER_PACKAGE && \
dpkg -i --force-architecture $ARM_CUDNN_DEV_INSTALLER_PACKAGE && \
apt update -y || true && apt install -y cuda-libraries-dev-9-0 libcudnn7-dev
+RUN ln -s /usr/include/aarch64-linux-gnu/cudnn_v7.h /usr/include/aarch64-linux-gnu/cudnn.h
ENV PATH $PATH:/usr/local/cuda/bin
ENV NVCCFLAGS "-m64"
ENV CUDA_ARCH "-gencode arch=compute_53,code=sm_53 -gencode arch=compute_62,code=sm_62"
diff --git a/make/crosscompile.jetson.mk b/make/crosscompile.jetson.mk
index 5bb4961..cf651f4 100644
--- a/make/crosscompile.jetson.mk
+++ b/make/crosscompile.jetson.mk
@@ -57,10 +57,10 @@ DEBUG = 0
USE_SIGNAL_HANDLER = 1
# the additional link flags you want to add
-ADD_LDFLAGS = -L${CROSS_ROOT}/lib
+ADD_LDFLAGS = -L${CROSS_ROOT}/lib -L/usr/lib/aarch64-linux-gnu/
# the additional compile flags you want to add
-ADD_CFLAGS = -I${CROSS_ROOT}/include
+ADD_CFLAGS = -I${CROSS_ROOT}/include -I/usr/include/aarch64-linux-gnu/
#---------------------------------------------
# matrix computation libraries for CPU/GPU
diff --git a/tests/python/unittest/test_operator.py b/tests/python/unittest/test_operator.py
index f58f0e4..7065cbc 100644
--- a/tests/python/unittest/test_operator.py
+++ b/tests/python/unittest/test_operator.py
@@ -2519,7 +2519,7 @@ def test_flip():
@with_seed()
def test_stn():
- np.set_printoptions(threshold=np.nan)
+ np.set_printoptions(threshold=sys.maxsize)
num_filter = 2 # conv of loc net
kernel = (3, 3) # conv of loc net
num_hidden = 6 # fc of loc net