Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
devel:kubic:ei-demo
ngraph
ngraph-rpm.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File ngraph-rpm.patch of Package ngraph
diff --git a/CMakeLists.txt b/CMakeLists.txt index 604daa0e4..22bcdc8ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -597,20 +597,20 @@ if (NGRAPH_ONNX_IMPORT_ENABLE) endif() endif() -if(NGRAPH_JSON_ENABLE) - include(cmake/external_json.cmake) -endif() -if(NGRAPH_CPU_ENABLE OR NGRAPH_GENERIC_CPU_ENABLE) - include(cmake/external_eigen.cmake) -endif() -if(NGRAPH_CPU_ENABLE) - if(NGRAPH_USE_LEGACY_MKLDNN) - include(cmake/external_mkldnn.cmake) - set(NGRAPH_DEX_ONLY TRUE) - else() - include(cmake/external_mkldnn_v1.cmake) - endif() -endif() +#if(NGRAPH_JSON_ENABLE) +# include(cmake/external_json.cmake) +#endif() +#if(NGRAPH_CPU_ENABLE OR NGRAPH_GENERIC_CPU_ENABLE) +# include(cmake/external_eigen.cmake) +#endif() +#if(NGRAPH_CPU_ENABLE) +# if(NGRAPH_USE_LEGACY_MKLDNN) +# include(cmake/external_mkldnn.cmake) +# set(NGRAPH_DEX_ONLY TRUE) +# else() +# include(cmake/external_mkldnn_v1.cmake) +# endif() +#endif() if (NGRAPH_MLIR_ENABLE) include(cmake/external_mlir.cmake) endif() @@ -623,19 +623,19 @@ endif() if(NGRAPH_CODEGEN_ENABLE) if (NOT MSVC) - include(cmake/external_llvm.cmake) + # include(cmake/external_llvm.cmake) else() message(FATAL_ERROR "CODEGEN is not supported on Windows!") endif() endif() -if(NGRAPH_TBB_ENABLE) - if (WIN32 OR APPLE) - include(cmake/external_tbb_prebuilt.cmake) - else() - include(cmake/external_tbb.cmake) - endif() -endif() +#if(NGRAPH_TBB_ENABLE) +# if (WIN32 OR APPLE) +# include(cmake/external_tbb_prebuilt.cmake) +# else() +# include(cmake/external_tbb.cmake) +# endif() +#endif() if (NGRAPH_DISTRIBUTED_MLSL_ENABLE) include(cmake/external_mlsl.cmake) @@ -643,9 +643,9 @@ endif() add_subdirectory(src) -if (NGRAPH_TEST_UTIL_ENABLE) - include(cmake/external_gtest.cmake) -endif() +#if (NGRAPH_TEST_UTIL_ENABLE) +# include(cmake/external_gtest.cmake) +#endif() add_subdirectory(test) diff --git a/cmake/clang_4_0_flags.cmake b/cmake/clang_4_0_flags.cmake index 6d39e14a5..d274f38be 100644 --- a/cmake/clang_4_0_flags.cmake +++ b/cmake/clang_4_0_flags.cmake @@ -14,10 +14,10 @@ # limitations under the License. # ****************************************************************************** -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=inconsistent-missing-override") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=comment") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors") +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type") +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=inconsistent-missing-override") +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=comment") +#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Weverything") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") diff --git a/cmake/external_llvm.cmake b/cmake/external_llvm.cmake index 83a960263..f53d1a176 100644 --- a/cmake/external_llvm.cmake +++ b/cmake/external_llvm.cmake @@ -38,11 +38,11 @@ endif() message(STATUS "LLVM_INSTALL_ROOT: ${LLVM_INSTALL_ROOT}") find_package(Clang REQUIRED CONFIG - HINTS ${LLVM_INSTALL_ROOT}/lib/cmake/clang NO_DEFAULT_PATH) + HINTS /usr/lib64/cmake/clang NO_DEFAULT_PATH) message(STATUS "CLANG_CMAKE_DIR: ${CLANG_CMAKE_DIR}") message(STATUS "CLANG_INCLUDE_DIRS: ${CLANG_INCLUDE_DIRS}") message(STATUS "LLVM_INCLUDE_DIRS: ${LLVM_INCLUDE_DIRS}") add_library(libllvm INTERFACE) target_include_directories(libllvm INTERFACE ${CLANG_INCLUDE_DIRS} ${LLVM_INCLUDE_DIR}) -target_link_libraries(libllvm INTERFACE clangHandleCXX clangHandleLLVM) +target_link_libraries(libllvm INTERFACE LLVM) diff --git a/cmake/external_mkldnn.cmake b/cmake/external_mkldnn.cmake index babe551d2..979cb2eca 100644 --- a/cmake/external_mkldnn.cmake +++ b/cmake/external_mkldnn.cmake @@ -136,7 +136,7 @@ ExternalProject_Add( ) set(MKLDNN_DEPENDS ext_mkl) -ExternalProject_Get_Property(ext_mkl source_dir) +#ExternalProject_Get_Property(ext_mkl source_dir) set(MKL_ROOT ${EXTERNAL_PROJECTS_ROOT}/mkldnn/src/external/mkl) set(MKL_SOURCE_DIR ${source_dir}) diff --git a/cmake/external_mkldnn_v1.cmake b/cmake/external_mkldnn_v1.cmake index e18d7f4dc..f05c16e8d 100644 --- a/cmake/external_mkldnn_v1.cmake +++ b/cmake/external_mkldnn_v1.cmake @@ -136,7 +136,7 @@ ExternalProject_Add( ) set(MKLDNN_DEPENDS ext_mkl) -ExternalProject_Get_Property(ext_mkl source_dir) +#ExternalProject_Get_Property(ext_mkl source_dir) set(MKL_ROOT ${EXTERNAL_PROJECTS_ROOT}/mkldnn/src/external/mkl) set(MKL_SOURCE_DIR ${source_dir}) @@ -234,8 +234,6 @@ else() ext_mkldnn PREFIX mkldnn DEPENDS ${MKLDNN_DEPENDS} - GIT_REPOSITORY ${MKLDNN_GIT_REPO_URL} - GIT_TAG ${MKLDNN_GIT_TAG} UPDATE_COMMAND "" CONFIGURE_COMMAND PATCH_COMMAND ${MKLDNN_PATCH_REVERT_COMMAND} diff --git a/cmake/llvm_fetch.cmake.in b/cmake/llvm_fetch.cmake.in index 8f0e56ffd..e4a4f611d 100644 --- a/cmake/llvm_fetch.cmake.in +++ b/cmake/llvm_fetch.cmake.in @@ -26,56 +26,6 @@ set(LLVM_SHA1_HASH @LLVM_SHA1_HASH@) if(NGRAPH_USE_PREBUILT_LLVM) message(STATUS "LLVM: Using prebuilt LLVM") - # Override default LLVM binaries - if(NOT DEFINED LLVM_TARBALL_URL) - if(APPLE) - set(NGRAPH_LLVM_VERSION 8.0.0) - set(LLVM_TARBALL_URL http://releases.llvm.org/${NGRAPH_LLVM_VERSION}/clang+llvm-${NGRAPH_LLVM_VERSION}-x86_64-apple-darwin.tar.xz) - set(LLVM_SHA1_HASH a5674f2ce5b9ed1b67d92689d319ed3b46d66e29) - elseif(UNIX AND NOT APPLE) - set(NGRAPH_LLVM_VERSION 8.0.0) - if(EXISTS /etc/lsb-release) - execute_process(COMMAND grep DISTRIB_RELEASE /etc/lsb-release OUTPUT_VARIABLE UBUNTU_VER_LINE) - string(REGEX MATCH "[0-9.]+" UBUNTU_VER ${UBUNTU_VER_LINE}) - message(STATUS "Ubuntu version: ${UBUNTU_VER} detected.") - set(LLVM_TARBALL_URL http://releases.llvm.org/${NGRAPH_LLVM_VERSION}/clang+llvm-${NGRAPH_LLVM_VERSION}-x86_64-linux-gnu-ubuntu-${UBUNTU_VER}.tar.xz) - if(UBUNTU_VER MATCHES "14.04") - set(LLVM_SHA1_HASH 552ea458b70961b7922a4bbe9de1434688342dbf) - elseif(UBUNTU_VER MATCHES "16.04") - set(LLVM_SHA1_HASH 2be69be355b012ae206dbc0ea7d84b831d77dc27) - elseif(UBUNTU_VER MATCHES "18.04") - set(LLVM_SHA1_HASH 6aeb8aa0998d37be67d886b878f27de5e5ccc5e4) - else() - message(FATAL_ERROR "No prebuilt LLVM available for Ubuntu ${UBUNTU_VER} on llvm.org, please set LLVM_TARBALL_URL manually.") - endif() - else() - message(FATAL_ERROR "Prebuilt LLVM: Only Ubuntu Linux is supported.") - endif() - else() - message(FATAL_ERROR "Prebuilt LLVM: unsupported OS.") - endif() - else() - if(NOT DEFINED LLVM_SHA1_HASH) - message(FATAL_ERROR "Prebuilt LLVM: please provide LLVM_SHA_HASH.") - endif() - endif() - - ExternalProject_Add( - ext_llvm - PREFIX llvm - URL ${LLVM_TARBALL_URL} - URL_HASH SHA1=${LLVM_SHA1_HASH} - CMAKE_GENERATOR "${CMAKE_GENERATOR}" - CMAKE_GENERATOR_PLATFORM "${CMAKE_GENERATOR_PLATFORM}" - CMAKE_GENERATOR_TOOLSET "${CMAKE_GENERATOR_TOOLSET}" - CONFIGURE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - UPDATE_COMMAND "" - SOURCE_DIR @LLVM_INSTALL_ROOT@ - DOWNLOAD_NO_PROGRESS TRUE - ) - else() message(STATUS "LLVM: Building LLVM from source") diff --git a/src/ngraph/CMakeLists.txt b/src/ngraph/CMakeLists.txt index 96e7a0588..9cc34cc49 100644 --- a/src/ngraph/CMakeLists.txt +++ b/src/ngraph/CMakeLists.txt @@ -702,7 +702,7 @@ if(NGRAPH_LIB_VERSIONING_ENABLE) SOVERSION ${NGRAPH_API_VERSION}) endif() if(NGRAPH_JSON_ENABLE) - target_link_libraries(ngraph PRIVATE libjson) + # target_link_libraries(ngraph PRIVATE libjson) endif() target_compile_definitions(ngraph PUBLIC NGRAPH_VERSION="${NGRAPH_VERSION}") diff --git a/src/ngraph/codegen/CMakeLists.txt b/src/ngraph/codegen/CMakeLists.txt index c2af6e585..29327fcb0 100644 --- a/src/ngraph/codegen/CMakeLists.txt +++ b/src/ngraph/codegen/CMakeLists.txt @@ -39,8 +39,8 @@ endif() get_filename_component(CLANG_INTRIN_INCLUDE_DIR ${LLVM_INCLUDE_DIRS}/../lib/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include ABSOLUTE) if(NGRAPH_CPU_ENABLE) - get_target_property(MKLDNN_INCLUDE_DIR libmkldnn INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(EIGEN_INCLUDE_DIR libeigen INTERFACE_INCLUDE_DIRECTORIES) + #get_target_property(MKLDNN_INCLUDE_DIR libmkldnn INTERFACE_INCLUDE_DIRECTORIES) + #get_target_property(EIGEN_INCLUDE_DIR libeigen INTERFACE_INCLUDE_DIRECTORIES) list(APPEND HEADER_SEARCH_DEFINES EIGEN_HEADERS_PATH="${EIGEN_INCLUDE_DIR}") list(APPEND HEADER_SEARCH_DEFINES MKLDNN_HEADERS_PATH="${MKLDNN_INCLUDE_DIR}") endif() @@ -49,7 +49,7 @@ list(APPEND HEADER_SEARCH_DEFINES CLANG_BUILTIN_HEADERS_PATH="${CLANG_INTRIN_INC list(APPEND HEADER_SEARCH_DEFINES NGRAPH_HEADERS_PATH="${NGRAPH_INCLUDE_PATH}") if(NGRAPH_TBB_ENABLE) - get_target_property(TBB_INCLUDE_DIR libtbb INTERFACE_INCLUDE_DIRECTORIES) + #get_target_property(TBB_INCLUDE_DIR libtbb INTERFACE_INCLUDE_DIRECTORIES) list(APPEND HEADER_SEARCH_DEFINES TBB_HEADERS_PATH="${TBB_INCLUDE_DIR}") set_source_files_properties(compiler.cpp PROPERTIES COMPILE_DEFINITIONS "NGRAPH_TBB_ENABLE") endif() @@ -62,9 +62,9 @@ add_custom_target(header_resource DEPENDS resource_generator BYPRODUCTS ) -if (NGRAPH_CPU_ENABLE) - add_dependencies(header_resource ext_eigen libmkldnn) -endif() +#if (NGRAPH_CPU_ENABLE) +# add_dependencies(header_resource libmkldnn) +#endif() if(NGRAPH_LIB_VERSIONING_ENABLE) set_target_properties(codegen PROPERTIES @@ -73,7 +73,7 @@ if(NGRAPH_LIB_VERSIONING_ENABLE) endif() add_dependencies(codegen header_resource) if (NGRAPH_CPU_ENABLE) - add_dependencies(codegen libmkldnn libeigen) +# add_dependencies(codegen libmkldnn) if(LINUX) # --exclude-libs=ALL prevents symbols from statically-linked libraries (LLVM, in this case) # from being automatically exported @@ -81,5 +81,5 @@ if (NGRAPH_CPU_ENABLE) endif() endif() target_include_directories(codegen SYSTEM PRIVATE ${CMAKE_BINARY_DIR}) -target_link_libraries(codegen PRIVATE libllvm ngraph) +target_link_libraries(codegen PRIVATE clang-cpp LLVM ngraph) install(TARGETS codegen DESTINATION ${NGRAPH_INSTALL_LIB}) diff --git a/src/ngraph/runtime/cpu/CMakeLists.txt b/src/ngraph/runtime/cpu/CMakeLists.txt index 901e927cd..7dc3571d2 100644 --- a/src/ngraph/runtime/cpu/CMakeLists.txt +++ b/src/ngraph/runtime/cpu/CMakeLists.txt @@ -228,18 +228,18 @@ if (NGRAPH_CPU_ENABLE) target_compile_definitions(cpu_backend PRIVATE "NGRAPH_CPU_OPTIMIZE_${t}") endforeach() - add_dependencies(cpu_backend libmkldnn ext_eigen) - target_link_libraries(cpu_backend PUBLIC ngraph libmkldnn libmkl libeigen) + #add_dependencies(cpu_backend libmkldnn) + target_link_libraries(cpu_backend PUBLIC ngraph dnnl gomp) if (NGRAPH_JSON_ENABLE) - target_link_libraries(cpu_backend PUBLIC libjson) + #target_link_libraries(cpu_backend PUBLIC libjson) endif() if (NGRAPH_TBB_ENABLE) - target_link_libraries(cpu_backend PUBLIC libtbb) + target_link_libraries(cpu_backend PUBLIC tbb) endif() if (NOT NGRAPH_DEX_ONLY) target_link_libraries(cpu_backend PRIVATE codegen) endif() - target_include_directories(cpu_backend SYSTEM PUBLIC libmkldnn) + #target_include_directories(cpu_backend SYSTEM PUBLIC libmkldnn) if (NOT APPLE AND NOT MSVC) # CPU backend uses third-party libraries like Eigen that might be linked in and diff --git a/src/ngraph/runtime/cpu/mkldnn_emitter.cpp b/src/ngraph/runtime/cpu/mkldnn_emitter.cpp index 3ee88c5cd..511a36dda 100644 --- a/src/ngraph/runtime/cpu/mkldnn_emitter.cpp +++ b/src/ngraph/runtime/cpu/mkldnn_emitter.cpp @@ -66,7 +66,7 @@ MKLDNNEmitter::~MKLDNNEmitter() // To avoid memory leak in mkldnn, release any buffers that are not free'd yet. // https://software.intel.com/en-us/mkl-linux-developer-guide-avoiding-memory-leaks-in-intel-mkl // mkl_free_buffers() is not exposed at this point, hence using mkl_serv_free_buffers() - mkldnn_utils::mkl_serv_free_buffers(); + // mkldnn_utils::mkl_serv_free_buffers(); #endif } diff --git a/src/resource/CMakeLists.txt b/src/resource/CMakeLists.txt index 3ddef0804..a913f9d03 100644 --- a/src/resource/CMakeLists.txt +++ b/src/resource/CMakeLists.txt @@ -30,22 +30,22 @@ set (SRC ) add_executable(resource_generator EXCLUDE_FROM_ALL ${SRC}) -add_dependencies(resource_generator libllvm) +#add_dependencies(resource_generator libllvm) get_filename_component(CLANG_INTRIN_INCLUDE_DIR ${LLVM_INCLUDE_DIRS}/../lib/clang/${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}/include ABSOLUTE) list(APPEND HEADER_SEARCH_DEFINES CLANG_BUILTIN_HEADERS_PATH="${CLANG_INTRIN_INCLUDE_DIR}") list(APPEND HEADER_SEARCH_DEFINES NGRAPH_HEADERS_PATH="${NGRAPH_INCLUDE_PATH}") if(NGRAPH_CPU_ENABLE) - add_dependencies(resource_generator libmkldnn libeigen) - get_target_property(MKLDNN_INCLUDE_DIR libmkldnn INTERFACE_INCLUDE_DIRECTORIES) - get_target_property(EIGEN_INCLUDE_DIR libeigen INTERFACE_INCLUDE_DIRECTORIES) + #add_dependencies(resource_generator libmkldnn) + #get_target_property(MKLDNN_INCLUDE_DIR libmkldnn INTERFACE_INCLUDE_DIRECTORIES) + #get_target_property(EIGEN_INCLUDE_DIR libeigen INTERFACE_INCLUDE_DIRECTORIES) list(APPEND HEADER_SEARCH_DEFINES EIGEN_HEADERS_PATH="${EIGEN_INCLUDE_DIR}") list(APPEND HEADER_SEARCH_DEFINES MKLDNN_HEADERS_PATH="${MKLDNN_INCLUDE_DIR}") endif() if(NGRAPH_TBB_ENABLE) - add_dependencies(resource_generator libtbb) - get_target_property(TBB_INCLUDE_DIR libtbb INTERFACE_INCLUDE_DIRECTORIES) + #add_dependencies(resource_generator libtbb) + #get_target_property(TBB_INCLUDE_DIR libtbb INTERFACE_INCLUDE_DIRECTORIES) list(APPEND HEADER_SEARCH_DEFINES TBB_HEADERS_PATH="${TBB_INCLUDE_DIR}") endif() diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 0eb90b9b1..a7b6f9181 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -540,12 +540,12 @@ if(NGRAPH_ADDRESS_SANITIZER) endif() target_link_libraries(unit-test PRIVATE ngraph_test_util) -target_link_libraries(unit-test PRIVATE ngraph libgtest) +target_link_libraries(unit-test PRIVATE ngraph gtest) target_compile_definitions(unit-test PRIVATE NGRAPH_VERSION_LABEL="${NGRAPH_VERSION_LABEL}") -if (NGRAPH_JSON_ENABLE) - target_link_libraries(unit-test PRIVATE libjson) -endif() +#if (NGRAPH_JSON_ENABLE) +# target_link_libraries(unit-test PRIVATE libjson) +#endif() if(NOT WIN32) target_link_libraries(unit-test PRIVATE pthread) endif() diff --git a/test/util/CMakeLists.txt b/test/util/CMakeLists.txt index 5fd2e063a..a24d6b3f5 100644 --- a/test/util/CMakeLists.txt +++ b/test/util/CMakeLists.txt @@ -34,8 +34,8 @@ if(NGRAPH_LIB_VERSIONING_ENABLE) VERSION ${NGRAPH_VERSION}) endif() target_include_directories(ngraph_test_util PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..) -target_link_libraries(ngraph_test_util PRIVATE ngraph libgtest) -add_dependencies(ngraph_test_util ext_gtest) +target_link_libraries(ngraph_test_util PRIVATE ngraph gtest) +#add_dependencies(ngraph_test_util ext_gtest) if (NGRAPH_UNIT_TEST_OPENVINO_ENABLE) add_definitions(-DNGRAPH_UNIT_TEST_OPENVINO_ENABLE)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
