@@ -36,18 +36,13 @@ INCLUDE(ExternalProject)
36
36
37
37
SET (NGRAPH_PROJECT "extern_ngraph" )
38
38
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" )
41
40
SET (NGRAPH_SOURCES_DIR ${THIRD_PARTY_PATH} /ngraph )
42
41
SET (NGRAPH_INSTALL_DIR ${THIRD_PARTY_PATH} /install/ngraph )
43
42
SET (NGRAPH_INC_DIR ${NGRAPH_INSTALL_DIR} /include )
44
- SET (NGRAPH_LIB_DIR ${NGRAPH_INSTALL_DIR} /lib )
45
43
SET (NGRAPH_SHARED_LIB_NAME libngraph.so.${NGRAPH_VERSION} )
46
44
SET (NGRAPH_CPU_LIB_NAME libcpu_backend.so )
47
45
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} )
51
46
SET (NGRAPH_GIT_REPO "https://github.com/NervanaSystems/ngraph.git" )
52
47
53
48
ExternalProject_Add (
@@ -68,6 +63,18 @@ ExternalProject_Add(
68
63
CMAKE_ARGS -DMKLDNN_LIB_DIR=${MKLDNN_INSTALL_DIR}/lib
69
64
)
70
65
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
+
71
78
# Workaround for nGraph expecting mklml to be in mkldnn install directory.
72
79
ExternalProject_Add_Step (
73
80
${NGRAPH_PROJECT}
0 commit comments