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

Enable MKL-DNN in pip packages #16899

Merged
merged 18 commits into from
Feb 15, 2020
Merged

Enable MKL-DNN in pip packages #16899

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8259349
enable mkldnn by default in pip packages
TaoLv Nov 25, 2019
284aa18
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Nov 30, 2019
91bd30e
add make file for native build
TaoLv Nov 30, 2019
39e1b5c
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Dec 4, 2019
2fb6e43
rm *mkl build scripts
TaoLv Dec 4, 2019
4987d5b
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Dec 17, 2019
7195c78
remove *mkl variants
TaoLv Dec 17, 2019
9417588
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Dec 20, 2019
4fe1eaa
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Dec 26, 2019
912b921
Change readme/cd
TaoLv Dec 26, 2019
79bb7b3
clear native build configurations
TaoLv Dec 26, 2019
055e3c0
fix static build test in ci
TaoLv Dec 26, 2019
84ae814
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Jan 4, 2020
88c1fc3
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Jan 22, 2020
3418636
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Feb 10, 2020
d2aec9d
git mv linux_cu102mkl.mk linux_cu102.mk
TaoLv Feb 11, 2020
94cc6b0
fix merge conflict
TaoLv Feb 11, 2020
8b67d21
Merge branch 'master' of https://github.com/apache/incubator-mxnet in…
TaoLv Feb 12, 2020
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 make/pip/pip_darwin_cpu.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ USE_LIBJPEG_TURBO = 1
# Please refer to MKL_README.md for details

# whether use MKL-DNN library
USE_MKLDNN = 0
USE_MKLDNN = 1

# MKL ML Library folder, need to be root for /usr/local
# Change to User Home directory for standard user
Expand Down
2 changes: 1 addition & 1 deletion make/pip/pip_linux_cpu.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ USE_OPERATOR_TUNING = 1
USE_LIBJPEG_TURBO = 1

# whether use MKL-DNN library
USE_MKLDNN = 0
USE_MKLDNN = 1


# MKL ML Library for Intel CPU/Xeon Phi
Expand Down
2 changes: 1 addition & 1 deletion make/pip/pip_linux_cu100.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ USE_OPERATOR_TUNING = 1
USE_LIBJPEG_TURBO = 1

# whether use MKL-DNN library
USE_MKLDNN = 0
USE_MKLDNN = 1


# MKL ML Library for Intel CPU/Xeon Phi
Expand Down
2 changes: 1 addition & 1 deletion make/pip/pip_linux_cu101.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ USE_OPERATOR_TUNING = 1
USE_LIBJPEG_TURBO = 1

# whether use MKL-DNN library
USE_MKLDNN = 0
USE_MKLDNN = 1


# MKL ML Library for Intel CPU/Xeon Phi
Expand Down
2 changes: 1 addition & 1 deletion make/pip/pip_linux_cu75.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ USE_OPERATOR_TUNING = 1
USE_LIBJPEG_TURBO = 1

# whether use MKL-DNN library
USE_MKLDNN = 0
USE_MKLDNN = 1


# MKL ML Library for Intel CPU/Xeon Phi
Expand Down
2 changes: 1 addition & 1 deletion make/pip/pip_linux_cu80.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ USE_OPERATOR_TUNING = 1
USE_LIBJPEG_TURBO = 1

# whether use MKL-DNN library
USE_MKLDNN = 0
USE_MKLDNN = 1


# MKL ML Library for Intel CPU/Xeon Phi
Expand Down
2 changes: 1 addition & 1 deletion make/pip/pip_linux_cu90.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ USE_OPERATOR_TUNING = 1
USE_LIBJPEG_TURBO = 1

# whether use MKL-DNN library
USE_MKLDNN = 0
USE_MKLDNN = 1


# MKL ML Library for Intel CPU/Xeon Phi
Expand Down
2 changes: 1 addition & 1 deletion make/pip/pip_linux_cu91.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ USE_OPERATOR_TUNING = 1
USE_LIBJPEG_TURBO = 1

# whether use MKL-DNN library
USE_MKLDNN = 0
USE_MKLDNN = 1


# MKL ML Library for Intel CPU/Xeon Phi
Expand Down
2 changes: 1 addition & 1 deletion make/pip/pip_linux_cu92.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ USE_OPERATOR_TUNING = 1
USE_LIBJPEG_TURBO = 1

# whether use MKL-DNN library
USE_MKLDNN = 0
USE_MKLDNN = 1


# MKL ML Library for Intel CPU/Xeon Phi
Expand Down
5 changes: 1 addition & 4 deletions tools/staticbuild/build_lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ git submodule update --init --recursive || true
$MAKE DEPS_PATH=$DEPS_PATH DMLCCORE
$MAKE DEPS_PATH=$DEPS_PATH $PWD/3rdparty/tvm/nnvm/lib/libnnvm.a
$MAKE DEPS_PATH=$DEPS_PATH PSLITE

if [[ $VARIANT == *mkl ]]; then
$MAKE DEPS_PATH=$DEPS_PATH mkldnn
fi
$MAKE DEPS_PATH=$DEPS_PATH mkldnn

>&2 echo "Now building mxnet..."
$MAKE DEPS_PATH=$DEPS_PATH
Expand Down