Unverified Commit c32512fa authored by Scott Cyphers's avatar Scott Cyphers Committed by GitHub

Add info about lib versions in an easy to find place (#2508)

* Add info about lib versions in an easy to find place

* Review comments
parent 6d9bc696
......@@ -16,6 +16,11 @@
include(ExternalProject)
# Includes blas 3.8.0 in mkldnn
set(NGRAPH_MKLDNN_VERSION "v0.18-rc")
set(NGRAPH_MKLDNN_SUB_VERSION "2019.0.3.20190125")
set(NGRAPH_MKLDNN_GIT_TAG "08bd90c")
#------------------------------------------------------------------------------
# Fetch and install MKL-DNN
#------------------------------------------------------------------------------
......@@ -53,8 +58,8 @@ endif()
# This section sets up MKL as an external project to be used later by MKLDNN
set(MKLURLROOT "https://github.com/intel/mkl-dnn/releases/download/v0.18-rc/")
set(MKLVERSION "2019.0.3.20190125")
set(MKLURLROOT "https://github.com/intel/mkl-dnn/releases/download/${NGRAPH_MKLDNN_VERSION}/")
set(MKLVERSION ${NGRAPH_MKLDNN_SUB_VERSION})
if (LINUX)
set(MKLPACKAGE "mklml_lnx_${MKLVERSION}.tgz")
set(MKL_SHA1_HASH 968318286897da5ffd225f0851aec18f02b347f8)
......@@ -144,7 +149,7 @@ else()
endif()
set(MKLDNN_GIT_REPO_URL https://github.com/intel/mkl-dnn)
set(MKLDNN_GIT_TAG "08bd90c")
set(MKLDNN_GIT_TAG ${NGRAPH_MKLDNN_GIT_TAG})
set(MKLDNN_PATCH_FILE mkldnn.patch)
set(MKLDNN_LIBS ${EXTERNAL_PROJECTS_ROOT}/mkldnn/lib/${MKLDNN_LIB})
......
......@@ -21,14 +21,15 @@ include(ExternalProject)
# Download and install Google Protobuf ...
#------------------------------------------------------------------------------
set(PROTOBUF_GIT_REPO_URL https://github.com/google/protobuf.git)
set(PROTOBUF_GIT_BRANCH origin/3.5.x)
# This version of PROTOBUF is required by Microsoft ONNX Runtime.
set(NGRAPH_PROTOBUF_GIT_REPO_URL "https://github.com/protocolbuffers/protobuf")
set(NGRAPH_PROTOBUF_GIT_TAG "v3.5.2")
ExternalProject_Add(
ext_protobuf
PREFIX protobuf
GIT_REPOSITORY ${PROTOBUF_GIT_REPO_URL}
GIT_TAG ${PROTOBUF_GIT_BRANCH}
GIT_REPOSITORY ${NGRAPH_PROTOBUF_GIT_REPO_URL}
GIT_TAG ${NGRAPH_PROTOBUF_GIT_TAG}
UPDATE_COMMAND ""
PATCH_COMMAND ""
CONFIGURE_COMMAND ./autogen.sh COMMAND ./configure --prefix=${EXTERNAL_PROJECTS_ROOT}/protobuf --disable-shared CXX=${CMAKE_CXX_COMPILER} CXXFLAGS=-fPIC
......
......@@ -18,10 +18,10 @@
# Fetch and configure TBB
#------------------------------------------------------------------------------
if(NGRAPH_TBB_ENABLE)
set(TBB_GIT_REPO_URL https://github.com/01org/tbb)
set(TBB_GIT_TAG "2019_U2")
set(TBB_GIT_REPO_URL https://github.com/01org/tbb)
set(NGRAPH_TBB_VERSION "2019_U3")
if(NGRAPH_TBB_ENABLE)
set(TBB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/tbb/tbb-src)
configure_file(${CMAKE_SOURCE_DIR}/cmake/tbb_fetch.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/tbb/CMakeLists.txt)
......
......@@ -16,12 +16,15 @@
include(ExternalProject)
set(ARCHIVE_FILE_BASE tbb2019_20181203oss)
set(NGRAPH_TBB_VERSION "2019_U3")
set(NGRAPH_TBB_SUB_VERSION "tbb2019_20181203oss")
if (WIN32)
set(TBB_FILE https://github.com/01org/tbb/releases/download/2019_U3/${ARCHIVE_FILE_BASE}_win.zip)
set(TBB_FILE https://github.com/01org/tbb/releases/download/${NGRAPH_TBB_VERSION}/${NGRAPH_TBB_SUB_VERSION}_win.zip)
set(TBB_SHA1_HASH 1989458a49e780d76248edac13b963f80c9a460c)
elseif(APPLE)
set(TBB_FILE https://github.com/01org/tbb/releases/download/2019_U3/${ARCHIVE_FILE_BASE}_mac.tgz)
set(TBB_FILE https://github.com/01org/tbb/releases/download/${NGRAPH_TBB_VERSION}/${NGRAPH_TBB_SUB_VERSION}_mac.tgz)
set(TBB_SHA1_HASH 36926fb46add578b88a5c7e19652b94bb612e4be)
endif()
......@@ -39,7 +42,7 @@ ExternalProject_Add(
)
ExternalProject_Get_Property(ext_tbb SOURCE_DIR)
set(INSTALL_DIR ${SOURCE_DIR}/${ARCHIVE_FILE_BASE})
set(INSTALL_DIR ${SOURCE_DIR}/${NGRAPH_TBB_SUB_VERSION})
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
set(TBB_LIB_NAME tbb_debug)
......
......@@ -24,7 +24,7 @@ ExternalProject_Add(
ext_tbb
PREFIX tbb
GIT_REPOSITORY ${TBB_GIT_REPO_URL}
GIT_TAG ${TBB_GIT_TAG}
GIT_TAG "${NGRAPH_TBB_VERSION}"
SOURCE_DIR "${TBB_ROOT}"
CONFIGURE_COMMAND ""
BUILD_COMMAND ""
......
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