From bb0b48e4ce3bc0dbb01f849e4d491ec1e2d751fd Mon Sep 17 00:00:00 2001 From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com> Date: Sat, 24 Apr 2021 06:26:16 +0800 Subject: [PATCH] [cub] update to 1.12.0 (#17355) * [cub] update to 1.12.0 * update version --- ports/cub/CONTROL | 4 ---- ports/cub/portfile.cmake | 6 +++--- ports/cub/vcpkg.json | 9 +++++++++ versions/baseline.json | 2 +- versions/c-/cub.json | 5 +++++ 5 files changed, 18 insertions(+), 8 deletions(-) delete mode 100644 ports/cub/CONTROL create mode 100644 ports/cub/vcpkg.json diff --git a/ports/cub/CONTROL b/ports/cub/CONTROL deleted file mode 100644 index eb708a84a8..0000000000 --- a/ports/cub/CONTROL +++ /dev/null @@ -1,4 +0,0 @@ -Source: cub -Version: 1.8.0-1 -Description: CUB is a flexible library of cooperative threadblock primitives and other utilities for CUDA kernel programming -Build-Depends: cuda diff --git a/ports/cub/portfile.cmake b/ports/cub/portfile.cmake index 9d9416f276..d15c623f8b 100644 --- a/ports/cub/portfile.cmake +++ b/ports/cub/portfile.cmake @@ -1,11 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO NVlabs/cub - REF v1.8.0 - SHA512 c4ba51ca4e369c8ef87bc411aa011470478fcc2526b667f088e9ac8c62e6532dc2368e869f5147b56f22b3e8718c7276434c3294d9d67cb3a92c700d163e8fa7 + REF 7cdf6dfc7ed60e4f44d025b84ea8260755f298e6 #v1.12.0 + SHA512 aff3ba375a33844efdc57f8ba190e8880db6247bc1245340b2fe87f8933d3abfcbc7dcdffffd45cf00db4981cd2e37029061fca7161554a4c7c779a7d414aada HEAD_REF master ) file(COPY ${SOURCE_PATH}/cub/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/cub) -configure_file(${SOURCE_PATH}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/cub/copyright COPYONLY) +configure_file(${SOURCE_PATH}/LICENSE.TXT ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) diff --git a/ports/cub/vcpkg.json b/ports/cub/vcpkg.json new file mode 100644 index 0000000000..85f29e6fb1 --- /dev/null +++ b/ports/cub/vcpkg.json @@ -0,0 +1,9 @@ +{ + "name": "cub", + "version": "1.12.0", + "description": "CUB is a flexible library of cooperative threadblock primitives and other utilities for CUDA kernel programming", + "homepage": "https://github.com/NVIDIA/cub", + "dependencies": [ + "cuda" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 1e59c3564a..1db3d007b3 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1517,7 +1517,7 @@ "port-version": 0 }, "cub": { - "baseline": "1.8.0-1", + "baseline": "1.12.0", "port-version": 0 }, "cuda": { diff --git a/versions/c-/cub.json b/versions/c-/cub.json index 54f9e9761f..5478b52920 100644 --- a/versions/c-/cub.json +++ b/versions/c-/cub.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ec58db0c42a8978215a38d7e9ac938dd1b936c1f", + "version": "1.12.0", + "port-version": 0 + }, { "git-tree": "3d12aea8561ac6b5566b5ade8379993b82d8d6b1", "version-string": "1.8.0-1",