From 63ba7e98eb6bcf529567e90fc3f62c8b78304346 Mon Sep 17 00:00:00 2001 From: Bradley Dice Date: Thu, 14 Dec 2023 13:43:31 -0600 Subject: [PATCH] Remove workaround for nvcomp 2.4.0 ZSTD on Pascal architectures. --- cpp/src/io/comp/nvcomp_adapter.cpp | 10 ---------- cpp/tests/io/comp/decomp_test.cpp | 2 -- 2 files changed, 12 deletions(-) diff --git a/cpp/src/io/comp/nvcomp_adapter.cpp b/cpp/src/io/comp/nvcomp_adapter.cpp index 1a2c90eb52e..ec71b5a2d94 100644 --- a/cpp/src/io/comp/nvcomp_adapter.cpp +++ b/cpp/src/io/comp/nvcomp_adapter.cpp @@ -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 nvcompBatchedDecompressGetTempSizeEx @@ -551,11 +546,6 @@ std::optional 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; } diff --git a/cpp/tests/io/comp/decomp_test.cpp b/cpp/tests/io/comp/decomp_test.cpp index 35176c70d84..c3394ba238c 100644 --- a/cpp/tests/io/comp/decomp_test.cpp +++ b/cpp/tests/io/comp/decomp_test.cpp @@ -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}));