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 4.9 #38928

Open
wants to merge 227 commits into
base: master
Choose a base branch
from
Open

[opencv] update to 4.9 #38928

wants to merge 227 commits into from

Conversation

cenit
Copy link
Contributor

@cenit cenit commented May 24, 2024

Fixes #41418
Fixes #41250
Fixes #41094
Fixes #41038
Fixes #40680
Fixes #40568
Fixes #40393
Fixes #40406
Fixes #39884
Fixes #39835
Fixes #39651
Fixes #39454
Fixes #39224
Fixes #38321
Fixes #36771
Fixes #36093
Fixes #36009
Fixes #35937
Fixes #34559
Fixes #34279
Fixes #33742
Fixes #32228
Fixes #17850
Fixes #13120
Fixes #4937

Depending on #39703 (need to remove ffmpeg from ci.baseline here after that PR acceptance)

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

@JonLiu1993 JonLiu1993 added the category:port-update The issue is with a library, which is requesting update new revision label May 24, 2024
@BillyONeal
Copy link
Member

/azp run

@BillyONeal
Copy link
Member

Rerunning due to network mistake.

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

ports/pcl/gh-6053.patch Outdated Show resolved Hide resolved
BillyONeal
BillyONeal previously approved these changes Oct 18, 2024
Copy link
Member

@BillyONeal BillyONeal left a comment

Choose a reason for hiding this comment

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

@JavierMatosD Do you remember why you tagged this team review?

@russelltg
Copy link
Contributor

I think the string(APPEND DEPS_STRING "\nfind_dependency(CUDA)") need to be string(APPEND DEPS_STRING "\nfind_dependency(CUDAToolkit)") now that we pass ENABLE_CUDA_FIRST_CLASS_LANGUAGE

@cenit
Copy link
Contributor Author

cenit commented Oct 21, 2024

merged with master to fix file conflicts (pcl patch was added also to a more recent PR already accepted)

@cenit
Copy link
Contributor Author

cenit commented Oct 21, 2024

I think the string(APPEND DEPS_STRING "\nfind_dependency(CUDA)") need to be string(APPEND DEPS_STRING "\nfind_dependency(CUDAToolkit)") now that we pass ENABLE_CUDA_FIRST_CLASS_LANGUAGE

good catch. Done, thanks.

@cenit
Copy link
Contributor Author

cenit commented Oct 21, 2024

I think the string(APPEND DEPS_STRING "\nfind_dependency(CUDA)") need to be string(APPEND DEPS_STRING "\nfind_dependency(CUDAToolkit)") now that we pass ENABLE_CUDA_FIRST_CLASS_LANGUAGE

good catch. Done, thanks.

if CUDA feature is enable, this is already appearing in OpenCVConfig.cmake:

# Version Compute Capability from which OpenCV has been compiled is remembered
set(OpenCV_COMPUTE_CAPABILITIES "50-real;52-real;60-real;61-real;70-real;75-real;80-real;86-real;89-real;90-real;90-virtual")

set(OpenCV_CUDA_VERSION "12.6.20")
set(OpenCV_USE_CUBLAS   "1")
set(OpenCV_USE_CUFFT    "1")
set(OpenCV_USE_NVCUVID  "")
set(OpenCV_USE_NVCUVENC "")
set(OpenCV_CUDNN_VERSION    "")
set(OpenCV_USE_CUDNN        "")
set(ENABLE_CUDA_FIRST_CLASS_LANGUAGE  ON)

if(NOT CUDAToolkit_FOUND)
  if(NOT CMAKE_VERSION VERSION_LESS 3.18)
    if(UNIX AND NOT CMAKE_CUDA_COMPILER AND NOT CUDAToolkit_ROOT)
      message(STATUS "Checking for CUDAToolkit in default location (/usr/local/cuda)")
      set(CUDA_PATH "/usr/local/cuda" CACHE INTERNAL "")
      set(ENV{CUDA_PATH} ${CUDA_PATH})
    endif()
    find_package(CUDAToolkit ${OpenCV_CUDA_VERSION} EXACT REQUIRED)
  else()
    message(FATAL_ERROR "Using OpenCV compiled with CUDA as first class language requires CMake \>= 3.18.")
  endif()
else()
  if(CUDAToolkit_FOUND)
    set(CUDA_VERSION_STRING ${CUDAToolkit_VERSION})
  endif()
  if(NOT CUDA_VERSION_STRING VERSION_EQUAL OpenCV_CUDA_VERSION)
      message(FATAL_ERROR "OpenCV library was compiled with CUDA ${OpenCV_CUDA_VERSION} support. Please, use the same version or rebuild OpenCV with CUDA ${CUDA_VERSION_STRING}")
  endif()
endif()

so the find_dependency(CUDA) was unnecessary with the new architecture, but also the find_dependency(CUDAToolkit) is too!

I have removed it from OpenCV 4 port

@cenit
Copy link
Contributor Author

cenit commented Oct 21, 2024

i think that regression on vcpkg-ci-msys2 is not due to this PR

@dg0yt
Copy link
Contributor

dg0yt commented Oct 22, 2024

i think that regression on vcpkg-ci-msys2 is not due to this PR

No, it isn't, and there are PRs for that.

@dg0yt
Copy link
Contributor

dg0yt commented Oct 22, 2024

i think that regression on vcpkg-ci-msys2 is not due to this PR

No, it isn't, and there are PRs for that.

Merged. (#41691)

@cenit
Copy link
Contributor Author

cenit commented Oct 23, 2024

@JavierMatosD Do you remember why you tagged this team review?

any news?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-update The issue is with a library, which is requesting update new revision info:reviewed Pull Request changes follow basic guidelines requires:vcpkg-team-review This PR or issue requires someone on the vcpkg team to take a further look.
Projects
None yet