From db253f3a520d03d79abb55667f1aad44daefa42d Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Thu, 10 Oct 2024 11:08:56 -0700 Subject: [PATCH 1/2] Move pylibcudf/libcudf/wrappers/decimals to pylibcudf/libcudf/fixed_point --- .../pylibcudf/libcudf/fixed_point/__init__.pxd | 0 .../pylibcudf/libcudf/fixed_point/__init__.pyx | 0 .../libcudf/fixed_point/fixed_point.pxd | 8 ++++++++ .../pylibcudf/libcudf/scalar/scalar.pxd | 2 +- .../pylibcudf/libcudf/wrappers/decimals.pxd | 16 ---------------- 5 files changed, 9 insertions(+), 17 deletions(-) create mode 100644 python/pylibcudf/pylibcudf/libcudf/fixed_point/__init__.pxd create mode 100644 python/pylibcudf/pylibcudf/libcudf/fixed_point/__init__.pyx create mode 100644 python/pylibcudf/pylibcudf/libcudf/fixed_point/fixed_point.pxd delete mode 100644 python/pylibcudf/pylibcudf/libcudf/wrappers/decimals.pxd diff --git a/python/pylibcudf/pylibcudf/libcudf/fixed_point/__init__.pxd b/python/pylibcudf/pylibcudf/libcudf/fixed_point/__init__.pxd new file mode 100644 index 00000000000..e69de29bb2d diff --git a/python/pylibcudf/pylibcudf/libcudf/fixed_point/__init__.pyx b/python/pylibcudf/pylibcudf/libcudf/fixed_point/__init__.pyx new file mode 100644 index 00000000000..e69de29bb2d diff --git a/python/pylibcudf/pylibcudf/libcudf/fixed_point/fixed_point.pxd b/python/pylibcudf/pylibcudf/libcudf/fixed_point/fixed_point.pxd new file mode 100644 index 00000000000..e55574020f4 --- /dev/null +++ b/python/pylibcudf/pylibcudf/libcudf/fixed_point/fixed_point.pxd @@ -0,0 +1,8 @@ +# Copyright (c) 2021-2024, NVIDIA CORPORATION. + +from libc.stdint cimport int32_t + + +cdef extern from "cudf/fixed_point/fixed_point.hpp" namespace "numeric" nogil: + cdef cppclass scale_type: + scale_type(int32_t) diff --git a/python/pylibcudf/pylibcudf/libcudf/scalar/scalar.pxd b/python/pylibcudf/pylibcudf/libcudf/scalar/scalar.pxd index 4b40a8a26f6..a51413669c5 100644 --- a/python/pylibcudf/pylibcudf/libcudf/scalar/scalar.pxd +++ b/python/pylibcudf/pylibcudf/libcudf/scalar/scalar.pxd @@ -4,9 +4,9 @@ from libc.stdint cimport int32_t, int64_t from libcpp cimport bool from libcpp.string cimport string from pylibcudf.libcudf.column.column_view cimport column_view +from pylibcudf.libcudf.fixed_point.fixed_point cimport scale_type from pylibcudf.libcudf.table.table_view cimport table_view from pylibcudf.libcudf.types cimport data_type -from pylibcudf.libcudf.wrappers.decimals cimport scale_type cdef extern from "cudf/scalar/scalar.hpp" namespace "cudf" nogil: diff --git a/python/pylibcudf/pylibcudf/libcudf/wrappers/decimals.pxd b/python/pylibcudf/pylibcudf/libcudf/wrappers/decimals.pxd deleted file mode 100644 index 558299501d6..00000000000 --- a/python/pylibcudf/pylibcudf/libcudf/wrappers/decimals.pxd +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright (c) 2021-2024, NVIDIA CORPORATION. - -from libc.stdint cimport int32_t, int64_t -from pylibcudf.libcudf.types cimport int128 - - -cdef extern from "cudf/fixed_point/fixed_point.hpp" namespace "numeric" nogil: - # cython type stub to help resolve to numeric::decimal64 - ctypedef int64_t decimal64 - # cython type stub to help resolve to numeric::decimal32 - ctypedef int64_t decimal32 - # cython type stub to help resolve to numeric::decimal128 - ctypedef int128 decimal128 - - cdef cppclass scale_type: - scale_type(int32_t) From 17d8fdd0e6306f371a6ff51fe4ee322989269f39 Mon Sep 17 00:00:00 2001 From: Matthew Roeschke <10647082+mroeschke@users.noreply.github.com> Date: Thu, 10 Oct 2024 14:47:43 -0700 Subject: [PATCH 2/2] Remove unneeded .pyx --- python/pylibcudf/pylibcudf/libcudf/fixed_point/__init__.pyx | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 python/pylibcudf/pylibcudf/libcudf/fixed_point/__init__.pyx diff --git a/python/pylibcudf/pylibcudf/libcudf/fixed_point/__init__.pyx b/python/pylibcudf/pylibcudf/libcudf/fixed_point/__init__.pyx deleted file mode 100644 index e69de29bb2d..00000000000