diff --git a/.ci/openvino-onnx/Dockerfile b/.ci/openvino-onnx/Dockerfile index 40f62f3cbea..954b1634ed2 100644 --- a/.ci/openvino-onnx/Dockerfile +++ b/.ci/openvino-onnx/Dockerfile @@ -75,8 +75,8 @@ RUN make -j $(nproc) install # Run tests via tox WORKDIR /openvino/ngraph/python -ENV NGRAPH_CPP_BUILD_PATH=/openvino/dist -ENV LD_LIBRARY_PATH=/openvino/dist/lib +ENV NGRAPH_CPP_BUILD_PATH=/openvino/dist/deployment_tools/ngraph +ENV LD_LIBRARY_PATH=/openvino/dist/deployment_tools/ngraph/lib ENV NGRAPH_ONNX_IMPORT_ENABLE=TRUE ENV PYTHONPATH=/openvino/bin/intel64/Release/lib/python_api/python3.8:${PYTHONPATH} RUN git clone --recursive https://github.com/pybind/pybind11.git -b v2.5.0 --depth 1 diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c3585a3e96..d6bf93044b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,7 +114,7 @@ function(build_ngraph) ie_cpack_add_component(ngraph) set(SDL_cmake_included ON) - # set(NGRAPH_COMPONENT_PREFIX "deployment_tools/ngraph/") + set(NGRAPH_COMPONENT_PREFIX "deployment_tools/ngraph/") add_subdirectory(ngraph) set(NGRAPH_LIBRARIES ngraph PARENT_SCOPE) endfunction() diff --git a/inference-engine/cmake/dependencies.cmake b/inference-engine/cmake/dependencies.cmake index 1cf5464ac92..4c1a7ff18d1 100644 --- a/inference-engine/cmake/dependencies.cmake +++ b/inference-engine/cmake/dependencies.cmake @@ -126,6 +126,13 @@ if (THREADING STREQUAL "OMP") update_deps_cache(OMP "${OMP}" "Path to OMP root folder") log_rpath_from_dir(OMP "${OMP}/lib") debug_message(STATUS "intel_omp=" ${OMP}) + + ie_cpack_add_component(omp) + file(GLOB_RECURSE source_list "${OMP}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*") + install(FILES ${source_list} + DESTINATION "deployment_tools/inference_engine/external/omp/lib" + COMPONENT omp) + endif () ## TBB package diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt index c85590d034d..3665310b971 100644 --- a/inference-engine/samples/CMakeLists.txt +++ b/inference-engine/samples/CMakeLists.txt @@ -121,7 +121,7 @@ set (BUILD_TESTING OFF) if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags") function(add_gflags) set(BUILD_SHARED_LIBS OFF) - add_subdirectory(thirdparty/gflags) + add_subdirectory(thirdparty/gflags EXCLUDE_FROM_ALL) set_target_properties(gflags_nothreads_static PROPERTIES FOLDER thirdparty) endfunction() add_gflags() diff --git a/inference-engine/src/gna_plugin/CMakeLists.txt b/inference-engine/src/gna_plugin/CMakeLists.txt index f5625436e66..c01325c06cd 100644 --- a/inference-engine/src/gna_plugin/CMakeLists.txt +++ b/inference-engine/src/gna_plugin/CMakeLists.txt @@ -69,6 +69,7 @@ set_target_properties(${TARGET_NAME} ${TARGET_NAME}_test_static # install -install(FILES "${GNA_KERNEL_LIBRARY}" - DESTINATION ${IE_CPACK_IE_DIR}/external/gna/lib +file(GLOB_RECURSE source_list "${libGNA_LIBRARIES_BASE_PATH}/*${CMAKE_SHARED_LIBRARY_SUFFIX}*") +install(FILES ${source_list} + DESTINATION ${IE_CPACK_IE_DIR}/external/gna/lib COMPONENT gna) diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt index e36931925c9..6dee3f11890 100644 --- a/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt +++ b/inference-engine/tests/ie_test_utils/common_test_utils/CMakeLists.txt @@ -15,7 +15,7 @@ function(add_gtest_libraries) endif () set(BUILD_SHARED_LIBS OFF) - add_subdirectory(gtest) + add_subdirectory(gtest EXCLUDE_FROM_ALL) get_target_property(gtest_include_dirs gtest INTERFACE_INCLUDE_DIRECTORIES) set_target_properties(gtest PROPERTIES INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${gtest_include_dirs}") diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt index 9185fcd4787..cd35228121f 100644 --- a/inference-engine/thirdparty/CMakeLists.txt +++ b/inference-engine/thirdparty/CMakeLists.txt @@ -50,7 +50,7 @@ function(ie_build_pugixml) set(BUILD_TESTS_current ${BUILD_TESTS}) set(BUILD_TESTS OFF CACHE BOOL "Build tests" FORCE) set(BUILD_SHARED_LIBS OFF) - add_subdirectory(pugixml) + add_subdirectory(pugixml EXCLUDE_FROM_ALL) set(BUILD_TESTS ${BUILD_TESTS_current} CACHE BOOL "Build tests" FORCE) endfunction() @@ -63,7 +63,7 @@ else() endif() add_subdirectory(stb_lib) -add_subdirectory(ade) +add_subdirectory(ade EXCLUDE_FROM_ALL) add_subdirectory(fluid/modules/gapi) set_target_properties(ade fluid stb_image PROPERTIES FOLDER thirdparty) diff --git a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt index 6a223b38ff1..3872a70ae3f 100644 --- a/inference-engine/thirdparty/clDNN/src/CMakeLists.txt +++ b/inference-engine/thirdparty/clDNN/src/CMakeLists.txt @@ -172,20 +172,3 @@ elseif((NOT ANDROID) AND (UNIX)) target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE pthread) endif() target_link_libraries("${CLDNN_BUILD__PROJ}" PRIVATE ${CLDNN__SYSTEM_LINK_LIBRARIES}) - -# ========================================== Installation ============================================== - -# API headers. -install(DIRECTORY "${CLDNN__API_DIR}/" - DESTINATION "include/clDNN" - FILE_PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ - ) -# Binaries. -install(TARGETS "${CLDNN_BUILD__PROJ}" - ARCHIVE DESTINATION "lib" - LIBRARY DESTINATION "lib" - RUNTIME DESTINATION "bin" - INCLUDES DESTINATION "include/clDNN" - ) - -# ====================================================================================================== diff --git a/inference-engine/tools/compile_tool/README.md b/inference-engine/tools/compile_tool/README.md index 1c3c48cb811..4bda89a94bc 100644 --- a/inference-engine/tools/compile_tool/README.md +++ b/inference-engine/tools/compile_tool/README.md @@ -2,8 +2,7 @@ The Compile tool is a C++ application that enables you to dump a loaded executable network blob. The tool is delivered as an executable file that can be run on both Linux\* and Windows\*. -The tool is located in the `/deployment_tools/inference_engine/lib/intel64/` directory on Linux -and `` on Windows. +The tool is located in the `/deployment_tools/tools/compile_tool` directory. The workflow of the Compile tool is as follows: diff --git a/scripts/setupvars/setupvars.bat b/scripts/setupvars/setupvars.bat index 4ba1b0dffa8..4c4bb5b99b2 100644 --- a/scripts/setupvars/setupvars.bat +++ b/scripts/setupvars/setupvars.bat @@ -38,7 +38,13 @@ set "PATH=%INTEL_OPENVINO_DIR%\deployment_tools\model_optimizer;%PATH%" :: Inference Engine set "InferenceEngine_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\share" set "HDDL_INSTALL_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\external\hddl" -set "PATH=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\external\tbb\bin;%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\Release;%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\Debug;%HDDL_INSTALL_DIR%\bin;%PATH%" +set "OPENMP_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\external\omp\lib" +set "GNA_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\external\gna\lib" + +set "PATH=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\external\tbb\bin;%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\Release;%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\Debug;%HDDL_INSTALL_DIR%\bin;%OPENMP_DIR%;%GNA_DIR%;%PATH%" +if exist %INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\arch_descriptions ( +set ARCH_ROOT_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\arch_descriptions +) if exist %INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\arch_descriptions ( set ARCH_ROOT_DIR=%INTEL_OPENVINO_DIR%\deployment_tools\inference_engine\bin\intel64\arch_descriptions ) diff --git a/scripts/setupvars/setupvars.sh b/scripts/setupvars/setupvars.sh index 03ec42b22d0..d9beeb3e971 100755 --- a/scripts/setupvars/setupvars.sh +++ b/scripts/setupvars/setupvars.sh @@ -51,10 +51,10 @@ if [ -e "$INSTALLDIR/deployment_tools/inference_engine" ]; then export HDDL_INSTALL_DIR=$INSTALLDIR/deployment_tools/inference_engine/external/hddl if [[ "$OSTYPE" == "darwin"* ]]; then - export DYLD_LIBRARY_PATH=$INSTALLDIR/deployment_tools/inference_engine/external/mkltiny_mac/lib:$INSTALLDIR/deployment_tools/inference_engine/external/tbb/lib:${IE_PLUGINS_PATH}${DYLD_LIBRARY_PATH:+:DYLD_LIBRARY_PATH} - export LD_LIBRARY_PATH=$INSTALLDIR/deployment_tools/inference_engine/external/mkltiny_mac/lib:$INSTALLDIR/deployment_tools/inference_engine/external/tbb/lib:${IE_PLUGINS_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + export DYLD_LIBRARY_PATH=$INSTALLDIR/deployment_tools/inference_engine/external/omp/lib:$INSTALLDIR/deployment_tools/inference_engine/external/mkltiny_mac/lib:$INSTALLDIR/deployment_tools/inference_engine/external/tbb/lib:${IE_PLUGINS_PATH}${DYLD_LIBRARY_PATH:+:DYLD_LIBRARY_PATH} + export LD_LIBRARY_PATH=$INSTALLDIR/deployment_tools/inference_engine/external/omp/lib:$INSTALLDIR/deployment_tools/inference_engine/external/mkltiny_mac/lib:$INSTALLDIR/deployment_tools/inference_engine/external/tbb/lib:${IE_PLUGINS_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} else - export LD_LIBRARY_PATH=$HDDL_INSTALL_DIR/lib:$INSTALLDIR/deployment_tools/inference_engine/external/gna/lib:$INSTALLDIR/deployment_tools/inference_engine/external/mkltiny_lnx/lib:$INSTALLDIR/deployment_tools/inference_engine/external/tbb/lib:${IE_PLUGINS_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} + export LD_LIBRARY_PATH=$HDDL_INSTALL_DIR/lib:$INSTALLDIR/deployment_tools/inference_engine/external/omp/lib:$INSTALLDIR/deployment_tools/inference_engine/external/gna/lib:$INSTALLDIR/deployment_tools/inference_engine/external/mkltiny_lnx/lib:$INSTALLDIR/deployment_tools/inference_engine/external/tbb/lib:${IE_PLUGINS_PATH}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} fi HDDL_UNITE_DIR=$INSTALLDIR/deployment_tools/inference_engine/external/hddl_unite