Merge pull request #11829 from rapidsai/branch-22.10

[gpuCI] Forward-merge branch-22.10 to branch-22.12 [skip gpuci]
rapidsai · Sep 29, 2022 · 59ce915 · 59ce915
2 parents 0ecbaa1 + 628c857
commit 59ce915
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/cpp/src/io/comp/nvcomp_adapter.cpp b/cpp/src/io/comp/nvcomp_adapter.cpp
@@ -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();

diff --git a/cpp/src/io/orc/reader_impl.cu b/cpp/src/io/orc/reader_impl.cu
@@ -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,

diff --git a/python/cudf/cudf/tests/test_orc.py b/python/cudf/cudf/tests/test_orc.py
@@ -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:

diff --git a/python/cudf/cudf/utils/ioutils.py b/python/cudf/cudf/utils/ioutils.py
@@ -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.