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
Boxiang Sun
cython
Commits
5949fc5d
Commit
5949fc5d
authored
Jul 28, 2008
by
Dag Sverre Seljebotn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed and cleaned buffer acquisition (but should do more); well on the way for indirect access
parent
724f5756
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
400 additions
and
115 deletions
+400
-115
Cython/Compiler/Buffer.py
Cython/Compiler/Buffer.py
+181
-90
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+14
-6
Cython/Compiler/Naming.py
Cython/Compiler/Naming.py
+1
-1
tests/run/bufaccess.pyx
tests/run/bufaccess.pyx
+204
-18
No files found.
Cython/Compiler/Buffer.py
View file @
5949fc5d
This diff is collapsed.
Click to expand it.
Cython/Compiler/ExprNodes.py
View file @
5949fc5d
...
...
@@ -890,7 +890,8 @@ class NameNode(AtomicExprNode):
# safe than sorry. Feel free to change this.
import
Buffer
self
.
new_buffer_temp
=
Symtab
.
new_temp
(
self
.
entry
.
type
)
self
.
temps
=
[
self
.
new_buffer_temp
]
self
.
retcode_temp
=
Symtab
.
new_temp
(
PyrexTypes
.
c_int_type
)
self
.
temps
=
[
self
.
new_buffer_temp
,
self
.
retcode_temp
]
Buffer
.
used_buffer_aux_vars
(
self
.
entry
)
def
analyse_rvalue_entry
(
self
,
env
):
...
...
@@ -1035,6 +1036,16 @@ class NameNode(AtomicExprNode):
rhs
.
generate_disposal_code
(
code
)
else
:
if
self
.
type
.
is_buffer
:
# Generate code for doing the buffer release/acquisition.
# This might raise an exception in which case the assignment (done
# below) will not happen.
#
# The reason this is not in a typetest-like node is because the
# variables that the acquired buffer info is stored to is allocated
# per entry and coupled with it.
self
.
generate_acquire_buffer
(
rhs
,
code
)
if
self
.
type
.
is_pyobject
:
rhs
.
make_owned_reference
(
code
)
#print "NameNode.generate_assignment_code: to", self.name ###
...
...
@@ -1050,9 +1061,6 @@ class NameNode(AtomicExprNode):
code
.
put_xdecref
(
self
.
result_code
,
self
.
ctype
())
else
:
code
.
put_decref
(
self
.
result_code
,
self
.
ctype
())
if
self
.
type
.
is_buffer
:
self
.
generate_acquire_buffer
(
rhs
,
code
)
else
:
code
.
putln
(
'%s = %s;'
%
(
self
.
result_code
,
rhs
.
result_as
(
self
.
ctype
())))
if
debug_disposal_code
:
print
(
"NameNode.generate_assignment_code:"
)
...
...
@@ -1066,7 +1074,7 @@ class NameNode(AtomicExprNode):
code
.
putln
(
'%s = %s;'
%
(
rhstmp
,
rhs
.
result_as
(
self
.
ctype
())))
import
Buffer
Buffer
.
put_assign_to_buffer
(
self
.
result_code
,
rhstmp
,
buffer_aux
,
self
.
entry
.
type
,
Buffer
.
put_assign_to_buffer
(
self
.
result_code
,
rhstmp
,
self
.
retcode_temp
.
cname
,
buffer_aux
,
self
.
entry
.
type
,
is_initialized
=
not
self
.
skip_assignment_decref
,
pos
=
self
.
pos
,
code
=
code
)
code
.
putln
(
"%s = 0;"
%
rhstmp
)
...
...
Cython/Compiler/Naming.py
View file @
5949fc5d
...
...
@@ -34,7 +34,7 @@ var_prefix = pyrex_prefix + "v_"
bufstruct_prefix
=
pyrex_prefix
+
"bstruct_"
bufstride_prefix
=
pyrex_prefix
+
"bstride_"
bufshape_prefix
=
pyrex_prefix
+
"bshape_"
bufoffset_prefix
=
pyrex_prefix
+
"boffset_"
buf
sub
offset_prefix
=
pyrex_prefix
+
"boffset_"
vtable_prefix
=
pyrex_prefix
+
"vtable_"
vtabptr_prefix
=
pyrex_prefix
+
"vtabptr_"
vtabstruct_prefix
=
pyrex_prefix
+
"vtabstruct_"
...
...
tests/run/bufaccess.pyx
View file @
5949fc5d
...
...
@@ -26,6 +26,9 @@ def testcase(func):
__test__
[
func
.
__name__
]
=
setup_string
+
func
.
__doc__
return
func
def
testcas
(
a
):
pass
@
testcase
def
acquire_release
(
o1
,
o2
):
"""
...
...
@@ -34,11 +37,16 @@ def acquire_release(o1, o2):
released A
acquired B
released B
>>> acquire_release(None, None)
>>> acquire_release(None, B)
acquired B
released B
"""
cdef
object
[
int
]
buf
buf
=
o1
buf
=
o2
#TODO!
#@testcase
def
acquire_raise
(
o
):
"""
...
...
@@ -60,6 +68,134 @@ def acquire_raise(o):
o
.
printlog
()
raise
Exception
(
"on purpose"
)
@
testcase
def
acquire_failure1
():
"""
>>> acquire_failure1()
acquired working
0 3
0 3
released working
"""
cdef
object
[
int
]
buf
buf
=
IntMockBuffer
(
"working"
,
range
(
4
))
print
buf
[
0
],
buf
[
3
]
try
:
buf
=
ErrorBuffer
()
assert
False
except
Exception
:
print
buf
[
0
],
buf
[
3
]
@
testcase
def
acquire_failure2
():
"""
>>> acquire_failure2()
acquired working
0 3
0 3
released working
"""
cdef
object
[
int
]
buf
=
IntMockBuffer
(
"working"
,
range
(
4
))
print
buf
[
0
],
buf
[
3
]
try
:
buf
=
ErrorBuffer
()
assert
False
except
Exception
:
print
buf
[
0
],
buf
[
3
]
@
testcase
def
acquire_failure3
():
"""
>>> acquire_failure3()
acquired working
0 3
released working
acquired working
0 3
released working
"""
cdef
object
[
int
]
buf
buf
=
IntMockBuffer
(
"working"
,
range
(
4
))
print
buf
[
0
],
buf
[
3
]
try
:
buf
=
3
assert
False
except
Exception
:
print
buf
[
0
],
buf
[
3
]
@
testcase
def
acquire_failure4
():
"""
>>> acquire_failure4()
acquired working
0 3
released working
acquired working
0 3
released working
"""
cdef
object
[
int
]
buf
=
IntMockBuffer
(
"working"
,
range
(
4
))
print
buf
[
0
],
buf
[
3
]
try
:
buf
=
2
assert
False
except
Exception
:
print
buf
[
0
],
buf
[
3
]
@
testcase
def
acquire_failure5
():
"""
>>> acquire_failure5()
Traceback (most recent call last):
...
ValueError: Buffer acquisition failed on assignment; and then reacquiring the old buffer failed too!
"""
cdef
object
[
int
]
buf
buf
=
IntMockBuffer
(
"working"
,
range
(
4
))
buf
.
fail
=
True
buf
=
3
@
testcase
def
acquire_nonbuffer1
(
first
,
second
=
None
):
"""
>>> acquire_nonbuffer1(3)
Traceback (most recent call last):
...
TypeError: 'int' does not have the buffer interface
>>> acquire_nonbuffer1(type)
Traceback (most recent call last):
...
TypeError: 'type' does not have the buffer interface
>>> acquire_nonbuffer1(None, 2)
Traceback (most recent call last):
...
TypeError: 'int' does not have the buffer interface
"""
cdef
object
[
int
]
buf
buf
=
first
buf
=
second
@
testcase
def
acquire_nonbuffer2
():
"""
>>> acquire_nonbuffer2()
acquired working
0 3
released working
acquired working
0 3
released working
"""
cdef
object
[
int
]
buf
=
IntMockBuffer
(
"working"
,
range
(
4
))
print
buf
[
0
],
buf
[
3
]
try
:
buf
=
ErrorBuffer
assert
False
except
Exception
:
print
buf
[
0
],
buf
[
3
]
@
testcase
def
as_argument
(
object
[
int
]
bufarg
,
int
n
):
"""
...
...
@@ -331,14 +467,19 @@ available_flags = (
(
'WRITABLE'
,
python_buffer
.
PyBUF_WRITABLE
)
)
cimport
stdio
cdef
class
MockBuffer
:
cdef
object
format
cdef
char
*
buffer
cdef
void
*
buffer
cdef
int
len
,
itemsize
,
ndim
cdef
Py_ssize_t
*
strides
cdef
Py_ssize_t
*
shape
cdef
Py_ssize_t
*
suboffsets
cdef
object
label
,
log
cdef
readonly
object
recieved_flags
cdef
public
object
fail
def
__init__
(
self
,
label
,
data
,
shape
=
None
,
strides
=
None
,
format
=
None
):
self
.
label
=
label
...
...
@@ -356,27 +497,78 @@ cdef class MockBuffer:
cumprod
*=
s
strides
.
reverse
()
strides
=
[
x
*
self
.
itemsize
for
x
in
strides
]
suboffsets
=
[
-
1
]
*
len
(
shape
)
datashape
=
[
len
(
data
)]
p
=
data
while
True
:
p
=
p
[
0
]
if
isinstance
(
p
,
list
):
datashape
.
append
(
len
(
p
))
else
:
break
if
len
(
datashape
)
>
1
:
# indirect access
self
.
ndim
=
len
(
datashape
)
shape
=
datashape
self
.
buffer
=
self
.
create_indirect_buffer
(
data
,
shape
)
self
.
suboffsets
=
self
.
list_to_sizebuf
(
suboffsets
)
else
:
# strided and/or simple access
self
.
buffer
=
self
.
create_buffer
(
data
)
self
.
ndim
=
len
(
shape
)
self
.
suboffsets
=
NULL
self
.
format
=
format
self
.
len
=
len
(
data
)
*
self
.
itemsize
self
.
buffer
=
<
char
*>
stdlib
.
malloc
(
self
.
len
)
self
.
fill_buffer
(
data
)
self
.
ndim
=
len
(
shape
)
self
.
strides
=
<
Py_ssize_t
*>
stdlib
.
malloc
(
self
.
ndim
*
sizeof
(
Py_ssize_t
))
for
i
,
x
in
enumerate
(
strides
):
self
.
strides
[
i
]
=
x
self
.
shape
=
<
Py_ssize_t
*>
stdlib
.
malloc
(
self
.
ndim
*
sizeof
(
Py_ssize_t
))
for
i
,
x
in
enumerate
(
shape
):
self
.
shape
[
i
]
=
x
self
.
strides
=
self
.
list_to_sizebuf
(
strides
)
self
.
shape
=
self
.
list_to_sizebuf
(
shape
)
def
__dealloc__
(
self
):
stdlib
.
free
(
self
.
strides
)
stdlib
.
free
(
self
.
shape
)
if
self
.
suboffsets
!=
NULL
:
stdlib
.
free
(
self
.
suboffsets
)
# must recursively free indirect...
else
:
stdlib
.
free
(
self
.
buffer
)
cdef
void
*
create_buffer
(
self
,
data
):
cdef
char
*
buf
=
<
char
*>
stdlib
.
malloc
(
len
(
data
)
*
self
.
itemsize
)
cdef
char
*
it
=
buf
for
value
in
data
:
self
.
write
(
it
,
value
)
it
+=
self
.
itemsize
return
buf
cdef
void
*
create_indirect_buffer
(
self
,
data
,
shape
):
cdef
void
**
buf
assert
shape
[
0
]
==
len
(
data
)
if
len
(
shape
)
==
1
:
return
self
.
create_buffer
(
data
)
else
:
shape
=
shape
[
1
:]
buf
=
<
void
**>
stdlib
.
malloc
(
len
(
data
)
*
sizeof
(
void
*
))
for
idx
,
subdata
in
enumerate
(
data
):
buf
[
idx
]
=
self
.
create_indirect_buffer
(
subdata
,
shape
)
return
buf
cdef
Py_ssize_t
*
list_to_sizebuf
(
self
,
l
):
cdef
Py_ssize_t
*
buf
=
<
Py_ssize_t
*>
stdlib
.
malloc
(
len
(
l
)
*
sizeof
(
Py_ssize_t
))
for
i
,
x
in
enumerate
(
l
):
buf
[
i
]
=
x
return
buf
def
__getbuffer__
(
MockBuffer
self
,
Py_buffer
*
buffer
,
int
flags
):
if
self
.
fail
:
raise
ValueError
(
"Failing on purpose"
)
if
buffer
is
NULL
:
print
u"locking!"
return
self
.
recieved_flags
=
[]
cdef
int
value
for
name
,
value
in
available_flags
:
if
(
value
&
flags
)
==
value
:
self
.
recieved_flags
.
append
(
name
)
...
...
@@ -388,7 +580,7 @@ cdef class MockBuffer:
buffer
.
ndim
=
self
.
ndim
buffer
.
shape
=
self
.
shape
buffer
.
strides
=
self
.
strides
buffer
.
suboffsets
=
NULL
buffer
.
suboffsets
=
self
.
suboffsets
buffer
.
itemsize
=
self
.
itemsize
buffer
.
internal
=
NULL
msg
=
"acquired %s"
%
self
.
label
...
...
@@ -400,12 +592,6 @@ cdef class MockBuffer:
print
msg
self
.
log
+=
msg
+
"
\
n
"
cdef
fill_buffer
(
self
,
object
data
):
cdef
char
*
it
=
self
.
buffer
for
value
in
data
:
self
.
write
(
it
,
value
)
it
+=
self
.
itemsize
def
printlog
(
self
):
print
self
.
log
,
...
...
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