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

[gpuCI] Forward-merge branch-22.10 to branch-22.12 [skip gpuci] #11829

Merged
merged 1 commit into from
Sep 29, 2022
Merged

[gpuCI] Forward-merge branch-22.10 to branch-22.12 [skip gpuci] #11829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion cpp/src/io/comp/nvcomp_adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,8 @@ bool is_compression_enabled(compression_type compression)
{
switch (compression) {
case compression_type::DEFLATE:
return NVCOMP_HAS_DEFLATE and detail::nvcomp_integration::is_all_enabled();
// See https://github.com/rapidsai/cudf/issues/11812
return false;
case compression_type::SNAPPY: return detail::nvcomp_integration::is_stable_enabled();
case compression_type::ZSTD:
return NVCOMP_HAS_ZSTD_COMP and detail::nvcomp_integration::is_all_enabled();
Expand Down
3 changes: 2 additions & 1 deletion cpp/src/io/orc/reader_impl.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,8 @@ rmm::device_buffer reader::impl::decompress_stripe_data(
device_span<device_span<uint8_t>> inflate_out_view{inflate_out.data(), num_compressed_blocks};
switch (decompressor.compression()) {
case compression_type::ZLIB:
if (nvcomp_integration::is_all_enabled()) {
// See https://github.com/rapidsai/cudf/issues/11812
if (false) {
nvcomp::batched_decompress(nvcomp::compression_type::DEFLATE,
inflate_in_view,
inflate_out_view,
Expand Down
6 changes: 4 additions & 2 deletions python/cudf/cudf/tests/test_orc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1746,8 +1746,10 @@ def test_writer_protobuf_large_rowindexentry():


@pytest.mark.parametrize("compression", ["ZLIB", "ZSTD"])
def test_orc_writer_nvcomp(list_struct_buff, compression):
expected = cudf.read_orc(list_struct_buff)
def test_orc_writer_nvcomp(compression):
expected = cudf.datasets.randomdata(
nrows=12345, dtypes={"a": int, "b": str, "c": float}, seed=1
)

buff = BytesIO()
try:
Expand Down
2 changes: 1 addition & 1 deletion python/cudf/cudf/utils/ioutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@
----------
fname : str
File path or object where the ORC dataset will be stored.
compression : {{ 'snappy', 'ZLIB', 'ZSTD', None }}, default 'snappy'
compression : {{ 'snappy', 'ZSTD', None }}, default 'snappy'
Name of the compression to use. Use None for no compression.
enable_statistics: boolean, default True
Enable writing column statistics.
Expand Down