Skip to content

Commit 236e4d2

Browse files
silee2baojun-nervana
authored andcommitted
Fix build issues on CentOS.
test=develop
1 parent f30c1dd commit 236e4d2

File tree

1 file changed

+13
-6
lines changed

1 file changed

+13
-6
lines changed

cmake/external/ngraph.cmake

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,13 @@ INCLUDE(ExternalProject)
3636

3737
SET(NGRAPH_PROJECT "extern_ngraph")
3838
SET(NGRAPH_VERSION "0.9")
39-
SET(NGRAPH_TAG_VERSION "0.9.1")
40-
SET(NGRAPH_GIT_TAG "v${NGRAPH_TAG_VERSION}")
39+
SET(NGRAPH_GIT_TAG "f9fd9d4cc318dc59dd4b68448e7fbb5f67a28bd0")
4140
SET(NGRAPH_SOURCES_DIR ${THIRD_PARTY_PATH}/ngraph)
4241
SET(NGRAPH_INSTALL_DIR ${THIRD_PARTY_PATH}/install/ngraph)
4342
SET(NGRAPH_INC_DIR ${NGRAPH_INSTALL_DIR}/include)
44-
SET(NGRAPH_LIB_DIR ${NGRAPH_INSTALL_DIR}/lib)
4543
SET(NGRAPH_SHARED_LIB_NAME libngraph.so.${NGRAPH_VERSION})
4644
SET(NGRAPH_CPU_LIB_NAME libcpu_backend.so)
4745
SET(NGRAPH_TBB_LIB_NAME libtbb.so.2)
48-
SET(NGRAPH_SHARED_LIB ${NGRAPH_LIB_DIR}/${NGRAPH_SHARED_LIB_NAME})
49-
SET(NGRAPH_CPU_LIB ${NGRAPH_LIB_DIR}/${NGRAPH_CPU_LIB_NAME})
50-
SET(NGRAPH_TBB_LIB ${NGRAPH_LIB_DIR}/${NGRAPH_TBB_LIB_NAME})
5146
SET(NGRAPH_GIT_REPO "https://github.com/NervanaSystems/ngraph.git")
5247

5348
ExternalProject_Add(
@@ -68,6 +63,18 @@ ExternalProject_Add(
6863
CMAKE_ARGS -DMKLDNN_LIB_DIR=${MKLDNN_INSTALL_DIR}/lib
6964
)
7065

66+
if(UNIX AND NOT APPLE)
67+
include(GNUInstallDirs)
68+
SET(NGRAPH_LIB_DIR ${NGRAPH_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR})
69+
else()
70+
SET(NGRAPH_LIB_DIR ${NGRAPH_INSTALL_DIR}/lib)
71+
endif()
72+
MESSAGE(STATUS "nGraph lib will be installed at: ${NGRAPH_LIB_DIR}")
73+
74+
SET(NGRAPH_SHARED_LIB ${NGRAPH_LIB_DIR}/${NGRAPH_SHARED_LIB_NAME})
75+
SET(NGRAPH_CPU_LIB ${NGRAPH_LIB_DIR}/${NGRAPH_CPU_LIB_NAME})
76+
SET(NGRAPH_TBB_LIB ${NGRAPH_LIB_DIR}/${NGRAPH_TBB_LIB_NAME})
77+
7178
# Workaround for nGraph expecting mklml to be in mkldnn install directory.
7279
ExternalProject_Add_Step(
7380
${NGRAPH_PROJECT}

0 commit comments

Comments
 (0)