From ac997f8f0dada1b17a7d45b8cc55abe53541397a Mon Sep 17 00:00:00 2001
From: Jia Yue Hua <3423893+jiayuehua@users.noreply.github.com>
Date: Thu, 5 Oct 2023 05:25:20 +0800
Subject: [PATCH] [cub] update to 2.1.0 (#34111)

---
 ports/cub/fix-usage.patch | 20 ++++----------------
 ports/cub/portfile.cmake  |  4 ++--
 ports/cub/vcpkg.json      |  2 +-
 versions/baseline.json    |  2 +-
 versions/c-/cub.json      |  5 +++++
 5 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/ports/cub/fix-usage.patch b/ports/cub/fix-usage.patch
index 56801fdb9e..353818cb7f 100644
--- a/ports/cub/fix-usage.patch
+++ b/ports/cub/fix-usage.patch
@@ -1,24 +1,12 @@
 diff --git a/cub/cmake/cub-config.cmake b/cub/cmake/cub-config.cmake
-index 3d7f64b..213a95e 100644
+index ebe40ef..884ce65 100644
 --- a/cub/cmake/cub-config.cmake
 +++ b/cub/cmake/cub-config.cmake
-@@ -8,6 +8,7 @@ if (TARGET CUB::CUB)
-   return()
- endif()
+@@ -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
-diff --git a/cub/cmake/cub-header-search.cmake.in b/cub/cmake/cub-header-search.cmake.in
-index 2a46606..d2c38ef 100644
---- a/cub/cmake/cub-header-search.cmake.in
-+++ b/cub/cmake/cub-header-search.cmake.in
-@@ -3,6 +3,6 @@ unset(_CUB_VERSION_INCLUDE_DIR CACHE) # Clear old result to force search
- find_path(_CUB_VERSION_INCLUDE_DIR cub/version.cuh
-   NO_DEFAULT_PATH # Only search explicit paths below:
-   PATHS
--    "${CMAKE_CURRENT_LIST_DIR}/../../../@CMAKE_INSTALL_INCLUDEDIR@" # Install tree
-+    "${CMAKE_CURRENT_LIST_DIR}/../../@CMAKE_INSTALL_INCLUDEDIR@" # Install tree
- )
- set_property(CACHE _CUB_VERSION_INCLUDE_DIR PROPERTY TYPE INTERNAL)
diff --git a/ports/cub/portfile.cmake b/ports/cub/portfile.cmake
index 69f73ad63c..9049648f0d 100644
--- a/ports/cub/portfile.cmake
+++ b/ports/cub/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO NVlabs/cub
-    REF ed040d585c3237d706973d7ad290bfee40958270 #v1.16.0
-    SHA512 81e0bacb0aa4ee7a1c86f3c12e3135a133579678d3530e0e0b8310f716d0355e5096925ac6de5865140a7aac08d974ea5169d47e34951b932a23965f74fe4ee6
+    REF "${VERSION}"
+    SHA512 f88fdf80c81b8b5d3d09797bf5e9a9e82e1365950b358e0ffc2141b465646c2054ce7e6a30ae07735fbaa69d07c9a8e9bab57c8ddb8a0db8426b27eadd045197
     HEAD_REF master
     PATCHES fix-usage.patch
 )
diff --git a/ports/cub/vcpkg.json b/ports/cub/vcpkg.json
index f6988759ff..2162ca5a63 100644
--- a/ports/cub/vcpkg.json
+++ b/ports/cub/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "cub",
-  "version": "1.16.0",
+  "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",
diff --git a/versions/baseline.json b/versions/baseline.json
index 22bc58b637..40c34ab924 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1965,7 +1965,7 @@
       "port-version": 0
     },
     "cub": {
-      "baseline": "1.16.0",
+      "baseline": "2.1.0",
       "port-version": 0
     },
     "cubeb": {
diff --git a/versions/c-/cub.json b/versions/c-/cub.json
index 4dc47df086..6538ac26f5 100644
--- a/versions/c-/cub.json
+++ b/versions/c-/cub.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c7b6e0430fa6c7701a81090f35c8344c7889d790",
+      "version": "2.1.0",
+      "port-version": 0
+    },
     {
       "git-tree": "d6fe5c753cf67eeb18b536ea933864d15a88331d",
       "version": "1.16.0",