From 78528b851841c45eed57e6a6ea5224e6e92307cd Mon Sep 17 00:00:00 2001 From: Kellen Sunderland Date: Mon, 17 Dec 2018 13:25:39 -0800 Subject: [PATCH 1/2] Revert "remove omp which can cause ssd accuracy variance (#13622)" This reverts commit 655f1c6f7a0706dd622f73db9af2e6df895ca213. From 58e9d01a3906b0411111f9cb36edeaa8afaf9fc9 Mon Sep 17 00:00:00 2001 From: Kellen Sunderland Date: Mon, 17 Dec 2018 13:25:39 -0800 Subject: [PATCH 2/2] 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 07097887f87d..30b9b7e37507 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 c101ba102386..275a0c96de94 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 171f846d20dd..a1468f4496d3 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