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

USE_MKLDNN=1 is default in make build (mkldnn must be explicitly turned off) #12591

Closed
wants to merge 19 commits into from
Closed

USE_MKLDNN=1 is default in make build (mkldnn must be explicitly turned off) #12591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1e17a51
mkldnn is default makefile and explicitly turn off for buidls
azai91 Sep 18, 2018
abbc3ad
add endif
azai91 Sep 18, 2018
92b91f8
retrigger
azai91 Oct 30, 2018
335748b
Merge branch 'master' into feature/mklnn-default-make
azai91 Oct 30, 2018
ce5336c
retrigger
azai91 Oct 31, 2018
d12d2cd
Merge branch 'master' into feature/mklnn-default-make
azai91 Nov 9, 2018
da8f62c
Merge branch 'master' into feature/mklnn-default-make
azai91 Nov 13, 2018
78c6093
Merge branch 'master' into feature/mklnn-default-make
azai91 Nov 21, 2018
cb095c6
retrigger
azai91 Nov 21, 2018
c08f6fa
retrigger
azai91 Nov 22, 2018
bf78666
turn of mkldnn on arm builds
azai91 Nov 22, 2018
46da874
Merge branch 'master' into feature/mklnn-default-make
azai91 Nov 29, 2018
9b60119
Merge branch 'feature/mklnn-default-make' of github.com:azai91/incuba…
azai91 Nov 29, 2018
a484fec
Merge branch 'master' into feature/mklnn-default-make
azai91 Dec 13, 2018
aac30b4
Merge branch 'feature/mklnn-default-make' of github.com:azai91/incuba…
azai91 Dec 13, 2018
e5a40f6
enable mkldnn on all builds
azai91 Dec 13, 2018
c483179
merge from master
azai91 Dec 13, 2018
f33f736
Merge branch 'feature/mklnn-default-make' of github.com:azai91/incuba…
azai91 Dec 13, 2018
7f1f81f
set make flag correctly
azai91 Dec 13, 2018
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
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ endif
# use customized config file
include $(config)

ifndef $(USE_MKLDNN)
USE_MKLDNN = 1
endif

ifeq ($(USE_MKL2017), 1)
$(warning "USE_MKL2017 is deprecated. We will switch to USE_MKLDNN.")
USE_MKLDNN=1
Expand Down
8 changes: 0 additions & 8 deletions ci/docker/runtime_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,6 @@ build_centos7_mkldnn() {
ENABLE_TESTCOVERAGE=1 \
USE_LAPACK=1 \
USE_LAPACK_PATH=/usr/lib64/liblapack.so \
USE_MKLDNN=1 \
USE_BLAS=openblas \
-j$(nproc)
}
Expand Down Expand Up @@ -458,7 +457,6 @@ build_ubuntu_cpu_clang39_mkldnn() {
ENABLE_TESTCOVERAGE=1 \
USE_CPP_PACKAGE=1 \
USE_BLAS=openblas \
USE_MKLDNN=1 \
USE_OPENMP=0 \
-j$(nproc)
}
Expand All @@ -475,7 +473,6 @@ build_ubuntu_cpu_clang60_mkldnn() {
ENABLE_TESTCOVERAGE=1 \
USE_CPP_PACKAGE=1 \
USE_BLAS=openblas \
USE_MKLDNN=1 \
USE_OPENMP=1 \
-j$(nproc)
}
Expand All @@ -490,7 +487,6 @@ build_ubuntu_cpu_mkldnn() {
ENABLE_TESTCOVERAGE=1 \
USE_CPP_PACKAGE=1 \
USE_BLAS=openblas \
USE_MKLDNN=1 \
-j$(nproc)
}

Expand Down Expand Up @@ -578,7 +574,6 @@ build_ubuntu_gpu_mkldnn() {
ENABLE_TESTCOVERAGE=1 \
USE_CPP_PACKAGE=1 \
USE_BLAS=openblas \
USE_MKLDNN=1 \
USE_CUDA=1 \
USE_CUDA_PATH=/usr/local/cuda \
USE_CUDNN=1 \
Expand All @@ -595,7 +590,6 @@ build_ubuntu_gpu_mkldnn_nocudnn() {
DEV=1 \
ENABLE_TESTCOVERAGE=1 \
USE_BLAS=openblas \
USE_MKLDNN=1 \
USE_CUDA=1 \
USE_CUDA_PATH=/usr/local/cuda \
USE_CUDNN=0 \
Expand Down Expand Up @@ -649,7 +643,6 @@ build_ubuntu_gpu_cmake_mkldnn() {
-DUSE_CUDA=1 \
-DUSE_CUDNN=1 \
-DUSE_MKLML_MKL=1 \
-DUSE_MKLDNN=1 \
-DCMAKE_BUILD_TYPE=Release \
-DCUDA_ARCH_NAME=Manual \
-DCUDA_ARCH_BIN=$CI_CMAKE_CUDA_ARCH_BIN \
Expand All @@ -669,7 +662,6 @@ build_ubuntu_gpu_cmake() {
-DUSE_CUDA=1 \
-DUSE_CUDNN=1 \
-DUSE_MKLML_MKL=0 \
-DUSE_MKLDNN=0 \
Copy link
Member

Choose a reason for hiding this comment

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

I don't think this is supposed to be removed.

-DUSE_DIST_KVSTORE=1 \
-DCMAKE_BUILD_TYPE=Release \
-DCUDA_ARCH_NAME=Manual \
Expand Down