Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Gwenaël Samain
cython
Commits
287b5d83
Commit
287b5d83
authored
Nov 27, 2008
by
Dag Sverre Seljebotn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
One shouldn't have to maintain manual recursion stacks in this day and age...
parent
4b4d3f43
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
48 additions
and
52 deletions
+48
-52
Cython/Includes/numpy.pxd
Cython/Includes/numpy.pxd
+48
-52
No files found.
Cython/Includes/numpy.pxd
View file @
287b5d83
...
@@ -132,58 +132,9 @@ cdef extern from "numpy/arrayobject.h":
...
@@ -132,58 +132,9 @@ cdef extern from "numpy/arrayobject.h":
return
return
else
:
else
:
info
.
format
=
<
char
*>
stdlib
.
malloc
(
255
)
# static size
info
.
format
=
<
char
*>
stdlib
.
malloc
(
255
)
# static size
f
=
info
.
format
f
=
_util_dtypestring
(
descr
,
info
.
format
,
info
.
format
+
255
)
stack
=
[
iter
(
descr
.
fields
.
iteritems
())]
f
[
0
]
=
0
# Terminate format string
while
True
:
iterator
=
stack
[
-
1
]
descr
=
None
while
descr
is
None
:
try
:
descr
=
iterator
.
next
()[
1
][
0
]
except
StopIteration
:
stack
.
pop
()
if
len
(
stack
)
>
0
:
f
[
0
]
=
125
#"}"
f
+=
1
iterator
=
stack
[
-
1
]
else
:
f
[
0
]
=
0
# Terminate string!
return
hasfields
=
PyDataType_HASFIELDS
(
descr
)
if
not
hasfields
:
t
=
descr
.
type_num
if
f
-
info
.
format
>
240
:
# this should leave room for "T{" and "}" as well
raise
RuntimeError
(
"Format string allocated too short."
)
# Until ticket #99 is fixed, use integers to avoid warnings
if
t
==
NPY_BYTE
:
f
[
0
]
=
98
#"b"
elif
t
==
NPY_UBYTE
:
f
[
0
]
=
66
#"B"
elif
t
==
NPY_SHORT
:
f
[
0
]
=
104
#"h"
elif
t
==
NPY_USHORT
:
f
[
0
]
=
72
#"H"
elif
t
==
NPY_INT
:
f
[
0
]
=
105
#"i"
elif
t
==
NPY_UINT
:
f
[
0
]
=
73
#"I"
elif
t
==
NPY_LONG
:
f
[
0
]
=
108
#"l"
elif
t
==
NPY_ULONG
:
f
[
0
]
=
76
#"L"
elif
t
==
NPY_LONGLONG
:
f
[
0
]
=
113
#"q"
elif
t
==
NPY_ULONGLONG
:
f
[
0
]
=
81
#"Q"
elif
t
==
NPY_FLOAT
:
f
[
0
]
=
102
#"f"
elif
t
==
NPY_DOUBLE
:
f
[
0
]
=
100
#"d"
elif
t
==
NPY_LONGDOUBLE
:
f
[
0
]
=
103
#"g"
elif
t
==
NPY_CFLOAT
:
f
[
0
]
=
90
;
f
[
1
]
=
102
;
f
+=
1
elif
t
==
NPY_CDOUBLE
:
f
[
0
]
=
90
;
f
[
1
]
=
100
;
f
+=
1
elif
t
==
NPY_CLONGDOUBLE
:
f
[
0
]
=
90
;
f
[
1
]
=
103
;
f
+=
1
elif
t
==
NPY_OBJECT
:
f
[
0
]
=
79
#"O"
else
:
raise
ValueError
(
"unknown dtype code in numpy.pxd (%d)"
%
t
)
f
+=
1
else
:
f
[
0
]
=
84
#"T"
f
[
1
]
=
123
#"{"
f
+=
2
stack
.
append
(
iter
(
descr
.
fields
.
iteritems
()))
def
__releasebuffer__
(
ndarray
self
,
Py_buffer
*
info
):
def
__releasebuffer__
(
ndarray
self
,
Py_buffer
*
info
):
if
PyArray_HASFIELDS
(
self
):
if
PyArray_HASFIELDS
(
self
):
stdlib
.
free
(
info
.
format
)
stdlib
.
free
(
info
.
format
)
...
@@ -292,3 +243,48 @@ ctypedef npy_longdouble longdouble_t
...
@@ -292,3 +243,48 @@ ctypedef npy_longdouble longdouble_t
ctypedef
npy_cfloat
cfloat_t
ctypedef
npy_cfloat
cfloat_t
ctypedef
npy_cdouble
cdouble_t
ctypedef
npy_cdouble
cdouble_t
ctypedef
npy_clongdouble
clongdouble_t
ctypedef
npy_clongdouble
clongdouble_t
cdef
inline
char
*
_util_dtypestring
(
dtype
descr
,
char
*
f
,
char
*
end
)
except
NULL
:
# Recursive utility function used in __getbuffer__ to get format
# string. The new location in the format string is returned.
cdef
dtype
child
cdef
tuple
i
for
i
in
descr
.
fields
.
itervalues
():
child
=
i
[
0
]
if
not
PyDataType_HASFIELDS
(
child
):
t
=
child
.
type_num
if
end
-
f
<
15
:
# this should leave room for "T{" and "}" as well
raise
RuntimeError
(
"Format string allocated too short."
)
# Until ticket #99 is fixed, use integers to avoid warnings
if
t
==
NPY_BYTE
:
f
[
0
]
=
98
#"b"
elif
t
==
NPY_UBYTE
:
f
[
0
]
=
66
#"B"
elif
t
==
NPY_SHORT
:
f
[
0
]
=
104
#"h"
elif
t
==
NPY_USHORT
:
f
[
0
]
=
72
#"H"
elif
t
==
NPY_INT
:
f
[
0
]
=
105
#"i"
elif
t
==
NPY_UINT
:
f
[
0
]
=
73
#"I"
elif
t
==
NPY_LONG
:
f
[
0
]
=
108
#"l"
elif
t
==
NPY_ULONG
:
f
[
0
]
=
76
#"L"
elif
t
==
NPY_LONGLONG
:
f
[
0
]
=
113
#"q"
elif
t
==
NPY_ULONGLONG
:
f
[
0
]
=
81
#"Q"
elif
t
==
NPY_FLOAT
:
f
[
0
]
=
102
#"f"
elif
t
==
NPY_DOUBLE
:
f
[
0
]
=
100
#"d"
elif
t
==
NPY_LONGDOUBLE
:
f
[
0
]
=
103
#"g"
elif
t
==
NPY_CFLOAT
:
f
[
0
]
=
90
;
f
[
1
]
=
102
;
f
+=
1
elif
t
==
NPY_CDOUBLE
:
f
[
0
]
=
90
;
f
[
1
]
=
100
;
f
+=
1
elif
t
==
NPY_CLONGDOUBLE
:
f
[
0
]
=
90
;
f
[
1
]
=
103
;
f
+=
1
elif
t
==
NPY_OBJECT
:
f
[
0
]
=
79
#"O"
else
:
raise
ValueError
(
"unknown dtype code in numpy.pxd (%d)"
%
t
)
f
+=
1
else
:
f
[
0
]
=
84
#"T"
f
[
1
]
=
123
#"{"
f
+=
2
f
=
_util_dtypestring
(
child
,
f
,
end
)
f
[
0
]
=
125
#"}"
f
+=
1
return
f
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment