[vcpkg baseline] fix opencv4 by deindexing cub (#44245)

This commit is contained in:
Billy O'Neal 2025-03-07 12:08:25 -08:00 committed by GitHub
parent 21abda44e0
commit 300239058e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 14 additions and 75 deletions

View File

@ -1,7 +1,7 @@
{
"name": "arrayfire",
"version-semver": "3.8.0",
"port-version": 7,
"port-version": 8,
"description": "ArrayFire is a general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.",
"homepage": "https://github.com/arrayfire/arrayfire",
"license": "BSD-3-Clause",
@ -34,7 +34,6 @@
"cuda": {
"description": "ArrayFire CUDA backend. This feature only supports dynamic because dependency cudnn is dynamic only.",
"dependencies": [
"cub",
"cuda",
"cudnn"
]

View File

@ -1,12 +0,0 @@
diff --git a/cub/cmake/cub-config.cmake b/cub/cmake/cub-config.cmake
index ebe40ef..884ce65 100644
--- a/cub/cmake/cub-config.cmake
+++ b/cub/cmake/cub-config.cmake
@@ -11,6 +11,7 @@ endif()
# Minimum supported libcudacxx version:
set(cub_libcudacxx_version 1.8.0)
+include("${CMAKE_CURRENT_LIST_DIR}/cub-header-search.cmake")
function(_cub_declare_interface_alias alias_name ugly_name)
# 1) Only IMPORTED and ALIAS targets can be placed in a namespace.
# 2) When an IMPORTED library is linked to another target, its include

View File

@ -1,31 +0,0 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO NVlabs/cub
REF "${VERSION}"
SHA512 f88fdf80c81b8b5d3d09797bf5e9a9e82e1365950b358e0ffc2141b465646c2054ce7e6a30ae07735fbaa69d07c9a8e9bab57c8ddb8a0db8426b27eadd045197
HEAD_REF master
PATCHES fix-usage.patch
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCUB_ENABLE_INSTALL_RULES=ON
-DCUB_ENABLE_HEADER_TESTING=OFF
-DCUB_ENABLE_TESTING=OFF
-DCUB_ENABLE_EXAMPLES=OFF
-DCUB_ENABLE_CPP_DIALECT_IN_NAMES=ON
)
vcpkg_cmake_install()
vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/cub)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/cub/cmake"
"${CURRENT_PACKAGES_DIR}/debug"
"${CURRENT_PACKAGES_DIR}/lib"
)
file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
file(INSTALL "${SOURCE_PATH}/LICENSE.TXT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,4 +0,0 @@
The package cub is header only and can be used from CMake via:
find_package(cub CONFIG REQUIRED)
target_include_directories(main PRIVATE CUB::CUB)

View File

@ -1,18 +0,0 @@
{
"name": "cub",
"version": "2.1.0",
"description": "CUB is a flexible library of cooperative threadblock primitives and other utilities for CUDA kernel programming",
"homepage": "https://github.com/NVIDIA/cub",
"license": "BSD-3-Clause",
"dependencies": [
"cuda",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -1,7 +1,7 @@
{
"name": "flashlight-cuda",
"version": "0.3",
"port-version": 6,
"port-version": 7,
"description": "A C++ standalone library for machine learning. CUDA backend.",
"homepage": "https://github.com/facebookresearch/flashlight",
"license": "MIT",
@ -73,7 +73,6 @@
"lib": {
"description": "flashlight libraries",
"dependencies": [
"cub",
"cuda",
"fftw3",
"intel-mkl",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "3ed888c7fc2aa125e626ff0f097b00a4230bab1c",
"version-semver": "3.8.0",
"port-version": 8
},
{
"git-tree": "985696275cbb76cb02d89d11f8e2490921c09874",
"version-semver": "3.8.0",

View File

@ -242,7 +242,7 @@
},
"arrayfire": {
"baseline": "3.8.0",
"port-version": 7
"port-version": 8
},
"arrow": {
"baseline": "19.0.1",
@ -2112,10 +2112,6 @@
"baseline": "2.0.3.2",
"port-version": 0
},
"cub": {
"baseline": "2.1.0",
"port-version": 0
},
"cubeb": {
"baseline": "2023-09-26",
"port-version": 1
@ -2810,7 +2806,7 @@
},
"flashlight-cuda": {
"baseline": "0.3",
"port-version": 6
"port-version": 7
},
"flashlight-sequence": {
"baseline": "0.0.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "c3d98ac4f7c7a2c79630020b88176f1d24440af1",
"version": "0.3",
"port-version": 7
},
{
"git-tree": "c6d4ea65707f91031fb354aaeb2c76897256d861",
"version": "0.3",