diff --git a/ci/docker/Dockerfile.build.android_armv7 b/ci/docker/Dockerfile.build.android_armv7 old mode 100755 new mode 100644 index 799e29c99127..c601fc5e5ff7 --- 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 2c2c71c003f0..60376b8efda2 --- 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 78071fa33992..6f16d8c77a0a --- 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 9a23a5dbefee..5f0223448f12 --- 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 46cc229d5904..40f0efe19ce0 --- 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 4be011af068e..7957f599e45a 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 5bb4961bf01e..cf651f43e168 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 f58f0e4ebd40..7065cbc1bd1e 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