From d5927fd6895e987cda3d6239ae5870f1b3bf3de9 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 21 Jul 2022 14:30:19 -0700 Subject: [PATCH 1/5] Update nvcomp version. --- rapids-cmake/cpm/versions.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rapids-cmake/cpm/versions.json b/rapids-cmake/cpm/versions.json index 64135a10..91a4988a 100644 --- a/rapids-cmake/cpm/versions.json +++ b/rapids-cmake/cpm/versions.json @@ -13,7 +13,7 @@ "git_tag" : "12d13bdc5e74801645eba3e46a64081b9b020dca" }, "nvcomp" : { - "version" : "2.3.2", + "version" : "2.3.3", "git_url" : "https://github.com/NVIDIA/nvcomp.git", "git_tag" : "v2.2.0", "proprietary_binary" : { From aa0c9d79ac775d6f75a57db81528b214a1d37c95 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 21 Jul 2022 14:30:54 -0700 Subject: [PATCH 2/5] Change RAPIDS.cmake to pull the branch for testing. --- RAPIDS.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RAPIDS.cmake b/RAPIDS.cmake index d96958c3..aad89571 100644 --- a/RAPIDS.cmake +++ b/RAPIDS.cmake @@ -21,8 +21,8 @@ set(rapids-cmake-version 22.08) include(FetchContent) FetchContent_Declare( rapids-cmake - GIT_REPOSITORY https://github.com/rapidsai/rapids-cmake.git - GIT_TAG branch-${rapids-cmake-version} + GIT_REPOSITORY https://github.com/vyasr/rapids-cmake.git + GIT_TAG feature/nvcomp_2.3.3 ) FetchContent_GetProperties(rapids-cmake) if(rapids-cmake_POPULATED) From eaf4a91da32295d31862129f0bc490a5acb5da9f Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 22 Jul 2022 10:17:11 -0700 Subject: [PATCH 3/5] Add filter based on version. --- rapids-cmake/cpm/nvcomp.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rapids-cmake/cpm/nvcomp.cmake b/rapids-cmake/cpm/nvcomp.cmake index 0f27a0e2..a265cdc1 100644 --- a/rapids-cmake/cpm/nvcomp.cmake +++ b/rapids-cmake/cpm/nvcomp.cmake @@ -95,7 +95,7 @@ function(rapids_cpm_nvcomp) # Remove incorrect public dependency on the static cuda runtime We have to modify the # nvcomp-targets.cmake since these entries will cause a failure when rapids_cpm_find is called. - if(nvcomp_proprietary_binary) + if(nvcomp_proprietary_binary AND ${version} STREQUAL "2.3.2") set(target_file "${nvcomp_ROOT}/lib/cmake/nvcomp/nvcomp-targets.cmake") if(EXISTS "${target_file}") file(READ "${target_file}" file_contents) From d1268e3e7aa18f13fe97d1923a601bf26533a21c Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 4 Aug 2022 15:04:06 -0700 Subject: [PATCH 4/5] Update rapids-cmake/cpm/nvcomp.cmake --- rapids-cmake/cpm/nvcomp.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rapids-cmake/cpm/nvcomp.cmake b/rapids-cmake/cpm/nvcomp.cmake index a265cdc1..0798f207 100644 --- a/rapids-cmake/cpm/nvcomp.cmake +++ b/rapids-cmake/cpm/nvcomp.cmake @@ -95,7 +95,7 @@ function(rapids_cpm_nvcomp) # Remove incorrect public dependency on the static cuda runtime We have to modify the # nvcomp-targets.cmake since these entries will cause a failure when rapids_cpm_find is called. - if(nvcomp_proprietary_binary AND ${version} STREQUAL "2.3.2") + if(nvcomp_proprietary_binary AND ${version} VERSION_EQUAL "2.3.2") set(target_file "${nvcomp_ROOT}/lib/cmake/nvcomp/nvcomp-targets.cmake") if(EXISTS "${target_file}") file(READ "${target_file}" file_contents) From b9aab7554575b7632393ed64e6f8f37447f7eb13 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Fri, 5 Aug 2022 08:31:21 -0700 Subject: [PATCH 5/5] Update RAPIDS.cmake --- RAPIDS.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RAPIDS.cmake b/RAPIDS.cmake index aad89571..d96958c3 100644 --- a/RAPIDS.cmake +++ b/RAPIDS.cmake @@ -21,8 +21,8 @@ set(rapids-cmake-version 22.08) include(FetchContent) FetchContent_Declare( rapids-cmake - GIT_REPOSITORY https://github.com/vyasr/rapids-cmake.git - GIT_TAG feature/nvcomp_2.3.3 + GIT_REPOSITORY https://github.com/rapidsai/rapids-cmake.git + GIT_TAG branch-${rapids-cmake-version} ) FetchContent_GetProperties(rapids-cmake) if(rapids-cmake_POPULATED)