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

Revert "[MXNET-43] Fix Jetson compilation" #13665

Merged
merged 2 commits into from
Dec 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion ci/docker/Dockerfile.build.jetson
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion ci/jenkins/Jenkinsfile_edge
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
4 changes: 2 additions & 2 deletions make/crosscompile.jetson.mk
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 -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
Expand Down