From 1c92c09237455650c1730213bf13cb4237555b01 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Fri, 1 Nov 2019 02:52:16 +0000 Subject: [PATCH] fix install dir --- mkldnn.mk | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/mkldnn.mk b/mkldnn.mk index bc2190018bdf..aa92108e33b0 100644 --- a/mkldnn.mk +++ b/mkldnn.mk @@ -22,10 +22,8 @@ ifeq ($(USE_MKLDNN), 1) MXNET_INCLDIR = $(ROOTDIR)/include ifeq ($(UNAME_S), Darwin) MKLDNN_LIBFILE = $(MKLDNNROOT)/lib/libmkldnn.1.dylib - MKLDNN_LIB64FILE = $(MKLDNNROOT)/lib64/libmkldnn.1.dylib else MKLDNN_LIBFILE = $(MKLDNNROOT)/lib/libmkldnn.so.1 - MKLDNN_LIB64FILE = $(MKLDNNROOT)/lib64/libmkldnn.so.1 endif endif @@ -35,16 +33,11 @@ mkldnn_build: $(MKLDNN_LIBFILE) $(MKLDNN_LIBFILE): mkdir -p $(MKLDNNROOT)/lib - cmake $(MKLDNN_SUBMODDIR) -DCMAKE_INSTALL_PREFIX=$(MKLDNNROOT) -B$(MKLDNN_BUILDDIR) -DMKLDNN_ARCH_OPT_FLAGS="" -DMKLDNN_BUILD_TESTS=OFF -DMKLDNN_BUILD_EXAMPLES=OFF -DMKLDNN_ENABLE_JIT_PROFILING=OFF + cmake $(MKLDNN_SUBMODDIR) -DCMAKE_INSTALL_PREFIX=$(MKLDNNROOT) -DCMAKE_INSTALL_LIBDIR=lib -B$(MKLDNN_BUILDDIR) -DMKLDNN_ARCH_OPT_FLAGS="" -DMKLDNN_BUILD_TESTS=OFF -DMKLDNN_BUILD_EXAMPLES=OFF -DMKLDNN_ENABLE_JIT_PROFILING=OFF $(MAKE) -C $(MKLDNN_BUILDDIR) VERBOSE=1 $(MAKE) -C $(MKLDNN_BUILDDIR) install mkdir -p $(MXNET_LIBDIR) - if [ -f "$(MKLDNN_LIB64FILE)" ]; then \ - cp $(MKLDNNROOT)/lib64/libmkldnn* $(MXNET_LIBDIR); \ - cp $(MKLDNNROOT)/lib64/libmkldnn* $(MKLDNNROOT)/lib/; \ - else \ - cp $(MKLDNNROOT)/lib/libmkldnn* $(MXNET_LIBDIR); \ - fi + cp $(MKLDNN_LIBFILE) $(MXNET_LIBDIR) cp $(MKLDNN_BUILDDIR)/include/mkldnn_version.h $(MXNET_INCLDIR)/mkldnn/. mkldnn_clean: