This is an automated email from the ASF dual-hosted git repository.
marcoabreu pushed a commit to branch v1.4.x
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/v1.4.x by this push:
new d793feb Fix Jetson compilation (#13547)
d793feb is described below
commit d793feb750103b8702ced8b7fc29e96f55a7f2d2
Author: Pedro Larroy <928489+lar...@users.noreply.github.com>
AuthorDate: Wed Dec 5 16:58:32 2018 +0100
Fix Jetson compilation (#13547)
---
Jenkinsfile | 20 ++++++++++----------
ci/docker/Dockerfile.build.jetson | 1 +
ci/jenkins/Jenkinsfile_edge | 2 +-
make/crosscompile.jetson.mk | 4 ++--
4 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 015ca81..79392b4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -428,16 +428,16 @@ core_logic: {
}
}
},
- //'NVidia Jetson / ARMv8':{
- // node(NODE_LINUX_CPU) {
- // ws('workspace/build-jetson-armv8') {
- // timeout(time: max_time, unit: 'MINUTES') {
- // utils.init_git()
- // utils.docker_run('jetson', 'build_jetson', false)
- // }
- // }
- // }
- //},
+ 'NVidia Jetson / ARMv8':{
+ node(NODE_LINUX_CPU) {
+ ws('workspace/build-jetson-armv8') {
+ timeout(time: max_time, unit: 'MINUTES') {
+ utils.init_git()
+ utils.docker_run('jetson', 'build_jetson', false)
+ }
+ }
+ }
+ },
'ARMv7':{
node(NODE_LINUX_CPU) {
ws('workspace/build-ARMv7') {
diff --git a/ci/docker/Dockerfile.build.jetson
b/ci/docker/Dockerfile.build.jetson
index d128ebc..2904467 100644
--- a/ci/docker/Dockerfile.build.jetson
+++ b/ci/docker/Dockerfile.build.jetson
@@ -77,6 +77,7 @@ RUN
JETPACK_DOWNLOAD_PREFIX=https://developer.download.nvidia.com/devzone/devcen
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
+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/ci/jenkins/Jenkinsfile_edge b/ci/jenkins/Jenkinsfile_edge
index 275a0c9..c101ba1 100644
--- a/ci/jenkins/Jenkinsfile_edge
+++ b/ci/jenkins/Jenkinsfile_edge
@@ -34,7 +34,7 @@ utils.assign_node_labels(utility: 'utility', linux_cpu:
'mxnetlinux-cpu', linux_
utils.main_wrapper(
core_logic: {
utils.parallel_stage('Build', [
-// custom_steps.compile_armv8_jetson_gpu(),
+ custom_steps.compile_armv8_jetson_gpu(),
custom_steps.compile_armv7_cpu(),
custom_steps.compile_armv6_cpu(),
custom_steps.compile_armv8_cpu(),
diff --git a/make/crosscompile.jetson.mk b/make/crosscompile.jetson.mk
index a1468f4..171f846 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
