Skip to content

Commit ae26ec7

Browse files
sinhrksjreback
sinhrks
authored and
jreback
committed
BLD: Fix sparse warnings
closes #13942 xref #13849
1 parent b7abef4 commit ae26ec7

File tree

3 files changed

+35
-35
lines changed

3 files changed

+35
-35
lines changed

‎pandas/src/sparse.pyx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,13 @@ cdef class IntIndex(SparseIndex):
147147
return IntIndex(self.length, new_indices)
148148

149149
@cython.wraparound(False)
150-
cpdef int lookup(self, Py_ssize_t index):
150+
cpdef int32_t lookup(self, Py_ssize_t index):
151151
"""
152152
Return the internal location if value exists on given index.
153153
Return -1 otherwise.
154154
"""
155155
cdef:
156-
Py_ssize_t res
156+
int32_t res
157157
ndarray[int32_t, ndim=1] inds
158158

159159
inds = self.indices
@@ -290,7 +290,7 @@ cdef class BlockIndex(SparseIndex):
290290
----------
291291
"""
292292
cdef readonly:
293-
Py_ssize_t nblocks, npoints, length
293+
int32_t nblocks, npoints, length
294294
ndarray blocs, blengths
295295

296296
cdef:
@@ -308,7 +308,7 @@ cdef class BlockIndex(SparseIndex):
308308
self.lenbuf = <int32_t*> self.blengths.data
309309

310310
self.length = length
311-
self.nblocks = len(self.blocs)
311+
self.nblocks = np.int32(len(self.blocs))
312312
self.npoints = self.blengths.sum()
313313

314314
# self.block_start = blocs
@@ -381,7 +381,7 @@ cdef class BlockIndex(SparseIndex):
381381

382382
def to_int_index(self):
383383
cdef:
384-
Py_ssize_t i = 0, j, b
384+
int32_t i = 0, j, b
385385
int32_t offset
386386
ndarray[int32_t, ndim=1] indices
387387

@@ -498,7 +498,7 @@ cdef class BlockIndex(SparseIndex):
498498
"""
499499
return BlockUnion(self, y.to_block_index()).result
500500

