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

[MXNET-74]Update mkldnn to the newest & Add clang build test with mkldnn. #9918

Merged
merged 17 commits into from
Mar 14, 2018
Merged
Show file tree
Hide file tree
Changes from 3 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
2 changes: 1 addition & 1 deletion 3rdparty/mkldnn
38 changes: 38 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,25 @@ try {
}
}
},
'CPU: Clang 3.9 MKLDNN': {
node('mxnetlinux-cpu') {
ws('workspace/build-cpu-clang') {
init_git()
def flag = """ \
USE_PROFILER=1 \
USE_CPP_PACKAGE=1 \
USE_BLAS=mkl \
USE_MKLDNN=1 \
USE_OPENMP=0 \
CXX=clang++-3.9 \
CC=clang-3.9 \
-j\$(nproc)
"""
make("cpu_clang", flag)
pack_lib('cpu_clang')
}
}
},
'CPU: Clang 5': {
node('mxnetlinux-cpu') {
ws('workspace/build-cpu-clang') {
Expand All @@ -244,6 +263,25 @@ try {
}
}
},
'CPU: Clang 5 MKLDNN': {
node('mxnetlinux-cpu') {
ws('workspace/build-mkldnn-clang') {
init_git()
def flag = """ \
USE_PROFILER=1 \
USE_CPP_PACKAGE=1 \
USE_BLAS=mkl \
USE_MKLDNN=1 \
USE_OPENMP=1 \
CXX=clang++-5.0 \
CC=clang-5.0 \
-j\$(nproc)
"""
make("cpu_clang", flag)
pack_lib('cpu_clang')
}
}
},
'CPU: MKLDNN': {
node('mxnetlinux-cpu') {
ws('workspace/build-mkldnn-cpu') {
Expand Down
6 changes: 6 additions & 0 deletions tests/ci_build/Dockerfile.cpu_clang
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,9 @@ RUN wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
apt-get install -y clang-3.9 clang-5.0 && \
clang-3.9 --version && \
clang-5.0 --version

# Add MKLML library, compatiable with Ubuntu16.04
RUN wget --no-check-certificate -O /tmp/mklml.tgz https://github.com/01org/mkl-dnn/releases/download/v0.12/mklml_lnx_2018.0.1.20171227.tgz
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please update all dockerfiles in that directory in order to use the correct mkl version

RUN tar -zxvf /tmp/mklml.tgz && cp -rf mklml_*/* /usr/local/ && rm -rf mklml_*

ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/usr/local/lib