From b64f7dbc8a5b110328a16a4c6dd2f03689656a54 Mon Sep 17 00:00:00 2001 From: Vukasin Milovanovic Date: Fri, 28 Feb 2025 13:44:32 -0800 Subject: [PATCH] tests pass --- cpp/src/io/comp/comp.cpp | 1 + cpp/src/io/comp/nvcomp_adapter.cpp | 4 +++- cpp/tests/io/comp/comp_test.cpp | 5 ++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cpp/src/io/comp/comp.cpp b/cpp/src/io/comp/comp.cpp index a0397bc3ffb..93723f21701 100644 --- a/cpp/src/io/comp/comp.cpp +++ b/cpp/src/io/comp/comp.cpp @@ -351,6 +351,7 @@ void host_compress(compression_type compression, { auto const nvcomp_type = to_nvcomp_compression(compression); switch (compression) { + case compression_type::GZIP: case compression_type::LZ4: case compression_type::ZLIB: case compression_type::ZSTD: return not nvcomp::is_compression_disabled(nvcomp_type.value()); diff --git a/cpp/src/io/comp/nvcomp_adapter.cpp b/cpp/src/io/comp/nvcomp_adapter.cpp index 7c191b03350..f0647e1c080 100644 --- a/cpp/src/io/comp/nvcomp_adapter.cpp +++ b/cpp/src/io/comp/nvcomp_adapter.cpp @@ -337,6 +337,7 @@ size_t compress_max_output_chunk_size(compression_type compression, capped_uncomp_bytes, nvcompBatchedSnappyDefaultOpts, &max_comp_chunk_size); break; case compression_type::DEFLATE: + case compression_type::GZIP: // HACK! status = nvcompBatchedDeflateCompressGetMaxOutputChunkSize( capped_uncomp_bytes, nvcompBatchedDeflateDefaultOpts, &max_comp_chunk_size); break; @@ -495,7 +496,8 @@ size_t required_alignment(compression_type compression) std::optional compress_max_allowed_chunk_size(compression_type compression) { switch (compression) { - case compression_type::DEFLATE: return nvcompDeflateCompressionMaxAllowedChunkSize; + case compression_type::DEFLATE: + case compression_type::GZIP: return nvcompDeflateCompressionMaxAllowedChunkSize; case compression_type::SNAPPY: return nvcompSnappyCompressionMaxAllowedChunkSize; case compression_type::ZSTD: return nvcompZstdCompressionMaxAllowedChunkSize; case compression_type::LZ4: return nvcompLZ4CompressionMaxAllowedChunkSize; diff --git a/cpp/tests/io/comp/comp_test.cpp b/cpp/tests/io/comp/comp_test.cpp index 80e63973e17..736ec579ec5 100644 --- a/cpp/tests/io/comp/comp_test.cpp +++ b/cpp/tests/io/comp/comp_test.cpp @@ -288,7 +288,7 @@ void roundtip_test(cudf::io::compression_type compression) ASSERT_EQ(hd_stats[0].status, compression_status::SUCCESS); d_comp.resize(hd_stats[0].bytes_written, stream); } - std::cout << "Compressed size: " << d_comp.size() << std::endl; + auto d_got = cudf::detail::hostdevice_vector(expected.size(), stream); { auto hd_srcs = cudf::detail::hostdevice_vector>(1, stream); @@ -314,14 +314,13 @@ void roundtip_test(cudf::io::compression_type compression) EXPECT_EQ(expected, got); } } -/* + TEST_P(HostCompressTest, HostCompression) { roundtip_test(GetParam()); } INSTANTIATE_TEST_CASE_P(HostCompression, HostCompressTest, ::testing::Values(cudf::io::compression_type::GZIP, cudf::io::compression_type::SNAPPY)); - */ TEST_P(HostDecompressTest, HostDecompression) { roundtip_test(GetParam()); }