more updates

pandas-dev · WillAyd · Mar 11, 2023 · Feb 18, 2023 · Feb 18, 2023 · Feb 18, 2023
commit 782b9718897d93ac9df7a04ac7c12c42ac4ee1c0
diff --git a/pandas/_libs/missing.pyx b/pandas/_libs/missing.pyx
@@ -34,6 +34,7 @@ from pandas._libs.tslibs.np_datetime cimport (
    get_datetime64_unit,
    get_datetime64_value,
    get_timedelta64_value,
+    import_pandas_datetime
 )

 from pandas._libs.ops_dispatch import maybe_dispatch_ufunc_to_dunder_op

diff --git a/pandas/_libs/src/ujson/python/date_conversions.c b/pandas/_libs/src/ujson/python/date_conversions.c
@@ -10,6 +10,7 @@ The full license is in the LICENSE file, distributed with this software.

 #include "date_conversions.h"
 #include <../../../tslibs/src/datetime/np_datetime.h>
+#include <../../../tslibs/src/datetime/pd_datetime.h>
 #include <../../../tslibs/src/datetime/np_datetime_strings.h>

 /*

diff --git a/pandas/_libs/src/ujson/python/ujson.c b/pandas/_libs/src/ujson/python/ujson.c
@@ -40,6 +40,7 @@ Numeric decoder derived from TCL library
 #include <Python.h>
 #define PY_ARRAY_UNIQUE_SYMBOL UJSON_NUMPY
 #include "numpy/arrayobject.h"
+#include <../../../tslibs/src/datetime/pd_datetime.h>

 /* objToJSON */
 PyObject *objToJSON(PyObject *self, PyObject *args, PyObject *kwargs);
@@ -447,5 +448,6 @@ PyMODINIT_FUNC PyInit_json(void) {
    }
    */

+    PandasDateTime_IMPORT;
    return module;
 }
diff --git a/pandas/_libs/tslibs/np_datetime.pxd b/pandas/_libs/tslibs/np_datetime.pxd
@@ -74,8 +74,11 @@ cdef extern from "src/datetime/pd_datetime.h":
    void pandas_datetime_to_datetimestruct(npy_datetime val,
                                           NPY_DATETIMEUNIT fr,
                                           npy_datetimestruct *result) nogil
+    void PandasDateTime_IMPORT()

-PandasDateTime_IMPORT
+# You must call this before using the PandasDateTime CAPI functions
+cdef inline void import_pandas_datetime():
+    PandasDateTime_IMPORT

 cdef bint cmp_scalar(int64_t lhs, int64_t rhs, int op) except -1


diff --git a/pandas/_libs/tslibs/src/datetime/np_datetime.c b/pandas/_libs/tslibs/src/datetime/np_datetime.c
@@ -444,107 +444,6 @@ int convert_pydatetime_to_datetimestruct(PyObject *dtobj,
    return 0;
 }

-
-/*
- * Converts a datetime from a datetimestruct to a datetime based
- * on a metadata unit. The date is assumed to be valid.
- */
-npy_datetime npy_datetimestruct_to_datetime(NPY_DATETIMEUNIT base,
-                                            const npy_datetimestruct *dts) {
-    npy_datetime ret;
-
-    if (base == NPY_FR_Y) {
-        /* Truncate to the year */
-        ret = dts->year - 1970;
-    } else if (base == NPY_FR_M) {
-        /* Truncate to the month */
-        ret = 12 * (dts->year - 1970) + (dts->month - 1);
-    } else {
-        /* Otherwise calculate the number of days to start */
-        npy_int64 days = get_datetimestruct_days(dts);
-
-        switch (base) {
-            case NPY_FR_W:
-                /* Truncate to weeks */
-                if (days >= 0) {
-                    ret = days / 7;
-                } else {
-                    ret = (days - 6) / 7;
-                }
-                break;
-            case NPY_FR_D:
-                ret = days;
-                break;
-            case NPY_FR_h:
-                ret = days * 24 + dts->hour;
-                break;
-            case NPY_FR_m:
-                ret = (days * 24 + dts->hour) * 60 + dts->min;
-                break;
-            case NPY_FR_s:
-                ret = ((days * 24 + dts->hour) * 60 + dts->min) * 60 + dts->sec;
-                break;
-            case NPY_FR_ms:
-                ret = (((days * 24 + dts->hour) * 60 + dts->min) * 60 +
-                       dts->sec) *
-                          1000 +
-                      dts->us / 1000;
-                break;
-            case NPY_FR_us:
-                ret = (((days * 24 + dts->hour) * 60 + dts->min) * 60 +
-                       dts->sec) *
-                          1000000 +
-                      dts->us;
-                break;
-            case NPY_FR_ns:
-                ret = ((((days * 24 + dts->hour) * 60 + dts->min) * 60 +
-                        dts->sec) *
-                           1000000 +
-                       dts->us) *
-                          1000 +
-                      dts->ps / 1000;
-                break;
-            case NPY_FR_ps:
-                ret = ((((days * 24 + dts->hour) * 60 + dts->min) * 60 +
-                        dts->sec) *
-                           1000000 +
-                       dts->us) *
-                          1000000 +
-                      dts->ps;
-                break;
-            case NPY_FR_fs:
-                /* only 2.6 hours */
-                ret = (((((days * 24 + dts->hour) * 60 + dts->min) * 60 +
-                         dts->sec) *
-                            1000000 +
-                        dts->us) *
-                           1000000 +
-                       dts->ps) *
-                          1000 +
-                      dts->as / 1000;
-                break;
-            case NPY_FR_as:
-                /* only 9.2 secs */
-                ret = (((((days * 24 + dts->hour) * 60 + dts->min) * 60 +
-                         dts->sec) *
-                            1000000 +
-                        dts->us) *
-                           1000000 +
-                       dts->ps) *
-                          1000000 +
-                      dts->as;
-                break;
-            default:
-                /* Something got corrupted */
-                PyErr_SetString(
-                    PyExc_ValueError,
-                    "NumPy datetime metadata with corrupt unit value");
-                return -1;
-        }
-    }
-    return ret;
-}
-
 /*
 * Port numpy#13188 https://github.com/numpy/numpy/pull/13188/
 *

diff --git a/pandas/_libs/tslibs/src/datetime/np_datetime.h b/pandas/_libs/tslibs/src/datetime/np_datetime.h
@@ -53,9 +53,6 @@ PyObject *extract_utc_offset(PyObject *obj);
 int convert_pydatetime_to_datetimestruct(PyObject *dtobj,
                                         npy_datetimestruct *out);

-npy_datetime npy_datetimestruct_to_datetime(NPY_DATETIMEUNIT base,
-                                            const npy_datetimestruct *dts);
-
 void pandas_datetime_to_datetimestruct(npy_datetime val, NPY_DATETIMEUNIT fr,
                                       npy_datetimestruct *result);


diff --git a/pandas/_libs/tslibs/src/datetime/pd_datetime.h b/pandas/_libs/tslibs/src/datetime/pd_datetime.h
@@ -33,6 +33,9 @@ extern "C" {

  #define PandasDateTime_IMPORT \
    PandasDateTimeAPI = (PandasDateTime_CAPI *)PyCapsule_Import(PandasDateTime_CAPSULE_NAME, 0)
+
+#define npy_datetimestruct_to_datetime(NPY_DATETIMEUNIT, npy_datetimestruct) \
+  PandasDateTimeAPI->npy_datetimestruct_to_datetime(NPY_DATETIMEUNIT, npy_datetimestruct)
 #endif /* !defined(_PANDAS_DATETIME_IMPL) */

 #ifdef __cplusplus