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

microsoft · Mar 7, 2025 · 3002390 · 3002390
1 parent 21abda4
commit 3002390
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 75 deletions.
diff --git a/ports/arrayfire/vcpkg.json b/ports/arrayfire/vcpkg.json
@@ -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"
       ]

diff --git a/ports/cub/fix-usage.patch b/ports/cub/fix-usage.patch
diff --git a/ports/cub/portfile.cmake b/ports/cub/portfile.cmake
diff --git a/ports/cub/usage b/ports/cub/usage
diff --git a/ports/cub/vcpkg.json b/ports/cub/vcpkg.json
diff --git a/ports/flashlight-cuda/vcpkg.json b/ports/flashlight-cuda/vcpkg.json
@@ -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",

diff --git a/versions/a-/arrayfire.json b/versions/a-/arrayfire.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "3ed888c7fc2aa125e626ff0f097b00a4230bab1c",
+      "version-semver": "3.8.0",
+      "port-version": 8
+    },
     {
       "git-tree": "985696275cbb76cb02d89d11f8e2490921c09874",
       "version-semver": "3.8.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -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",

diff --git a/versions/f-/flashlight-cuda.json b/versions/f-/flashlight-cuda.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c3d98ac4f7c7a2c79630020b88176f1d24440af1",
+      "version": "0.3",
+      "port-version": 7
+    },
     {
       "git-tree": "c6d4ea65707f91031fb354aaeb2c76897256d861",
       "version": "0.3",