Skip to content

Commit

Permalink
Revert "nvCOMP GZIP integration (#16770)"
Browse files Browse the repository at this point in the history
This reverts commit 750adca.
  • Loading branch information
gerashegalov committed Oct 2, 2024
1 parent f8ad96c commit fdf36ad
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 22 deletions.
2 changes: 1 addition & 1 deletion cpp/include/cudf/io/nvcomp_adapter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
namespace CUDF_EXPORT cudf {
namespace io::nvcomp {

enum class compression_type { SNAPPY, ZSTD, DEFLATE, LZ4, GZIP };
enum class compression_type { SNAPPY, ZSTD, DEFLATE, LZ4 };

/**
* @brief Set of parameters that impact whether nvCOMP features are enabled.
Expand Down
5 changes: 1 addition & 4 deletions cpp/src/io/comp/nvcomp_adapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,6 @@ auto batched_decompress_async(compression_type compression, Args&&... args)
nvcomp::is_decompression_disabled(nvcomp::compression_type::DEFLATE).value());
#endif
case compression_type::LZ4: return nvcompBatchedLZ4DecompressAsync(std::forward<Args>(args)...);
case compression_type::GZIP:
return nvcompBatchedGzipDecompressAsync(std::forward<Args>(args)...);
default: CUDF_FAIL("Unsupported compression type");
}
}
Expand All @@ -147,7 +145,6 @@ std::string compression_type_name(compression_type compression)
case compression_type::ZSTD: return "Zstandard";
case compression_type::DEFLATE: return "Deflate";
case compression_type::LZ4: return "LZ4";
case compression_type::GZIP: return "GZIP";
}
return "compression_type(" + std::to_string(static_cast<int>(compression)) + ")";
}
Expand Down Expand Up @@ -547,8 +544,8 @@ std::optional<std::string> is_compression_disabled_impl(compression_type compres
"environment variable.";
}
return std::nullopt;
default: return "Unsupported compression type";
}
return "Unsupported compression type";
}

std::optional<std::string> is_compression_disabled(compression_type compression,
Expand Down
14 changes: 2 additions & 12 deletions cpp/src/io/parquet/reader_impl_chunking.cu
Original file line number Diff line number Diff line change
Expand Up @@ -865,18 +865,8 @@ std::vector<row_range> compute_page_splits_by_row(device_span<cumulative_page_in

switch (codec.compression_type) {
case GZIP:
if (cudf::io::nvcomp_integration::is_all_enabled()) {
nvcomp::batched_decompress(nvcomp::compression_type::GZIP,
d_comp_in_view,
d_comp_out_view,
d_comp_res_view,
codec.max_decompressed_size,
codec.total_decomp_size,
stream);
} else {
gpuinflate(
d_comp_in_view, d_comp_out_view, d_comp_res_view, gzip_header_included::YES, stream);
}
gpuinflate(
d_comp_in_view, d_comp_out_view, d_comp_res_view, gzip_header_included::YES, stream);
break;
case SNAPPY:
if (cudf::io::nvcomp_integration::is_stable_enabled()) {
Expand Down
6 changes: 1 addition & 5 deletions docs/cudf/source/user_guide/io/io.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ IO format.

</div>


**Notes:**

- \[¹\] - Not all orientations are GPU-accelerated.
Expand Down Expand Up @@ -176,9 +177,4 @@ If no value is set, behavior will be the same as the "STABLE" option.
+-----------------------+--------+--------+--------------+--------------+---------+--------+--------------+--------------+--------+
| DEFLATE | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | Experimental | Experimental | ❌ |
+-----------------------+--------+--------+--------------+--------------+---------+--------+--------------+--------------+--------+
| LZ4 | ❌ | ❌ | Stable | Stable | ❌ | ❌ | Stable | Stable | ❌ |
+-----------------------+--------+--------+--------------+--------------+---------+--------+--------------+--------------+--------+
| GZIP | ❌ | ❌ | Experimental | Experimental | ❌ | ❌ | ❌ | ❌ | ❌ |
+-----------------------+--------+--------+--------------+--------------+---------+--------+--------------+--------------+--------+
```

0 comments on commit fdf36ad

Please sign in to comment.