501-
cpdef int lookup(self, Py_ssize_t index):
501+
cpdef Py_ssize_t lookup(self, Py_ssize_t index):
502502
"""
503503
Return the internal location if value exists on given index.
504504
Return -1 otherwise.

‎pandas/src/sparse_op_helper.pxi‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ cdef inline tuple block_op_add_float64(ndarray x_,
8787
cdef:
8888
BlockIndex out_index
8989
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
90-
Py_ssize_t xbp = 0, ybp = 0 # block positions
90+
int32_t xbp = 0, ybp = 0 # block positions
9191
int32_t xloc, yloc
9292
Py_ssize_t xblock = 0, yblock = 0 # block numbers
9393

@@ -282,7 +282,7 @@ cdef inline tuple block_op_add_int64(ndarray x_,
282282
cdef:
283283
BlockIndex out_index
284284
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
285-
Py_ssize_t xbp = 0, ybp = 0 # block positions
285+
int32_t xbp = 0, ybp = 0 # block positions
286286
int32_t xloc, yloc
287287
Py_ssize_t xblock = 0, yblock = 0 # block numbers
288288

@@ -477,7 +477,7 @@ cdef inline tuple block_op_sub_float64(ndarray x_,
477477
cdef:
478478
BlockIndex out_index
479479
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
480-
Py_ssize_t xbp = 0, ybp = 0 # block positions
480+
int32_t xbp = 0, ybp = 0 # block positions
481481
int32_t xloc, yloc
482482
Py_ssize_t xblock = 0, yblock = 0 # block numbers
483483

@@ -672,7 +672,7 @@ cdef inline tuple block_op_sub_int64(ndarray x_,
672672
cdef:
673673
BlockIndex out_index
674674
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
675-
Py_ssize_t xbp = 0, ybp = 0 # block positions
675+
int32_t xbp = 0, ybp = 0 # block positions
676676
int32_t xloc, yloc
677677
Py_ssize_t xblock = 0, yblock = 0 # block numbers
678678

@@ -867,7 +867,7 @@ cdef inline tuple block_op_mul_float64(ndarray x_,
867867
cdef:
868868
BlockIndex out_index
869869
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
870-
Py_ssize_t xbp = 0, ybp = 0 # block positions
870+
int32_t xbp = 0, ybp = 0 # block positions
871871
int32_t xloc, yloc
872872
Py_ssize_t xblock = 0, yblock = 0 # block numbers
873873

@@ -1062,7 +1062,7 @@ cdef inline tuple block_op_mul_int64(ndarray x_,
10621062
cdef:
10631063
BlockIndex out_index
10641064
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
1065-
Py_ssize_t xbp = 0, ybp = 0 # block positions
1065+
int32_t xbp = 0, ybp = 0 # block positions
10661066
int32_t xloc, yloc
10671067
Py_ssize_t xblock = 0, yblock = 0 # block numbers
10681068

@@ -1257,7 +1257,7 @@ cdef inline tuple block_op_div_float64(ndarray x_,
12571257
cdef:
12581258
BlockIndex out_index
12591259
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
1260-
Py_ssize_t xbp = 0, ybp = 0 # block positions
1260+
int32_t xbp = 0, ybp = 0 # block positions
12611261
int32_t xloc, yloc
12621262
Py_ssize_t xblock = 0, yblock = 0 # block numbers
12631263

@@ -1452,7 +1452,7 @@ cdef inline tuple block_op_div_int64(ndarray x_,
14521452
cdef:
14531453
BlockIndex out_index
14541454
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
1455-
Py_ssize_t xbp = 0, ybp = 0 # block positions
1455+
int32_t xbp = 0, ybp = 0 # block positions
14561456
int32_t xloc, yloc
14571457
Py_ssize_t xblock = 0, yblock = 0 # block numbers
14581458

@@ -1647,7 +1647,7 @@ cdef inline tuple block_op_mod_float64(ndarray x_,
16471647
cdef:
16481648
BlockIndex out_index
16491649
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
1650-
Py_ssize_t xbp = 0, ybp = 0 # block positions
1650+
int32_t xbp = 0, ybp = 0 # block positions
16511651
int32_t xloc, yloc
16521652
Py_ssize_t xblock = 0, yblock = 0 # block numbers
16531653

@@ -1842,7 +1842,7 @@ cdef inline tuple block_op_mod_int64(ndarray x_,
18421842
cdef:
18431843
BlockIndex out_index
18441844
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
1845-
Py_ssize_t xbp = 0, ybp = 0 # block positions
1845+
int32_t xbp = 0, ybp = 0 # block positions
18461846
int32_t xloc, yloc
18471847
Py_ssize_t xblock = 0, yblock = 0 # block numbers
18481848

@@ -2037,7 +2037,7 @@ cdef inline tuple block_op_truediv_float64(ndarray x_,
20372037
cdef:
20382038
BlockIndex out_index
20392039
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
2040-
Py_ssize_t xbp = 0, ybp = 0 # block positions
2040+
int32_t xbp = 0, ybp = 0 # block positions
20412041
int32_t xloc, yloc
20422042
Py_ssize_t xblock = 0, yblock = 0 # block numbers
20432043

@@ -2232,7 +2232,7 @@ cdef inline tuple block_op_truediv_int64(ndarray x_,
22322232
cdef:
22332233
BlockIndex out_index
22342234
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
2235-
Py_ssize_t xbp = 0, ybp = 0 # block positions
2235+
int32_t xbp = 0, ybp = 0 # block positions
22362236
int32_t xloc, yloc
22372237
Py_ssize_t xblock = 0, yblock = 0 # block numbers
22382238

@@ -2427,7 +2427,7 @@ cdef inline tuple block_op_floordiv_float64(ndarray x_,
24272427
cdef:
24282428
BlockIndex out_index
24292429
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
2430-
Py_ssize_t xbp = 0, ybp = 0 # block positions
2430+
int32_t xbp = 0, ybp = 0 # block positions
24312431
int32_t xloc, yloc
24322432
Py_ssize_t xblock = 0, yblock = 0 # block numbers
24332433

@@ -2622,7 +2622,7 @@ cdef inline tuple block_op_floordiv_int64(ndarray x_,
26222622
cdef:
26232623
BlockIndex out_index
26242624
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
2625-
Py_ssize_t xbp = 0, ybp = 0 # block positions
2625+
int32_t xbp = 0, ybp = 0 # block positions
26262626
int32_t xloc, yloc
26272627
Py_ssize_t xblock = 0, yblock = 0 # block numbers
26282628

@@ -2817,7 +2817,7 @@ cdef inline tuple block_op_pow_float64(ndarray x_,
28172817
cdef:
28182818
BlockIndex out_index
28192819
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
2820-
Py_ssize_t xbp = 0, ybp = 0 # block positions
2820+
int32_t xbp = 0, ybp = 0 # block positions
28212821
int32_t xloc, yloc
28222822
Py_ssize_t xblock = 0, yblock = 0 # block numbers
28232823

@@ -3012,7 +3012,7 @@ cdef inline tuple block_op_pow_int64(ndarray x_,
30123012
cdef:
30133013
BlockIndex out_index
30143014
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
3015-
Py_ssize_t xbp = 0, ybp = 0 # block positions
3015+
int32_t xbp = 0, ybp = 0 # block positions
30163016
int32_t xloc, yloc
30173017
Py_ssize_t xblock = 0, yblock = 0 # block numbers
30183018

@@ -3207,7 +3207,7 @@ cdef inline tuple block_op_eq_float64(ndarray x_,
32073207
cdef:
32083208
BlockIndex out_index
32093209
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
3210-
Py_ssize_t xbp = 0, ybp = 0 # block positions
3210+
int32_t xbp = 0, ybp = 0 # block positions
32113211
int32_t xloc, yloc
32123212
Py_ssize_t xblock = 0, yblock = 0 # block numbers
32133213

@@ -3402,7 +3402,7 @@ cdef inline tuple block_op_eq_int64(ndarray x_,
34023402
cdef:
34033403
BlockIndex out_index
34043404
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
3405-
Py_ssize_t xbp = 0, ybp = 0 # block positions
3405+
int32_t xbp = 0, ybp = 0 # block positions
34063406
int32_t xloc, yloc
34073407
Py_ssize_t xblock = 0, yblock = 0 # block numbers
34083408

@@ -3597,7 +3597,7 @@ cdef inline tuple block_op_ne_float64(ndarray x_,
35973597
cdef:
35983598
BlockIndex out_index
35993599
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
3600-
Py_ssize_t xbp = 0, ybp = 0 # block positions
3600+
int32_t xbp = 0, ybp = 0 # block positions
36013601
int32_t xloc, yloc
36023602
Py_ssize_t xblock = 0, yblock = 0 # block numbers
36033603

@@ -3792,7 +3792,7 @@ cdef inline tuple block_op_ne_int64(ndarray x_,
37923792
cdef:
37933793
BlockIndex out_index
37943794
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
3795-
Py_ssize_t xbp = 0, ybp = 0 # block positions
3795+
int32_t xbp = 0, ybp = 0 # block positions
37963796
int32_t xloc, yloc
37973797
Py_ssize_t xblock = 0, yblock = 0 # block numbers
37983798

@@ -3987,7 +3987,7 @@ cdef inline tuple block_op_lt_float64(ndarray x_,
39873987
cdef:
39883988
BlockIndex out_index
39893989
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
3990-
Py_ssize_t xbp = 0, ybp = 0 # block positions
3990+
int32_t xbp = 0, ybp = 0 # block positions
39913991
int32_t xloc, yloc
39923992
Py_ssize_t xblock = 0, yblock = 0 # block numbers
39933993

@@ -4182,7 +4182,7 @@ cdef inline tuple block_op_lt_int64(ndarray x_,
41824182
cdef:
41834183
BlockIndex out_index
41844184
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
4185-
Py_ssize_t xbp = 0, ybp = 0 # block positions
4185+
int32_t xbp = 0, ybp = 0 # block positions
41864186
int32_t xloc, yloc
41874187
Py_ssize_t xblock = 0, yblock = 0 # block numbers
41884188

@@ -4377,7 +4377,7 @@ cdef inline tuple block_op_gt_float64(ndarray x_,
43774377
cdef:
43784378
BlockIndex out_index
43794379
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
4380-
Py_ssize_t xbp = 0, ybp = 0 # block positions
4380+
int32_t xbp = 0, ybp = 0 # block positions
43814381
int32_t xloc, yloc
43824382
Py_ssize_t xblock = 0, yblock = 0 # block numbers
43834383

@@ -4572,7 +4572,7 @@ cdef inline tuple block_op_gt_int64(ndarray x_,
45724572
cdef:
45734573
BlockIndex out_index
45744574
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
4575-
Py_ssize_t xbp = 0, ybp = 0 # block positions
4575+
int32_t xbp = 0, ybp = 0 # block positions
45764576
int32_t xloc, yloc
45774577
Py_ssize_t xblock = 0, yblock = 0 # block numbers
45784578

@@ -4767,7 +4767,7 @@ cdef inline tuple block_op_le_float64(ndarray x_,
47674767
cdef:
47684768
BlockIndex out_index
47694769
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
4770-
Py_ssize_t xbp = 0, ybp = 0 # block positions
4770+
int32_t xbp = 0, ybp = 0 # block positions
47714771
int32_t xloc, yloc
47724772
Py_ssize_t xblock = 0, yblock = 0 # block numbers
47734773

@@ -4962,7 +4962,7 @@ cdef inline tuple block_op_le_int64(ndarray x_,
49624962
cdef:
49634963
BlockIndex out_index
49644964
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
4965-
Py_ssize_t xbp = 0, ybp = 0 # block positions
4965+
int32_t xbp = 0, ybp = 0 # block positions
49664966
int32_t xloc, yloc
49674967
Py_ssize_t xblock = 0, yblock = 0 # block numbers
49684968

@@ -5157,7 +5157,7 @@ cdef inline tuple block_op_ge_float64(ndarray x_,
51575157
cdef:
51585158
BlockIndex out_index
51595159
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
5160-
Py_ssize_t xbp = 0, ybp = 0 # block positions
5160+
int32_t xbp = 0, ybp = 0 # block positions
51615161
int32_t xloc, yloc
51625162
Py_ssize_t xblock = 0, yblock = 0 # block numbers
51635163

@@ -5352,7 +5352,7 @@ cdef inline tuple block_op_ge_int64(ndarray x_,
53525352
cdef:
53535353
BlockIndex out_index
53545354
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
5355-
Py_ssize_t xbp = 0, ybp = 0 # block positions
5355+
int32_t xbp = 0, ybp = 0 # block positions
53565356
int32_t xloc, yloc
53575357
Py_ssize_t xblock = 0, yblock = 0 # block numbers
53585358

‎pandas/src/sparse_op_helper.pxi.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ cdef inline tuple block_op_{{opname}}_{{dtype}}(ndarray x_,
155155
cdef:
156156
BlockIndex out_index
157157
Py_ssize_t xi = 0, yi = 0, out_i = 0 # fp buf indices
158-
Py_ssize_t xbp = 0, ybp = 0 # block positions
158+
int32_t xbp = 0, ybp = 0 # block positions
159159
int32_t xloc, yloc
160160
Py_ssize_t xblock = 0, yblock = 0 # block numbers
161161

0 commit comments

Comments
 (0)