Skip to content

Commit

Permalink
Remove workaround for nvcomp 2.4.0 ZSTD on Pascal architectures.
Browse files Browse the repository at this point in the history
  • Loading branch information
bdice committed Jan 2, 2024
1 parent 04cf296 commit 63ba7e9
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
10 changes: 0 additions & 10 deletions cpp/src/io/comp/nvcomp_adapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,6 @@
#define NVCOMP_ZSTD_DECOMP_IS_STABLE(MAJOR, MINOR, PATCH) \
(MAJOR > 2 or (MAJOR == 2 and MINOR > 3) or (MAJOR == 2 and MINOR == 3 and PATCH >= 2))

// Issue https://github.com/NVIDIA/spark-rapids/issues/6614 impacts nvCOMP 2.4.0 ZSTD decompression
// on compute 6.x
#define NVCOMP_ZSTD_IS_DISABLED_ON_PASCAL(MAJOR, MINOR, PATCH) \
(MAJOR == 2 and MINOR == 4 and PATCH == 0)

namespace cudf::io::nvcomp {

// Dispatcher for nvcompBatched<format>DecompressGetTempSizeEx
Expand Down Expand Up @@ -551,11 +546,6 @@ std::optional<std::string> is_zstd_decomp_disabled(feature_status_parameters con
"`LIBCUDF_NVCOMP_POLICY` environment variable.";
}

if (NVCOMP_ZSTD_IS_DISABLED_ON_PASCAL(
params.lib_major_version, params.lib_minor_version, params.lib_patch_version) and
params.compute_capability_major == 6) {
return "Zstandard decompression is disabled on Pascal GPUs";
}
return std::nullopt;
}

Expand Down
2 changes: 0 additions & 2 deletions cpp/tests/io/comp/decomp_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,6 @@ TEST_F(NvcompConfigTest, Decompression)
EXPECT_TRUE(decomp_disabled(compression_type::ZSTD, {2, 2, 0, true, true, 7}));
// stable integrations enabled required
EXPECT_TRUE(decomp_disabled(compression_type::ZSTD, {2, 4, 0, false, false, 7}));
// 2.4.0 disabled on Pascal
EXPECT_TRUE(decomp_disabled(compression_type::ZSTD, {2, 4, 0, true, true, 6}));

EXPECT_FALSE(decomp_disabled(compression_type::SNAPPY, {2, 4, 0, true, true, 7}));
EXPECT_FALSE(decomp_disabled(compression_type::SNAPPY, {2, 3, 0, false, true, 7}));
Expand Down

0 comments on commit 63ba7e9

Please sign in to comment.