@@ -8,7 +8,9 @@ cdef bint PY3 = (sys.version_info[0] >= 3)
8
8
9
9
from numpy cimport *
10
10
11
+ # initialize numpy
11
12
np.import_array()
13
+ np.import_ufunc()
12
14
13
15
from libc.stdlib cimport malloc, free
14
16
@@ -52,23 +54,15 @@ PyDateTime_IMPORT
52
54
from tslibs.np_datetime cimport get_timedelta64_value, get_datetime64_value
53
55
54
56
from tslib cimport _check_all_nulls
55
- import tslib
56
- from tslib import NaT, Timestamp, Timedelta
57
- import interval
57
+ from tslib import NaT, Timestamp, Timedelta, array_to_datetime
58
58
from interval import Interval
59
59
60
60
cdef int64_t NPY_NAT = util.get_nat()
61
61
62
62
cimport util
63
63
from util cimport is_array, _checknull, _checknan
64
64
65
- cdef extern from " math.h" :
66
- double sqrt(double x)
67
- double fabs(double )
68
-
69
- # initialize numpy
70
- import_array()
71
- import_ufunc()
65
+ from libc.math cimport sqrt, fabs
72
66
73
67
74
68
def values_from_object (object o ):
@@ -151,7 +145,7 @@ cpdef bint checknull_old(object val):
151
145
elif is_array(val):
152
146
return False
153
147
else :
154
- return util. _checknull(val)
148
+ return _checknull(val)
155
149
156
150
157
151
cpdef bint isposinf_scalar(object val):
@@ -787,13 +781,13 @@ def scalar_binop(ndarray[object] values, object val, object op):
787
781
object x
788
782
789
783
result = np.empty(n, dtype = object )
790
- if util. _checknull(val):
784
+ if _checknull(val):
791
785
result.fill(val)
792
786
return result
793
787
794
788
for i in range (n):
795
789
x = values[i]
796
- if util. _checknull(x):
790
+ if _checknull(x):
797
791
result[i] = x
798
792
else :
799
793
result[i] = op(x, val)
@@ -820,9 +814,9 @@ def vec_binop(ndarray[object] left, ndarray[object] right, object op):
820
814
try :
821
815
result[i] = op(x, y)
822
816
except TypeError :
823
- if util. _checknull(x):
817
+ if _checknull(x):
824
818
result[i] = x
825
- elif util. _checknull(y):
819
+ elif _checknull(y):
826
820
result[i] = y
827
821
else :
828
822
raise
0 commit comments