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
a5953c6c
Commit
a5953c6c
authored
15 years ago
by
Kurt Smith
Committed by
Mark Florisson
13 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactoring of MemoryViewSliceType utility code.
parent
c041335f
No related merge requests found
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
197 additions
and
121 deletions
+197
-121
Cython/Compiler/ExprNodes.py
Cython/Compiler/ExprNodes.py
+0
-1
Cython/Compiler/MemoryView.py
Cython/Compiler/MemoryView.py
+175
-87
Cython/Compiler/PyrexTypes.py
Cython/Compiler/PyrexTypes.py
+22
-33
No files found.
Cython/Compiler/ExprNodes.py
View file @
a5953c6c
...
...
@@ -592,7 +592,6 @@ class ExprNode(Node):
error
(
self
.
pos
,
"Memoryview '%s' not conformable to memoryview '%s'."
%
(
src
.
type
,
dst_type
))
elif
dst_type
.
is_pyobject
:
if
not
src
.
type
.
is_pyobject
:
if
dst_type
is
bytes_type
and
src
.
type
.
is_int
:
...
...
This diff is collapsed.
Click to expand it.
Cython/Compiler/MemoryView.py
View file @
a5953c6c
This diff is collapsed.
Click to expand it.
Cython/Compiler/PyrexTypes.py
View file @
a5953c6c
...
...
@@ -387,6 +387,7 @@ class MemoryViewSliceType(PyrexType):
import
Symtab
,
MemoryView
from
MemoryView
import
axes_to_str
self
.
scope
=
scope
=
Symtab
.
CClassScope
(
'mvs_class_'
+
self
.
specialization_suffix
(),
None
,
...
...
@@ -408,53 +409,41 @@ class MemoryViewSliceType(PyrexType):
to_memview_c
=
MemoryViewSliceType
(
self
.
dtype
,
to_axes_c
)
to_memview_f
=
MemoryViewSliceType
(
self
.
dtype
,
to_axes_f
)
copy_contents_name_c
=
\
MemoryView
.
get_copy_contents_name
(
self
,
to_memview_c
)
copy_contents_name_f
=
\
MemoryView
.
get_copy_contents_name
(
self
,
to_memview_f
)
c_copy_decl
,
c_copy_impl
,
c_entry
=
\
MemoryView
.
memoryviewslice_get_copy_func
(
self
,
to_memview_c
,
'c'
,
self
.
scope
)
f_copy_decl
,
f_copy_impl
,
f_entry
=
\
MemoryView
.
memoryviewslice_get_copy_func
(
self
,
to_memview_f
,
'fortran'
,
self
.
scope
)
cython_name_c
,
cython_name_f
=
"copy"
,
"copy_fortran"
copy_name_c
,
copy_name_f
=
(
MemoryView
.
get_copy_func_name
(
to_memview_c
),
MemoryView
.
get_copy_func_name
(
to_memview_f
))
c_copy_contents_decl
,
c_copy_contents_impl
=
\
MemoryView
.
get_copy_contents_func
(
self
,
to_memview_c
,
copy_contents_name_c
)
f_copy_contents_decl
,
f_copy_contents_impl
=
\
MemoryView
.
get_copy_contents_func
(
self
,
to_memview_f
,
copy_contents_name_f
)
c_util_code
=
UtilityCode
(
proto
=
"%s%s"
%
(
c_copy_decl
,
c_copy_contents_decl
),
impl
=
"%s%s"
%
(
c_copy_impl
,
c_copy_contents_impl
))
f_util_code
=
UtilityCode
(
proto
=
f_copy_decl
,
impl
=
f_copy_impl
)
for
(
to_memview
,
cython_name
,
copy_name
)
in
((
to_memview_c
,
cython_name_c
,
copy_name_c
),
(
to_memview_f
,
cython_name_f
,
copy_name_f
)):
c_entry
.
utility_code_definition
=
c_util_code
f_entry
.
utility_code_definition
=
f_util_code
entry
=
scope
.
declare_cfunction
(
cython_name
,
CFuncType
(
self
,
[
CFuncTypeArg
(
"memviewslice"
,
self
,
None
)]),
pos
=
None
,
defining
=
1
,
cname
=
copy_name
)
if
copy_contents_name_c
!=
copy_contents_name_f
:
f_util_code
.
proto
+=
f_copy_contents_decl
f_util_code
.
impl
+=
f_copy_contents_impl
entry
.
utility_code_definition
=
\
MemoryView
.
CopyFuncUtilCode
(
self
,
to_memview
)
# is_c_contiguous and is_f_contiguous functions
# is_c_contig and is_f_contig functions
for
(
c_or_f
,
cython_name
)
in
((
'c'
,
'is_c_contig'
),
(
'fortran'
,
'is_f_contig'
)):
for
c_or_f
,
cython_name
in
((
'c'
,
'is_c_contig'
),
(
'fortran'
,
'is_f_contig'
)):
is_contig_name
=
\
MemoryView
.
get_is_contig_func_name
(
c_or_f
)
is_contig_name
=
MemoryView
.
get_is_contig_func_name
(
c_or_f
)
scope
.
declare_cfunction
(
cython_name
,
entry
=
scope
.
declare_cfunction
(
cython_name
,
CFuncType
(
c_int_type
,
[
CFuncTypeArg
(
"memviewslice"
,
self
,
None
)]),
pos
=
None
,
defining
=
1
,
cname
=
is_contig_name
)
contig_decl
,
contig_impl
=
MemoryView
.
get_is_contiguous_func
(
c_or_f
)
entry
.
utility_code_definition
=
\
MemoryView
.
IsContigFuncUtilCode
(
c_or_f
)
contig_util_code
=
UtilityCode
(
proto
=
contig_decl
,
impl
=
contig_impl
)
return
True
...
...
This diff is collapsed.
Click to expand it.
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