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

Jump to bottom

Treat zstd as stable in nvcomp releases 2.3.2 and later #11226

Merged
merged 2 commits into from
Jul 11, 2022
Merged

Treat zstd as stable in nvcomp releases 2.3.2 and later #11226

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b249af7
Treat zstd as stable in nvcomp releases 2.3.2 and later
jbrennan333 Jul 8, 2022
fc8b074
Add comment
jbrennan333 Jul 9, 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
10 changes: 10 additions & 0 deletions cpp/src/io/comp/nvcomp_adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,14 @@
#define NVCOMP_HAS_TEMPSIZE_EX 0
#endif

// ZSTD is stable for nvcomp 2.3.2 or newer
#if NVCOMP_MAJOR_VERSION > 2 or (NVCOMP_MAJOR_VERSION == 2 and NVCOMP_MINOR_VERSION > 3) or \
jbrennan333 marked this conversation as resolved.
Show resolved Hide resolved
(NVCOMP_MAJOR_VERSION == 2 and NVCOMP_MINOR_VERSION == 3 and NVCOMP_PATCH_VERSION >= 2)
#define NVCOMP_ZSTD_IS_EXPERIMENTAL 0
#else
#define NVCOMP_ZSTD_IS_EXPERIMENTAL 1
#endif

namespace cudf::io::nvcomp {

// Dispatcher for nvcompBatched<format>DecompressGetTempSizeEx
Expand Down Expand Up @@ -146,9 +154,11 @@ void batched_decompress(compression_type compression,
// TODO Consolidate config use to a common location
if (compression == compression_type::ZSTD) {
#if NVCOMP_HAS_ZSTD
#if NVCOMP_ZSTD_IS_EXPERIMENTAL
CUDF_EXPECTS(cudf::io::detail::nvcomp_integration::is_all_enabled(),
"Zstandard compression is experimental, you can enable it through "
"`LIBCUDF_NVCOMP_POLICY` environment variable.");
#endif
#else
CUDF_FAIL("nvCOMP 2.3 or newer is required for Zstandard compression");
#endif
Expand Down