CMake installation rules for 3rd party components #2944
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
slyubimt
changed the title
openvino-pushbot
added
category: CI
|
|
||
| if(WIN32) | ||
| file(GLOB_RECURSE source_list "${OMP}/*.dll") | ||
| elseif(LINUX OR APPLE) |
There was a problem hiding this comment.
LINUX OR APPLE -> UNIX
There was a problem hiding this comment.
The proper way is to use https://cmake.org/cmake/help/v3.0/variable/CMAKE_SHARED_LIBRARY_SUFFIX.html to have an unified code here.
There was a problem hiding this comment.
BTW, we don't ship packages with OMP.
|
|
||
| install(DIRECTORY ${OPENCV}/../python/ | ||
| DESTINATION python | ||
| COMPONENT opencv) |
There was a problem hiding this comment.
Agree, this version is usually a bit outdated. But it's convenient to have it in the package to run samples.
There was a problem hiding this comment.
We should install ALL components that a part of package now, and resolve other issues step by step...
1st priority - no actions out of CMake for preparing FULL package.
| 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} |
There was a problem hiding this comment.
@AlexPeskov @dmitry-gorokhov do we still need mkltiny_mac here?
| install(FILES ${source_list} DESTINATION ${IE_CPACK_RUNTIME_PATH}) | ||
| elseif(LINUX) | ||
| file(GLOB_RECURSE source_list "${GNA}/*.so*") | ||
| install(FILES ${source_list} DESTINATION "deployment_tools/inference_engine/external/gna/lib") |
There was a problem hiding this comment.
align GNA Windows install path with Linux
ilya-lavrenov
approved these changes
Nov 5, 2020
|
@slyubimt please, merge with latest master to make CI green. |
|
@slyubimt please, make CI green |
…stall_3rdparty # Conflicts: # inference-engine/samples/CMakeLists.txt # inference-engine/thirdparty/CMakeLists.txt
add explicitly clDNN_unit_tests target to build
|
ci/jenkins green status: https://openvino-ci.intel.com/job/private-ci/job/gitlab_precommit/18232/ |
azhogov
approved these changes
Nov 30, 2020
evolosen
pushed a commit
to evolosen/openvino
that referenced
this pull request
Dec 3, 2020
* [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * Add CMake install rules for OpenVINO 3rd party dependencies Remove unwanted targets from final distribution (test, static libs, etc) * remove duplicated targets from install align GNA Windows install path with Linux * Add COMPONENT install name for OMP remove empty lines * Add OMP to CPack components * remove gtest from deliverables add explicitly clDNN_unit_tests target to build * set clDNN_unit_tests properties only by condition * remove install commands for clDNN Co-authored-by: Alexander Zhogov <[email protected]>
mryzhov
pushed a commit
to mryzhov/openvino
that referenced
this pull request
Dec 11, 2020
* [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * Add CMake install rules for OpenVINO 3rd party dependencies Remove unwanted targets from final distribution (test, static libs, etc) * remove duplicated targets from install align GNA Windows install path with Linux * Add COMPONENT install name for OMP remove empty lines * Add OMP to CPack components * remove gtest from deliverables add explicitly clDNN_unit_tests target to build * set clDNN_unit_tests properties only by condition * remove install commands for clDNN Co-authored-by: Alexander Zhogov <[email protected]>
mryzhov
pushed a commit
to mryzhov/openvino
that referenced
this pull request
Dec 16, 2020
* [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * Add CMake install rules for OpenVINO 3rd party dependencies Remove unwanted targets from final distribution (test, static libs, etc) * remove duplicated targets from install align GNA Windows install path with Linux * Add COMPONENT install name for OMP remove empty lines * Add OMP to CPack components * remove gtest from deliverables add explicitly clDNN_unit_tests target to build * set clDNN_unit_tests properties only by condition * remove install commands for clDNN Co-authored-by: Alexander Zhogov <[email protected]>
mryzhov
pushed a commit
to mryzhov/openvino
that referenced
this pull request
Jan 14, 2021
* [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * Add CMake install rules for OpenVINO 3rd party dependencies Remove unwanted targets from final distribution (test, static libs, etc) * remove duplicated targets from install align GNA Windows install path with Linux * Add COMPONENT install name for OMP remove empty lines * Add OMP to CPack components * remove gtest from deliverables add explicitly clDNN_unit_tests target to build * set clDNN_unit_tests properties only by condition * remove install commands for clDNN Co-authored-by: Alexander Zhogov <[email protected]>
jiwaszki
pushed a commit
to akuporos/openvino
that referenced
this pull request
Jan 15, 2021
* [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * Add CMake install rules for OpenVINO 3rd party dependencies Remove unwanted targets from final distribution (test, static libs, etc) * remove duplicated targets from install align GNA Windows install path with Linux * Add COMPONENT install name for OMP remove empty lines * Add OMP to CPack components * remove gtest from deliverables add explicitly clDNN_unit_tests target to build * set clDNN_unit_tests properties only by condition * remove install commands for clDNN Co-authored-by: Alexander Zhogov <[email protected]>
tadamowicz
pushed a commit
to tadamowicz/openvino
that referenced
this pull request
Aug 30, 2023
* [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * [MO] Add CMake install for Model Optimizer * [MO] Update test for version.py * Add CMake install rules for OpenVINO 3rd party dependencies Remove unwanted targets from final distribution (test, static libs, etc) * remove duplicated targets from install align GNA Windows install path with Linux * Add COMPONENT install name for OMP remove empty lines * Add OMP to CPack components * remove gtest from deliverables add explicitly clDNN_unit_tests target to build * set clDNN_unit_tests properties only by condition * remove install commands for clDNN Co-authored-by: Alexander Zhogov <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add CMake install rules for OpenVINO 3rd party dependencies
Remove unwanted targets from final distribution (test, static libs, etc.)