Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update nvcomp to 2.3.3 #221

Merged
merged 5 commits into from
Aug 5, 2022
Merged

Update nvcomp to 2.3.3 #221

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d5927fd
Update nvcomp version.
vyasr Jul 21, 2022
aa0c9d7
Change RAPIDS.cmake to pull the branch for testing.
vyasr Jul 21, 2022
eaf4a91
Add filter based on version.
vyasr Jul 22, 2022
d1268e3
Update rapids-cmake/cpm/nvcomp.cmake
vyasr Aug 4, 2022
b9aab75
Update RAPIDS.cmake
vyasr Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions RAPIDS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
vyasr marked this conversation as resolved.
Show resolved Hide resolved
)
FetchContent_GetProperties(rapids-cmake)
if(rapids-cmake_POPULATED)
Expand Down
2 changes: 1 addition & 1 deletion rapids-cmake/cpm/nvcomp.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
vyasr marked this conversation as resolved.
Show resolved Hide resolved
vyasr marked this conversation as resolved.
Show resolved Hide resolved
set(target_file "${nvcomp_ROOT}/lib/cmake/nvcomp/nvcomp-targets.cmake")
if(EXISTS "${target_file}")
file(READ "${target_file}" file_contents)
Expand Down
2 changes: 1 addition & 1 deletion rapids-cmake/cpm/versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" : {
Expand Down