This is an automated email from the ASF dual-hosted git repository.
anirudh2290 pushed a commit to branch v1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.2.0 by this push:
new c5dbc81 Fix arm64 docker build for v1.2.0 branch (#11578)
c5dbc81 is described below
commit c5dbc817e0d15b56c77b5033e516ffbffcb3c767
Author: Pedro Larroy <928489+lar...@users.noreply.github.com>
AuthorDate: Sat Jul 7 18:11:18 2018 +0200
Fix arm64 docker build for v1.2.0 branch (#11578)
* Fix arm64 docker build
- Added @KellenSunderland fix for jetson/jetpack
* [MXNET-601] Fix caffe converter test (#11425)
* fix url
* fix url
* fix url
* Update compare_layers.py
* Update compare_layers.py
* Update test_converter.py
* Update compare_layers.py
* Update compare_layers.py
* Update compare_layers.py
---
ci/docker/Dockerfile.build.arm64 | 8 ++++++--
ci/docker/Dockerfile.build.jetson | 23 +++++++++++++---------
.../ssd/tools/caffe_converter/compare_layers.py | 3 ++-
tools/caffe_converter/compare_layers.py | 3 ++-
tools/caffe_converter/test_converter.py | 3 ++-
5 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/ci/docker/Dockerfile.build.arm64 b/ci/docker/Dockerfile.build.arm64
index 7a2e172..b5197d4 100755
--- a/ci/docker/Dockerfile.build.arm64
+++ b/ci/docker/Dockerfile.build.arm64
@@ -19,14 +19,18 @@
# Dockerfile to build MXNet for ARM64/ARMv8
# Temporary fix due to https://github.com/apache/incubator-mxnet/issues/10837
-#FROM dockcross/linux-arm64
-FROM mxnetci/dockcross-linux-arm64:05082018
+FROM dockcross/linux-arm64
+#FROM mxnetci/dockcross-linux-arm64:05082018
ENV ARCH aarch64
ENV FC /usr/bin/${CROSS_TRIPLE}-gfortran
ENV HOSTCC gcc
ENV TARGET ARMV8
+# gh issue #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
+
WORKDIR /work/deps
COPY install/ubuntu_arm.sh /work/
diff --git a/ci/docker/Dockerfile.build.jetson
b/ci/docker/Dockerfile.build.jetson
index 5bbc5d4..f996bbe 100755
--- a/ci/docker/Dockerfile.build.jetson
+++ b/ci/docker/Dockerfile.build.jetson
@@ -31,6 +31,11 @@ ENV FC /usr/bin/${CROSS_TRIPLE}-gfortran
ENV HOSTCC gcc
ENV TARGET ARMV8
+# gh issue #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
+
+
WORKDIR /work/deps
COPY install/ubuntu_arm.sh /work/
@@ -47,20 +52,20 @@ 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
-RUN
JETPACK_DOWNLOAD_PREFIX=http://developer.download.nvidia.com/devzone/devcenter/mobile/jetpack_l4t/3.2GA/m892ki/JetPackL4T_32_b196/
&& \
+# 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.0.5.13-1+cuda9.0_arm64.deb && \
- ARM_CUDNN_DEV_INSTALLER_PACKAGE=libcudnn7-dev_7.0.5.13-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 && \
- dpkg -i $ARM_CUDA_INSTALLER_PACKAGE && \
+ dpkg -i --force-architecture $ARM_CUDA_INSTALLER_PACKAGE && \
apt-key add /var/cuda-repo-9-0-local/7fa2af80.pub && \
- dpkg -i $ARM_CUDNN_INSTALLER_PACKAGE && \
- dpkg -i $ARM_CUDNN_DEV_INSTALLER_PACKAGE && \
- apt update -y && apt install -y unzip cuda-libraries-dev-9-0 libcudnn7-dev
-
+ 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
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/example/ssd/tools/caffe_converter/compare_layers.py
b/example/ssd/tools/caffe_converter/compare_layers.py
index 12568ed..9509027 100644
--- a/example/ssd/tools/caffe_converter/compare_layers.py
+++ b/example/ssd/tools/caffe_converter/compare_layers.py
@@ -339,7 +339,8 @@ def main():
parser = argparse.ArgumentParser(
description='Tool for testing caffe to mxnet conversion layer by
layer')
parser.add_argument('--image_url', type=str,
-
default='http://writm.com/wp-content/uploads/2016/08/Cat-hd-wallpapers.jpg',
+
default='https://github.com/dmlc/web-data/raw/master/mxnet/doc/'\
+ 'tutorials/python/predict_image/cat.jpg',
help='input image to test inference, can be either
file path or url')
parser.add_argument('--caffe_prototxt_path', type=str,
default='./model.prototxt',
diff --git a/tools/caffe_converter/compare_layers.py
b/tools/caffe_converter/compare_layers.py
index 6cb82e8..ed73ee9 100644
--- a/tools/caffe_converter/compare_layers.py
+++ b/tools/caffe_converter/compare_layers.py
@@ -341,7 +341,8 @@ def main():
parser = argparse.ArgumentParser(
description='Tool for testing caffe to mxnet conversion layer by
layer')
parser.add_argument('--image_url', type=str,
-
default='http://writm.com/wp-content/uploads/2016/08/Cat-hd-wallpapers.jpg',
+
default='https://github.com/dmlc/web-data/raw/master/mxnet/doc/'\
+ 'tutorials/python/predict_image/cat.jpg',
help='input image to test inference, can be either
file path or url')
parser.add_argument('--caffe_prototxt_path', type=str,
default='./model.prototxt',
diff --git a/tools/caffe_converter/test_converter.py
b/tools/caffe_converter/test_converter.py
index 6bc5d56..7b47278 100644
--- a/tools/caffe_converter/test_converter.py
+++ b/tools/caffe_converter/test_converter.py
@@ -84,7 +84,8 @@ def main():
parser = argparse.ArgumentParser(description='Test Caffe converter')
parser.add_argument('--cpu', action='store_true', help='use cpu?')
parser.add_argument('--image_url', type=str,
-
default='http://writm.com/wp-content/uploads/2016/08/Cat-hd-wallpapers.jpg',
+
default='https://github.com/dmlc/web-data/raw/master/mxnet/doc/'\
+ 'tutorials/python/predict_image/cat.jpg',
help='input image to test inference, can be either
file path or url')
args = parser.parse_args()
if args.cpu:
