Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Updated dockerfiles to get the dockcross images from mxnetcipinned #13562

Merged
merged 6 commits into from
Feb 14, 2019
Merged

Updated dockerfiles to get the dockcross images from mxnetcipinned #13562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6ebc897
Updated dockerfiles to get the dockcross images from mxnetcipinned
Dec 6, 2018
1e6121e
Updated jetson dockerfile
Dec 6, 2018
d39eb13
Fixed error in armv7, checked out armv8 and jetson from master branch
jlcontreras Dec 6, 2018
cea5b74
Added fix for Jetson, removed CUDA update
Dec 7, 2018
18ea768
Fixed Jetson build
jlcontreras Feb 11, 2019
b3306cd
Minor fix to test_operator.test_stn
Feb 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile.build.android_armv7
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile.build.android_armv8
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile.build.armv6
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/Dockerfile.build.armv7
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions ci/docker/Dockerfile.build.armv8
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
7 changes: 4 additions & 3 deletions ci/docker/Dockerfile.build.jetson
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions make/crosscompile.jetson.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/python/unittest/test_operator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down