Skip to content

Openvino autogenerated cmake#5484

Merged
azhogov merged 27 commits intoopenvinotoolkit:masterfrom
ilya-lavrenov:openvino-cmake-versioning
May 7, 2021
Merged

Openvino autogenerated cmake#5484
azhogov merged 27 commits intoopenvinotoolkit:masterfrom
ilya-lavrenov:openvino-cmake-versioning

Conversation

@ilya-lavrenov
Copy link
Copy Markdown
Contributor

@ilya-lavrenov ilya-lavrenov commented May 1, 2021 •
edited
Loading

Details:

  • Export targets from OpenVINO build tree during install commands
  • Generate InferenceEngineConfig.cmake based on that

Tickets:

@ilya-lavrenov ilya-lavrenov changed the title Openvino cmake versioning Openvino autogenerated cmake May 1, 2021
@ilya-lavrenov ilya-lavrenov force-pushed the openvino-cmake-versioning branch from 8efd80f to f4f4e98 Compare May 2, 2021 08:22
ilya-lavrenov added 16 commits May 2, 2021 13:00
@ilya-lavrenov ilya-lavrenov force-pushed the openvino-cmake-versioning branch 2 times, most recently from 7868b4c to f575a8c Compare May 3, 2021 10:23
@ilya-lavrenov ilya-lavrenov marked this pull request as ready for review May 3, 2021 11:56
@ilya-lavrenov ilya-lavrenov requested a review from ilyachur as a code owner May 3, 2021 11:56
@ilya-lavrenov ilya-lavrenov requested review from a team May 3, 2021 11:56
@ilya-lavrenov ilya-lavrenov requested a review from a team as a code owner May 3, 2021 11:56
@ilya-lavrenov ilya-lavrenov requested review from a team May 3, 2021 11:56
@ilya-lavrenov ilya-lavrenov added this to the 2021.4 milestone May 3, 2021
@ilya-lavrenov ilya-lavrenov added the category: build OpenVINO cmake script / infra label May 3, 2021
@ilya-lavrenov ilya-lavrenov self-assigned this May 3, 2021
@ilya-lavrenov ilya-lavrenov requested review from alalek and vinograd47 May 3, 2021 12:02
@ilya-lavrenov ilya-lavrenov mentioned this pull request May 3, 2021
Merged
6 tasks
@ilya-lavrenov ilya-lavrenov requested a review from slyubimt May 5, 2021 16:47
@azhogov
Copy link
Copy Markdown

azhogov commented May 7, 2021

CI passed: https://gitlab-icv.inn.intel.com/inference-engine/product-configs/merge_requests/1679

@azhogov azhogov merged commit 349e291 into openvinotoolkit:master May 7, 2021
@yeonbok
Copy link
Copy Markdown
Contributor

yeonbok commented May 11, 2021

After merging this patch, mkldnn and cldnn cannot be built from local. Seems that the building script is different from when it is done in local and being built with CI script.. Could you please check from local build? I used this cmake command: "cmake -DENABLE_PYTHON=ON -DENABLE_MKL_DNN=ON -DENABLE_TESTS=ON -DENABLE_BEH_TESTS=OFF -DENABLE_FUNCTIONAL_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DENABLE_CLDNN=ON -DENABLE_MYRIAD=OFF -DENABLE_CLDNN_TESTS=ON .. "

@ilya-lavrenov ilya-lavrenov deleted the openvino-cmake-versioning branch May 11, 2021 07:14
@ilya-lavrenov
Copy link
Copy Markdown
Contributor Author

ilya-lavrenov commented May 11, 2021

@yeonbok looks like the difference in ENABLE_CLDNN_TESTS. I managed to reproduce the problem, here is a fix.
I wonder how this patch broke internal tests, are you sure they were compilable before?

Thanks for letting know about the issue.

Ilya.

yeonbok added a commit to yeonbok/openvino that referenced this pull request May 12, 2021
@yeonbok
Revert "Openvino autogenerated cmake (openvinotoolkit#5484)"
1a2835d 
This reverts commit 349e291.
ghost pushed a commit to yeonbok/openvino that referenced this pull request May 12, 2021
Revert "Openvino autogenerated cmake (openvinotoolkit#5484)"
1954774 
This reverts commit 349e291.
mshabunin
mshabunin reviewed May 13, 2021
View reviewed changes
inference-engine/cmake/templates/InferenceEngineConfig.cmake.in
if(THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO")
set_and_check(_tbb_dir "@PACKAGE_IE_TBB_DIR@")
find_dependency(TBB
COMPONENTS tbb tbbmalloc
Copy link
Copy Markdown
Contributor

@mshabunin mshabunin May 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like COMPONENTS argument did not work until cmake 3.9.0:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@GlebKazantaev GlebKazantaev Awaiting requested review from GlebKazantaev

@ilyachur ilyachur Awaiting requested review from ilyachur

@vinograd47 vinograd47 Awaiting requested review from vinograd47

@alalek alalek Awaiting requested review from alalek

@slyubimt slyubimt Awaiting requested review from slyubimt

1 more reviewer

@mshabunin mshabunin mshabunin left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@ilya-lavrenov ilya-lavrenov

Labels

category: build OpenVINO cmake script / infra

Projects

None yet

Milestone

2021.4

Development

Successfully merging this pull request may close these issues.

4 participants

@ilya-lavrenov @azhogov @yeonbok @mshabunin