You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by aa...@apache.org on 2018/12/18 01:14:52 UTC
[incubator-mxnet] branch master updated: Revert "[MXNET-43] Fix
Jetson compilation" (#13665)
This is an automated email from the ASF dual-hosted git repository.
aaronmarkham pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-mxnet.git
The following commit(s) were added to refs/heads/master by this push:
new 3433776 Revert "[MXNET-43] Fix Jetson compilation" (#13665)
3433776 is described below
commit 3433776dac7be75928082bbc1d552fca248fb8e8
Author: Kellen Sunderland <ke...@gmail.com>
AuthorDate: Mon Dec 17 17:14:31 2018 -0800
Revert "[MXNET-43] Fix Jetson compilation" (#13665)
* Revert "remove omp which can cause ssd accuracy variance (#13622)"
This reverts commit 655f1c6f7a0706dd622f73db9af2e6df895ca213.
* Revert "Fix Jetson compilation (#13532)"
This reverts commit 48e25c4cae355753dd96ea7afe004bf78e0719e4.
---
ci/docker/Dockerfile.build.jetson | 1 -
ci/jenkins/Jenkinsfile_edge | 2 +-
make/crosscompile.jetson.mk | 4 ++--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ci/docker/Dockerfile.build.jetson b/ci/docker/Dockerfile.build.jetson
index 0709788..30b9b7e 100644
--- a/ci/docker/Dockerfile.build.jetson
+++ b/ci/docker/Dockerfile.build.jetson
@@ -77,7 +77,6 @@ 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 c101ba1..275a0c9 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 171f846..a1468f4 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 -L/usr/lib/aarch64-linux-gnu/
+ADD_LDFLAGS = -L${CROSS_ROOT}/lib
# the additional compile flags you want to add
-ADD_CFLAGS = -I${CROSS_ROOT}/include -I/usr/include/aarch64-linux-gnu/
+ADD_CFLAGS = -I${CROSS_ROOT}/include
#---------------------------------------------
# matrix computation libraries for CPU/GPU