From c29cdc45d4f28cdbf95e378b13378ace9129c192 Mon Sep 17 00:00:00 2001 From: Matthew Murray Date: Thu, 19 Dec 2024 16:06:41 +0000 Subject: [PATCH] remove stream param from avro reader --- python/pylibcudf/pylibcudf/io/avro.pxd | 3 +-- python/pylibcudf/pylibcudf/io/avro.pyi | 6 +----- python/pylibcudf/pylibcudf/io/avro.pyx | 4 ---- python/pylibcudf/pylibcudf/libcudf/io/avro.pxd | 1 - 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/python/pylibcudf/pylibcudf/io/avro.pxd b/python/pylibcudf/pylibcudf/io/avro.pxd index 5036ef04533..9981a954b6c 100644 --- a/python/pylibcudf/pylibcudf/io/avro.pxd +++ b/python/pylibcudf/pylibcudf/io/avro.pxd @@ -2,7 +2,6 @@ from pylibcudf.io.types cimport SourceInfo, TableWithMetadata from pylibcudf.libcudf.io.avro cimport avro_reader_options, avro_reader_options_builder from pylibcudf.libcudf.types cimport size_type -from rmm._cuda.stream cimport Stream from pylibcudf.libcudf.types cimport size_type @@ -20,4 +19,4 @@ cdef class AvroReaderOptionsBuilder: cpdef AvroReaderOptionsBuilder num_rows(self, size_type num_rows) cpdef AvroReaderOptions build(self) -cpdef TableWithMetadata read_avro(AvroReaderOptions options, Stream stream = *) +cpdef TableWithMetadata read_avro(AvroReaderOptions options) diff --git a/python/pylibcudf/pylibcudf/io/avro.pyi b/python/pylibcudf/pylibcudf/io/avro.pyi index 3de4c4bf9c2..764b15f37d9 100644 --- a/python/pylibcudf/pylibcudf/io/avro.pyi +++ b/python/pylibcudf/pylibcudf/io/avro.pyi @@ -1,7 +1,5 @@ # Copyright (c) 2024, NVIDIA CORPORATION. -from rmm._cuda.stream import Stream - from pylibcudf.io.types import SourceInfo, TableWithMetadata __all__ = ["AvroReaderOptions", "AvroReaderOptionsBuilder", "read_avro"] @@ -16,6 +14,4 @@ class AvroReaderOptionsBuilder: def num_rows(num_rows: int) -> AvroReaderOptionsBuilder: ... def build(self) -> AvroReaderOptions: ... -def read_avro( - options: AvroReaderOptions, stream: Stream = None -) -> TableWithMetadata: ... +def read_avro(options: AvroReaderOptions) -> TableWithMetadata: ... diff --git a/python/pylibcudf/pylibcudf/io/avro.pyx b/python/pylibcudf/pylibcudf/io/avro.pyx index e5e1e9755fd..5b37f0a0a67 100644 --- a/python/pylibcudf/pylibcudf/io/avro.pyx +++ b/python/pylibcudf/pylibcudf/io/avro.pyx @@ -9,7 +9,6 @@ from pylibcudf.libcudf.io.avro cimport ( read_avro as cpp_read_avro, ) from pylibcudf.libcudf.types cimport size_type -from rmm._cuda.stream cimport Stream __all__ = ["read_avro", "AvroReaderOptions", "AvroReaderOptionsBuilder"] @@ -128,7 +127,6 @@ cdef class AvroReaderOptionsBuilder: cpdef TableWithMetadata read_avro( AvroReaderOptions options, - Stream stream = None, ): """ Read from Avro format. @@ -143,8 +141,6 @@ cpdef TableWithMetadata read_avro( options: AvroReaderOptions Settings for controlling reading behavior """ - if stream is None: - stream = Stream() with nogil: c_result = move(cpp_read_avro(options.c_obj, stream.view())) diff --git a/python/pylibcudf/pylibcudf/libcudf/io/avro.pxd b/python/pylibcudf/pylibcudf/libcudf/io/avro.pxd index 5252d6d7186..9e571609d9c 100644 --- a/python/pylibcudf/pylibcudf/libcudf/io/avro.pxd +++ b/python/pylibcudf/pylibcudf/libcudf/io/avro.pxd @@ -47,5 +47,4 @@ cdef extern from "cudf/io/avro.hpp" \ cdef cudf_io_types.table_with_metadata read_avro( avro_reader_options &options, - cuda_stream_view stream, ) except +libcudf_exception_handler