Skip to content

Commit 8487b2e

Browse files
authored
Revert "Use PyCapsule for internal datetime functions" (#51951)
Revert "Use PyCapsule for internal datetime functions (#51525)" This reverts commit 251b512.
1 parent 0359f17 commit 8487b2e

33 files changed

+223
-748
lines changed

MANIFEST.in

-2
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,3 @@ prune pandas/tests/io/parser/data
5858
# Selectively re-add *.cxx files that were excluded above
5959
graft pandas/_libs/src
6060
graft pandas/_libs/tslibs/src
61-
include pandas/_libs/pd_parser.h
62-
include pandas/_libs/pd_parser.c

pandas/_libs/__init__.py

-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@
1010
]
1111

1212

13-
# Below imports needs to happen first to ensure pandas top level
14-
# module gets monkeypatched with the pandas_datetime_CAPI
15-
# see pandas_datetime_exec in pd_datetime.c
16-
import pandas._libs.pandas_parser # noqa # isort: skip # type: ignore[reportUnusedImport]
17-
import pandas._libs.pandas_datetime # noqa # isort: skip # type: ignore[reportUnusedImport]
1813
from pandas._libs.interval import Interval
1914
from pandas._libs.tslibs import (
2015
NaT,

pandas/_libs/index.pyx

-5
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,7 @@ from pandas._libs.tslibs.nattype cimport c_NaT as NaT
2020
from pandas._libs.tslibs.np_datetime cimport (
2121
NPY_DATETIMEUNIT,
2222
get_unit_from_dtype,
23-
import_pandas_datetime,
2423
)
25-
26-
import_pandas_datetime()
27-
28-
2924
from pandas._libs.tslibs.period cimport is_period_object
3025
from pandas._libs.tslibs.timedeltas cimport _Timedelta
3126
from pandas._libs.tslibs.timestamps cimport _Timestamp

pandas/_libs/lib.pyx

+2-4
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,9 @@ cdef extern from "numpy/arrayobject.h":
8888
cdef extern from "numpy/ndarrayobject.h":
8989
bint PyArray_CheckScalar(obj) nogil
9090

91-
cdef extern from "pd_parser.h":
92-
int floatify(object, float64_t *result, int *maybe_int) except -1
93-
void PandasParser_IMPORT()
9491

95-
PandasParser_IMPORT
92+
cdef extern from "src/parse_helper.h":
93+
int floatify(object, float64_t *result, int *maybe_int) except -1
9694

9795
from pandas._libs cimport util
9896
from pandas._libs.util cimport (

pandas/_libs/missing.pyx

-3
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,8 @@ from pandas._libs.tslibs.np_datetime cimport (
3434
get_datetime64_unit,
3535
get_datetime64_value,
3636
get_timedelta64_value,
37-
import_pandas_datetime,
3837
)
3938

40-
import_pandas_datetime()
41-
4239
from pandas._libs.ops_dispatch import maybe_dispatch_ufunc_to_dunder_op
4340

4441
cdef:

pandas/_libs/parsers.pyx

+20-53
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,9 @@ cdef extern from "parser/tokenizer.h":
229229
int64_t skip_first_N_rows
230230
int64_t skipfooter
231231
# pick one, depending on whether the converter requires GIL
232-
double (*double_converter)(const char *, char **,
233-
char, char, char,
234-
int, int *, int *) nogil
232+
float64_t (*double_converter)(const char *, char **,
233+
char, char, char,
234+
int, int *, int *) nogil
235235

236236
# error handling
237237
char *warn_msg
@@ -249,16 +249,6 @@ cdef extern from "parser/tokenizer.h":
249249
int seen_uint
250250
int seen_null
251251

252-
void COLITER_NEXT(coliter_t, const char *) nogil
253-
254-
cdef extern from "pd_parser.h":
255-
void *new_rd_source(object obj) except NULL
256-
257-
int del_rd_source(void *src)
258-
259-
void* buffer_rd_bytes(void *source, size_t nbytes,
260-
size_t *bytes_read, int *status, const char *encoding_errors)
261-
262252
void uint_state_init(uint_state *self)
263253
int uint64_conflict(uint_state *self)
264254

@@ -289,49 +279,26 @@ cdef extern from "pd_parser.h":
289279
uint64_t str_to_uint64(uint_state *state, char *p_item, int64_t int_max,
290280
uint64_t uint_max, int *error, char tsep) nogil
291281

292-
double xstrtod(const char *p, char **q, char decimal,
293-
char sci, char tsep, int skip_trailing,
294-
int *error, int *maybe_int) nogil
295-
double precise_xstrtod(const char *p, char **q, char decimal,
296-
char sci, char tsep, int skip_trailing,
297-
int *error, int *maybe_int) nogil
298-
double round_trip(const char *p, char **q, char decimal,
282+
float64_t xstrtod(const char *p, char **q, char decimal,
299283
char sci, char tsep, int skip_trailing,
300284
int *error, int *maybe_int) nogil
285+
float64_t precise_xstrtod(const char *p, char **q, char decimal,
286+
char sci, char tsep, int skip_trailing,
287+
int *error, int *maybe_int) nogil
288+
float64_t round_trip(const char *p, char **q, char decimal,
289+
char sci, char tsep, int skip_trailing,
290+
int *error, int *maybe_int) nogil
301291

302292
int to_boolean(const char *item, uint8_t *val) nogil
303293

304-
void PandasParser_IMPORT()
305-
306-
PandasParser_IMPORT
307-
308-
# When not invoked directly but rather assigned as a function,
309-
# cdef extern'ed declarations seem to leave behind an undefined symbol
310-
cdef double xstrtod_wrapper(const char *p, char **q, char decimal,
311-
char sci, char tsep, int skip_trailing,
312-
int *error, int *maybe_int) nogil:
313-
return xstrtod(p, q, decimal, sci, tsep, skip_trailing, error, maybe_int)
314-
315-
316-
cdef double precise_xstrtod_wrapper(const char *p, char **q, char decimal,
317-
char sci, char tsep, int skip_trailing,
318-
int *error, int *maybe_int) nogil:
319-
return precise_xstrtod(p, q, decimal, sci, tsep, skip_trailing, error, maybe_int)
320-
321-
322-
cdef double round_trip_wrapper(const char *p, char **q, char decimal,
323-
char sci, char tsep, int skip_trailing,
324-
int *error, int *maybe_int) nogil:
325-
return round_trip(p, q, decimal, sci, tsep, skip_trailing, error, maybe_int)
326294

295+
cdef extern from "parser/io.h":
296+
void *new_rd_source(object obj) except NULL
327297

328-
cdef void* buffer_rd_bytes_wrapper(void *source, size_t nbytes,
329-
size_t *bytes_read, int *status,
330-
const char *encoding_errors) noexcept:
331-
return buffer_rd_bytes(source, nbytes, bytes_read, status, encoding_errors)
298+
int del_rd_source(void *src)
332299

333-
cdef int del_rd_source_wrapper(void *src) noexcept:
334-
return del_rd_source(src)
300+
void* buffer_rd_bytes(void *source, size_t nbytes,
301+
size_t *bytes_read, int *status, const char *encoding_errors)
335302

336303

337304
cdef class TextReader:
@@ -518,11 +485,11 @@ cdef class TextReader:
518485

519486
if float_precision == "round_trip":
520487
# see gh-15140
521-
self.parser.double_converter = round_trip_wrapper
488+
self.parser.double_converter = round_trip
522489
elif float_precision == "legacy":
523-
self.parser.double_converter = xstrtod_wrapper
490+
self.parser.double_converter = xstrtod
524491
elif float_precision == "high" or float_precision is None:
525-
self.parser.double_converter = precise_xstrtod_wrapper
492+
self.parser.double_converter = precise_xstrtod
526493
else:
527494
raise ValueError(f"Unrecognized float_precision option: "
528495
f"{float_precision}")
@@ -640,8 +607,8 @@ cdef class TextReader:
640607

641608
ptr = new_rd_source(source)
642609
self.parser.source = ptr
643-
self.parser.cb_io = buffer_rd_bytes_wrapper
644-
self.parser.cb_cleanup = del_rd_source_wrapper
610+
self.parser.cb_io = &buffer_rd_bytes
611+
self.parser.cb_cleanup = &del_rd_source
645612

646613
cdef _get_header(self, list prelim_header):
647614
# header is now a list of lists, so field_count should use header[0]

pandas/_libs/pd_parser.c

-178
This file was deleted.

0 commit comments

Comments
 (0)