From aace40f163ae40ab7e7e6e73c98df77e270df6fd Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Mon, 12 Apr 2021 17:25:56 -0700 Subject: [PATCH] Fix submodules --- cmake/external/ngraph.cmake | 109 ---------------------------------- cmake/external/openvino.cmake | 107 --------------------------------- 2 files changed, 216 deletions(-) delete mode 100644 cmake/external/ngraph.cmake delete mode 100644 cmake/external/openvino.cmake diff --git a/cmake/external/ngraph.cmake b/cmake/external/ngraph.cmake deleted file mode 100644 index 1a84fac64d..0000000000 --- a/cmake/external/ngraph.cmake +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright(C) 2019 Intel Corporation -# Licensed under the MIT License - -include (ExternalProject) - -set(ngraph_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/ngraph) -set(ngraph_INSTALL_DIR ${ngraph_ROOT_DIR}) -set(ngraph_INCLUDE_DIRS ${ngraph_INSTALL_DIR}/include) -set(ngraph_LIBRARIES ${ngraph_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}) -set(ngraph_SRC ${CMAKE_CURRENT_BINARY_DIR}/ngraph/src/project_ngraph) -set(prebuilt_ONNX_SOURCE_DIR "${PROJECT_SOURCE_DIR}/external/onnx") -set(prebuilt_ONNX_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}") -set(ngraph_URL "https://github.com/NervanaSystems/ngraph.git") -set(ngraph_TAG "v0.26.0") - -# Libraries for python package. -if (WIN32) - set(NGRAPH_SHARED_LIB ngraph.dll) - set(NGRAPH_CPU_BACKEND_SHARED_LIB cpu_backend.dll) - set(NGRAPH_IOMP5MD_SHARED_LIB libiomp5md.dll) - set(NGRAPH_MKLDNN_SHARED_LIB mkldnn.dll) - set(NGRAPH_MKLML_SHARED_LIB mklml.dll) - if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") - set(NGRAPH_TBB_SHARED_LIB tbb_debug.dll) - else() - set(NGRAPH_TBB_SHARED_LIB tbb.dll) - endif() -else() - set(NGRAPH_SHARED_LIB libngraph.so) - set(NGRAPH_CODEGEN_SHARED_LIB libcodegen.so) - set(NGRAPH_CPU_BACKEND_SHARED_LIB libcpu_backend.so) - set(NGRAPH_IOMP5MD_SHARED_LIB libiomp5.so) - set(NGRAPH_MKLDNN_SHARED_LIB libmkldnn.so) - set(NGRAPH_MKLML_SHARED_LIB libmklml_intel.so) - if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") - set(NGRAPH_TBB_SHARED_LIB libtbb_debug.so) - set(NGRAPH_TBB_SHARED_LIB_2 libtbb_debug.so.2) - else() - set(NGRAPH_TBB_SHARED_LIB libtbb.so) - set(NGRAPH_TBB_SHARED_LIB_2 libtbb.so.2) - endif() -endif() - -# discard prior changes due to unblock incremental builds. -set(NGRAPH_PATCH_DISCARD_COMMAND cd ${ngraph_SRC} && git reset HEAD --hard && git clean -fx) - -if (MSVC) - # For the moment, Windows does not support codegen, it works on DEX-only mode - ExternalProject_Add(project_ngraph - PREFIX ngraph - GIT_REPOSITORY ${ngraph_URL} - GIT_TAG ${ngraph_TAG} - GIT_SHALLOW TRUE - GIT_CONFIG core.autocrlf=input - PATCH_COMMAND ${NGRAPH_PATCH_DISCARD_COMMAND} - COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/patches/ngraph/ngraph_onnx.cmake ${ngraph_SRC}/cmake/external_onnx.cmake - COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/ngraph/ngraph_protobuf.patch - COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/ngraph/dnnl_v1.patch - CMAKE_ARGS - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DNGRAPH_DEX_ONLY=ON - -DNGRAPH_USE_SYSTEM_PROTOBUF=FALSE - -DNGRAPH_ONNX_IMPORT_ENABLE=TRUE - -DNGRAPH_INTERPRETER_ENABLE=FALSE - -DNGRAPH_ONNXIFI_ENABLE=FALSE - -DNGRAPH_UNIT_TEST_ENABLE=FALSE - -DNGRAPH_TOOLS_ENABLE=FALSE - -DNGRAPH_USE_LEGACY_MKLDNN=FALSE - -DCMAKE_INSTALL_PREFIX=${ngraph_INSTALL_DIR} - -Dprebuilt_ONNX_BINARY_DIR=${prebuilt_ONNX_BINARY_DIR} - -Dprebuilt_ONNX_SOURCE_DIR=${prebuilt_ONNX_SOURCE_DIR} - DEPENDS onnx - ) - add_library(ngraph SHARED IMPORTED) - set_property(TARGET ngraph PROPERTY IMPORTED_LOCATION ${ngraph_LIBRARIES}/${NGRAPH_SHARED_LIB}) - set_property(TARGET ngraph PROPERTY IMPORTED_IMPLIB ${ngraph_LIBRARIES}/ngraph.lib) -else() - ExternalProject_Add(project_ngraph - PREFIX ngraph - GIT_REPOSITORY ${ngraph_URL} - GIT_TAG ${ngraph_TAG} - GIT_SHALLOW TRUE - PATCH_COMMAND ${NGRAPH_PATCH_DISCARD_COMMAND} - # Here we use onnx and protobuf built by onnxruntime to avoid linking with incompatible libraries. This might change in future. - COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/patches/ngraph/ngraph_onnx.cmake ${ngraph_SRC}/cmake/external_onnx.cmake - # TODO: Use cmake.file+copy as above. - COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/ngraph/ngraph_protobuf.patch - COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/ngraph/dnnl_v1.patch - CMAKE_ARGS - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DNGRAPH_USE_PREBUILT_LLVM=TRUE - -DNGRAPH_USE_SYSTEM_PROTOBUF=FALSE - -DNGRAPH_ONNX_IMPORT_ENABLE=TRUE - -DNGRAPH_INTERPRETER_ENABLE=FALSE - -DNGRAPH_ONNXIFI_ENABLE=FALSE - -DNGRAPH_UNIT_TEST_ENABLE=FALSE - -DNGRAPH_TOOLS_ENABLE=FALSE - -DNGRAPH_USE_LEGACY_MKLDNN=FALSE - -DCMAKE_INSTALL_PREFIX=${ngraph_INSTALL_DIR} - -Dprebuilt_ONNX_BINARY_DIR=${prebuilt_ONNX_BINARY_DIR} - -Dprebuilt_ONNX_SOURCE_DIR=${prebuilt_ONNX_SOURCE_DIR} - DEPENDS onnx - ) - - add_library(ngraph SHARED IMPORTED) - set_property(TARGET ngraph PROPERTY IMPORTED_LOCATION ${ngraph_LIBRARIES}/${NGRAPH_SHARED_LIB}) -endif() -add_dependencies(ngraph project_ngraph) -include_directories(${ngraph_INCLUDE_DIRS}) diff --git a/cmake/external/openvino.cmake b/cmake/external/openvino.cmake deleted file mode 100644 index 3cdb8cd758..0000000000 --- a/cmake/external/openvino.cmake +++ /dev/null @@ -1,107 +0,0 @@ -# Copyright(C) 2019 Intel Corporation -# Licensed under the MIT License - -include (ExternalProject) - -set(ngraph_ROOT_DIR ${CMAKE_CURRENT_BINARY_DIR}/external/ngraph) -set(ngraph_INSTALL_DIR ${ngraph_ROOT_DIR}) -set(ngraph_INCLUDE_DIRS ${ngraph_INSTALL_DIR}/include) -set(ngraph_LIBRARIES ${ngraph_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}) -set(ngraph_SRC ${CMAKE_CURRENT_BINARY_DIR}/ngraph/src/project_ngraph) -set(prebuilt_ONNX_SOURCE_DIR "${PROJECT_SOURCE_DIR}/external/onnx") -set(prebuilt_ONNX_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}") -set(ngraph_URL "https://github.com/NervanaSystems/ngraph.git") -set(ngraph_TAG "edc65ca0111f86a7e63a98f62cb17d153cc2535c") - -# Libraries for python package. -if (WIN32) - set(NGRAPH_SHARED_LIB ovep_ngraph.dll) -else() - set(NGRAPH_SHARED_LIB libovep_ngraph.so) -endif() - -# discard prior changes due to unblock incremental builds. -set(NGRAPH_CHANGE_DIR_COMMAND cd ${ngraph_SRC}) - -if (MSVC) - # For the moment, Windows does not support codegen, it works on DEX-only mode - ExternalProject_Add(project_ngraph - PREFIX ngraph - GIT_REPOSITORY ${ngraph_URL} - GIT_TAG ${ngraph_TAG} - GIT_SHALLOW TRUE - GIT_CONFIG core.autocrlf=input - PATCH_COMMAND ${NGRAPH_CHANGE_DIR_COMMAND} - COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/patches/openvino/ngraph_onnx.cmake ${ngraph_SRC}/cmake/external_onnx.cmake - COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/openvino/ngraph_protobuf.patch - COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/openvino/lib_name.patch - CMAKE_ARGS - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DNGRAPH_ONNX_IMPORT_ENABLE=TRUE - -DNGRAPH_JSON_ENABLE=FALSE - -DNGRAPH_USE_SYSTEM_PROTOBUF=FALSE - -DNGRAPH_UNIT_TEST_ENABLE=FALSE - -DNGRAPH_TEST_UTIL_ENABLE=FALSE - -DNGRAPH_TOOLS_ENABLE=FALSE - -DNGRAPH_CPU_ENABLE=FALSE - -DNGRAPH_INTERPRETER_ENABLE=FALSE - -DNGRAPH_NOP_ENABLE=FALSE - -DNGRAPH_GPU_ENABLE=FALSE - -DNGRAPH_GENERIC_CPU_ENABLE=FALSE - -DNGRAPH_PLAIDML_ENABLE=FALSE - -DNGRAPH_ENABLE_CPU_CONV_AUTO=FALSE - -DNGRAPH_PYTHON_BUILD_ENABLE=FALSE - -DNGRAPH_FAST_MATH_ENABLE=FALSE - -DNGRAPH_DYNAMIC_COMPONENTS_ENABLE=FALSE - -DNGRAPH_NATIVE_ARCH_ENABLE=FALSE - -DCMAKE_INSTALL_PREFIX=${ngraph_INSTALL_DIR} - -Dprebuilt_ONNX_BINARY_DIR=${prebuilt_ONNX_BINARY_DIR} - -Dprebuilt_ONNX_SOURCE_DIR=${prebuilt_ONNX_SOURCE_DIR} - DEPENDS onnx - ) - add_library(ovep_ngraph SHARED IMPORTED) - set_property(TARGET ovep_ngraph PROPERTY IMPORTED_LOCATION ${ngraph_LIBRARIES}/${NGRAPH_SHARED_LIB}) - set_property(TARGET ovep_ngraph PROPERTY IMPORTED_IMPLIB ${ngraph_LIBRARIES}/ovep_ngraph.lib) - -else() - ExternalProject_Add(project_ngraph - PREFIX ngraph - GIT_REPOSITORY ${ngraph_URL} - GIT_TAG ${ngraph_TAG} - GIT_SHALLOW TRUE - PATCH_COMMAND ${NGRAPH_CHANGE_DIR_COMMAND} - # Here we use onnx and protobuf built by onnxruntime to avoid linking with incompatible libraries. This might change in future. - COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/patches/openvino/ngraph_onnx.cmake ${ngraph_SRC}/cmake/external_onnx.cmake - # TODO: Use cmake.file+copy as above. - COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/openvino/ngraph_protobuf.patch - COMMAND git apply --ignore-space-change --ignore-whitespace ${PROJECT_SOURCE_DIR}/patches/openvino/lib_name.patch - CMAKE_ARGS - -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - -DNGRAPH_ONNX_IMPORT_ENABLE=TRUE - -DNGRAPH_JSON_ENABLE=FALSE - -DNGRAPH_USE_SYSTEM_PROTOBUF=FALSE - -DNGRAPH_UNIT_TEST_ENABLE=FALSE - -DNGRAPH_TEST_UTIL_ENABLE=FALSE - -DNGRAPH_TOOLS_ENABLE=FALSE - -DNGRAPH_CPU_ENABLE=FALSE - -DNGRAPH_INTERPRETER_ENABLE=FALSE - -DNGRAPH_NOP_ENABLE=FALSE - -DNGRAPH_GPU_ENABLE=FALSE - -DNGRAPH_GENERIC_CPU_ENABLE=FALSE - -DNGRAPH_PLAIDML_ENABLE=FALSE - -DNGRAPH_ENABLE_CPU_CONV_AUTO=FALSE - -DNGRAPH_PYTHON_BUILD_ENABLE=FALSE - -DNGRAPH_FAST_MATH_ENABLE=FALSE - -DNGRAPH_DYNAMIC_COMPONENTS_ENABLE=FALSE - -DNGRAPH_NATIVE_ARCH_ENABLE=FALSE - -DCMAKE_INSTALL_PREFIX=${ngraph_INSTALL_DIR} - -Dprebuilt_ONNX_BINARY_DIR=${prebuilt_ONNX_BINARY_DIR} - -Dprebuilt_ONNX_SOURCE_DIR=${prebuilt_ONNX_SOURCE_DIR} - DEPENDS onnx - ) - - add_library(ovep_ngraph SHARED IMPORTED) - set_property(TARGET ovep_ngraph PROPERTY IMPORTED_LOCATION ${ngraph_LIBRARIES}/${NGRAPH_SHARED_LIB}) -endif() -add_dependencies(ovep_ngraph project_ngraph) -include_directories(${ngraph_INCLUDE_DIRS})