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
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
7de1010c
Commit
7de1010c
authored
Feb 24, 2018
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid slow Pythran dtype checking code in fused function dispatch if pythran is not used.
parent
8581fb72
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
11 deletions
+21
-11
Cython/Compiler/FusedNode.py
Cython/Compiler/FusedNode.py
+21
-11
No files found.
Cython/Compiler/FusedNode.py
View file @
7de1010c
...
@@ -424,7 +424,7 @@ class FusedCFuncDefNode(StatListNode):
...
@@ -424,7 +424,7 @@ class FusedCFuncDefNode(StatListNode):
if ndarray is not None:
if ndarray is not None:
if isinstance(arg, ndarray):
if isinstance(arg, ndarray):
dtype = arg.dtype
dtype = arg.dtype
arg_is_pythran_compatible = True
"""
+
(
"arg_is_pythran_compatible = True"
if
pythran_types
else
""
)
+
"""
elif __pyx_memoryview_check(arg):
elif __pyx_memoryview_check(arg):
arg_base = arg.base
arg_base = arg.base
if isinstance(arg_base, ndarray):
if isinstance(arg_base, ndarray):
...
@@ -438,24 +438,30 @@ class FusedCFuncDefNode(StatListNode):
...
@@ -438,24 +438,30 @@ class FusedCFuncDefNode(StatListNode):
if dtype is not None:
if dtype is not None:
itemsize = dtype.itemsize
itemsize = dtype.itemsize
kind = ord(dtype.kind)
kind = ord(dtype.kind)
dtype_signed = kind == 'i'
"""
)
pyx_code
.
indent
(
2
)
if
pythran_types
:
pyx_code
.
put_chunk
(
u"""
# We only support the endianness of the current compiler
# We only support the endianness of the current compiler
byteorder = dtype.byteorder
byteorder = dtype.byteorder
if byteorder == "<" and not __Pyx_Is_Little_Endian():
if byteorder == "<" and not __Pyx_Is_Little_Endian():
arg_is_pythran_compatible = False
arg_is_pythran_compatible = False
if byteorder == ">" and __Pyx_Is_Little_Endian():
el
if byteorder == ">" and __Pyx_Is_Little_Endian():
arg_is_pythran_compatible = False
arg_is_pythran_compatible = False
dtype_signed = kind == 'i'
if arg_is_pythran_compatible:
if arg_is_pythran_compatible:
cur_stride = itemsize
cur_stride = itemsize
for dim,stride in zip(reversed(arg.shape),reversed(arg.strides)):
shape = arg.shape
if stride != cur_stride:
strides = arg.strides
for i in range(arg.ndim):
if strides[i] != cur_stride:
arg_is_pythran_compatible = False
arg_is_pythran_compatible = False
break
break
cur_stride *=
dim
cur_stride *=
shape[i]
else:
else:
arg_is_pythran_compatible = not (arg.flags.f_contiguous and arg.ndim > 1)
arg_is_pythran_compatible = not (arg.flags.f_contiguous and arg.ndim > 1)
"""
)
"""
)
pyx_code
.
indent
(
2
)
pyx_code
.
named_insertion_point
(
"numpy_dtype_checks"
)
pyx_code
.
named_insertion_point
(
"numpy_dtype_checks"
)
self
.
_buffer_check_numpy_dtype
(
pyx_code
,
buffer_types
,
pythran_types
)
self
.
_buffer_check_numpy_dtype
(
pyx_code
,
buffer_types
,
pythran_types
)
pyx_code
.
dedent
(
2
)
pyx_code
.
dedent
(
2
)
...
@@ -464,7 +470,7 @@ class FusedCFuncDefNode(StatListNode):
...
@@ -464,7 +470,7 @@ class FusedCFuncDefNode(StatListNode):
self
.
_buffer_parse_format_string_check
(
self
.
_buffer_parse_format_string_check
(
pyx_code
,
decl_code
,
specialized_type
,
env
)
pyx_code
,
decl_code
,
specialized_type
,
env
)
def
_buffer_declarations
(
self
,
pyx_code
,
decl_code
,
all_buffer_types
):
def
_buffer_declarations
(
self
,
pyx_code
,
decl_code
,
all_buffer_types
,
pythran_types
):
"""
"""
If we have any buffer specializations, write out some variable
If we have any buffer specializations, write out some variable
declarations and imports.
declarations and imports.
...
@@ -484,9 +490,13 @@ class FusedCFuncDefNode(StatListNode):
...
@@ -484,9 +490,13 @@ class FusedCFuncDefNode(StatListNode):
cdef Py_ssize_t itemsize
cdef Py_ssize_t itemsize
cdef bint dtype_signed
cdef bint dtype_signed
cdef char kind
cdef char kind
cdef bint arg_is_pythran_compatible
itemsize = -1
itemsize = -1
"""
)
if
pythran_types
:
pyx_code
.
local_variable_declarations
.
put_chunk
(
u"""
cdef bint arg_is_pythran_compatible
arg_is_pythran_compatible = False
arg_is_pythran_compatible = False
"""
)
"""
)
...
@@ -670,7 +680,7 @@ class FusedCFuncDefNode(StatListNode):
...
@@ -670,7 +680,7 @@ class FusedCFuncDefNode(StatListNode):
default_idx
+=
1
default_idx
+=
1
if
all_buffer_types
:
if
all_buffer_types
:
self
.
_buffer_declarations
(
pyx_code
,
decl_code
,
all_buffer_types
)
self
.
_buffer_declarations
(
pyx_code
,
decl_code
,
all_buffer_types
,
pythran_types
)
env
.
use_utility_code
(
Code
.
UtilityCode
.
load_cached
(
"Import"
,
"ImportExport.c"
))
env
.
use_utility_code
(
Code
.
UtilityCode
.
load_cached
(
"Import"
,
"ImportExport.c"
))
env
.
use_utility_code
(
Code
.
UtilityCode
.
load_cached
(
"ImportNumPyArray"
,
"ImportExport.c"
))
env
.
use_utility_code
(
Code
.
UtilityCode
.
load_cached
(
"ImportNumPyArray"
,
"ImportExport.c"
))
...
...
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