Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OpenCV] update to v4.5 and to v3.4.12 #15162

Merged
merged 32 commits into from
Jan 22, 2021

Conversation

cenit
Copy link
Contributor

@cenit cenit commented Dec 16, 2020

Update OpenCV to v4.5 (and v3.4.12)

Depends on: #15089
Fixes: #15479
Fixes: #15146
Fixes: #15108
Fixes: #15055
Fixes: #14368
Closes: #14118 (superseded, abandoned?)
Fixes: #13565
Fixes: #13098
Fixes: #13077
Fixes: #12740
Fixes: #12620
Fixes: #12587
Fixes: #11875

@cenit cenit changed the title Dev/cenit/opencv45 [OpenCV] update to v4.5 and to v3.4.12 Dec 16, 2020
@NancyLi1013 NancyLi1013 added the category:port-update The issue is with a library, which is requesting update new revision label Dec 17, 2020
@JackBoosY
Copy link
Contributor

Please consider support to CUDA 11, see the discussion.

@cenit
Copy link
Contributor Author

cenit commented Jan 12, 2021

OpenCV 4.5 supports CUDA 11 :)

@JackBoosY
Copy link
Contributor

@cenit If you need any help. please ping me.

@cenit
Copy link
Contributor Author

cenit commented Jan 13, 2021

This PR (and anything related to OpenCV) really depends on #15089 being merged first, because it re-enables CI tests on this port. Otherwise the risk is of breaking the port even more.
I won't work on this PR before that one is merged

@JackBoosY JackBoosY added the depends:different-pr This PR or Issue depends on a PR which has been filed label Jan 14, 2021
@elevir
Copy link

elevir commented Jan 15, 2021

@cenit thanks for your work! I've tried to use your branch with opencv, but I've met a bug on windows. So, the bug is: share files are installing in folder share/opencv/${arch}/${vc}/lib, where OpenCVModules.cmake has incorrect relative path to libs (share/opencv/x64/lib). I think, config files should be moved in share/opencv instead of share/opencv/${arch}/${vc}. I've tried to figure out where the bug is, but at this time I couldn't do it. For now, I've manually moved this files into share/opencv and fixed OpenCV_INSTALL_PATH.

@cenit
Copy link
Contributor Author

cenit commented Jan 15, 2021

this branch is incomplete. I am waiting for some important fixes to be merged with master before pushing work here

@cenit
Copy link
Contributor Author

cenit commented Jan 19, 2021

@JackBoosY all configs should have been tested by CI and should pass.
Please let me know if you see anything strange/not working. Otherwise for me it's ready for merge

@cenit cenit force-pushed the dev/cenit/opencv45 branch 3 times, most recently from 9ad71c4 to 6fccd8a Compare January 19, 2021 22:23
@cenit
Copy link
Contributor Author

cenit commented Jan 19, 2021

by the way @BillyONeal one thing might be improved about ci/regressions/baseline: if a regression is baselined in a "basic port", like qt5-tools:x64-windows-static-md, then with just a single line you are turning off many many ports from CI due to a very light "cascade" failure in all dependent ports (which in turn will get green mark in future even with a completely broken PR).

I don't know if I am clear enough, in case we can just discuss it in a different place because this PR is for sure not the right place.

ports/opencv3/portfile.cmake Show resolved Hide resolved
ports/opencv4/portfile.cmake Show resolved Hide resolved
scripts/test_ports/vcpkg-ci-opencv/CONTROL Outdated Show resolved Hide resolved
@JackBoosY
Copy link
Contributor

Need test features.

@cenit
Copy link
Contributor Author

cenit commented Jan 20, 2021

Need test features.

maybe not :)
If you check, CI is already testing all reasonable working features, thanks to vcpkg-ci-opencv which I put exactly for that.
In this way, I hope to protect also other ports from breaking features of OpenCV :)

(of course any additional test is extremely welcomed, but I just wanted to highlight you the vcpkg-ci-opencv so that you do not duplicate work)

@JackBoosY JackBoosY added the info:reviewed Pull Request changes follow basic guidelines label Jan 21, 2021
@JackBoosY
Copy link
Contributor

LGTM.

@JackBoosY
Copy link
Contributor

Already merged from master.

@dan-shaw dan-shaw merged commit 450de5f into microsoft:master Jan 22, 2021
@cenit cenit deleted the dev/cenit/opencv45 branch January 22, 2021 20:19
@JackBoosY
Copy link
Contributor

Thanks for @cenit 's hard work!
Thanks!

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