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

Commit

Permalink
Fix horovod build failure when mxnet is built from source (#15213)
Browse files Browse the repository at this point in the history
* fix horovod build when mxnet is built from source

* copy header file in mkldnn

* copy mkldnn_version header file to include

* remove unnecessary line

* fix the untracked file

* whitelist mkldnn headerfile

* exlude lint path
  • Loading branch information
apeforest authored and szha committed Jun 16, 2019
1 parent c4ea674 commit 85aaa3a
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -161,4 +161,7 @@ tests/mxnet_unit_tests
coverage.xml

# Local CMake build config
cmake_options.yml
cmake_options.yml

# header file generated at compile time
include/mkldnn/mkldnn_version.h
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -594,7 +594,7 @@ lint: cpplint rcpplint jnilint pylint

cpplint:
3rdparty/dmlc-core/scripts/lint.py mxnet cpp include src plugin cpp-package tests \
--exclude_path src/operator/contrib/ctc_include
--exclude_path src/operator/contrib/ctc_include include/mkldnn

pylint:
python3 -m pylint --rcfile=$(ROOTDIR)/ci/other/pylintrc --ignore-patterns=".*\.so$$,.*\.dll$$,.*\.dylib$$" python/mxnet tools/caffe_converter/*.py
Expand Down
1 change: 0 additions & 1 deletion include/mkldnn

This file was deleted.

1 change: 1 addition & 0 deletions include/mkldnn/mkldnn.h
1 change: 1 addition & 0 deletions include/mkldnn/mkldnn_types.h
3 changes: 2 additions & 1 deletion mkldnn.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ ifeq ($(USE_MKLDNN), 1)
MKLDNN_SUBMODDIR = $(ROOTDIR)/3rdparty/mkldnn
MKLDNN_BUILDDIR = $(MKLDNN_SUBMODDIR)/build
MXNET_LIBDIR = $(ROOTDIR)/lib
MXNET_INCLDIR = $(ROOTDIR)/include
ifeq ($(UNAME_S), Darwin)
OMP_LIBFILE = $(MKLDNNROOT)/lib/libiomp5.dylib
MKLML_LIBFILE = $(MKLDNNROOT)/lib/libmklml.dylib
Expand Down Expand Up @@ -49,7 +50,7 @@ $(MKLDNN_LIBFILE):
cp $(OMP_LIBFILE) $(MXNET_LIBDIR)
cp $(MKLML_LIBFILE) $(MXNET_LIBDIR)
cp $(MKLDNN_LIBFILE) $(MXNET_LIBDIR)

cp $(MKLDNN_BUILDDIR)/include/mkldnn_version.h $(MXNET_INCLDIR)/mkldnn/.
mkldnn_clean:
$(RM) -r 3rdparty/mkldnn/build
$(RM) -r $(MKLDNNROOT)
Expand Down
3 changes: 3 additions & 0 deletions tools/license_header.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@
# Git submodules under different licenses
'3rdparty',

# 3rdparty headerfiles under different licenses
'include/mkldnn',

# Code shared with project by author - see file for details
'src/operator/special_functions-inl.h',

Expand Down

0 comments on commit 85aaa3a

Please sign in to comment.