Unverified Commit fc50420f authored by Jai Menon's avatar Jai Menon Committed by GitHub

Merge branch 'master' into jmenon/cpu_kernels

parents 85f42f42 0513ad96
...@@ -100,8 +100,11 @@ include_directories( ...@@ -100,8 +100,11 @@ include_directories(
) )
if(LLVM_INCLUDE_DIR AND MKLDNN_INCLUDE_DIR) if(LLVM_INCLUDE_DIR AND MKLDNN_INCLUDE_DIR)
find_package(ZLIB REQUIRED)
include_directories(SYSTEM ${LLVM_INCLUDE_DIR} ${MKLDNN_INCLUDE_DIR}) include_directories(SYSTEM ${LLVM_INCLUDE_DIR} ${MKLDNN_INCLUDE_DIR})
link_directories(${LLVM_LIB_DIR} ${MKLDNN_LIB_DIR}) link_directories(${LLVM_LIB_DIR} ${MKLDNN_LIB_DIR})
# Add sources for the CPU backend # Add sources for the CPU backend
# and all its dependencies # and all its dependencies
set(SRC ${SRC} set(SRC ${SRC}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment