From 6ebc8977987b3f935da57370cf2d96497a5d8522 Mon Sep 17 00:00:00 2001 From: Jose Luis Contreras Date: Thu, 6 Dec 2018 13:21:55 +0100 Subject: [PATCH 1/6] Updated dockerfiles to get the dockcross images from mxnetcipinned --- 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 | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) mode change 100755 => 100644 ci/docker/Dockerfile.build.android_armv7 mode change 100755 => 100644 ci/docker/Dockerfile.build.android_armv8 mode change 100755 => 100644 ci/docker/Dockerfile.build.armv6 mode change 100755 => 100644 ci/docker/Dockerfile.build.armv7 mode change 100755 => 100644 ci/docker/Dockerfile.build.armv8 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..a20c16f7819c --- 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-arm64: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..acad506fa8d9 --- 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 From 1e6121ef0fca2e848ee6d5bda5a6d5f5bdf6e9ab Mon Sep 17 00:00:00 2001 From: Jose Luis Contreras Date: Thu, 6 Dec 2018 14:20:55 +0100 Subject: [PATCH 2/6] Updated jetson dockerfile --- ci/docker/Dockerfile.build.jetson | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/docker/Dockerfile.build.jetson b/ci/docker/Dockerfile.build.jetson index 4be011af068e..4ab123a72c3d 100755 --- a/ci/docker/Dockerfile.build.jetson +++ b/ci/docker/Dockerfile.build.jetson @@ -22,7 +22,7 @@ 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 From d39eb1321e060a1aa76cc689705702ce72369920 Mon Sep 17 00:00:00 2001 From: jlcontreras Date: Thu, 6 Dec 2018 14:57:21 +0000 Subject: [PATCH 3/6] Fixed error in armv7, checked out armv8 and jetson from master branch --- ci/docker/Dockerfile.build.armv7 | 2 +- ci/docker/Dockerfile.build.armv8 | 4 ++-- ci/docker/Dockerfile.build.jetson | 27 +++++++++++++++++++-------- 3 files changed, 22 insertions(+), 11 deletions(-) mode change 100755 => 100644 ci/docker/Dockerfile.build.jetson diff --git a/ci/docker/Dockerfile.build.armv7 b/ci/docker/Dockerfile.build.armv7 index a20c16f7819c..5f0223448f12 100644 --- a/ci/docker/Dockerfile.build.armv7 +++ b/ci/docker/Dockerfile.build.armv7 @@ -18,7 +18,7 @@ # # Dockerfile to build MXNet for Android ARMv7 -FROM mxnetcipinned/dockcross-linux-arm64:11262018 +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 index acad506fa8d9..27bd425ae9b7 100644 --- a/ci/docker/Dockerfile.build.armv8 +++ b/ci/docker/Dockerfile.build.armv8 @@ -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 old mode 100755 new mode 100644 index 4ab123a72c3d..d128ebc7e2a7 --- a/ci/docker/Dockerfile.build.jetson +++ b/ci/docker/Dockerfile.build.jetson @@ -29,8 +29,8 @@ 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 @@ -52,20 +52,31 @@ COPY --from=cudabuilder /usr/local/cuda /usr/local/cuda ENV TARGET_ARCH aarch64 ENV TARGET_OS linux -# Install ARM depedencies based on Jetpack 3.2.1 -RUN JETPACK_DOWNLOAD_PREFIX=https://developer.download.nvidia.com/devzone/devcenter/mobile/jetpack_l4t/3.2.1/m8u2ki/JetPackL4T_321_b23 && \ +# Install ARM depedencies based on Jetpack 3.3 +RUN JETPACK_DOWNLOAD_PREFIX=https://developer.download.nvidia.com/devzone/devcenter/mobile/jetpack_l4t/3.3/lw.xd42/JetPackL4T_33_b39 && \ + CUDA_REPO_PREFIX=/var/cuda-repo-9-0-local && \ ARM_CUDA_INSTALLER_PACKAGE=cuda-repo-l4t-9-0-local_9.0.252-1_arm64.deb && \ - ARM_CUDNN_INSTALLER_PACKAGE=libcudnn7_7.0.5.15-1+cuda9.0_arm64.deb && \ - ARM_CUDNN_DEV_INSTALLER_PACKAGE=libcudnn7-dev_7.0.5.15-1+cuda9.0_arm64.deb && \ + ARM_CUDNN_INSTALLER_PACKAGE=libcudnn7_7.1.5.14-1+cuda9.0_arm64.deb && \ + ARM_CUDNN_DEV_INSTALLER_PACKAGE=libcudnn7-dev_7.1.5.14-1+cuda9.0_arm64.deb && \ + ARM_LICENSE_INSTALLER=cuda-license-9-0_9.0.252-1_arm64.deb && \ + ARM_CUBLAS_INSTALLER=cuda-cublas-9-0_9.0.252-1_arm64.deb && \ + ARM_NVINFER_INSTALLER_PACKAGE=libnvinfer4_4.1.3-1+cuda9.0_arm64.deb && \ + ARM_NVINFER_DEV_INSTALLER_PACKAGE=libnvinfer-dev_4.1.3-1+cuda9.0_arm64.deb && \ dpkg --add-architecture arm64 && \ wget -nv $JETPACK_DOWNLOAD_PREFIX/$ARM_CUDA_INSTALLER_PACKAGE && \ wget -nv $JETPACK_DOWNLOAD_PREFIX/$ARM_CUDNN_INSTALLER_PACKAGE && \ wget -nv $JETPACK_DOWNLOAD_PREFIX/$ARM_CUDNN_DEV_INSTALLER_PACKAGE && \ + wget -nv $JETPACK_DOWNLOAD_PREFIX/$ARM_NVINFER_INSTALLER_PACKAGE && \ + wget -nv $JETPACK_DOWNLOAD_PREFIX/$ARM_NVINFER_DEV_INSTALLER_PACKAGE && \ dpkg -i --force-architecture $ARM_CUDA_INSTALLER_PACKAGE && \ - apt-key add /var/cuda-repo-9-0-local/7fa2af80.pub && \ + apt-key add $CUDA_REPO_PREFIX/7fa2af80.pub && \ 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 + dpkg -i --force-architecture $CUDA_REPO_PREFIX/$ARM_LICENSE_INSTALLER && \ + dpkg -i --force-architecture $CUDA_REPO_PREFIX/$ARM_CUBLAS_INSTALLER && \ + dpkg -i --force-architecture $ARM_NVINFER_INSTALLER_PACKAGE && \ + dpkg -i --force-architecture $ARM_NVINFER_DEV_INSTALLER_PACKAGE && \ + apt update -y || true && apt install -y cuda-libraries-dev-9-0 libcudnn7-dev libnvinfer-dev 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" From cea5b74b11a5b32f51a609571d2ca347be18ffc6 Mon Sep 17 00:00:00 2001 From: Jose Luis Contreras Date: Fri, 7 Dec 2018 10:45:30 +0100 Subject: [PATCH 4/6] Added fix for Jetson, removed CUDA update --- ci/docker/Dockerfile.build.armv8 | 4 ++-- ci/docker/Dockerfile.build.jetson | 28 +++++++++------------------- make/crosscompile.jetson.mk | 2 +- 3 files changed, 12 insertions(+), 22 deletions(-) mode change 100644 => 100755 ci/docker/Dockerfile.build.jetson diff --git a/ci/docker/Dockerfile.build.armv8 b/ci/docker/Dockerfile.build.armv8 index 27bd425ae9b7..40f0efe19ce0 100644 --- a/ci/docker/Dockerfile.build.armv8 +++ b/ci/docker/Dockerfile.build.armv8 @@ -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 old mode 100644 new mode 100755 index d128ebc7e2a7..7957f599e45a --- a/ci/docker/Dockerfile.build.jetson +++ b/ci/docker/Dockerfile.build.jetson @@ -29,8 +29,8 @@ 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 @@ -52,31 +52,21 @@ COPY --from=cudabuilder /usr/local/cuda /usr/local/cuda ENV TARGET_ARCH aarch64 ENV TARGET_OS linux -# Install ARM depedencies based on Jetpack 3.3 -RUN JETPACK_DOWNLOAD_PREFIX=https://developer.download.nvidia.com/devzone/devcenter/mobile/jetpack_l4t/3.3/lw.xd42/JetPackL4T_33_b39 && \ - CUDA_REPO_PREFIX=/var/cuda-repo-9-0-local && \ +# Install ARM depedencies based on Jetpack 3.2.1 +RUN JETPACK_DOWNLOAD_PREFIX=https://developer.download.nvidia.com/devzone/devcenter/mobile/jetpack_l4t/3.2.1/m8u2ki/JetPackL4T_321_b23 && \ ARM_CUDA_INSTALLER_PACKAGE=cuda-repo-l4t-9-0-local_9.0.252-1_arm64.deb && \ - ARM_CUDNN_INSTALLER_PACKAGE=libcudnn7_7.1.5.14-1+cuda9.0_arm64.deb && \ - ARM_CUDNN_DEV_INSTALLER_PACKAGE=libcudnn7-dev_7.1.5.14-1+cuda9.0_arm64.deb && \ - ARM_LICENSE_INSTALLER=cuda-license-9-0_9.0.252-1_arm64.deb && \ - ARM_CUBLAS_INSTALLER=cuda-cublas-9-0_9.0.252-1_arm64.deb && \ - ARM_NVINFER_INSTALLER_PACKAGE=libnvinfer4_4.1.3-1+cuda9.0_arm64.deb && \ - ARM_NVINFER_DEV_INSTALLER_PACKAGE=libnvinfer-dev_4.1.3-1+cuda9.0_arm64.deb && \ + ARM_CUDNN_INSTALLER_PACKAGE=libcudnn7_7.0.5.15-1+cuda9.0_arm64.deb && \ + ARM_CUDNN_DEV_INSTALLER_PACKAGE=libcudnn7-dev_7.0.5.15-1+cuda9.0_arm64.deb && \ dpkg --add-architecture arm64 && \ wget -nv $JETPACK_DOWNLOAD_PREFIX/$ARM_CUDA_INSTALLER_PACKAGE && \ wget -nv $JETPACK_DOWNLOAD_PREFIX/$ARM_CUDNN_INSTALLER_PACKAGE && \ wget -nv $JETPACK_DOWNLOAD_PREFIX/$ARM_CUDNN_DEV_INSTALLER_PACKAGE && \ - wget -nv $JETPACK_DOWNLOAD_PREFIX/$ARM_NVINFER_INSTALLER_PACKAGE && \ - wget -nv $JETPACK_DOWNLOAD_PREFIX/$ARM_NVINFER_DEV_INSTALLER_PACKAGE && \ dpkg -i --force-architecture $ARM_CUDA_INSTALLER_PACKAGE && \ - apt-key add $CUDA_REPO_PREFIX/7fa2af80.pub && \ + apt-key add /var/cuda-repo-9-0-local/7fa2af80.pub && \ dpkg -i --force-architecture $ARM_CUDNN_INSTALLER_PACKAGE && \ dpkg -i --force-architecture $ARM_CUDNN_DEV_INSTALLER_PACKAGE && \ - dpkg -i --force-architecture $CUDA_REPO_PREFIX/$ARM_LICENSE_INSTALLER && \ - dpkg -i --force-architecture $CUDA_REPO_PREFIX/$ARM_CUBLAS_INSTALLER && \ - dpkg -i --force-architecture $ARM_NVINFER_INSTALLER_PACKAGE && \ - dpkg -i --force-architecture $ARM_NVINFER_DEV_INSTALLER_PACKAGE && \ - apt update -y || true && apt install -y cuda-libraries-dev-9-0 libcudnn7-dev libnvinfer-dev + 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..501642708fe9 100644 --- a/make/crosscompile.jetson.mk +++ b/make/crosscompile.jetson.mk @@ -57,7 +57,7 @@ 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 From 18ea7683819c981a4674806cdb7fda8b1a887944 Mon Sep 17 00:00:00 2001 From: Jose Luis Contreras Date: Mon, 11 Feb 2019 12:37:54 +0000 Subject: [PATCH 5/6] Fixed Jetson build --- make/crosscompile.jetson.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make/crosscompile.jetson.mk b/make/crosscompile.jetson.mk index 501642708fe9..cf651f43e168 100644 --- a/make/crosscompile.jetson.mk +++ b/make/crosscompile.jetson.mk @@ -60,7 +60,7 @@ USE_SIGNAL_HANDLER = 1 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 From b3306cdbacb86963e7b5c358341ddc27662c3f51 Mon Sep 17 00:00:00 2001 From: Jose Luis Contreras Date: Mon, 11 Feb 2019 16:44:16 +0100 Subject: [PATCH 6/6] Minor fix to test_operator.test_stn --- tests/python/unittest/test_operator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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