Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
pybind11
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
open
pybind11
Commits
51439896
Commit
51439896
authored
Feb 28, 2017
by
Dean Moldovan
Committed by
Wenzel Jakob
Feb 28, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compilation of Eigen casters with complex scalars
parent
5687b337
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
3 deletions
+9
-3
include/pybind11/numpy.h
+1
-1
tests/test_eigen.cpp
+1
-0
tests/test_eigen.py
+7
-2
No files found.
include/pybind11/numpy.h
View file @
51439896
...
...
@@ -731,7 +731,7 @@ public:
template
<
typename
T2
=
T
,
enable_if_t
<
is_complex
<
T2
>::
value
,
int
>
=
0
>
static
PYBIND11_DESCR
name
()
{
return
_
<
std
::
is_same
<
typename
T2
::
value_type
,
float
>::
value
||
std
::
is_same
<
typename
T2
::
value_type
,
double
>::
value
>
(
_
(
"complex"
)
+
_
<
sizeof
(
T2
::
value_type
)
*
16
>
(),
_
(
"longcomplex"
));
_
(
"complex"
)
+
_
<
sizeof
(
typename
T2
::
value_type
)
*
16
>
(),
_
(
"longcomplex"
));
}
};
...
...
tests/test_eigen.cpp
View file @
51439896
...
...
@@ -66,6 +66,7 @@ test_initializer eigen([](py::module &m) {
m
.
def
(
"double_col"
,
[](
const
Eigen
::
VectorXf
&
x
)
->
Eigen
::
VectorXf
{
return
2.0
f
*
x
;
});
m
.
def
(
"double_row"
,
[](
const
Eigen
::
RowVectorXf
&
x
)
->
Eigen
::
RowVectorXf
{
return
2.0
f
*
x
;
});
m
.
def
(
"double_complex"
,
[](
const
Eigen
::
VectorXcf
&
x
)
->
Eigen
::
VectorXcf
{
return
2.0
f
*
x
;
});
m
.
def
(
"double_threec"
,
[](
py
::
EigenDRef
<
Eigen
::
Vector3f
>
x
)
{
x
*=
2
;
});
m
.
def
(
"double_threer"
,
[](
py
::
EigenDRef
<
Eigen
::
RowVector3f
>
x
)
{
x
*=
2
;
});
m
.
def
(
"double_mat_cm"
,
[](
Eigen
::
MatrixXf
x
)
->
Eigen
::
MatrixXf
{
return
2.0
f
*
x
;
});
...
...
tests/test_eigen.py
View file @
51439896
...
...
@@ -129,7 +129,7 @@ def test_pass_readonly_array():
def
test_nonunit_stride_from_python
():
from
pybind11_tests
import
(
double_row
,
double_col
,
double_mat_cm
,
double_mat_rm
,
double_row
,
double_col
,
double_
complex
,
double_
mat_cm
,
double_mat_rm
,
double_threec
,
double_threer
)
counting_mat
=
np
.
arange
(
9.0
,
dtype
=
np
.
float32
)
.
reshape
((
3
,
3
))
...
...
@@ -137,8 +137,10 @@ def test_nonunit_stride_from_python():
second_col
=
counting_mat
[:,
1
]
np
.
testing
.
assert_array_equal
(
double_row
(
second_row
),
2.0
*
second_row
)
np
.
testing
.
assert_array_equal
(
double_col
(
second_row
),
2.0
*
second_row
)
np
.
testing
.
assert_array_equal
(
double_complex
(
second_row
),
2.0
*
second_row
)
np
.
testing
.
assert_array_equal
(
double_row
(
second_col
),
2.0
*
second_col
)
np
.
testing
.
assert_array_equal
(
double_col
(
second_col
),
2.0
*
second_col
)
np
.
testing
.
assert_array_equal
(
double_complex
(
second_col
),
2.0
*
second_col
)
counting_3d
=
np
.
arange
(
27.0
,
dtype
=
np
.
float32
)
.
reshape
((
3
,
3
,
3
))
slices
=
[
counting_3d
[
0
,
:,
:],
counting_3d
[:,
0
,
:],
counting_3d
[:,
:,
0
]]
...
...
@@ -564,7 +566,7 @@ def test_special_matrix_objects():
def
test_dense_signature
(
doc
):
from
pybind11_tests
import
double_col
,
double_row
,
double_mat_rm
from
pybind11_tests
import
double_col
,
double_row
,
double_
complex
,
double_
mat_rm
assert
doc
(
double_col
)
==
"""
double_col(arg0: numpy.ndarray[float32[m, 1]]) -> numpy.ndarray[float32[m, 1]]
...
...
@@ -572,6 +574,9 @@ def test_dense_signature(doc):
assert
doc
(
double_row
)
==
"""
double_row(arg0: numpy.ndarray[float32[1, n]]) -> numpy.ndarray[float32[1, n]]
"""
assert
doc
(
double_complex
)
==
"""
double_complex(arg0: numpy.ndarray[complex64[m, 1]]) -> numpy.ndarray[complex64[m, 1]]
"""
assert
doc
(
double_mat_rm
)
==
"""
double_mat_rm(arg0: numpy.ndarray[float32[m, n]]) -> numpy.ndarray[float32[m, n]]
"""
...
...
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